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

Timestamp:

May 7, 2010 9:03:34 AM (15 years ago)

Author:

vboxsync

Message:

java bridge: callbacks (not yet works due to DCOM issues)

Location:

trunk/src/libs/xpcom18a4/java

Files:

• src/nsJavaXPCOMGlue.cpp (modified) (1 diff)
• src/org/virtualbox/VirtualBoxManager.java (modified) (1 diff)
• tests/TestVBox.java (modified) (4 diffs)

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

@@ -158 +158 @@
 };
 
-NS_IMPL_ISUPPORTS1(nsXPTCJStub, nsISupports);
+NS_IMPL_ADDREF(nsXPTCJStub)
+NS_IMPL_RELEASE(nsXPTCJStub)
+
+NS_IMETHODIMP nsXPTCJStub::QueryInterface(REFNSIID aIID, void** aInstancePtr)
+{
+    return mOuter->QueryInterface(aIID, aInstancePtr);
+}
 
 nsresult

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

@@ -114 +114 @@
         return true;
     }
+
+    public Mozilla getMozilla()
+    {
+        return mozilla;
+    }
+
+    public void waitForEvents(long tmo)
+    {
+        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);
+    }
 }

trunk/src/libs/xpcom18a4/java/tests/TestVBox.java

@@ -34 +34 @@
         /** @todo long -> MachineState */
         public void onMachineStateChange(String machineId, long state) { System.out.println("onMachineStateChange -- VM: " + machineId + ", state: " + state); };
-        
+
         /** @todo ugly reimplementation of queryInterface, should have base class to derive from */
         public nsISupports queryInterface(String iid) { return org.mozilla.xpcom.Mozilla.queryInterface(this, iid); }
     };
-        
-        
+
+
     public static void main(String[] args)
     {
@@ -68 +68 @@
             }
 
-//            VBoxCallbacks vboxCallbacks = new VBoxCallbacks();
-//            vbox.registerCallback(vboxCallbacks);
+            VBoxCallbacks vboxCallbacks = new VBoxCallbacks();
+            vbox.registerCallback(mgr.makeVirtualBoxCallback(vboxCallbacks));
 
             /* do something silly, start the first VM in the list */
@@ -76 +76 @@
             if (mgr.startVm(m, 7000))
             {
-                System.out.println("started, presss any key...");
-                int ch = System.in.read();
+                VBoxCbImpl cb = new VBoxCbImpl();
+                vbox.registerCallback(mgr.makeVirtualBoxCallback(cb));
+
+                if (false)
+                {
+                    System.out.println("started, presss any key...");
+                    int ch = System.in.read();
+                } else {
+                    while (true)
+                    {
+                        mgr.waitForEvents(500);
+                    }
+                }
             }
             else
@@ -83 +94 @@
                 System.out.println("cannot start machine "+m);
             }
-            
-//            vbox.unregisterCallback(vboxCallbacks);
+
+            vbox.unregisterCallback(vboxCallbacks);
         }
         catch (Throwable e)