diff options
| author | Jose <jose@zeroc.com> | 2012-12-13 15:08:58 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-12-13 15:08:58 +0100 |
| commit | 6ad4d7c12c9aecf7ba742dc644253d2993bedfd7 (patch) | |
| tree | b7c9206116e44d2da3e369a834df244205b78835 /eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/internal/Configuration.java | |
| parent | ICE-5139 - Ice-3.5b-bin-macosx.tar.gz (diff) | |
| download | ice-6ad4d7c12c9aecf7ba742dc644253d2993bedfd7.tar.bz2 ice-6ad4d7c12c9aecf7ba742dc644253d2993bedfd7.tar.xz ice-6ad4d7c12c9aecf7ba742dc644253d2993bedfd7.zip | |
ICE-5071 - Eclipse plug-in should detect an RPM installation
Diffstat (limited to 'eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/internal/Configuration.java')
| -rw-r--r-- | eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/internal/Configuration.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/internal/Configuration.java b/eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/internal/Configuration.java index c656d2346af..966549d8d41 100644 --- a/eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/internal/Configuration.java +++ b/eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/internal/Configuration.java @@ -812,7 +812,7 @@ public class Configuration return getTranslatorForHome(dir) != null; } - public String getJarDir() + public static String getJarDir() { String iceHome = getIceHome(); String os = System.getProperty("os.name"); @@ -939,9 +939,9 @@ public class Configuration } else { - cpEntry = JavaCore.newVariableEntry(new Path("ICE_HOME/lib/Ice.jar"), - new Path("ICE_HOME/lib/Ice.jar"), - new Path("ICE_HOME/lib/"), + cpEntry = JavaCore.newVariableEntry(new Path("ICE_JAR_HOME/Ice.jar"), + new Path("ICE_JAR_HOME/Ice.jar"), + new Path("ICE_JAR_HOME/lib/"), true); } @@ -976,9 +976,9 @@ public class Configuration private void addLibrary(IJavaProject project, String jar) throws CoreException { - IClasspathEntry cpEntry = JavaCore.newVariableEntry(new Path("ICE_HOME/lib/" + jar), - new Path("ICE_HOME/lib/" + jar), - new Path("ICE_HOME/lib/"), + IClasspathEntry cpEntry = JavaCore.newVariableEntry(new Path("ICE_JAR_HOME/" + jar), + new Path("ICE_JAR_HOME/" + jar), + new Path("ICE_JAR_HOME/"), true); IClasspathEntry[] entries = project.getRawClasspath(); @@ -1040,7 +1040,7 @@ public class Configuration public void removeLibrary(IJavaProject project, String lib) throws CoreException { - IClasspathEntry cpEntry = JavaCore.newVariableEntry(new Path("ICE_HOME/lib/" + lib), null, null); + IClasspathEntry cpEntry = JavaCore.newVariableEntry(new Path("ICE_JAR_HOME/lib/" + lib), null, null); IClasspathEntry[] entries = project.getRawClasspath(); |