From ab515f799ca6f94a12604695146d55a6eb492d59 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Tue, 5 Feb 2008 12:36:50 +0000 Subject: INTEGRATION: CWS native127 (1.2.44); FILE MERGED 2008/01/28 16:00:44 is 1.2.44.2: #i85281# improve performance 2008/01/25 16:23:57 is 1.2.44.1: #i85474# not all language modules deselectable --- .../ChooseUninstallationComponentsCtrl.java | 35 ++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationComponentsCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationComponentsCtrl.java index d72722576999..2182526162de 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationComponentsCtrl.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationComponentsCtrl.java @@ -4,9 +4,9 @@ * * $RCSfile: ChooseUninstallationComponentsCtrl.java,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2007-07-03 11:50:57 $ + * last change: $Author: ihi $ $Date: 2008-02-05 13:36:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -94,6 +94,37 @@ public class ChooseUninstallationComponentsCtrl extends PanelController { // -> The responsible value is InstallData.isMaskedCompleteUninstallation data.setMaskedCompleteUninstallation(true); ModuleCtrl.checkMaskedCompleteUninstallation(packageData, data); + + // If this is not a complete uninstallation, at least one language + // module or one application module has to be installed. + + if ( ! data.isMaskedCompleteUninstallation() ) { + + data.setApplicationModulesChecked(false); + ModuleCtrl.checkApplicationModulesUninstall(packageData, data); + + if ( ! data.applicationModulesChecked() ) { + + String message = ResourceManager.getString("String_All_Applicationcomponents_Selected_1") + "\n" + + ResourceManager.getString("String_All_Applicationcomponents_Selected_2"); + String title = ResourceManager.getString("String_Change_Selection"); + Informer.showInfoMessage(message, title); + repeatDialog = true; + } else { + + data.setLanguageModulesChecked(false); + ModuleCtrl.checkLanguageModulesUninstall(packageData, data); + + if ( ! data.languageModulesChecked() ) { + + String message = ResourceManager.getString("String_All_Languagecomponents_Selected_1") + "\n" + + ResourceManager.getString("String_All_Languagecomponents_Selected_2"); + String title = ResourceManager.getString("String_Change_Selection"); + Informer.showInfoMessage(message, title); + repeatDialog = true; + } + } + } } } else { // the back button was pressed // Saving typical selection state values (always if back button is pressed!). -- cgit