Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Rennie2011-02-07 16:44:40 -0500
committerMichael Rennie2011-02-07 16:44:40 -0500
commit7b9df4346d5066d82b499d08791cd59144c1bab9 (patch)
treecdbe7cc08575263e592decc8e829e758fbbf522c /org.eclipse.core.externaltools
parent202c068081a1d23e8e9d9a0a71e49a2bc0dae123 (diff)
downloadeclipse.platform.debug-7b9df4346d5066d82b499d08791cd59144c1bab9.tar.gz
eclipse.platform.debug-7b9df4346d5066d82b499d08791cd59144c1bab9.tar.xz
eclipse.platform.debug-7b9df4346d5066d82b499d08791cd59144c1bab9.zip
Bug 302296 - Please update to Ant 1.8.2v20110207
Diffstat (limited to 'org.eclipse.core.externaltools')
-rw-r--r--org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/ExternalToolsCore.java6
-rw-r--r--org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/IExternalToolConstants.java10
-rw-r--r--org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/launchConfigurations/ProgramLaunchDelegate.java4
3 files changed, 13 insertions, 7 deletions
diff --git a/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/ExternalToolsCore.java b/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/ExternalToolsCore.java
index e14df9960..b0e2bf115 100644
--- a/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/ExternalToolsCore.java
+++ b/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/ExternalToolsCore.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
+ * Copyright (c) 2009, 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
@@ -24,8 +24,6 @@ public class ExternalToolsCore extends Plugin {
// The plug-in ID
public static final String PLUGIN_ID = "org.eclipse.core.externaltools"; //$NON-NLS-1$
- private static final String EMPTY_STRING= ""; //$NON-NLS-1$
-
/**
* Status code indicating an unexpected internal error.
* @since 2.1
@@ -102,7 +100,7 @@ public class ExternalToolsCore extends Plugin {
*/
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.core.externaltools/src/org/eclipse/core/externaltools/internal/IExternalToolConstants.java b/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/IExternalToolConstants.java
index 4641a0e8c..b276e212b 100644
--- a/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/IExternalToolConstants.java
+++ b/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/IExternalToolConstants.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
@@ -18,6 +18,14 @@ package org.eclipse.core.externaltools.internal;
* </p>
*/
public interface IExternalToolConstants {
+
+ /**
+ * Constant for the empty {@link String}
+ *
+ * @since org.eclipse.core.externaltools 1.0.100
+ */
+ public static final String EMPTY_STRING = ""; //$NON-NLS-1$
+
/**
* Plug-in identifier for external tools UI (value <code>org.eclipse.ui.externaltools</code>).
*/
diff --git a/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/launchConfigurations/ProgramLaunchDelegate.java b/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/launchConfigurations/ProgramLaunchDelegate.java
index 00d1c63f8..a1ae3a67b 100644
--- a/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/launchConfigurations/ProgramLaunchDelegate.java
+++ b/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/launchConfigurations/ProgramLaunchDelegate.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
@@ -166,7 +166,7 @@ public class ProgramLaunchDelegate extends LaunchConfigurationDelegate {
private String generateCommandLine(String[] commandLine) {
if (commandLine.length < 1)
- return ""; //$NON-NLS-1$
+ return IExternalToolConstants.EMPTY_STRING;
StringBuffer buf = new StringBuffer();
for (int i = 0; i < commandLine.length; i++) {
buf.append(' ');

Back to the top