diff options
Diffstat (limited to 'javainstaller2/src/JavaSetup/org/openoffice/setup/Controller')
14 files changed, 226 insertions, 226 deletions
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/AcceptLicenseCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/AcceptLicenseCtrl.java index 025b96a7990d..8a1f390f8450 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/AcceptLicenseCtrl.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/AcceptLicenseCtrl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ public class AcceptLicenseCtrl extends PanelController { super("AcceptLicense", new AcceptLicense()); helpFile = "String_Helpfile_AcceptLicense"; } - + public String getNext() { InstallData data = InstallData.getInstance(); @@ -48,23 +48,23 @@ public class AcceptLicenseCtrl extends PanelController { if ( data.olderVersionExists() ) { return new String("InstallationImminent"); } else if ( data.sameVersionExists() ) { - return new String("ChooseComponents"); + return new String("ChooseComponents"); } else { return new String("ChooseInstallationType"); } } else { - return new String("ChooseDirectory"); + return new String("ChooseDirectory"); } } - + public String getPrevious() { return new String("Prologue"); - } + } public final String getHelpFileName () { return this.helpFile; } - + public void beforeShow() { String StringInstall = ResourceManager.getString("String_AcceptLicense"); getSetupFrame().setButtonText(StringInstall, getSetupFrame().BUTTON_NEXT); @@ -73,5 +73,5 @@ public class AcceptLicenseCtrl extends PanelController { getSetupFrame().setButtonSelected(getSetupFrame().BUTTON_CANCEL); } - + } diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseComponentsCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseComponentsCtrl.java index e6eeda82d7b6..1ab3edc7a6cb 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseComponentsCtrl.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseComponentsCtrl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,15 +52,15 @@ public class ChooseComponentsCtrl extends PanelController { public String getNext() { return new String("InstallationImminent"); } - + public String getPrevious() { InstallData data = InstallData.getInstance(); - + if ( data.isRootInstallation() ) { if ( data.sameVersionExists() ) { if ( data.hideEula() ) { - return new String("Prologue"); + return new String("Prologue"); } else { return new String("AcceptLicense"); } @@ -69,7 +69,7 @@ public class ChooseComponentsCtrl extends PanelController { } } else { if ( data.sameVersionExists() ) { - return new String("ChooseDirectory"); + return new String("ChooseDirectory"); } else { return new String("ChooseInstallationType"); } @@ -79,11 +79,11 @@ public class ChooseComponentsCtrl extends PanelController { public final String getHelpFileName () { return this.helpFile; } - + public void beforeShow() { InstallData data = InstallData.getInstance(); - + // Setting the package size for node modules, that have hidden children // -> Java module has three hidden children and 0 byte size @@ -92,39 +92,39 @@ public class ChooseComponentsCtrl extends PanelController { ModuleCtrl.setModuleSize(packageData); data.setModuleSizeSet(true); } - + if ( data.sameVersionExists() ) { ChooseComponents panel = (ChooseComponents)getPanel(); String dialogTitle = ResourceManager.getString("String_ChooseComponents1_Maintain"); panel.setTitleText(dialogTitle); } - + } - + public boolean afterShow(boolean nextButtonPressed) { boolean repeatDialog = false; InstallData data = InstallData.getInstance(); PackageDescription packageData = SetupDataProvider.getPackageDescription(); - + if ( nextButtonPressed ) { - + // Check, if at least one visible module was selected for installation data.setVisibleModulesChecked(false); ModuleCtrl.checkVisibleModulesInstall(packageData, data); - + if ( data.visibleModulesChecked() ) { // Check, if at least one application module was selected for installation // (not necessary, if an older product is updated or additional modules are // added in maintenance mode). - + boolean applicationSelected = false; if ( data.olderVersionExists() || data.sameVersionExists() ) { - applicationSelected = true; + applicationSelected = true; } else { data.setApplicationModulesChecked(false); - ModuleCtrl.checkApplicationSelection(packageData, data); + ModuleCtrl.checkApplicationSelection(packageData, data); applicationSelected = data.applicationModulesChecked(); } @@ -133,16 +133,16 @@ public class ChooseComponentsCtrl extends PanelController { // Check, if at least one language module was selected for installation // (not necessary, if an older product is updated or additional modules are // added in maintenance mode). - + boolean languageSelected = false; if ( data.olderVersionExists() || data.sameVersionExists() || ( ! data.isMultiLingual())) { - languageSelected = true; + languageSelected = true; } else { data.setLanguageModulesChecked(false); - ModuleCtrl.checkLanguageSelection(packageData, data); + ModuleCtrl.checkLanguageSelection(packageData, data); languageSelected = data.languageModulesChecked(); } - + if ( languageSelected ) { // Set module settings for hidden modules. @@ -175,7 +175,7 @@ public class ChooseComponentsCtrl extends PanelController { ResourceManager.getString("String_No_Language_Selected_2"); String title = ResourceManager.getString("String_Change_Selection"); Informer.showInfoMessage(message, title); - repeatDialog = true; + repeatDialog = true; } } else { String message = ResourceManager.getString("String_No_Application_Selected_1") + "\n" + @@ -183,7 +183,7 @@ public class ChooseComponentsCtrl extends PanelController { String title = ResourceManager.getString("String_Change_Selection"); Informer.showInfoMessage(message, title); repeatDialog = true; - } + } } else { // no modules selected for installation String message = ResourceManager.getString("String_No_Components_Selected_1") + "\n" + ResourceManager.getString("String_No_Components_Selected_2"); @@ -195,10 +195,10 @@ public class ChooseComponentsCtrl extends PanelController { // Saving typical selection state values (always if back button is pressed!). // System.err.println("Saving custom selection states"); ModuleCtrl.saveCustomSelectionStates(packageData); - data.setCustomSelectionStateSaved(true); + data.setCustomSelectionStateSaved(true); } - + return repeatDialog; } - + } diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseDirectoryCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseDirectoryCtrl.java index 4a3bfab8452e..deecd854e77c 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseDirectoryCtrl.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseDirectoryCtrl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ import org.openoffice.setup.Util.PackageCollector; public class ChooseDirectoryCtrl extends PanelController { private String helpFile; - + public ChooseDirectoryCtrl() { super("ChooseDirectory", new ChooseDirectory()); helpFile = "String_Helpfile_ChooseDirectory"; @@ -66,17 +66,17 @@ public class ChooseDirectoryCtrl extends PanelController { if ( data.olderVersionExists() ) { return new String("InstallationImminent"); } else if ( data.sameVersionExists() ) { - return new String("ChooseComponents"); + return new String("ChooseComponents"); } else { return new String("ChooseInstallationType"); } } - + public String getPrevious() { InstallData data = InstallData.getInstance(); if ( data.hideEula() ) { - return new String("Prologue"); + return new String("Prologue"); } else { return new String("AcceptLicense"); } @@ -94,14 +94,14 @@ public class ChooseDirectoryCtrl extends PanelController { } // mask spaces // s.replaceAll(" ", "\\ "); - + return s; } public void beforeShow() { ChooseDirectory panel = (ChooseDirectory)getPanel(); InstallData data = InstallData.getInstance(); - + if ( data.getInstallDir() == null ) { String installDir = data.getDefaultDir(); @@ -127,7 +127,7 @@ public class ChooseDirectoryCtrl extends PanelController { dir = removeEndingDelimiter(dir); InstallData data = InstallData.getInstance(); data.setInstallDir(dir); - + File installDefaultDir = new File(dir, data.getDefaultDir()); data.setInstallDefaultDir(installDefaultDir.getPath()); @@ -167,13 +167,13 @@ public class ChooseDirectoryCtrl extends PanelController { } // Additional tasks, if the directory is okay - + if ( ! repeatDialog ) { // Calculate available disc space int discSpace = SystemManager.calculateDiscSpace(dir); data.setAvailableDiscSpace(discSpace); - Installer installer = InstallerFactory.getInstance(); + Installer installer = InstallerFactory.getInstance(); // Is this a new directory, or one that was already set before. // In this case, the database does not need to be evaluated again. @@ -183,12 +183,12 @@ public class ChooseDirectoryCtrl extends PanelController { String oldDatabasePath = data.getDatabasePath(); // Setting the database path installer.defineDatabasePath(); - + if (( oldDatabasePath == null ) || ( ! oldDatabasePath.equals(data.getDatabasePath()))) { data.setDatabaseAnalyzed(false); data.setDatabaseQueried(false); } else { - data.setDatabaseAnalyzed(true); + data.setDatabaseAnalyzed(true); } } @@ -202,16 +202,16 @@ public class ChooseDirectoryCtrl extends PanelController { InstallChangeCtrl.checkInstallChange(data); // InstallChangeCtrl.checkInstallChange(data, panel); } - + // At this point it is clear, whether the update-Package is installed or not. // If it is installed, it is also clear, in which version it is installed. - // Therefore the following dialog is also defined. - + // Therefore the following dialog is also defined. + if ( data.newerVersionExists() ) { // This can happen only in installation with user privileges. - // Installations with root privileges have cancelled installation + // Installations with root privileges have cancelled installation // already at first dialog. - // Possibility to select a new directory, in which no + // Possibility to select a new directory, in which no // newer product exists String message = ResourceManager.getString("String_Newer_Version_Installed_Found") + "\n" + data.getInstallDir() + "\n" + ResourceManager.getString("String_Newer_Version_Database") + ": " + data.getDatabasePath() + "\n" + @@ -221,15 +221,15 @@ public class ChooseDirectoryCtrl extends PanelController { repeatDialog = true; } - + // If an older version is found, and the update is forbidden, the user // can select another installation directory. if ( data.olderVersionExists() && data.dontUpdate() ) { // This can happen only in installation with user privileges. - // Installations with root privileges have cancelled installation + // Installations with root privileges have cancelled installation // already at first dialog (InstallChangeCtrl.java). - // Possibility to select a new directory, in which no + // Possibility to select a new directory, in which no // older product exists String message = ResourceManager.getString("String_Older_Version_Installed_Found") + "\n" + data.getInstallDir() + "\n" + ResourceManager.getString("String_Newer_Version_Database") + ": " + data.getDatabasePath() + "\n" + @@ -249,7 +249,7 @@ public class ChooseDirectoryCtrl extends PanelController { } } } - + return repeatDialog; } diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseInstallationTypeCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseInstallationTypeCtrl.java index 25432ae7def3..ee7bea2e6f30 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseInstallationTypeCtrl.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseInstallationTypeCtrl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,47 +41,47 @@ import java.util.Vector; import org.openoffice.setup.Util.PackageCollector; public class ChooseInstallationTypeCtrl extends PanelController implements ActionListener { - + private String helpFile; - + public ChooseInstallationTypeCtrl() { super("ChooseInstallationType", new ChooseInstallationType()); helpFile = "String_Helpfile_ChooseInstallationType"; } - + public String getNext() { InstallData data = InstallData.getInstance(); - + if ( data.getInstallationType().equals(data.getCustomActionCommand()) ) { return new String("ChooseComponents"); } else if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) { - return new String("InstallationImminent"); + return new String("InstallationImminent"); } else { - System.err.println("Error: Unknown installation type!" ); - return new String("Error"); + System.err.println("Error: Unknown installation type!" ); + return new String("Error"); } } - + public String getPrevious() { InstallData data = InstallData.getInstance(); - + if ( data.isRootInstallation() ) { if ( data.hideEula() ) { - return new String("Prologue"); + return new String("Prologue"); } else { return new String("AcceptLicense"); } } else { return new String("ChooseDirectory"); } - } + } public final String getHelpFileName () { return this.helpFile; } - + public void beforeShow() { InstallData data = InstallData.getInstance(); @@ -91,22 +91,22 @@ public class ChooseInstallationTypeCtrl extends PanelController implements Actio panel.setTypicalActionCommand(data.getTypicalActionCommand()); panel.setCustomActionCommand(data.getCustomActionCommand()); } - + public boolean afterShow(boolean nextButtonPressed) { boolean repeatDialog = false; ChooseInstallationType panel = (ChooseInstallationType)getPanel(); panel.removeActionListener((ChooseInstallationTypeCtrl)this); - + if ( nextButtonPressed ) { - + InstallData data = InstallData.getInstance(); PackageDescription packageData = SetupDataProvider.getPackageDescription(); if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) { - + // If typical selection state values have been saved before, // it is now time to restore them - + if ( data.typicalSelectionStateSaved()) { // System.err.println("Restoring typical selection states"); ModuleCtrl.restoreTypicalSelectionStates(packageData); @@ -125,7 +125,7 @@ public class ChooseInstallationTypeCtrl extends PanelController implements Actio if ( data.logModuleStates() ) { Dumper.logModuleStates(packageData, "ChooseInstallationType: After setHiddenModuleSettingsInstall"); } - + // Collecting packages to install Vector installPackages = new Vector(); PackageCollector.collectInstallPackages(packageData, installPackages); @@ -134,7 +134,7 @@ public class ChooseInstallationTypeCtrl extends PanelController implements Actio // Check disc space if ( Calculator.notEnoughDiscSpace(data) ) { repeatDialog = true; - } + } } // Custom installation type @@ -145,7 +145,7 @@ public class ChooseInstallationTypeCtrl extends PanelController implements Actio ModuleCtrl.saveTypicalSelectionStates(packageData); data.setTypicalSelectionStateSaved(true); } - + // Setting custom selection state values, if they have been saved before. if ( data.customSelectionStateSaved() ) { // System.err.println("Restoring custom selection states"); @@ -156,19 +156,19 @@ public class ChooseInstallationTypeCtrl extends PanelController implements Actio return repeatDialog; } - + public void actionPerformed(ActionEvent evt) { InstallData data = InstallData.getInstance(); if (evt.getActionCommand().equals(data.getTypicalActionCommand())) { data.setInstallationType(data.getTypicalActionCommand()); - // System.err.println("Setting installation type: " + data.getTypicalActionCommand()); + // System.err.println("Setting installation type: " + data.getTypicalActionCommand()); } else if (evt.getActionCommand().equals(data.getCustomActionCommand())) { data.setInstallationType(data.getCustomActionCommand()); - // System.err.println("Setting installation type: " + data.getCustomActionCommand()); + // System.err.println("Setting installation type: " + data.getCustomActionCommand()); } - + } - + } diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationComponentsCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationComponentsCtrl.java index 15ae15654d28..69f01439a188 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationComponentsCtrl.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationComponentsCtrl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,19 +45,19 @@ public class ChooseUninstallationComponentsCtrl extends PanelController { super("ChooseUninstallationComponents", new ChooseUninstallationComponents()); helpFile = "String_Helpfile_ChooseUninstallationComponents"; } - + public String getNext() { return new String("UninstallationImminent"); } - + public String getPrevious() { return new String("ChooseUninstallationType"); - } + } public final String getHelpFileName () { return this.helpFile; } - + public boolean afterShow(boolean nextButtonPressed) { boolean repeatDialog = false; @@ -79,7 +79,7 @@ public class ChooseUninstallationComponentsCtrl extends PanelController { ResourceManager.getString("String_No_Uninstallcomponents_Selected_2"); String title = ResourceManager.getString("String_Nothing_To_Uninstall"); Informer.showInfoMessage(message, title); - repeatDialog = true; + repeatDialog = true; } else { // Check, if all visible modules are selected for uninstallation. // Then this shall be handled as complete uninstallation @@ -89,12 +89,12 @@ public class ChooseUninstallationComponentsCtrl extends PanelController { // 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" + @@ -122,10 +122,10 @@ public class ChooseUninstallationComponentsCtrl extends PanelController { } else { // the back button was pressed // Saving typical selection state values (always if back button is pressed!). ModuleCtrl.saveCustomSelectionStates(packageData); - data.setCustomSelectionStateSaved(true); + data.setCustomSelectionStateSaved(true); } - + return repeatDialog; } - + } diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationTypeCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationTypeCtrl.java index d1c5e69430db..e24f3859fbad 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationTypeCtrl.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationTypeCtrl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,32 +37,32 @@ import org.openoffice.setup.SetupData.SetupDataProvider; import org.openoffice.setup.Util.ModuleCtrl; public class ChooseUninstallationTypeCtrl extends PanelController implements ActionListener { - + private String helpFile; - + public ChooseUninstallationTypeCtrl() { super("ChooseUninstallationType", new ChooseUninstallationType()); helpFile = "String_Helpfile_ChooseUninstallationType"; } - + public String getNext() { InstallData data = InstallData.getInstance(); - + if ( data.getInstallationType().equals(data.getCustomActionCommand()) ) { return new String("ChooseUninstallationComponents"); } else if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) { - return new String("UninstallationImminent"); + return new String("UninstallationImminent"); } else { - System.err.println("Error: Unknown uninstallation type!" ); - return new String("Error"); + System.err.println("Error: Unknown uninstallation type!" ); + return new String("Error"); } } - + public String getPrevious() { return new String("UninstallationPrologue"); - } - + } + public void beforeShow() { InstallData data = InstallData.getInstance(); @@ -75,20 +75,20 @@ public class ChooseUninstallationTypeCtrl extends PanelController implements Act public boolean afterShow(boolean nextButtonPressed) { boolean repeatDialog = false; - + ChooseUninstallationType panel = (ChooseUninstallationType)getPanel(); panel.removeActionListener((ChooseUninstallationTypeCtrl)this); - + if ( nextButtonPressed ) { InstallData data = InstallData.getInstance(); PackageDescription packageData = SetupDataProvider.getPackageDescription(); - + // Typical uninstallation type if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) { // If typical selection state values have been saved before, // it is now time to restore them - + if ( data.typicalSelectionStateSaved()) { ModuleCtrl.restoreTypicalSelectionStates(packageData); } @@ -100,7 +100,7 @@ public class ChooseUninstallationTypeCtrl extends PanelController implements Act if ( ! data.typicalSelectionStateSaved()) { ModuleCtrl.saveTypicalSelectionStates(packageData); data.setTypicalSelectionStateSaved(true); - } + } // Setting custom selection state values, if they have been saved before. if ( data.customSelectionStateSaved() ) { @@ -111,23 +111,23 @@ public class ChooseUninstallationTypeCtrl extends PanelController implements Act return repeatDialog; } - + public void actionPerformed(ActionEvent evt) { InstallData data = InstallData.getInstance(); if (evt.getActionCommand().equals(data.getTypicalActionCommand())) { data.setInstallationType(data.getTypicalActionCommand()); - // System.err.println("Setting uninstallation type: " + data.getTypicalActionCommand()); + // System.err.println("Setting uninstallation type: " + data.getTypicalActionCommand()); } else if (evt.getActionCommand().equals(data.getCustomActionCommand())) { data.setInstallationType(data.getCustomActionCommand()); - // System.err.println("Setting uninstallation type: " + data.getCustomActionCommand()); + // System.err.println("Setting uninstallation type: " + data.getCustomActionCommand()); } - + } public final String getHelpFileName () { return this.helpFile; } - + } diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationCompletedCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationCompletedCtrl.java index fc14c238da0b..39342969dca2 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationCompletedCtrl.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationCompletedCtrl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ public class InstallationCompletedCtrl extends PanelController { super("InstallationCompleted", new installationCompleted()); helpFile = "String_Helpfile_InstallationCompleted"; } - + public void beforeShow() { InstallData installData = InstallData.getInstance(); ProductDescription productData = SetupDataProvider.getProductDescription(); @@ -58,12 +58,12 @@ public class InstallationCompletedCtrl extends PanelController { getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_HELP); getSetupFrame().removeButtonIcon(getSetupFrame().BUTTON_NEXT); getSetupFrame().setButtonSelected(getSetupFrame().BUTTON_NEXT); - + installationCompleted panel = (installationCompleted)getPanel(); panel.setDetailsButtonActionCommand(getSetupFrame().ACTION_DETAILS); panel.addDetailsButtonActionListener(getSetupFrame().getSetupActionListener()); - if ( installData.isAbortedInstallation() ) { + if ( installData.isAbortedInstallation() ) { String titleText = ResourceManager.getString("String_InstallationCompleted1_Abort"); panel.setTitleText(titleText); String dialogText = ResourceManager.getString("String_InstallationCompleted2_Abort"); @@ -72,7 +72,7 @@ public class InstallationCompletedCtrl extends PanelController { String titleText = ResourceManager.getString("String_InstallationCompleted1_Error"); panel.setTitleText(titleText); String dialogText = ResourceManager.getString("String_InstallationCompleted2_Error"); - panel.setDialogText(dialogText); + panel.setDialogText(dialogText); } htmlInfoText = InfoCtrl.setHtmlFrame("header", htmlInfoText); @@ -83,27 +83,27 @@ public class InstallationCompletedCtrl extends PanelController { public void duringShow() { Thread t = new Thread() { public void run() { - PackageDescription packageData = SetupDataProvider.getPackageDescription(); + PackageDescription packageData = SetupDataProvider.getPackageDescription(); Installer installer = InstallerFactory.getInstance(); installer.postInstall(packageData); } }; - t.start(); + t.start(); } public String getNext() { return null; } - + public String getPrevious() { return null; } - + public final String getHelpFileName () { return this.helpFile; } - + public String getDialogText() { return htmlInfoText; } diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationImminentCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationImminentCtrl.java index 0130607acc36..b2629f6137c2 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationImminentCtrl.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationImminentCtrl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,11 +50,11 @@ public class InstallationImminentCtrl extends PanelController { super("InstallationImminent", new InstallationImminent()); helpFile = "String_Helpfile_InstallationImminent"; } - + public String getNext() { return new String("InstallationOngoing"); } - + public String getPrevious() { InstallData data = InstallData.getInstance(); @@ -62,7 +62,7 @@ public class InstallationImminentCtrl extends PanelController { if ( data.isRootInstallation() ) { if ( data.olderVersionExists() ) { if ( data.hideEula() ) { - return new String("Prologue"); + return new String("Prologue"); } else { return new String("AcceptLicense"); } @@ -72,10 +72,10 @@ public class InstallationImminentCtrl extends PanelController { if ( data.getInstallationType().equals(data.getCustomActionCommand()) ) { return new String("ChooseComponents"); } else if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) { - return new String("ChooseInstallationType"); + return new String("ChooseInstallationType"); } else { - System.err.println("Error: Unknown installation type!" ); - return new String("Error"); + System.err.println("Error: Unknown installation type!" ); + return new String("Error"); } } } else { @@ -87,14 +87,14 @@ public class InstallationImminentCtrl extends PanelController { if ( data.getInstallationType().equals(data.getCustomActionCommand()) ) { return new String("ChooseComponents"); } else if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) { - return new String("ChooseInstallationType"); + return new String("ChooseInstallationType"); } else { - System.err.println("Error: Unknown installation type!" ); - return new String("Error"); + System.err.println("Error: Unknown installation type!" ); + return new String("Error"); } } } - } + } public final String getHelpFileName () { return this.helpFile; @@ -103,7 +103,7 @@ public class InstallationImminentCtrl extends PanelController { public void beforeShow() { String StringInstall = ResourceManager.getString("String_Install"); getSetupFrame().setButtonText(StringInstall, getSetupFrame().BUTTON_NEXT); - + ProductDescription productData = SetupDataProvider.getProductDescription(); PackageDescription packageData = SetupDataProvider.getPackageDescription(); // Dumper.dumpPackageSettings(packageData); @@ -115,7 +115,7 @@ public class InstallationImminentCtrl extends PanelController { InstallationImminent panel = (InstallationImminent)getPanel(); panel.setInfoText(htmlInfoText); panel.setCaretPosition(); - + // Update mode InstallData data = InstallData.getInstance(); if ( data.olderVersionExists() ) { @@ -149,7 +149,7 @@ public class InstallationImminentCtrl extends PanelController { repeatDialog = true; } } - + return repeatDialog; } } diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java index b435b480eaea..2cdaa16cb561 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,20 +46,20 @@ public class InstallationOngoingCtrl extends PanelController { private String helpFile; private String nextDialog = new String("InstallationCompleted"); private String previousDialog = new String("InstallationImminent"); - + public InstallationOngoingCtrl() { super("InstallationOngoing", new InstallationOngoing()); helpFile = "String_Helpfile_InstallationOngoing"; } - + public String getNext() { return new String("InstallationCompleted"); } - + public String getPrevious() { return new String("InstallationImminent"); } - + public final String getHelpFileName () { return this.helpFile; } @@ -89,15 +89,15 @@ public class InstallationOngoingCtrl extends PanelController { PackageCollector.sortPackages(installData.getOldPackages(), sortedUninstallPackages, "uninstall"); installData.setOldPackages(sortedUninstallPackages); } - + Installer installer = InstallerFactory.getInstance(); installer.preInstallationOngoing(); } - + public void duringShow() { - + Thread t = new Thread() { - + InstallData installData = InstallData.getInstance(); InstallationOngoing panel = (InstallationOngoing)getPanel(); Vector installPackages = installData.getInstallPackages(); @@ -130,10 +130,10 @@ public class InstallationOngoingCtrl extends PanelController { installer.installPackage(packageData); installedPackages.add(packageData); - + if ( installData.isAbortedInstallation() ) { break; - } + } } if ( installData.isMajorUpgrade() ) { @@ -167,8 +167,8 @@ public class InstallationOngoingCtrl extends PanelController { SystemManager.deleteFile(removeFile); } } - - installer.postInstallationOngoing(); + + installer.postInstallationOngoing(); String next = getNext(); getSetupFrame().setCurrentPanel(next, false, true); @@ -186,7 +186,7 @@ public class InstallationOngoingCtrl extends PanelController { InstallData installData = InstallData.getInstance(); if ( ! installData.isAbortedInstallation() ) { - InfoDir.prepareUninstallation(); + InfoDir.prepareUninstallation(); } return repeatDialog; diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java index 85c682f9dee6..0d3fc1f2fcdb 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,18 +40,18 @@ import org.openoffice.setup.Util.ModuleCtrl; import org.openoffice.setup.Util.SystemManager; public class PrologueCtrl extends PanelController { - + private String helpFile; public PrologueCtrl() { super("Prologue", new Prologue()); helpFile = "String_Helpfile_Prologue"; } - + // public void beforeShow() { public void duringShow() { getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_PREVIOUS); - + Thread t = new Thread() { public void run() { InstallData installData = InstallData.getInstance(); @@ -60,7 +60,7 @@ public class PrologueCtrl extends PanelController { Controller.checkPackagePathExistence(installData); Controller.checkPackageFormat(installData); - + if (( installData.getOSType().equalsIgnoreCase("SunOS") ) && ( installData.isMultiLingual() )) { Controller.collectSystemLanguages(installData); } @@ -81,12 +81,12 @@ public class PrologueCtrl extends PanelController { if (( installData.getOSType().equalsIgnoreCase("SunOS") ) && ( installData.isMultiLingual() )) { ModuleCtrl.checkLanguagesPackages(packageData, installData); - + // int count = installData.getPreselectedLanguages(); // System.err.println("Number of preselected language packages: " + count); - + if ( installData.getPreselectedLanguages() == 0 ) { - // Something misterious happened. Setting all languages again. + // Something misterious happened. Setting all languages again. ModuleCtrl.setLanguagesPackages(packageData); } @@ -145,11 +145,11 @@ public class PrologueCtrl extends PanelController { // Setting macro SetupDataProvider.setNewMacro("DIR", dir); // important for string replacement - + // Calculate available disc space int discSpace = SystemManager.calculateDiscSpace(dir); installData.setAvailableDiscSpace(discSpace); - + if ( ! installData.databaseAnalyzed()) { ModuleCtrl.defaultDatabaseAnalysis(installData); installData.setDatabaseAnalyzed(true); @@ -162,13 +162,13 @@ public class PrologueCtrl extends PanelController { }; t.start(); } - + public boolean afterShow(boolean nextButtonPressed) { boolean repeatDialog = false; getSetupFrame().setButtonEnabled(true, getSetupFrame().BUTTON_PREVIOUS); return repeatDialog; } - + public String getNext() { InstallData data = InstallData.getInstance(); @@ -177,24 +177,24 @@ public class PrologueCtrl extends PanelController { if ( data.olderVersionExists() ) { return new String("InstallationImminent"); } else if ( data.sameVersionExists() ) { - return new String("ChooseComponents"); + return new String("ChooseComponents"); } else { return new String("ChooseInstallationType"); } } else { - return new String("ChooseDirectory"); - } + return new String("ChooseDirectory"); + } } else { return new String("AcceptLicense"); } } - + public String getPrevious() { return null; } - + public final String getHelpFileName() { return this.helpFile; } - + } diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationCompletedCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationCompletedCtrl.java index 837f28546728..cb895dc43772 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationCompletedCtrl.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationCompletedCtrl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,23 +51,23 @@ public class UninstallationCompletedCtrl extends PanelController { public void beforeShow() { InstallData installData = InstallData.getInstance(); ProductDescription productData = SetupDataProvider.getProductDescription(); - + getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_PREVIOUS); getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_CANCEL); getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_HELP); getSetupFrame().removeButtonIcon(getSetupFrame().BUTTON_NEXT); getSetupFrame().setButtonSelected(getSetupFrame().BUTTON_NEXT); - + UninstallationCompleted panel = (UninstallationCompleted)getPanel(); panel.setDetailsButtonActionCommand(getSetupFrame().ACTION_DETAILS); panel.addDetailsButtonActionListener(getSetupFrame().getSetupActionListener()); - + if (( installData.isCustomInstallation() ) && ( ! installData.isMaskedCompleteUninstallation() )) { String dialogText = ResourceManager.getString("String_UninstallationCompleted2_Partial"); - panel.setDialogText(dialogText); + panel.setDialogText(dialogText); } - - if ( installData.isAbortedInstallation() ) { + + if ( installData.isAbortedInstallation() ) { String titleText = ResourceManager.getString("String_UninstallationCompleted1_Abort"); panel.setTitleText(titleText); String dialogText = ResourceManager.getString("String_UninstallationCompleted2_Abort"); @@ -76,26 +76,26 @@ public class UninstallationCompletedCtrl extends PanelController { String titleText = ResourceManager.getString("String_UninstallationCompleted1_Error"); panel.setTitleText(titleText); String dialogText = ResourceManager.getString("String_UninstallationCompleted2_Error"); - panel.setDialogText(dialogText); + panel.setDialogText(dialogText); } htmlInfoText = InfoCtrl.setHtmlFrame("header", htmlInfoText); htmlInfoText = InfoCtrl.setInstallLogInfoText(productData, htmlInfoText); htmlInfoText = InfoCtrl.setHtmlFrame("end", htmlInfoText); } - + public String getNext() { return null; } - + public String getPrevious() { return null; } - + public final String getHelpFileName () { return this.helpFile; } - + public String getDialogText() { return htmlInfoText; } diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationImminentCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationImminentCtrl.java index 00b7ff25de31..d8f74a50ab32 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationImminentCtrl.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationImminentCtrl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,11 +46,11 @@ public class UninstallationImminentCtrl extends PanelController { super("UninstallationImminent", new UninstallationImminent()); helpFile = "String_Helpfile_UninstallationImminent"; } - + public String getNext() { return new String("UninstallationOngoing"); } - + public String getPrevious() { InstallData data = InstallData.getInstance(); @@ -58,12 +58,12 @@ public class UninstallationImminentCtrl extends PanelController { if ( data.getInstallationType().equals(data.getCustomActionCommand()) ) { return new String("ChooseUninstallationComponents"); } else if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) { - return new String("ChooseUninstallationType"); + return new String("ChooseUninstallationType"); } else { - System.err.println("Error: Unknown uninstallation type!" ); - return new String("Error"); + System.err.println("Error: Unknown uninstallation type!" ); + return new String("Error"); } - } + } public final String getHelpFileName () { return this.helpFile; @@ -72,7 +72,7 @@ public class UninstallationImminentCtrl extends PanelController { public void beforeShow() { String StringInstall = ResourceManager.getString("String_Uninstall"); getSetupFrame().setButtonText(StringInstall, getSetupFrame().BUTTON_NEXT); - + ProductDescription productData = SetupDataProvider.getProductDescription(); PackageDescription packageData = SetupDataProvider.getPackageDescription(); @@ -88,7 +88,7 @@ public class UninstallationImminentCtrl extends PanelController { // System.err.println("\nUninstallation module state dump 3:"); // Dumper.dumpModuleStates(packageData); } - + public void duringShow() { UninstallationImminent panel = (UninstallationImminent)getPanel(); panel.setTabOrder(); @@ -105,8 +105,8 @@ public class UninstallationImminentCtrl extends PanelController { // System.err.println("\nUninstallation module state dump 4:"); // Dumper.dumpModuleStates(packageData); } - + return repeatDialog; } - + } diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationOngoingCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationOngoingCtrl.java index a5065cc0e905..4c95d13e4c70 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationOngoingCtrl.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationOngoingCtrl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ import java.util.Vector; public class UninstallationOngoingCtrl extends PanelController { private String helpFile; - + public UninstallationOngoingCtrl() { super("UninstallationOngoing", new UninstallationOngoing()); helpFile = "String_Helpfile_UninstallationOngoing"; @@ -50,7 +50,7 @@ public class UninstallationOngoingCtrl extends PanelController { public String getNext() { return new String("UninstallationCompleted"); } - + public String getPrevious() { return new String("UninstallationImminent"); } @@ -58,7 +58,7 @@ public class UninstallationOngoingCtrl extends PanelController { public final String getHelpFileName () { return this.helpFile; } - + public void beforeShow() { getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_PREVIOUS); getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_NEXT); @@ -80,27 +80,27 @@ public class UninstallationOngoingCtrl extends PanelController { data.setInstallPackages(sortedPackages); // collectPackages(packageData); - + Installer installer = InstallerFactory.getInstance(); installer.preInstallationOngoing(); } - + public void duringShow() { Thread t = new Thread() { - + UninstallationOngoing panel = (UninstallationOngoing)getPanel(); InstallData installData = InstallData.getInstance(); Vector uninstallPackages = installData.getInstallPackages(); - + public void run() { LogManager.setCommandsHeaderLine("Uninstallation"); Installer installer = InstallerFactory.getInstance(); - + for (int i = 0; i < uninstallPackages.size(); i++) { PackageDescription packageData = (PackageDescription) uninstallPackages.get(i); int progress = java.lang.Math.round((100*(i+1))/uninstallPackages.size()); - panel.setProgressValue(progress); + panel.setProgressValue(progress); panel.setProgressText(packageData.getPackageName()); installer.uninstallPackage(packageData); @@ -109,21 +109,21 @@ public class UninstallationOngoingCtrl extends PanelController { break; } } - + if ( installData.isAbortedInstallation() ) { LogManager.setCommandsHeaderLine("Uninstallation aborted!"); // undoing the uninstallation is not possible } - installer.postUninstallationOngoing(); + installer.postUninstallationOngoing(); - String next = getNext(); - getSetupFrame().setCurrentPanel(next, false, true); + String next = getNext(); + getSetupFrame().setCurrentPanel(next, false, true); } }; - + t.start(); - + } public boolean afterShow(boolean nextButtonPressed) { diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java index 1e35db23454d..bd3519497ebd 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ import org.openoffice.setup.ResourceManager; public class UninstallationPrologueCtrl extends PanelController { private String helpFile; - + public UninstallationPrologueCtrl() { super("UninstallationPrologue", new UninstallationPrologue()); helpFile = "String_Helpfile_UninstallationPrologue"; @@ -57,11 +57,11 @@ public class UninstallationPrologueCtrl extends PanelController { public String getNext() { return new String("ChooseUninstallationType"); } - + public String getPrevious() { return null; } - + public final String getHelpFileName () { return this.helpFile; } @@ -77,7 +77,7 @@ public class UninstallationPrologueCtrl extends PanelController { // for (int i = 0; i < infoFileContent.size(); i++) { // System.out.println(infoFileContent.get(i)); // } - + // Iterator m = map.entrySet().iterator(); // while ( m.hasNext() ) { // Map.Entry entry = (Map.Entry) m.next(); @@ -86,7 +86,7 @@ public class UninstallationPrologueCtrl extends PanelController { return map; } - + private void setNewInstallData(HashMap map) { InstallData data = InstallData.getInstance(); // adding information to installData @@ -97,16 +97,16 @@ public class UninstallationPrologueCtrl extends PanelController { data.setAdminFileNameNoRelocNoDepends((String)map.get("AdminFileNoRelocNoDepends")); data.setDatabasePath((String)map.get("DatabasePath")); data.setInstallDir((String)map.get("InstallationDir")); - data.setStoredInstallationPrivileges((String)map.get("InstallationPrivileges")); + data.setStoredInstallationPrivileges((String)map.get("InstallationPrivileges")); data.setGetUidPath((String)map.get("GetUidFile")); } - + private void readInfoFile() { HashMap map = getInfoFileData(); setNewInstallData(map); Dumper.dumpNewInstallData(); } - + private void checkUninstallPrivileges() { InstallData data = InstallData.getInstance(); // data.setStoredInstallationPrivileges((String)map.get("InstallationPrivileges")); @@ -120,7 +120,7 @@ public class UninstallationPrologueCtrl extends PanelController { Informer.showErrorMessage(message, title); String log = "<b>Error: Wrong uninstallation privileges (currently Root)!</b><br>"; System.err.println(log); - // LogManager.addLogfileComment(log); + // LogManager.addLogfileComment(log); } else { String message = ResourceManager.getString("String_UninstallationPrologue_Wrong_Privileges_Current_User"); String title = ResourceManager.getString("String_Error"); @@ -129,15 +129,15 @@ public class UninstallationPrologueCtrl extends PanelController { System.err.println(log); // LogManager.addLogfileComment(log); } - System.exit(1); + System.exit(1); } } - + public void beforeShow() { getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_PREVIOUS); // System.err.println("\nUninstallation module state dump 1:"); - // PackageDescription packageData = SetupDataProvider.getPackageDescription(); + // PackageDescription packageData = SetupDataProvider.getPackageDescription(); // ModuleCtrl.dumpModuleStates(packageData); getSetupFrame().setButtonSelected(getSetupFrame().BUTTON_NEXT); } @@ -149,15 +149,15 @@ public class UninstallationPrologueCtrl extends PanelController { InstallData installData = InstallData.getInstance(); if ( ! installData.databaseAnalyzed() ) { getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_NEXT); - + // now it is time to read the infoFile in directory "installData.getInfoRoot()" readInfoFile(); - + // controlling the installation privileges. Are the original installation privileges // identical with the current deinstallation privileges? checkUninstallPrivileges(); - PackageDescription packageData = SetupDataProvider.getPackageDescription(); + PackageDescription packageData = SetupDataProvider.getPackageDescription(); Installer installer = InstallerFactory.getInstance(); installer.preUninstall(packageData); @@ -173,8 +173,8 @@ public class UninstallationPrologueCtrl extends PanelController { } } }; - - t.start(); + + t.start(); } public boolean afterShow(boolean nextButtonPressed) { @@ -182,5 +182,5 @@ public class UninstallationPrologueCtrl extends PanelController { getSetupFrame().setButtonEnabled(true, getSetupFrame().BUTTON_PREVIOUS); return repeatDialog; } - + } |