From 7b9df4346d5066d82b499d08791cd59144c1bab9 Mon Sep 17 00:00:00 2001 From: Michael Rennie Date: Mon, 7 Feb 2011 21:44:40 +0000 Subject: Bug 302296 - Please update to Ant 1.8.2 --- .../launchConfigurations/ExternalToolsBuilderTab.java | 2 +- .../launchConfigurations/ExternalToolsMainTab.java | 14 +++++++------- .../externaltools/internal/model/ExternalToolsPlugin.java | 8 +++----- .../ui/externaltools/internal/ui/BuilderPropertyPage.java | 4 ++-- 4 files changed, 13 insertions(+), 15 deletions(-) (limited to 'org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui') 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 004f08059..2b53abfd7 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 @@ -319,7 +319,7 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab { String buildKindString= null; String buildScope= null; try { - buildKindString= configuration.getAttribute(IExternalToolConstants.ATTR_RUN_BUILD_KINDS, ""); //$NON-NLS-1$ + buildKindString= configuration.getAttribute(IExternalToolConstants.ATTR_RUN_BUILD_KINDS, IExternalToolConstants.EMPTY_STRING); buildScope= configuration.getAttribute(IExternalToolConstants.ATTR_BUILDER_SCOPE, (String)null); } catch (CoreException e) { } diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java index cb1ed713b..56fe08449 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2011 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 @@ -317,9 +317,9 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa * configuration. */ protected void updateWorkingDirectory(ILaunchConfiguration configuration) { - String workingDir= ""; //$NON-NLS-1$ + String workingDir= IExternalToolConstants.EMPTY_STRING; try { - workingDir= configuration.getAttribute(IExternalToolConstants.ATTR_WORKING_DIRECTORY, ""); //$NON-NLS-1$ + workingDir= configuration.getAttribute(IExternalToolConstants.ATTR_WORKING_DIRECTORY, IExternalToolConstants.EMPTY_STRING); } catch (CoreException ce) { ExternalToolsPlugin.getDefault().log(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Error_reading_configuration_10, ce); } @@ -331,9 +331,9 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa * configuration. */ protected void updateLocation(ILaunchConfiguration configuration) { - String location= ""; //$NON-NLS-1$ + String location= IExternalToolConstants.EMPTY_STRING; try { - location= configuration.getAttribute(IExternalToolConstants.ATTR_LOCATION, ""); //$NON-NLS-1$ + location= configuration.getAttribute(IExternalToolConstants.ATTR_LOCATION, IExternalToolConstants.EMPTY_STRING); } catch (CoreException ce) { ExternalToolsPlugin.getDefault().log(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Error_reading_configuration_10, ce); } @@ -345,9 +345,9 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa * configuration. */ protected void updateArgument(ILaunchConfiguration configuration) { - String arguments= ""; //$NON-NLS-1$ + String arguments= IExternalToolConstants.EMPTY_STRING; try { - arguments= configuration.getAttribute(IExternalToolConstants.ATTR_TOOL_ARGUMENTS, ""); //$NON-NLS-1$ + arguments= configuration.getAttribute(IExternalToolConstants.ATTR_TOOL_ARGUMENTS, IExternalToolConstants.EMPTY_STRING); } catch (CoreException ce) { ExternalToolsPlugin.getDefault().log(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Error_reading_configuration_7, ce); } diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsPlugin.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsPlugin.java index f3b82cbdb..16c945a2e 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsPlugin.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsPlugin.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2011 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 @@ -48,12 +48,10 @@ public final class ExternalToolsPlugin extends AbstractUIPlugin implements /** * Status representing no problems encountered during operation. */ - public static final IStatus OK_STATUS = new Status(IStatus.OK, PLUGIN_ID, 0, "", null); //$NON-NLS-1$ + public static final IStatus OK_STATUS = new Status(IStatus.OK, PLUGIN_ID, 0, IExternalToolConstants.EMPTY_STRING, null); private static ExternalToolsPlugin plugin; - private static final String EMPTY_STRING = ""; //$NON-NLS-1$ - private static IWindowListener fWindowListener; private static ILaunchManager launchManager; @@ -134,7 +132,7 @@ public final class ExternalToolsPlugin extends AbstractUIPlugin implements */ public static IStatus newErrorStatus(String message, Throwable exception) { if (message == null) { - message= EMPTY_STRING; + return new Status(IStatus.ERROR, PLUGIN_ID, 0, IExternalToolConstants.EMPTY_STRING, exception); } return new Status(IStatus.ERROR, PLUGIN_ID, 0, message, exception); } 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 3f97506f2..67c457c8c 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2011 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 @@ -209,7 +209,7 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta boolean projectNeedsMigration= false; for (int i = 0; i < commands.length; i++) { - String[] version= new String[] {""}; //$NON-NLS-1$ + String[] version= new String[] {IExternalToolConstants.EMPTY_STRING}; ILaunchConfiguration config = BuilderUtils.configFromBuildCommandArgs(project, commands[i].getArguments(), version); if (BuilderCoreUtils.VERSION_2_1.equals(version[0])) { // Storing the .project file of a project with 2.1 configs, will -- cgit v1.2.3