From d9591206dfe2f9a8650950296e8347811a97cc99 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 18 Mar 2008 11:14:15 +0000 Subject: [PATCH] INTEGRATION: CWS sb83 (1.4.8); FILE MERGED 2008/02/22 05:55:16 sb 1.4.8.2: RESYNC: (1.4-1.5); FILE MERGED 2008/02/11 16:07:20 is 1.4.8.1: #i86012# Java GUI Installer and three layer office --- .../org/openoffice/setup/InstallData.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java index 3b84bdfe164a..b7928cee3208 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java @@ -4,9 +4,9 @@ * * $RCSfile: InstallData.java,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: ihi $ $Date: 2008-02-05 13:36:14 $ + * last change: $Author: vg $ $Date: 2008-03-18 12:14:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -82,7 +82,8 @@ public class InstallData static private String osType; /* Linux, SunOS, ... */ static private String installDir = null; static private String installRoot = null; /* Root directory for Solaris user installation */ - static private String defaultDir = "/opt/OpenOffice.org"; + static private String defaultDir = "/opt"; + static private String productDir = null; static private String packageFormat = null; static private String architecture = null; static private String packagePath = null; @@ -269,6 +270,14 @@ public class InstallData defaultDir = dir; } + public String getProductDir() { + return productDir; + } + + public void setProductDir(String dir) { + productDir = dir; + } + public String getInstallDirName() { return installDirName; }