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

Timestamp:

Jul 22, 2010 3:24:27 PM (15 years ago)

Author:

vboxsync

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

63924

Message:

Main: reorganize session APIs

File:

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

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

@@ -2494 +2494 @@
     }
 
-    public ISession openMachineSession(String mid) throws Exception
+    public ISession openMachineSession(IMachine m) throws Exception
     {
         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.lockForSession(s, true /* fPermitShared */);
+        return s;
     }
 
@@ -2580 +2565 @@
         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.close();
@@ -3472 +3456 @@
     }
 
-    public ISession openMachineSession(String mid) throws Exception
+    public ISession openMachineSession(IMachine m) throws Exception
     {
         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.lockForSession(s, true /* fPermitShared */ );
+        return s;
     }
 
@@ -3540 +3509 @@
         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.close();