diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-06 09:46:04 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-06 09:46:04 +0000 |
| commit | d7dd182b65da0804370cd62d7376a5c545e0903a (patch) | |
| tree | 9b8aeaac52b7f0c9e3df3f84bf87cb200cedabcb /javainstaller2 | |
| parent | 1152ba2b99de780603fe3739b05aaf49c1445d8e (diff) | |
INTEGRATION: CWS native147 (1.5.2); FILE MERGED
2008/04/21 13:02:20 is 1.5.2.1: #i88334# packages no longer relocatable
Diffstat (limited to 'javainstaller2')
| -rwxr-xr-x | javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Controller.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Controller.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Controller.java index 8673704e2375..8410f8cd97a8 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Controller.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Controller.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: Controller.java,v $ - * $Revision: 1.5 $ + * $Revision: 1.6 $ * * This file is part of OpenOffice.org. * @@ -205,11 +205,11 @@ public class Controller { if ( installData.newerVersionExists() ) { // Inform user about a newer version installed - SetupDataProvider.setNewMacro("DIR", installData.getInstallDir()); // important for string replacement + SetupDataProvider.setNewMacro("DIR", installData.getInstallDefaultDir()); // important for string replacement - System.err.println("Error: A newer version is already installed in " + installData.getInstallDir() + " !"); + System.err.println("Error: A newer version is already installed in " + installData.getInstallDefaultDir() + " !"); String message1 = ResourceManager.getString("String_Newer_Version_Installed_Found") - + "\n" + installData.getInstallDir() + "\n"; + + "\n" + installData.getInstallDefaultDir() + "\n"; String message2 = ResourceManager.getString("String_Newer_Version_Installed_Remove"); String message = message1 + "\n" + message2; String title = ResourceManager.getString("String_Error"); |