From 1e97cdd74016a72909a4275ee53dcb5bf7ea68c0 Mon Sep 17 00:00:00 2001
From: Jose <jose@zeroc.com>
Date: Mon, 2 Feb 2015 16:37:08 +0100
Subject: Fixed (ICE-6235) - Update eclipse to support new JAR names

---
 .../preferences/PreferenceInitializer.java         | 28 ++++++++++++++--------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/PreferenceInitializer.java')

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 335b9703b25..10e66e7dccc 100644
--- a/eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/PreferenceInitializer.java
+++ b/eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/PreferenceInitializer.java
@@ -27,23 +27,31 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer
         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-" + Messages.IceStringVersion);
-            if(!f.exists())
+            final String[] defaultLocations = new String[]{
+                "C:\\Program Files\\ZeroC\\Ice-" + Messages.IceStringVersion,
+                "C:\\Program Files (x86)\\ZeroC\\Ice-" + Messages.IceStringVersion,
+                "C:\\Ice-" + Messages.IceStringVersion};
+            for(String s : defaultLocations)
             {
-                File f2 = new File("C:\\Program Files (x86)\\ZeroC\\Ice-" + Messages.IceStringVersion);
-                if(f2.exists())
+                if(new File(s).exists())
                 {
-                    return f2.toString();
+                    return s;
                 }
             }
-            return f.toString();
         }
-        if(os.equals("Linux")) //$NON-NLS-1$
+        else
         {
-            File f = new File("/usr/bin/slice2java"); //$NON-NLS-1$
-            if(f.exists())
+            final String[] defaultLocations = new String[]{
+                    "/usr/bin/slice2java",
+                    "/usr/local/bin/slice2java",
+                    "/opt/Ice-" + Messages.IceStringVersion + "/bin/slice2java"};
+            
+            for(String s : defaultLocations)
             {
-                return "/usr"; //$NON-NLS-1$
+                if(new File(s).exists())
+                {
+                    return s.replace("/bin/slice2java", "");
+                }
             }
         }
         return "/opt/Ice-" + Messages.IceStringVersion; //$NON-NLS-1$
-- 
cgit v1.2.3