From 563643999bdaa773af3cc3a3d6d975c2fd212e4f Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 16 Apr 2015 18:06:18 +0300
Subject: [PATCH] IDEA-138667 Save Groovy-Eclipse jar path setting as a
 system-independent name using path variables

---
 .../groovy/compiler/GreclipseConfigurable.java      | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GreclipseConfigurable.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GreclipseConfigurable.java
index 8bd61c0b6f61..1227d0aa1cb8 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GreclipseConfigurable.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GreclipseConfigurable.java
@@ -20,9 +20,11 @@ import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.openapi.util.Comparing;
+import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.ui.RawCommandLineEditor;
 import com.intellij.ui.components.JBCheckBox;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.incremental.groovy.GreclipseSettings;
 
@@ -65,21 +67,26 @@ public class GreclipseConfigurable implements Configurable {
 
   @Override
   public boolean isModified() {
-    return !Comparing.equal(myJarPath.getText(), mySettings.greclipsePath) ||
+    return !Comparing.equal(getExternalizableJarPath(), mySettings.greclipsePath) ||
            !Comparing.equal(myCmdLineParams.getText(), mySettings.cmdLineParams) ||
            !Comparing.equal(myGenerateDebugInfo.isSelected(), mySettings.debugInfo);
   }
 
   @Override
   public void apply() throws ConfigurationException {
-    mySettings.greclipsePath = myJarPath.getText();
+    mySettings.greclipsePath = getExternalizableJarPath();
     mySettings.cmdLineParams = myCmdLineParams.getText();
     mySettings.debugInfo = myGenerateDebugInfo.isSelected();
   }
 
+  @NotNull
+  private String getExternalizableJarPath() {
+    return FileUtil.toSystemIndependentName(myJarPath.getText());
+  }
+
   @Override
   public void reset() {
-    myJarPath.setText(mySettings.greclipsePath);
+    myJarPath.setText(FileUtil.toSystemDependentName(mySettings.greclipsePath));
     myCmdLineParams.setText(mySettings.cmdLineParams);
     myGenerateDebugInfo.setSelected(mySettings.debugInfo);
   }