From 12c7dbccf9cae6cb2966a5181f09ef42103a2e90 Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 23 May 2011 15:00:42 +0200 Subject: [PATCH] on Windows, there are problems with spaces in javaagent: (IDEA-69973) --- .../plugins/groovy/debugger/GroovyHotSwapper.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyHotSwapper.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyHotSwapper.java index 45223d715e30..e848a11816cd 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyHotSwapper.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyHotSwapper.java @@ -1,7 +1,10 @@ package org.jetbrains.plugins.groovy.debugger; import com.intellij.execution.Executor; -import com.intellij.execution.configurations.*; +import com.intellij.execution.configurations.JavaParameters; +import com.intellij.execution.configurations.ModuleBasedConfiguration; +import com.intellij.execution.configurations.RunConfiguration; +import com.intellij.execution.configurations.RunProfile; import com.intellij.execution.executors.DefaultDebugExecutor; import com.intellij.execution.runners.JavaProgramPatcher; import com.intellij.openapi.application.PathManager; @@ -13,7 +16,6 @@ import com.intellij.openapi.projectRoots.JdkUtil; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.LanguageLevelModuleExtension; import com.intellij.openapi.roots.LanguageLevelProjectExtension; -import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.io.FileUtil; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.search.FilenameIndex; @@ -111,11 +113,11 @@ public class GroovyHotSwapper extends JavaProgramPatcher { @Nullable private static String handleSpacesInPath(String agentPath) { - if (agentPath.contains(" ") && !SystemInfo.isWindows) { + if (agentPath.contains(" ")) { final File dir = new File(PathManager.getSystemPath(), "groovyHotSwap"); if (dir.getAbsolutePath().contains(" ")) { LOG.info("Groovy hot-swap not used since the agent path contains spaces: " + agentPath + "\n" + - "One can move the agent to a directory with no spaces in path and specify its path in idea.properties as " + GROOVY_HOTSWAP_AGENT_PATH + "="); + "One can move the agent to a directory with no spaces in path and specify its path in /bin/idea.properties as " + GROOVY_HOTSWAP_AGENT_PATH + "="); return null; }