diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-09-26 13:44:20 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-09-26 13:44:20 +0000 |
commit | 528df1e36902525a4c12c60645fb2db450725d75 (patch) | |
tree | 3f3d83fe602d74f637cd84b85e41df7d70cf76e0 /javainstaller2 | |
parent | c9413430ebfc2cc2a3b0dd31cee7a9bfeb455e3a (diff) |
CWS-TOOLING: integrate CWS native195_DEV300
Diffstat (limited to 'javainstaller2')
-rwxr-xr-x | javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java | 1 | ||||
-rwxr-xr-x | javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java index f8f17345f746..2b5773171298 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java @@ -167,6 +167,7 @@ public class UninstallationPrologueCtrl extends PanelController { ModuleCtrl.setDatabaseSettings(packageData, installData, installer); installData.setDatabaseAnalyzed(true); ModuleCtrl.setDontUninstallFlags(packageData); + if ( installData.isRootInstallation() ) { ModuleCtrl.setDontUninstallUserInstallOnylFlags(packageData); } ModuleCtrl.setParentDefaultModuleSettings(packageData); getSetupFrame().setButtonEnabled(true, getSetupFrame().BUTTON_NEXT); getSetupFrame().setButtonSelected(getSetupFrame().BUTTON_NEXT); diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java index c96e8ebd5700..35c9113c103b 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java @@ -500,7 +500,17 @@ public class ModuleCtrl { PackageDescription child = (PackageDescription) e.nextElement(); setDontUninstallFlags(child); } + } + + static public void setDontUninstallUserInstallOnylFlags(PackageDescription packageData) { + if ( packageData.showInUserInstallOnly() ) { + packageData.setSelectionState(PackageDescription.IGNORE); + } + for (Enumeration e = packageData.children(); e.hasMoreElements(); ) { + PackageDescription child = (PackageDescription) e.nextElement(); + setDontUninstallUserInstallOnylFlags(child); + } } static public void checkVisibleModulesInstall(PackageDescription packageData, InstallData data) { |