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

Timestamp:

Jul 26, 2010 8:55:20 AM (15 years ago)

Author:

vboxsync

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

64048

Message:

Java: MSCOM update

File:

• trunk/src/VBox/Main/glue/glue-java.xsl (modified) (6 diffs)

trunk/src/VBox/Main/glue/glue-java.xsl

@@ -2755 +2755 @@
     }
 
+    @SuppressWarnings("unchecked")
     public static <T> Object wrapVariant(Class<T> wrapperClass, Variant v)
     {
@@ -2784 +2785 @@
     }
 
+    @SuppressWarnings("unchecked")
     public static <T> List<T> wrap(Class<T> wrapperClass, SafeArray sa) {
         if (sa==null)  return null;
@@ -2911 +2913 @@
     }
 
+    @SuppressWarnings("unchecked")
     public static <T> T[] unwrap(Class<T> wrapperClass, List<T> thisPtrs) {
         if (thisPtrs==null) return null;
@@ -2916 +2919 @@
     }
 
+    @SuppressWarnings("unchecked")
     public static <T1 extends IUnknown,T2> T2[] unwrap2(Class<T1> wrapperClass1, Class<T2> wrapperClass2, List<T1> thisPtrs) {
         if (thisPtrs==null) return null;
@@ -2998 +3002 @@
     }
 
-    public ISession openMachineSession(String mid) throws Exception
+    public ISession openMachineSession(IMachine m)
     {
         ISession s = getSessionObject();
-        try {
-          this.vbox.openExistingSession(s, mid);
-          return s;
-        } catch (Exception e) {
-          try {
-            this.vbox.openSession(s, mid);
-            return s;
-          } catch (Exception e1) {
-            closeMachineSession(s);
-            throw e1;
-          }
-        }
-    }
-
-    public ISession openMachineSession(IMachine m) throws Exception
-    {
-          return openMachineSession(m.getId());
-    }
-
+        m.lockMachine(s, LockType.Shared);
+        return s;       
+    }
+   
     public void closeMachineSession(ISession s)
     {
@@ -3065 +3054 @@
             return false;
         ISession session = getSessionObject();
-
-        String mid = m.getId();
         if (type == null)
             type = "gui";
-        IProgress p = vbox.openRemoteSession(session, mid, type, "");
+        IProgress p = m.launchVMProcess(session, type, "");
         progressBar(p, timeout);
         session.unlockMachine();