INTEGRATION: CWS native147 (1.3.2); FILE MERGED

2008/04/21 13:02:19 is 1.3.2.1: #i88334# packages no longer relocatable

1 files changed, 13 insertions, 2 deletions

diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseInstallationTypeCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseInstallationTypeCtrl.java
index b2839018343f..84f7e8a45086 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseInstallationTypeCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseInstallationTypeCtrl.java
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ChooseInstallationTypeCtrl.java,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -67,7 +67,18 @@ public class ChooseInstallationTypeCtrl extends PanelController implements Actio
     }
 
     public String getPrevious() {
-        return new String("ChooseDirectory");
+
+        InstallData data = InstallData.getInstance();
+
+        if ( data.isRootInstallation() ) {
+            if ( data.hideEula() ) {
+                return new String("Prologue");
+            } else {
+                return new String("AcceptLicense");
+            }
+        } else {
+            return new String("ChooseDirectory");
+        }
     }
 
     public final String getHelpFileName () {