Changeset 29230 in vbox for trunk/src/libs/xpcom18a4/java

Timestamp:

May 7, 2010 7:29:18 PM (15 years ago)

Author:

vboxsync

Message:

java bridge: callbacks works too

Location:

trunk/src/libs/xpcom18a4/java/src

Files:

• nsJavaXPCOMGlue.cpp (modified) (4 diffs)
• org/virtualbox/VirtualBoxManager.java (modified) (3 diffs)

trunk/src/libs/xpcom18a4/java/src/nsJavaXPCOMGlue.cpp

@@ -133 +133 @@
     {
         mOuter = aOuter;
-        //if (mOuter)
-        //    mOuter->AddRef();
         mII = ii;
     }
@@ -140 +138 @@
     virtual ~nsXPTCJStub()
     {
-        //if (mOuter)
-        //  mOuter->Release();
     }
 
@@ -147 +143 @@
     {
         *info = mII;
+        (*info)->AddRef();
          return NS_OK;
     }
@@ -172 +169 @@
 NS_IMETHODIMP nsXPTCJStub::QueryInterface(REFNSIID aIID, void** aInstancePtr)
 {
-    nsIID* mIID;
+    nsIID* mIID; 
     mII->GetInterfaceIID(&mIID);
 

trunk/src/libs/xpcom18a4/java/src/org/virtualbox/VirtualBoxManager.java

@@ -98 +98 @@
     }
 
-    public boolean startVm(String name, int timeout)
+    public boolean startVm(String name, String type, int timeout)
     {
         IMachine m = vbox.findMachine(name);
@@ -107 +107 @@
 
         String mid = m.getId();
-        String type = "gui";
+        if (type == null)
+            type = "gui";
         IProgress p = vbox.openRemoteSession(session, mid, type, "");
         progressBar(p, timeout);
@@ -123 +124 @@
         mozilla.waitForEvents(tmo);
     }
-
-    public ILocalOwner makeWrapper(nsISupports obj)
-    {
-
-       ILocalOwner lo = (ILocalOwner) this.componentManager
-               .createInstanceByContractID("@virtualbox.org/CallbackWrapper;1",
-                                           null,
-                                           ILocalOwner.ILOCALOWNER_IID);
-       lo.setLocalObject(obj);
-       return lo;
-    }
-
-    public IVirtualBoxCallback makeVirtualBoxCallback(IVirtualBoxCallback obj)
-    {
-       ILocalOwner lo = makeWrapper(obj);
-       return (IVirtualBoxCallback)lo.queryInterface(IVirtualBoxCallback.IVIRTUALBOXCALLBACK_IID);
-    }
 }