Changeset 16662 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 11, 2009 1:01:48 PM (16 years ago)

Author:

vboxsync

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

42654

Message:

OVF: create new IAppliance::read() method instead of reading in constructor; IVirtualBox::openAppliance -> createAppliance; IAppliance->importAppliance -> importMachines

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManageImport.cpp (modified) (2 diffs)
• VirtualBox/src/VBoxImportAppliance.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageImport.cpp

@@ -155 +155 @@
         Bstr bstrOvfFilename(strOvfFilename);
         ComPtr<IAppliance> appliance;
-        CHECK_ERROR_BREAK(a->virtualBox, OpenAppliance(bstrOvfFilename, appliance.asOutParam()));
+        CHECK_ERROR_BREAK(a->virtualBox, CreateAppliance(appliance.asOutParam()));
+
+        CHECK_ERROR_BREAK(appliance, Read(bstrOvfFilename));
 
         RTPrintf("Interpreting %s... ", strOvfFilename.c_str());
@@ -434 +436 @@
                 ComPtr<IProgress> progress;
                 CHECK_ERROR_BREAK(appliance,
-                                  ImportAppliance(progress.asOutParam()));
+                                  ImportMachines(progress.asOutParam()));
 
                 showProgress(progress);

trunk/src/VBox/Frontends/VirtualBox/src/VBoxImportAppliance.cpp

@@ -954 +954 @@
         CVirtualBox vbox = vboxGlobal().virtualBox();
         /* Open the appliance */
-        CAppliance appliance = vbox.OpenAppliance (file);
+        CAppliance appliance = vbox.CreateAppliance();
         if (appliance.isOk())
         {
+            appliance.Read(file); // @todo error handling
             /* Now we have to interpret that stuff */
             appliance.Interpret();
@@ -967 +968 @@
                     /* Start the import asynchronously */
                     CProgress progress;
-                    progress = appliance.ImportAppliance();
+                    progress = appliance.ImportMachines();
                     if (!appliance.isOk())
                     {