1 files changed, 21 insertions, 21 deletions

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;
     }