diff options
author | Michael Rennie | 2011-02-08 17:31:36 +0000 |
---|---|---|
committer | Michael Rennie | 2011-02-08 17:31:36 +0000 |
commit | 3af5d412a98439a2f12a1a0e732bce60eebf7d46 (patch) | |
tree | a65049d4afa234fa1ff3da3ab24a9be5297fb9e2 | |
parent | 975d1f16840a2666b5e6215883157c85906b648e (diff) | |
download | eclipse.platform.debug-3af5d412a98439a2f12a1a0e732bce60eebf7d46.tar.gz eclipse.platform.debug-3af5d412a98439a2f12a1a0e732bce60eebf7d46.tar.xz eclipse.platform.debug-3af5d412a98439a2f12a1a0e732bce60eebf7d46.zip |
Revert - Bug 335967 - [launching] [builders] Ant Builder doesn't build with Target set to <default>
2 files changed, 15 insertions, 26 deletions
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java index b96fdc078..38f59a96c 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,9 +12,6 @@ package org.eclipse.ui.externaltools.internal.launchConfigurations; -import java.util.HashSet; -import java.util.Iterator; - import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.resources.ResourcesPlugin; @@ -411,28 +408,20 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab { */ public void performApply(ILaunchConfigurationWorkingCopy configuration) { if (fCreateBuildScheduleComponent) { - HashSet kinds = new HashSet(4); - if (afterClean.getSelection()) { - kinds.add(IExternalToolConstants.BUILD_TYPE_FULL); - } - if(manualBuild.getSelection()){ - kinds.add(IExternalToolConstants.BUILD_TYPE_FULL); - kinds.add(IExternalToolConstants.BUILD_TYPE_INCREMENTAL); - } - if (autoBuildButton.getSelection()) { - kinds.add(IExternalToolConstants.BUILD_TYPE_AUTO); - } - - if (fDuringClean.getSelection()) { - kinds.add(IExternalToolConstants.BUILD_TYPE_CLEAN); + StringBuffer buffer= new StringBuffer(); + if (afterClean.getSelection()) { + buffer.append(IExternalToolConstants.BUILD_TYPE_FULL).append(','); + } + if (manualBuild.getSelection()){ + buffer.append(IExternalToolConstants.BUILD_TYPE_INCREMENTAL).append(','); + } + if (autoBuildButton.getSelection()) { + buffer.append(IExternalToolConstants.BUILD_TYPE_AUTO).append(','); + } + + if (fDuringClean.getSelection()) { + buffer.append(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()); } if (workingSetButton.getSelection()) { diff --git a/org.eclipse.ui.externaltools/META-INF/MANIFEST.MF b/org.eclipse.ui.externaltools/META-INF/MANIFEST.MF index 89e0223ee..5dce95ff1 100644 --- a/org.eclipse.ui.externaltools/META-INF/MANIFEST.MF +++ b/org.eclipse.ui.externaltools/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name Bundle-SymbolicName: org.eclipse.ui.externaltools; singleton:=true -Bundle-Version: 3.2.1.qualifier +Bundle-Version: 3.2.0.qualifier Bundle-Activator: org.eclipse.ui.externaltools.internal.model.ExternalToolsPlugin Bundle-Vendor: %Plugin.providerName Bundle-Localization: plugin |