INTEGRATION: CWS native141 (1.4.10); FILE MERGED

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

1 files changed, 14 insertions, 1 deletions

diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/PackageDescription.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/PackageDescription.java
index 99107ef9cdc1..6124efa1d343 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/PackageDescription.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/PackageDescription.java
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: PackageDescription.java,v $
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -93,6 +93,7 @@ public class PackageDescription implements TreeNode {
     private String  pkgSubdir = null;
     private String  pkgLanguage = null;
     private int     pkgSize     = 0;
+    private int     pkgOrder    = 0;
     private int     pkgType     = NOTA_UNIT;
     private boolean pkgExists = true;  // must be default, especially for uninstallation
     private boolean isRelocatable = true;
@@ -155,6 +156,10 @@ public class PackageDescription implements TreeNode {
         pkgSize = size;
     }
 
+    public int getOrder() {
+        return pkgOrder;
+    }
+
     // public int getAccumulatedSize() {
     //     int size = getSize();
     //
@@ -455,6 +460,14 @@ public class PackageDescription implements TreeNode {
                 String sz = subSection.getValue();
                 pkgSize = Integer.parseInt(sz);
             }
+            subSection = section.getElement("installorder");
+            if (subSection != null) {
+                String order = subSection.getValue();
+                pkgOrder = Integer.parseInt(order);
+            } else {
+                // Setting the default for packages without order
+                pkgOrder = 1000;
+            }
             subSection = section.getElement("md5");
             if (subSection != null) {
                 pkgMD5Sum = subSection.getValue();