Changeset 30825 in vbox for trunk/src/VBox/Main/glue

Timestamp:

Jul 14, 2010 12:44:14 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

63641

Message:

Main: callbacks removal

Location:

trunk/src/VBox/Main/glue

Files:

• tests/TestVBox.java (modified) (4 diffs)
• vboxapi.py (modified) (6 diffs)

trunk/src/VBox/Main/glue/tests/TestVBox.java

@@ -16 +16 @@
 import java.math.BigInteger;
 
-class VBoxCallbacks extends VBoxObjectBase implements IVirtualBoxCallback
-{
-    public void onGuestPropertyChange(String machineId, String name, String value, String flags)
-    {
-        System.out.println("onGuestPropertyChange -- VM: " + machineId + ", " + name + "->" + value);
-    }
-    public void onSnapshotChange(String machineId, String snapshotId)
-    {
-        System.out.println("onSnapshotChange -- VM: " + machineId + ", snap: " + snapshotId);
-
-    }
-    public void onSnapshotDeleted(String machineId, String snapshotId)
-    {
-        System.out.println("onSnapshotDeleted -- VM: " + machineId + ", snap: " + snapshotId);
-    }
-    public void onSnapshotTaken(String machineId, String snapshotId)
-    {
-        System.out.println("onSnapshotTaken -- VM: " + machineId + ", snap: " + snapshotId);
-    }
-    public void onSessionStateChange(String machineId, SessionState state)
-    {
-        System.out.println("onSessionStateChange -- VM: " + machineId + ", state: " + state);
-    }
-    public void onMachineRegistered(String machineId, Boolean registered)
-    {
-        System.out.println("onMachineRegistered -- VM: " + machineId + ", registered: " + registered);
-    }
-    public void onMediumRegistered(String mediumId, DeviceType mediumType, Boolean registered)
-    {
-        System.out.println("onMediumRegistered -- ID: " + mediumId + ", type=" + mediumType + ", registered: " + registered);
-    }
-    public void onExtraDataChange(String machineId, String key, String value)
-    {
-        System.out.println("onExtraDataChange -- VM: " + machineId + ": " + key+"->"+value);
-    }
-    public Boolean onExtraDataCanChange(String machineId, String key, String value, Holder<String> error)
-    {
-        return true;
-    }
-    public void onMachineDataChange(String machineId)
-    {
-        System.out.println("onMachineDataChange -- VM: " + machineId);
-    }
-    public void onMachineStateChange(String machineId, MachineState state)
-    {
-        System.out.println("onMachineStateChange -- VM: " + machineId + ", state: " + state);
-    }
-}
-
-class ConsoleCallbacks extends VBoxObjectBase implements IConsoleCallback
-{
-    String mach;
-    ConsoleCallbacks(String mach)
-    {
-       this.mach = mach;
-    }
-    public void onMousePointerShapeChange(Boolean visible, Boolean alpha, Long xHot, Long yHot, Long width, Long height, List<Short> shape)
-    {
-       System.out.println("onMousePointerShapeChange -- VM: " + mach);
-    }
-    public void onMouseCapabilityChange(Boolean supportsAbsolute, Boolean supportsRelative, Boolean needsHostCursor)
-    {
-       System.out.println("onMouseCapabilityChange -- VM: " + mach+" abs="+supportsAbsolute+ " rel="+supportsRelative+" need host="+needsHostCursor);
-    }
-    public void onKeyboardLedsChange(Boolean numLock, Boolean capsLock, Boolean scrollLock)
-    {
-       System.out.println("onKeyboardLedsChange -- VM: " + mach);
-    }
-    public void onStateChange(org.virtualbox_3_3.MachineState state)
-    {
-       System.out.println("onStateChange -- VM: " + mach);
-    }
-    public void onAdditionsStateChange()
-    {
-       System.out.println("onAdditionsStateChange -- VM: " + mach);
-    }
-    public void onNetworkAdapterChange(org.virtualbox_3_3.INetworkAdapter networkAdapter)
-    {
-       System.out.println("onNetworkAdapterChange -- VM: " + mach);
-    }
-    public void onSerialPortChange(org.virtualbox_3_3.ISerialPort serialPort)
-    {
-       System.out.println("onSerialPortChange -- VM: " + mach);
-    }
-    public void onParallelPortChange(org.virtualbox_3_3.IParallelPort parallelPort)
-    {
-       System.out.println("onParallelPortChange -- VM: " + mach);
-    }
-    public void onStorageControllerChange()
-    {
-       System.out.println("onStorageControllerChange -- VM: " + mach);
-    }
-    public void onMediumChange(org.virtualbox_3_3.IMediumAttachment mediumAttachment)
-    {
-       System.out.println("onMediumChange -- VM: " + mach);
-    }
-    public void onCPUChange(Long cpu, Boolean add)
-    {
-       System.out.println("onCPUChange -- VM: " + mach);
-    }
-    public void onVRDPServerChange()
-    {
-       System.out.println("onVRDPServerChange -- VM: " + mach);
-    }
-    public void onRemoteDisplayInfoChange()
-    {
-       System.out.println("onRemoteDisplayInfoChange -- VM: " + mach);
-    }
-    public void onUSBControllerChange()
-    {
-       System.out.println("onUSBControllerChange -- VM: " + mach);
-    }
-    public void onUSBDeviceStateChange(org.virtualbox_3_3.IUSBDevice device, Boolean attached, org.virtualbox_3_3.IVirtualBoxErrorInfo error)
-    {
-       System.out.println("onUSBDeviceStateChange -- VM: " + mach);
-    }
-    public void onSharedFolderChange(org.virtualbox_3_3.Scope scope)
-    {
-       System.out.println("onSharedFolderChange -- VM: " + mach);
-    }
-
-    public void onRuntimeError(Boolean fatal, String id, String message)
-    {
-       System.out.println("onRuntimeError -- VM: " + mach);
-    }
-
-    public Boolean onCanShowWindow()
-    {
-       System.out.println("onCanShowWindow -- VM: " + mach);
-       return true;
-    }
-
-    public BigInteger onShowWindow()
-    {
-       System.out.println("onShowWindow -- VM: " + mach);
-       return BigInteger.ZERO;
-    }
-}
-
 public class TestVBox
 {
-    static void testCallbacks(VirtualBoxManager mgr, IVirtualBox vbox)
-    {
-
-        IVirtualBoxCallback cbs = new VBoxCallbacks();
-        mgr.registerGlobalCallback(vbox, cbs);
-
-        IMachine mach = vbox.getMachines().get(0);
-        IConsoleCallback mcbs = new ConsoleCallbacks(mach.getName());
-
-        ISession session = null;
-        try {
-          session = mgr.openMachineSession(mach);
-          mgr.registerMachineCallback(session, mcbs);
-
-          for (int i=0; i<100; i++)
-          {
-            mgr.waitForEvents(500);
-          }
-
-          System.out.println("done waiting");
-
-          mgr.unregisterMachineCallback(session, mcbs);
-        } catch (Exception e) {
-          e.printStackTrace();
-        } finally {
-          mgr.closeMachineSession(session);
-        }
-        mgr.unregisterGlobalCallback(vbox, cbs);
-    }
-
-
     static void processEvent(IEvent ev)
     {
@@ -198 +28 @@
         {
             case OnMachineStateChange:
-                IMachineStateChangeEvent mcse = IMachineStateChangeEvent.queryInterface(ev);
+                IMachineStateChangedEvent mcse = IMachineStateChangedEvent.queryInterface(ev);
                 if (mcse == null)
                     System.out.println("Cannot query an interface");
@@ -223 +53 @@
     {
         // active mode for Java doesn't fully work yet, and using passive
-        // is more portable (the only mode for MSCOM and WS) and thus generally 
+        // is more portable (the only mode for MSCOM and WS) and thus generally
         // recommended
         IEventListener listener = active ? mgr.createListener(new EventHandler()) : es.createListener();
@@ -285 +115 @@
             testEnumeration(mgr, vbox);
             testStart(mgr, vbox);
-            //testCallbacks(mgr, vbox);
             testEvents(mgr, vbox.getEventSource(), false);
 

trunk/src/VBox/Main/glue/vboxapi.py

@@ -217 +217 @@
             win32com.client.gencache.EnsureDispatch('VirtualBox.Session')
             win32com.client.gencache.EnsureDispatch('VirtualBox.VirtualBox')
-            win32com.client.gencache.EnsureDispatch('VirtualBox.CallbackWrapper')
 
     def getSessionObject(self, vbox):
@@ -245 +244 @@
         import pythoncom
         pythoncom.CoUninitialize()
-
-    def createCallback(self, iface, impl, arg):
-        d = {}
-        d['BaseClass'] = impl
-        d['arg'] = arg
-        d['tlb_guid'] = PlatformMSCOM.VBOX_TLB_GUID
-        str = ""
-        str += "import win32com.server.util\n"
-        str += "import pythoncom\n"
-
-        str += "class "+iface+"Impl(BaseClass):\n"
-        str += "   _com_interfaces_ = ['"+iface+"']\n"
-        str += "   _typelib_guid_ = tlb_guid\n"
-        str += "   _typelib_version_ = 1, 0\n"
-        str += "   _reg_clsctx_ = pythoncom.CLSCTX_INPROC_SERVER\n"
-        # Maybe we'd better implement Dynamic invoke policy, to be more flexible here
-        str += "   _reg_policy_spec_ = 'win32com.server.policy.EventHandlerPolicy'\n"
-
-        # generate capitalized version of callback methods -
-        # that's how Python COM looks them up
-        for m in dir(impl):
-           if m.startswith("on"):
-             str += "   "+ComifyName(m)+"=BaseClass."+m+"\n"
-
-        str += "   def __init__(self): BaseClass.__init__(self, arg)\n"
-        str += "result = win32com.client.Dispatch('VirtualBox.CallbackWrapper')\n"
-        str += "result.SetLocalObject(win32com.server.util.wrap("+iface+"Impl()))\n"
-        exec (str,d,d)
-        return d['result']
 
     def createListener(self, impl, arg):
@@ -292 +262 @@
         str += "   _reg_policy_spec_ = 'win32com.server.policy.EventHandlerPolicy'\n"
 
-        # capitalized version of callback method
+        # capitalized version of listener method
         str += "   HandleEvent=BaseClass.handleEvent\n"
         str += "   def __init__(self): BaseClass.__init__(self, arg)\n"
@@ -370 +340 @@
         import xpcom
         xpcom._xpcom.DetachThread()
-
-    def createCallback(self, iface, impl, arg):
-        d = {}
-        d['BaseClass'] = impl
-        d['arg'] = arg
-        str = ""
-        str += "import xpcom.components\n"
-        str += "class "+iface+"Impl(BaseClass):\n"
-        str += "   _com_interfaces_ = xpcom.components.interfaces."+iface+"\n"
-        str += "   def __init__(self): BaseClass.__init__(self, arg)\n"
-        str += "result = xpcom.components.classes['@virtualbox.org/CallbackWrapper;1'].createInstance()\n"
-        str += "result.setLocalObject("+iface+"Impl())\n"
-        exec (str,d,d)
-        return d['result']
 
     def createListener(self, impl, arg):
@@ -478 +434 @@
         pass
 
-    def createCallback(self, iface, impl, arg):
-        raise Exception("no callbacks for webservices")
-
     def createListener(self, impl, arg):
         raise Exception("no active listeners for webservices")
@@ -581 +534 @@
         self.platform.deinitPerThread()
 
-    def createCallback(self, iface, impl, arg):
-        return self.platform.createCallback(iface, impl, arg)
-
     def createListener(self, impl, arg = None):
         return self.platform.createListener(impl, arg)