Bug 38243 - Editing an external tool builder modifies the .project file

3 files changed, 11 insertions, 3 deletions

diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/WorkingSetComparator.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/IgnoreWhiteSpaceComparator.java
index 9516fec68..f2f93146d 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/WorkingSetComparator.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/IgnoreWhiteSpaceComparator.java
@@ -12,7 +12,7 @@ package org.eclipse.ui.externaltools.internal.launchConfigurations;
 
 import java.util.Comparator;
 
-public class WorkingSetComparator implements Comparator {
+public class IgnoreWhiteSpaceComparator implements Comparator {
 
 	/* (non-Javadoc)
 	 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java
index afc79e277..de72fbfec 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java
@@ -69,6 +69,7 @@ import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.ui.dialogs.ElementListSelectionDialog;
 import org.eclipse.ui.dialogs.PropertyPage;
 import org.eclipse.ui.externaltools.internal.launchConfigurations.ExternalToolsUtil;
+import org.eclipse.ui.externaltools.internal.launchConfigurations.IgnoreWhiteSpaceComparator;
 import org.eclipse.ui.externaltools.internal.model.ExternalToolBuilder;
 import org.eclipse.ui.externaltools.internal.model.ExternalToolsPlugin;
 import org.eclipse.ui.externaltools.internal.model.IExternalToolConstants;
@@ -1118,6 +1119,7 @@ public final class BuilderPropertyPage extends PropertyPage {
 			if (oldCommands.length != newCommands.length) {
 				return true;
 			}
+			IgnoreWhiteSpaceComparator comparator= new IgnoreWhiteSpaceComparator();
 			for (int i = 0; i < oldCommands.length; i++) {
 				ICommand oldCommand = oldCommands[i];
 				ICommand newCommand= newCommands[i];
@@ -1144,7 +1146,13 @@ public final class BuilderPropertyPage extends PropertyPage {
 				Iterator keySet= oldArgs.keySet().iterator();
 				while (keySet.hasNext()) {
 					Object key = keySet.next();
-					if (!oldArgs.get(key).equals(newArgs.get(key))) {
+					Object oldArg= oldArgs.get(key);
+					Object newArg= newArgs.get(key);
+					if (oldArg instanceof String && newArg instanceof String) {
+						if (comparator.compare(oldArg, newArg) != 0) {
+							return true;
+						}
+					} else if (!oldArg.equals(newArg)){
 						return true;
 					}
 				}
diff --git a/org.eclipse.ui.externaltools/plugin.xml b/org.eclipse.ui.externaltools/plugin.xml
index 9b596540f..8bb142f49 100644
--- a/org.eclipse.ui.externaltools/plugin.xml
+++ b/org.eclipse.ui.externaltools/plugin.xml
@@ -197,7 +197,7 @@
          point="org.eclipse.debug.core.launchConfigurationComparators">
       <launchConfigurationComparator
             attribute="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE"
-            class="org.eclipse.ui.externaltools.internal.launchConfigurations.WorkingSetComparator"
+            class="org.eclipse.ui.externaltools.internal.launchConfigurations.IgnoreWhiteSpaceComparator"
             id="org.eclipse.ui.externaltools.workingSetComparator">
       </launchConfigurationComparator>
    </extension>