summaryrefslogtreecommitdiff
path: root/eclipse/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/PreferenceInitializer.java
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2011-02-01 12:54:18 -0800
committerMark Spruiell <mes@zeroc.com>2011-02-01 12:54:18 -0800
commit7ca6c19f351273d8101a47f0ac5a1b08333370c4 (patch)
tree2fffa668af451becea65fb5c69d63458b291557a /eclipse/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/PreferenceInitializer.java
parent4975 - Uninitialized _fd on FileUtil.cpp (diff)
downloadice-7ca6c19f351273d8101a47f0ac5a1b08333370c4.tar.bz2
ice-7ca6c19f351273d8101a47f0ac5a1b08333370c4.tar.xz
ice-7ca6c19f351273d8101a47f0ac5a1b08333370c4.zip
merging eclipse plug-in from R3_3_branch
Diffstat (limited to 'eclipse/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/PreferenceInitializer.java')
-rw-r--r--eclipse/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/PreferenceInitializer.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/eclipse/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/PreferenceInitializer.java b/eclipse/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/PreferenceInitializer.java
index d667846a4ee..e87c71181f8 100644
--- a/eclipse/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/PreferenceInitializer.java
+++ b/eclipse/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/PreferenceInitializer.java
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.
//
// This plug-in is provided to you under the terms and conditions
// of the Eclipse Public License Version 1.0 ("EPL"). A copy of
@@ -31,10 +31,10 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer
}
else if(os.startsWith("Windows"))
{
- File f = new File("C:\\Ice-3.3.0");
+ File f = new File("C:\\Ice-3.4.1");
if(!f.exists())
{
- File f2 = new File("C:\\Ice-3.3.0-VC90");
+ File f2 = new File("C:\\Ice-3.4.1-VC90");
if(f2.exists())
{
return f2.toString();
@@ -42,7 +42,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer
}
return f.toString();
}
- return "/opt/Ice-3.3.0";
+ return "/opt/Ice-3.4.1";
}
/*