Attachment 165391 Details for Bug 114563 – Patch

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

[patch] Patch

patch114563_3.6M7_20100409.txt (text/plain), 9.17 KB, created by Szymon Ptaszkiewicz

on 2010-04-20 04:23:45 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Szymon Ptaszkiewicz

Created: 2010-04-20 04:23:45 EDT

Size: 9.17 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	9 Apr 2010 10:52:21 -0000
>@@ -59,6 +59,8 @@
>     
>     private static final String NOT_ENABLED= AntLaunchConfigurationMessages.AntBuilderTargetsTab_0; 
> 	private static final String DEFAULT_TARGET_SELECTED= AntLaunchConfigurationMessages.AntBuilderTargetsTab_10;
>+	private static final String NO_BUILD_KIND_ERROR= AntLaunchConfigurationMessages.AntBuilderTargetsTab_buildKindError_1;
>+	private static final String BUILD_KIND_ERROR= AntLaunchConfigurationMessages.AntBuilderTargetsTab_buildKindError_2;
>     
> 	private SelectionListener fSelectionListener= new SelectionAdapter() {
> 		/* (non-Javadoc)
>@@ -333,4 +335,54 @@
>     public Image getImage() {
>         return AntUIImages.getImage(IAntUIConstants.IMG_TAB_ANT_TARGETS);
>     }
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see
>+	 * org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug
>+	 * .core.ILaunchConfiguration)
>+	 */
>+	public boolean isValid(ILaunchConfiguration launchConfig) {
>+		setErrorMessage(null);
>+		setMessage(null);
>+
>+		// configuration is invalid if we set targets for incremental build kind
>+		// without setting any target for full build
>+		if ((!fManualBuildTargetText.getText().equals(NOT_ENABLED))
>+				|| (!fAutoBuildTargetText.getText().equals(NOT_ENABLED))) {
>+			if (fAfterCleanTargetText.getText().equals(NOT_ENABLED)) {
>+				setErrorMessage(BUILD_KIND_ERROR);
>+				return false;
>+			}
>+		}
>+
>+		// configuration is invalid if we do not set any target for any build
>+		// kind
>+		if (fAfterCleanTargetText.getText().equals(NOT_ENABLED)
>+				&& fManualBuildTargetText.getText().equals(NOT_ENABLED)
>+				&& fAutoBuildTargetText.getText().equals(NOT_ENABLED)
>+				&& fDuringCleanTargetText.getText().equals(NOT_ENABLED)) {
>+			setErrorMessage(NO_BUILD_KIND_ERROR);
>+			return false;
>+		}
>+
>+		return true;
>+	}
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#canSave()
>+	 */
>+	public boolean canSave() {
>+		return isValid(null);
>+	}
>+	
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
>+	 */
>+	public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
>+		// do nothing on activation
>+	}
> }
>Index: Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchConfigurationMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchConfigurationMessages.java,v
>retrieving revision 1.9
>diff -u -r1.9 AntLaunchConfigurationMessages.java
>--- Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchConfigurationMessages.java	8 Oct 2009 18:44:18 -0000	1.9
>+++ Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchConfigurationMessages.java	9 Apr 2010 10:52:21 -0000
>@@ -48,6 +48,8 @@
> 	public static String AntBuilderTargetsTab_7;
> 	public static String AntBuilderTargetsTab_8;
> 	public static String AntBuilderTargetsTab_10;
>+	public static String AntBuilderTargetsTab_buildKindError_1;
>+	public static String AntBuilderTargetsTab_buildKindError_2;
> 
> 	public static String AntMainTab__Select_a_build_file__1;
> 	public static String AntMainTab_3;
>Index: Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchConfigurationMessages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchConfigurationMessages.properties,v
>retrieving revision 1.46
>diff -u -r1.46 AntLaunchConfigurationMessages.properties
>--- Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchConfigurationMessages.properties	21 Oct 2009 16:51:34 -0000	1.46
>+++ Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchConfigurationMessages.properties	9 Apr 2010 10:52:21 -0000
>@@ -43,6 +43,8 @@
> AntBuilderTargetsTab_7=During a "Clean":
> AntBuilderTargetsTab_8=Set Tar&gets...
> AntBuilderTargetsTab_10=<default target selected>
>+AntBuilderTargetsTab_buildKindError_1=At least one target for one build kind must be selected
>+AntBuilderTargetsTab_buildKindError_2=At least one target for After a "Clean" must be selected if you want to select targets for Manual Build or Auto Build
> 
> AntMainTab__Select_a_build_file__1=&Select a buildfile:
> AntMainTab_3=Base Direct&ory:
>#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	9 Apr 2010 10:52:22 -0000
>@@ -470,6 +470,14 @@
>     			setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_buildKindError);
>     			return false;
>     		}
>+			// configuration is invalid if we set incremental builds without
>+			// setting full build
>+			if (manualBuild.getSelection() || autoBuildButton.getSelection()) {
>+				if (!afterClean.getSelection()) {
>+					setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_buildKindError_2);
>+					return false;
>+				}
>+			}
>         }
> 		if (workingSetButton.getSelection() && (workingSet == null || workingSet.getElements().length == 0)) {
> 			setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_16);
>Index: External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.java,v
>retrieving revision 1.10
>diff -u -r1.10 ExternalToolsLaunchConfigurationMessages.java
>--- External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.java	1 Feb 2010 16:38:18 -0000	1.10
>+++ External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.java	9 Apr 2010 10:52:22 -0000
>@@ -65,6 +65,7 @@
> 	public static String ExternalToolsBuilderTab_workingSet_label;
> 	public static String ExternalToolsBuilderTab_workingSet_tooltip;
> 	public static String ExternalToolsBuilderTab_buildKindError;
>+	public static String ExternalToolsBuilderTab_buildKindError_2;
> 	public static String ExternalToolsBuilderTab_14;
> 	public static String ExternalToolsBuilderTab_13;
> 	public static String ExternalToolsBuilderTab_16;
>Index: External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.properties,v
>retrieving revision 1.39
>diff -u -r1.39 ExternalToolsLaunchConfigurationMessages.properties
>--- External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.properties	1 Feb 2010 16:38:18 -0000	1.39
>+++ External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.properties	9 Apr 2010 10:52:22 -0000
>@@ -60,6 +60,7 @@
> ExternalToolsBuilderTab_workingSet_label=Specify working set of &relevant resources
> ExternalToolsBuilderTab_workingSet_tooltip=The working set of resources that if changed from a manual or auto build will trigger the external tool builder
> ExternalToolsBuilderTab_buildKindError=At least one type of build kind must be selected
>+ExternalToolsBuilderTab_buildKindError_2=Manual builds and Auto builds require setting the builder for After a "Clean"
> ExternalToolsBuilderTab_14=Launch in bac&kground
> ExternalToolsBuilderTab_13=&Specify Resources...
> ExternalToolsBuilderTab_16=Must select resources in working set.

Actions: View | Diff

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