INTEGRATION: CWS native141 (1.3.54); FILE MERGED

2008/04/09 16:40:38 is 1.3.54.1: #i88109# no packages at nodes in java installer and new install order

2 files changed, 15 insertions, 3 deletions

diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java
index 7df4adfec14d..c3e835f6ecd1 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: InstallationOngoingCtrl.java,v $
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -39,6 +39,7 @@ import org.openoffice.setup.ResourceManager;
 import org.openoffice.setup.SetupData.PackageDescription;
 import org.openoffice.setup.Util.LogManager;
 import org.openoffice.setup.Util.InfoDir;
+import org.openoffice.setup.Util.PackageCollector;
 import org.openoffice.setup.Util.SystemManager;
 import java.io.File;
 import java.util.Vector;
@@ -76,6 +77,14 @@ public class InstallationOngoingCtrl extends PanelController {
         panel.setStopButtonActionCommand(getSetupFrame().ACTION_STOP);
         panel.addStopButtonActionListener(getSetupFrame().getSetupActionListener());
 
+        // creating sorted list of packages to install
+        InstallData installData = InstallData.getInstance();
+        Vector installPackages = installData.getInstallPackages();
+
+        Vector sortedPackages = new Vector();
+        PackageCollector.sortPackages(installPackages, sortedPackages, "install");
+        installData.setInstallPackages(sortedPackages);
+
         Installer installer = InstallerFactory.getInstance();
         installer.preInstallationOngoing();
     }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationOngoingCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationOngoingCtrl.java
index a1a1de8c1ba9..a2c151f81b8a 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationOngoingCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationOngoingCtrl.java
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: UninstallationOngoingCtrl.java,v $
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -77,7 +77,10 @@ public class UninstallationOngoingCtrl extends PanelController {
         Vector uninstallPackages = new Vector();
         PackageDescription packageData = SetupDataProvider.getPackageDescription();
         PackageCollector.collectUninstallPackages(packageData, uninstallPackages);
-        data.setInstallPackages(uninstallPackages);
+
+        Vector sortedPackages = new Vector();
+        PackageCollector.sortPackages(uninstallPackages, sortedPackages, "uninstall");
+        data.setInstallPackages(sortedPackages);
 
         // collectPackages(packageData);