Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 114563 | Differences between
and this patch

Collapse All | Expand All

(-)Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntBuilderTargetsTab.java (-5 / +15 lines)
Lines 11-16 Link Here
11
package org.eclipse.ant.internal.ui.launchConfigurations;
11
package org.eclipse.ant.internal.ui.launchConfigurations;
12
12
13
import java.util.HashMap;
13
import java.util.HashMap;
14
import java.util.HashSet;
15
import java.util.Iterator;
14
import java.util.Map;
16
import java.util.Map;
15
17
16
import org.eclipse.ant.internal.ui.AntUIImages;
18
import org.eclipse.ant.internal.ui.AntUIImages;
Lines 294-312 Link Here
294
    }
296
    }
295
297
296
    public void performApply(ILaunchConfigurationWorkingCopy configuration) {
298
    public void performApply(ILaunchConfigurationWorkingCopy configuration) {
297
        StringBuffer buffer= new StringBuffer();
299
        HashSet kinds = new HashSet(4);
298
        if (!fAfterCleanTargetText.getText().equals(NOT_ENABLED)) {
300
        if (!fAfterCleanTargetText.getText().equals(NOT_ENABLED)) {
299
            buffer.append(IExternalToolConstants.BUILD_TYPE_FULL).append(',');
301
            kinds.add(IExternalToolConstants.BUILD_TYPE_FULL);
300
        } 
302
        } 
301
        if (!fManualBuildTargetText.getText().equals(NOT_ENABLED)){
303
        if (!fManualBuildTargetText.getText().equals(NOT_ENABLED)){
302
            buffer.append(IExternalToolConstants.BUILD_TYPE_INCREMENTAL).append(','); 
304
        	kinds.add(IExternalToolConstants.BUILD_TYPE_FULL);
305
            kinds.add(IExternalToolConstants.BUILD_TYPE_INCREMENTAL); 
303
        } 
306
        } 
304
        if (!fAutoBuildTargetText.getText().equals(NOT_ENABLED)) {
307
        if (!fAutoBuildTargetText.getText().equals(NOT_ENABLED)) {
305
            buffer.append(IExternalToolConstants.BUILD_TYPE_AUTO).append(',');
308
            kinds.add(IExternalToolConstants.BUILD_TYPE_AUTO);
306
        }
309
        }
307
        if (!fDuringCleanTargetText.getText().equals(NOT_ENABLED)) {
310
        if (!fDuringCleanTargetText.getText().equals(NOT_ENABLED)) {
308
            buffer.append(IExternalToolConstants.BUILD_TYPE_CLEAN);
311
            kinds.add(IExternalToolConstants.BUILD_TYPE_CLEAN);
309
        }
312
        }
313
        StringBuffer buffer= new StringBuffer();
314
		for(Iterator i = kinds.iterator(); i.hasNext();) {
315
			buffer.append(i.next());
316
			if(i.hasNext()) {
317
				buffer.append(',');
318
			}
319
		}
310
        configuration.setAttribute(IExternalToolConstants.ATTR_RUN_BUILD_KINDS, buffer.toString());
320
        configuration.setAttribute(IExternalToolConstants.ATTR_RUN_BUILD_KINDS, buffer.toString());
311
        
321
        
312
        String targets= (String) fAttributeToTargets.get(IAntLaunchConstants.ATTR_ANT_AFTER_CLEAN_TARGETS);
322
        String targets= (String) fAttributeToTargets.get(IAntLaunchConstants.ATTR_ANT_AFTER_CLEAN_TARGETS);
(-)External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java (-7 / +18 lines)
Lines 12-17 Link Here
12
package org.eclipse.ui.externaltools.internal.launchConfigurations;
12
package org.eclipse.ui.externaltools.internal.launchConfigurations;
13
13
14
14
15
import java.util.HashSet;
16
import java.util.Iterator;
17
15
import org.eclipse.core.externaltools.internal.IExternalToolConstants;
18
import org.eclipse.core.externaltools.internal.IExternalToolConstants;
16
import org.eclipse.core.externaltools.internal.launchConfigurations.ExternalToolsCoreUtil;
19
import org.eclipse.core.externaltools.internal.launchConfigurations.ExternalToolsCoreUtil;
17
import org.eclipse.core.resources.IResource;
20
import org.eclipse.core.resources.IResource;
Lines 387-411 Link Here
387
        fVariables.setEnabled(haveOutputFile);
390
        fVariables.setEnabled(haveOutputFile);
388
        fAppend.setEnabled(haveOutputFile);
391
        fAppend.setEnabled(haveOutputFile);
389
    }
392
    }
390
393
    
391
	/* (non-Javadoc)
394
	/* (non-Javadoc)
392
	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
395
	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
393
	 */
396
	 */
394
	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
397
	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
395
        if (fCreateBuildScheduleComponent) {
398
        if (fCreateBuildScheduleComponent) {
396
        	StringBuffer buffer= new StringBuffer();
399
        	HashSet kinds = new HashSet(4);
397
    		if (afterClean.getSelection()) {
400
    		if (afterClean.getSelection()) {
398
    			buffer.append(IExternalToolConstants.BUILD_TYPE_FULL).append(',');
401
    			kinds.add(IExternalToolConstants.BUILD_TYPE_FULL);
399
    		} 
402
    		} 
400
    		if (manualBuild.getSelection()){
403
    		if(manualBuild.getSelection()){
401
    			buffer.append(IExternalToolConstants.BUILD_TYPE_INCREMENTAL).append(','); 
404
    			kinds.add(IExternalToolConstants.BUILD_TYPE_FULL);
405
    			kinds.add(IExternalToolConstants.BUILD_TYPE_INCREMENTAL); 
402
    		} 
406
    		} 
403
    		if (autoBuildButton.getSelection()) {
407
    		if (autoBuildButton.getSelection()) {
404
    			buffer.append(IExternalToolConstants.BUILD_TYPE_AUTO).append(',');
408
    			kinds.add(IExternalToolConstants.BUILD_TYPE_AUTO);
405
    		}
409
    		}
406
    		
410
    		
407
    		if (fDuringClean.getSelection()) {
411
    		if (fDuringClean.getSelection()) {
408
    			buffer.append(IExternalToolConstants.BUILD_TYPE_CLEAN);
412
    			kinds.add(IExternalToolConstants.BUILD_TYPE_CLEAN);
413
    		}
414
    		StringBuffer buffer= new StringBuffer();
415
    		for(Iterator i = kinds.iterator(); i.hasNext();) {
416
    			buffer.append(i.next());
417
    			if(i.hasNext()) {
418
    				buffer.append(',');
419
    			}
409
    		}
420
    		}
410
    		configuration.setAttribute(IExternalToolConstants.ATTR_RUN_BUILD_KINDS, buffer.toString());
421
    		configuration.setAttribute(IExternalToolConstants.ATTR_RUN_BUILD_KINDS, buffer.toString());
411
        }
422
        }

Return to bug 114563