INTEGRATION: CWS native179 (1.8.20); FILE MERGED

2008/07/31 15:12:18 is 1.8.20.1: #i91489# improved solaris language preselection process

1 files changed, 17 insertions, 2 deletions

diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
index f62fe61fe..441c530f8 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ModuleCtrl.java,v $
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -715,10 +715,13 @@ public class ModuleCtrl {
                 oneLang = oneLang.trim();
                 if ( systemLanguages.contains(oneLang)) {
                     foundLang = true;
+                    int count = installData.getPreselectedLanguages();
+                    count++;
+                    installData.setPreselectedLanguages(count);
                     break;
                 }
             }
-            
+
             if ( ! foundLang ) {
                 packageData.setSelectionState(PackageDescription.DONT_INSTALL);
             }
@@ -729,6 +732,18 @@ public class ModuleCtrl {
             checkLanguagesPackages(child, installData);
         }
     }       
+
+    static public void setLanguagesPackages(PackageDescription packageData) {
+        if (( packageData.getPkgLanguage() != null ) && ( ! packageData.getPkgLanguage().equals(""))) {
+            // This is a package with a specific language.
+            packageData.setSelectionState(PackageDescription.INSTALL);
+        }
+
+        for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
+            PackageDescription child = (PackageDescription) e.nextElement();
+            setLanguagesPackages(child);
+        }
+    }       
     
     static public void defaultDatabaseAnalysis(InstallData data) {