diff options
author | Kurt Zenker <kz@openoffice.org> | 2008-05-06 09:46:38 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2008-05-06 09:46:38 +0000 |
commit | 9f9f7f4e2a5d73846f8f9b7756a832944cfa0844 (patch) | |
tree | 9b1bb2cedcf7fcad5ea4dd0c0f7e3703bf0434ac /javainstaller2 | |
parent | d7dd182b65da0804370cd62d7376a5c545e0903a (diff) |
INTEGRATION: CWS native147 (1.3.2); FILE MERGED
2008/04/21 13:02:20 is 1.3.2.1: #i88334# packages no longer relocatable
Diffstat (limited to 'javainstaller2')
3 files changed, 4 insertions, 70 deletions
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseDirectory.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseDirectory.java index e7575f6c41fa..d8f14a080bf8 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseDirectory.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseDirectory.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ChooseDirectory.java,v $ - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * This file is part of OpenOffice.org. * @@ -115,65 +115,6 @@ public class ChooseDirectory extends JPanel implements ActionListener { contentBox.add(contentPanel); - // new Panel for Solaris User installation - InstallData data = InstallData.getInstance(); - - if ( data.isSolarisUserInstallation() ) { - - Box contentBoxSolarisUser = new Box(BoxLayout.Y_AXIS); - - JPanel titlePanel = new JPanel(); - String subtitleTextRootdir = ResourceManager.getString("String_ChooseDirectory6"); - PanelLabel subTitleLabel = new PanelLabel(subtitleTextRootdir); - titlePanel.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0)); - titlePanel.add(subTitleLabel); - - contentBoxSolarisUser.add(titlePanel); - contentBoxSolarisUser.add(contentBoxSolarisUser.createVerticalStrut(10)); - - JPanel contentPanelRootdir = new JPanel(); - contentPanelRootdir.setLayout(new GridBagLayout()); - - directoryChooserRootdir = new JFileChooser(); - directoryChooserRootdir.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); - - String browseTextRootdir = ResourceManager.getString("String_ChooseDirectory3"); - directoryButtonRootdir = new JButton(browseTextRootdir); - directoryButtonRootdir.addActionListener(this); - - directoryFieldRootdir = new JTextField(); - - GridBagConstraints constraintsRootdir = new GridBagConstraints(); - - constraintsRootdir.gridx = 0; - constraintsRootdir.gridy = 0; - constraintsRootdir.weightx = 1; - constraintsRootdir.weighty = 0; - constraintsRootdir.fill = GridBagConstraints.HORIZONTAL; - - contentPanelRootdir.add(directoryFieldRootdir, constraintsRootdir); - - constraintsRootdir.gridx = 1; - constraintsRootdir.gridy = 0; - constraintsRootdir.weightx = 0; - constraintsRootdir.weighty = 0; - constraintsRootdir.fill = GridBagConstraints.HORIZONTAL; - - contentPanelRootdir.add(directoryButtonRootdir, constraintsRootdir); - - constraintsRootdir.gridx = 0; - constraintsRootdir.gridy = 1; - constraintsRootdir.weightx = 0; - constraintsRootdir.weighty = 1; - constraintsRootdir.fill = GridBagConstraints.VERTICAL; - - contentPanelRootdir.add(new JPanel(), constraintsRootdir); - - contentBoxSolarisUser.add(contentPanelRootdir); - - contentBox.add(contentBoxSolarisUser); - } - // defining a place for text output databaseProgress = new PanelLabel(""); // planned for database progress contentBox.add(databaseProgress); diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Dumper.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Dumper.java index c04931370a4a..d72eb8d65489 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Dumper.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Dumper.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: Dumper.java,v $ - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * This file is part of OpenOffice.org. * @@ -182,7 +182,6 @@ public class Dumper { System.err.println("AdminFileNoReloc: " + data.getAdminFileNameNoReloc()); System.err.println("DatabasePath: " + data.getDatabasePath()); System.err.println("InstallDir: " + data.getInstallDir()); - System.err.println("InstallRoot: " + data.getInstallRoot()); System.err.println("Original privileges: " + data.getStoredInstallationPrivileges()); System.err.println("getuid.so File: " + data.getGetUidPath()); } diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoCtrl.java index 543d8fc8a931..172844112c87 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoCtrl.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoCtrl.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: InfoCtrl.java,v $ - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * This file is part of OpenOffice.org. * @@ -57,10 +57,7 @@ public class InfoCtrl { String oneline = "-------------------------------------------------------------"; htmlInfoText = htmlInfoText + "<b>Product</b>: " + productData.get("product_fullname") + "<br>"; InstallData data = InstallData.getInstance(); - htmlInfoText = htmlInfoText + "<b>Location</b>: " + data.getInstallDir() + "<br>"; - if (( data.getInstallRoot() != null ) && ( ! data.getInstallRoot().equals("null") )) { - htmlInfoText = htmlInfoText + "<b>Root directory</b>: " + data.getInstallRoot() + "<br>"; - } + htmlInfoText = htmlInfoText + "<b>Location</b>: " + data.getInstallDefaultDir() + "<br>"; htmlInfoText = htmlInfoText + oneline + "<br>"; return htmlInfoText; @@ -151,9 +148,6 @@ public class InfoCtrl { htmlInfoText = htmlInfoText + "<b>Product</b>: " + productData.get("product_fullname") + "<br>"; InstallData data = InstallData.getInstance(); htmlInfoText = htmlInfoText + "<b>Location</b>: " + data.getInstallDir() + "<br>"; - if (( data.getInstallRoot() != null ) && ( ! data.getInstallRoot().equals("null") )) { - htmlInfoText = htmlInfoText + "<b>Root directory</b>: " + data.getInstallRoot() + "<br>"; - } htmlInfoText = htmlInfoText + "<b>Operating system</b>: " + data.getOSType() + "<br>"; if ( data.isUserInstallation() ) { htmlInfoText = htmlInfoText + "<b>Installation type</b>: " + "User installation" + "<br>"; |