summaryrefslogtreecommitdiff
path: root/javainstaller2/src
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-05-06 09:44:49 +0000
committerKurt Zenker <kz@openoffice.org>2008-05-06 09:44:49 +0000
commit937527c1ad7c0b43cc24e7b865fcb6d7bd0907ee (patch)
treef094a894a2fc6c6175f327d38e50b768a0ed95b5 /javainstaller2/src
parentd865d41e812abfd4f5cb090a7a3c1ff0bac744e4 (diff)
INTEGRATION: CWS native147 (1.4.2); FILE MERGED
2008/04/21 13:02:19 is 1.4.2.1: #i88334# packages no longer relocatable
Diffstat (limited to 'javainstaller2/src')
-rwxr-xr-xjavainstaller2/src/JavaSetup/org/openoffice/setup/Controller/AcceptLicenseCtrl.java17
-rwxr-xr-xjavainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseComponentsCtrl.java21
-rwxr-xr-xjavainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationImminentCtrl.java41
-rwxr-xr-xjavainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java3
-rwxr-xr-xjavainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java26
5 files changed, 75 insertions, 33 deletions
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/AcceptLicenseCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/AcceptLicenseCtrl.java
index 061ef9b54202..eb91691acac1 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/AcceptLicenseCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/AcceptLicenseCtrl.java
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: AcceptLicenseCtrl.java,v $
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
* This file is part of OpenOffice.org.
*
@@ -30,6 +30,7 @@
package org.openoffice.setup.Controller;
+import org.openoffice.setup.InstallData;
import org.openoffice.setup.PanelController;
import org.openoffice.setup.Panel.AcceptLicense;
import org.openoffice.setup.ResourceManager;
@@ -44,7 +45,19 @@ public class AcceptLicenseCtrl extends PanelController {
}
public String getNext() {
- return new String("ChooseDirectory");
+ InstallData data = InstallData.getInstance();
+
+ if ( data.isRootInstallation() ) {
+ if ( data.olderVersionExists() ) {
+ return new String("InstallationImminent");
+ } else if ( data.sameVersionExists() ) {
+ return new String("ChooseComponents");
+ } else {
+ return new String("ChooseInstallationType");
+ }
+ } else {
+ return new String("ChooseDirectory");
+ }
}
public String getPrevious() {
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseComponentsCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseComponentsCtrl.java
index 47c2739a1d90..1f2057446441 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseComponentsCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseComponentsCtrl.java
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ChooseComponentsCtrl.java,v $
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
* This file is part of OpenOffice.org.
*
@@ -60,12 +60,23 @@ public class ChooseComponentsCtrl extends PanelController {
InstallData data = InstallData.getInstance();
- if ( data.sameVersionExists() ) {
- return new String("ChooseDirectory");
+ if ( data.isRootInstallation() ) {
+ if ( data.sameVersionExists() ) {
+ if ( data.hideEula() ) {
+ return new String("Prologue");
+ } else {
+ return new String("AcceptLicense");
+ }
+ } else {
+ return new String("ChooseInstallationType");
+ }
} else {
- return new String("ChooseInstallationType");
+ if ( data.sameVersionExists() ) {
+ return new String("ChooseDirectory");
+ } else {
+ return new String("ChooseInstallationType");
+ }
}
-
}
public final String getHelpFileName () {
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationImminentCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationImminentCtrl.java
index eecc61e51bae..348cac6d9d66 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationImminentCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationImminentCtrl.java
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: InstallationImminentCtrl.java,v $
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
* This file is part of OpenOffice.org.
*
@@ -62,18 +62,39 @@ public class InstallationImminentCtrl extends PanelController {
InstallData data = InstallData.getInstance();
- if ( data.olderVersionExists() ) {
- return new String("ChooseDirectory");
- } else if ( data.sameVersionExists() ) {
- return new String("ChooseComponents");
+ if ( data.isRootInstallation() ) {
+ if ( data.olderVersionExists() ) {
+ if ( data.hideEula() ) {
+ return new String("Prologue");
+ } else {
+ return new String("AcceptLicense");
+ }
+ } else if ( data.sameVersionExists() ) {
+ return new String("ChooseComponents");
+ } else {
+ if ( data.getInstallationType().equals(data.getCustomActionCommand()) ) {
+ return new String("ChooseComponents");
+ } else if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) {
+ return new String("ChooseInstallationType");
+ } else {
+ System.err.println("Error: Unknown installation type!" );
+ return new String("Error");
+ }
+ }
} else {
- if ( data.getInstallationType().equals(data.getCustomActionCommand()) ) {
+ if ( data.olderVersionExists() ) {
+ return new String("ChooseDirectory");
+ } else if ( data.sameVersionExists() ) {
return new String("ChooseComponents");
- } else if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) {
- return new String("ChooseInstallationType");
} else {
- System.err.println("Error: Unknown installation type!" );
- return new String("Error");
+ if ( data.getInstallationType().equals(data.getCustomActionCommand()) ) {
+ return new String("ChooseComponents");
+ } else if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) {
+ return new String("ChooseInstallationType");
+ } else {
+ System.err.println("Error: Unknown installation type!" );
+ return new String("Error");
+ }
}
}
}
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java
index 2c261f6f4ee6..f8f17345f746 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: UninstallationPrologueCtrl.java,v $
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
* This file is part of OpenOffice.org.
*
@@ -98,7 +98,6 @@ public class UninstallationPrologueCtrl extends PanelController {
data.setAdminFileNameNoReloc((String)map.get("AdminFileNoReloc"));
data.setDatabasePath((String)map.get("DatabasePath"));
data.setInstallDir((String)map.get("InstallationDir"));
- data.setInstallRoot((String)map.get("InstallationRoot"));
data.setStoredInstallationPrivileges((String)map.get("InstallationPrivileges"));
data.setGetUidPath((String)map.get("GetUidFile"));
}
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java
index 415a84444084..967187f90005 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: SolarisHelper.java,v $
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
* This file is part of OpenOffice.org.
*
@@ -69,7 +69,7 @@ public class SolarisHelper {
String log = mktempCommand + "<br><b>Returns: " + uniqueLocalDir + "</b><br>";
LogManager.addCommandsLogfileComment(log);
- String installRoot = data.getInstallRoot();
+ String installRoot = data.getInstallDir();
File installRootTemp = new File(installRoot, "tmp");
if ( installRootTemp.exists() ) {
@@ -95,7 +95,7 @@ public class SolarisHelper {
InstallData data = InstallData.getInstance();
if ( data.getLocalTempPath() != null ) {
- File installRootTemp = new File(data.getInstallRoot(), "tmp");
+ File installRootTemp = new File(data.getInstallDir(), "tmp");
if ( installRootTemp.exists() ) {
installRootTemp.delete(); // removing the link
SystemManager.createDirectory(installRootTemp);
@@ -113,12 +113,12 @@ public class SolarisHelper {
Vector adminFile = new Vector();
InstallData data = InstallData.getInstance();
- if ( relocatable ) {
- String installDir = data.getInstallDir();
- // installDir = installDir.replace(" ", "\\ ");
- String baseDirLine = "basedir=" + installDir;
- adminFile.add(baseDirLine);
- }
+ // if ( relocatable ) {
+ // String installDir = data.getInstallDir();
+ // // installDir = installDir.replace(" ", "\\ ");
+ // String baseDirLine = "basedir=" + installDir;
+ // adminFile.add(baseDirLine);
+ // }
String conflictLine = "conflict=quit";
if ( data.isUserInstallation() ) { conflictLine = "conflict=nocheck"; }
@@ -241,8 +241,7 @@ public class SolarisHelper {
public void saveModulesLogFile(InstallData data) {
if ( data.logModuleStates() ) {
Vector logContent = LogManager.getModulesLogFile();
- File baseDir = new File(data.getInstallRoot(), data.getInstallDir());
- baseDir = new File(baseDir, data.getProductDir());
+ File baseDir = new File(data.getInstallDefaultDir(), data.getProductDir());
File uninstallDir = new File(baseDir, data.getUninstallDirName());
File modulesLogFile = new File(uninstallDir, "moduleSettingsLog.txt");
// System.err.println("Saving file: " + modulesLogFile.getPath());
@@ -262,7 +261,7 @@ public class SolarisHelper {
public String getSolarisDatabasePath(InstallData data) {
String databasePath = null;
- databasePath = data.getInstallRoot();
+ databasePath = data.getInstallDir();
return databasePath;
}
@@ -278,8 +277,7 @@ public class SolarisHelper {
}
Vector fileContent = getAdminFileContent(relocatable);
- File adminDir = new File(data.getInstallRoot(), data.getInstallDir());
- File adminFile = new File(adminDir, adminFileName);
+ File adminFile = new File(data.getInstallDir(), adminFileName);
String completeAdminFileName = adminFile.getPath();
if ( relocatable ) {