[jbosstools-commits] JBoss Tools SVN: r35568 - trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process.
Author: koen.aers(a)jboss.com
Date: 2011-10-12 08:23:38 -0400 (Wed, 12 Oct 2011)
New Revision: 35568
Modified:
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeLaunchHelper.java
Log:
JBIDE-9882: Forge does not start on XP
Modified:
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeLaunchHelper.java
===================================================================
---
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeLaunchHelper.java 2011-10-12
11:46:58 UTC (rev 35567)
+++
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeLaunchHelper.java 2011-10-12
12:23:38 UTC (rev 35568)
@@ -95,19 +95,42 @@
private static String createJBossModulesPathArgument(String location) {
StringBuffer buffer = new StringBuffer("-modulepath ");
- buffer.append(location).append("/modules").append(File.pathSeparator);
- buffer.append(System.getProperty("user.home")).append("/.forge/plugins").append(File.pathSeparator);
- buffer.append(getExtLocation());
+ buffer.append(getMainModulesLocation(location)).append(File.pathSeparator);
+ buffer.append(getUserModulesLocation()).append(File.pathSeparator);
+ buffer.append(getExtraModulesLocation());
return buffer.toString();
}
- private static String getExtLocation() {
+ private static String encloseWithDoubleQuotes(String str) {
+ return "\"" + str + "\"";
+ }
+
+ private static String getMainModulesLocation(String location) {
+ String result = location + "/modules";
+ if (result.contains(" ")) {
+ result = encloseWithDoubleQuotes(result);
+ }
+ return result;
+ }
+
+ private static String getUserModulesLocation() {
+ String result = System.getProperty("user.home") +
"/.forge/plugins";
+ if (result.contains(" ")) {
+ result = encloseWithDoubleQuotes(result);
+ }
+ return result;
+ }
+
+ private static String getExtraModulesLocation() {
String result = "";
try {
result =
FileLocator.getBundleFile(Platform.getBundle("org.jboss.tools.forge.runtime.ext")).getAbsolutePath()
+ "/modules";
} catch (IOException e) {
ForgeCorePlugin.log(new RuntimeException("Problem while obtaining location of
extra runtime classes.", e));
}
+ if (result.contains(" ")) {
+ result = encloseWithDoubleQuotes(result);
+ }
return result;
}