Attachment 184083 Details for Bug 114563 – proposed fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] proposed fix

builders.patch (text/plain), 5.13 KB, created by Michael Rennie

on 2010-11-29 17:06:04 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Rennie

Created: 2010-11-29 17:06:04 EST

Size: 5.13 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ant.ui
>Index: Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntBuilderTargetsTab.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntBuilderTargetsTab.java,v
>retrieving revision 1.9
>diff -u -r1.9 AntBuilderTargetsTab.java
>--- Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntBuilderTargetsTab.java	8 Oct 2009 18:44:18 -0000	1.9
>+++ Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntBuilderTargetsTab.java	29 Nov 2010 22:00:59 -0000
>@@ -11,6 +11,8 @@
> package org.eclipse.ant.internal.ui.launchConfigurations;
> 
> import java.util.HashMap;
>+import java.util.HashSet;
>+import java.util.Iterator;
> import java.util.Map;
> 
> import org.eclipse.ant.internal.ui.AntUIImages;
>@@ -294,19 +296,27 @@
>     }
> 
>     public void performApply(ILaunchConfigurationWorkingCopy configuration) {
>-        StringBuffer buffer= new StringBuffer();
>+        HashSet kinds = new HashSet(4);
>         if (!fAfterCleanTargetText.getText().equals(NOT_ENABLED)) {
>-            buffer.append(IExternalToolConstants.BUILD_TYPE_FULL).append(',');
>+            kinds.add(IExternalToolConstants.BUILD_TYPE_FULL);
>         } 
>         if (!fManualBuildTargetText.getText().equals(NOT_ENABLED)){
>-            buffer.append(IExternalToolConstants.BUILD_TYPE_INCREMENTAL).append(','); 
>+        	kinds.add(IExternalToolConstants.BUILD_TYPE_FULL);
>+            kinds.add(IExternalToolConstants.BUILD_TYPE_INCREMENTAL); 
>         } 
>         if (!fAutoBuildTargetText.getText().equals(NOT_ENABLED)) {
>-            buffer.append(IExternalToolConstants.BUILD_TYPE_AUTO).append(',');
>+            kinds.add(IExternalToolConstants.BUILD_TYPE_AUTO);
>         }
>         if (!fDuringCleanTargetText.getText().equals(NOT_ENABLED)) {
>-            buffer.append(IExternalToolConstants.BUILD_TYPE_CLEAN);
>+            kinds.add(IExternalToolConstants.BUILD_TYPE_CLEAN);
>         }
>+        StringBuffer buffer= new StringBuffer();
>+		for(Iterator i = kinds.iterator(); i.hasNext();) {
>+			buffer.append(i.next());
>+			if(i.hasNext()) {
>+				buffer.append(',');
>+			}
>+		}
>         configuration.setAttribute(IExternalToolConstants.ATTR_RUN_BUILD_KINDS, buffer.toString());
>         
>         String targets= (String) fAttributeToTargets.get(IAntLaunchConstants.ATTR_ANT_AFTER_CLEAN_TARGETS);
>#P org.eclipse.ui.externaltools
>Index: External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java,v
>retrieving revision 1.48
>diff -u -r1.48 ExternalToolsBuilderTab.java
>--- External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java	8 Oct 2009 18:44:14 -0000	1.48
>+++ External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java	29 Nov 2010 22:01:00 -0000
>@@ -12,6 +12,9 @@
> package org.eclipse.ui.externaltools.internal.launchConfigurations;
> 
> 
>+import java.util.HashSet;
>+import java.util.Iterator;
>+
> import org.eclipse.core.externaltools.internal.IExternalToolConstants;
> import org.eclipse.core.externaltools.internal.launchConfigurations.ExternalToolsCoreUtil;
> import org.eclipse.core.resources.IResource;
>@@ -387,25 +390,33 @@
>         fVariables.setEnabled(haveOutputFile);
>         fAppend.setEnabled(haveOutputFile);
>     }
>-
>+    
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
> 	 */
> 	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
>         if (fCreateBuildScheduleComponent) {
>-        	StringBuffer buffer= new StringBuffer();
>+        	HashSet kinds = new HashSet(4);
>     		if (afterClean.getSelection()) {
>-    			buffer.append(IExternalToolConstants.BUILD_TYPE_FULL).append(',');
>+    			kinds.add(IExternalToolConstants.BUILD_TYPE_FULL);
>     		} 
>-    		if (manualBuild.getSelection()){
>-    			buffer.append(IExternalToolConstants.BUILD_TYPE_INCREMENTAL).append(','); 
>+    		if(manualBuild.getSelection()){
>+    			kinds.add(IExternalToolConstants.BUILD_TYPE_FULL);
>+    			kinds.add(IExternalToolConstants.BUILD_TYPE_INCREMENTAL); 
>     		} 
>     		if (autoBuildButton.getSelection()) {
>-    			buffer.append(IExternalToolConstants.BUILD_TYPE_AUTO).append(',');
>+    			kinds.add(IExternalToolConstants.BUILD_TYPE_AUTO);
>     		}
>     		
>     		if (fDuringClean.getSelection()) {
>-    			buffer.append(IExternalToolConstants.BUILD_TYPE_CLEAN);
>+    			kinds.add(IExternalToolConstants.BUILD_TYPE_CLEAN);
>+    		}
>+    		StringBuffer buffer= new StringBuffer();
>+    		for(Iterator i = kinds.iterator(); i.hasNext();) {
>+    			buffer.append(i.next());
>+    			if(i.hasNext()) {
>+    				buffer.append(',');
>+    			}
>     		}
>     		configuration.setAttribute(IExternalToolConstants.ATTR_RUN_BUILD_KINDS, buffer.toString());
>         }

Actions: View | Diff

Attachments on bug 114563: 165391 | 184083 | 188199 | 188608