diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-18 09:46:58 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-18 09:46:58 +0000 |
commit | 2af2b07e935f701e9bccd550bf1bf17b9f64bd1a (patch) | |
tree | b32d4bee1af53123cd4b5b8cf07533057b5eac1b /javainstaller2 | |
parent | c9acd2026e66b28325c885a51e62395b1945b293 (diff) |
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
Diffstat (limited to 'javainstaller2')
-rwxr-xr-x | javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java index f2f7f243c4d3..ca85f37339e8 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,6 +715,9 @@ public class ModuleCtrl { oneLang = oneLang.trim(); if ( systemLanguages.contains(oneLang)) { foundLang = true; + int count = installData.getPreselectedLanguages(); + count++; + installData.setPreselectedLanguages(count); break; } } @@ -730,6 +733,18 @@ public class ModuleCtrl { } } + 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) { PackageDescription packageData = SetupDataProvider.getPackageDescription(); |