diff options
Diffstat (limited to 'eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin')
3 files changed, 27 insertions, 8 deletions
diff --git a/eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/Messages.java b/eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/Messages.java new file mode 100644 index 00000000000..3165bbe3143 --- /dev/null +++ b/eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/Messages.java @@ -0,0 +1,18 @@ +package com.zeroc.slice2javaplugin.preferences; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS +{ + private static final String BUNDLE_NAME = "com.zeroc.slice2javaplugin.preferences.messages"; //$NON-NLS-1$ + public static String IceStringVersion; + static + { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() + { + } +} diff --git a/eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/PreferenceInitializer.java b/eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/PreferenceInitializer.java index 0d4b7d3c300..05f784d599a 100644 --- a/eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/PreferenceInitializer.java +++ b/eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/PreferenceInitializer.java @@ -24,13 +24,13 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer { private String getDefaultHome() { - String os = System.getProperty("os.name"); - if(os.startsWith("Windows")) + String os = System.getProperty("os.name"); //$NON-NLS-1$ + if(os.startsWith("Windows")) //$NON-NLS-1$ { - File f = new File("C:\\Program Files\\ZeroC\\Ice-3.4.2"); + File f = new File("C:\\Program Files\\ZeroC\\Ice-" + Messages.IceStringVersion); if(!f.exists()) { - File f2 = new File("C:\\Program Files (x86)\\ZeroC\\Ice-3.4.2"); + File f2 = new File("C:\\Program Files (x86)\\ZeroC\\Ice-" + Messages.IceStringVersion); if(f2.exists()) { return f2.toString(); @@ -38,15 +38,15 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer } return f.toString(); } - if(os.equals("Linux")) + if(os.equals("Linux")) //$NON-NLS-1$ { - File f = new File("/usr/bin/slice2java"); + File f = new File("/usr/bin/slice2java"); //$NON-NLS-1$ if(f.exists()) { - return "/usr"; + return "/usr"; //$NON-NLS-1$ } } - return "/opt/Ice-3.4.2"; + return "/opt/Ice-" + Messages.IceStringVersion; //$NON-NLS-1$ } /* diff --git a/eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/messages.properties b/eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/messages.properties new file mode 100644 index 00000000000..2c0491b5049 --- /dev/null +++ b/eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/messages.properties @@ -0,0 +1 @@ +IceStringVersion=3.5b |