Bug 32205 - Move "merge output" launch attribute constant from ui toY20190708-0900I20190708-1035I20190708-0800I20190707-1800I20190707-0110I20190706-1800

core

Change-Id: I8c3c6be953954443f4be3adb053b404140d83816
Signed-off-by: Paul Pazderski <paul-eclipse@ppazderski.de>

7 files changed, 23 insertions, 32 deletions

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 5133bd9b4..8747d162e 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
@@ -50,17 +50,6 @@ public class ProgramLaunchDelegate extends LaunchConfigurationDelegate {
 	private static final String ATTR_LAUNCH_IN_BACKGROUND = "org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND"; //$NON-NLS-1$
 
 	/**
-	 * Launch configuration attribute - a boolean value indicating whether a
-	 * configuration should be launched with merged error and standard output.
-	 * Default value is <code>false</code>.
-	 * <p>
-	 * This constant is defined in org.eclipse.debug.ui, but has to be copied
-	 * here to support headless launching.
-	 * </p>
-	 */
-	private static final String ATTR_MERGE_OUTPUT = "org.eclipse.debug.ui.ATTR_MERGE_OUTPUT"; //$NON-NLS-1$
-
-	/**
 	 * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration,
 	 *      java.lang.String, org.eclipse.debug.core.ILaunch,
 	 *      org.eclipse.core.runtime.IProgressMonitor)
@@ -110,7 +99,7 @@ public class ProgramLaunchDelegate extends LaunchConfigurationDelegate {
 			return;
 		}
 
-		boolean mergeOutput = configuration.getAttribute(ATTR_MERGE_OUTPUT, false);
+		boolean mergeOutput = configuration.getAttribute(DebugPlugin.ATTR_MERGE_OUTPUT, false);
 		Process p = DebugPlugin.exec(cmdLine, workingDir, envp, mergeOutput);
 		IProcess process = null;
 
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java
index c11335107..acbef267d 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java
@@ -294,8 +294,22 @@ public class DebugPlugin extends Plugin {
 	public static final String ATTR_CONSOLE_ENCODING = "org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING"; //$NON-NLS-1$
 
 	/**
-	 * Boolean preference key (value <code>org.eclipse.debug.core.PREF_DELETE_CONFIGS_ON_PROJECT_DELETE</code>) that controls
-	 * whether to delete associated configurations when a project is deleted. Default value is <code>false</code>.
+	 * Launch configuration attribute - a boolean value indicating whether a
+	 * configuration should be launched with merged error and standard output.
+	 * Merging output can ensure the process output appears in console in same
+	 * order as the process produce it. On the other hand the error output can
+	 * not be colored different from standard output anymore. Default value is
+	 * <code>false</code>.
+	 *
+	 * @since 3.14
+	 */
+	public static final String ATTR_MERGE_OUTPUT = PI_DEBUG_CORE + ".ATTR_MERGE_OUTPUT"; //$NON-NLS-1$
+
+	/**
+	 * Boolean preference key (value
+	 * <code>org.eclipse.debug.core.PREF_DELETE_CONFIGS_ON_PROJECT_DELETE</code>)
+	 * that controls whether to delete associated configurations when a project
+	 * is deleted. Default value is <code>false</code>.
 	 *
 	 * @since 3.7
 	 */
diff --git a/org.eclipse.debug.core/schema/launchConfigurationTypes.exsd b/org.eclipse.debug.core/schema/launchConfigurationTypes.exsd
index b16af6f70..e630fe0ad 100644
--- a/org.eclipse.debug.core/schema/launchConfigurationTypes.exsd
+++ b/org.eclipse.debug.core/schema/launchConfigurationTypes.exsd
@@ -173,7 +173,7 @@ Since 3.3, the &lt;code&gt;sourceLocatorId&lt;/code&gt; can also be specified vi
          <attribute name="allowOutputMerging" type="boolean">
             <annotation>
                <documentation>
-                  specifies whether this launch configuration type supports output merging. A launch configuration which singals support must check the launch configuration attribute "org.eclipse.debug.ui.ATTR_MERGE_OUTPUT" and if its value is true perform the launch in a way that stderr and stdout are merged and both can be read through stdout.
+                  specifies whether this launch configuration type supports output merging. A launch configuration which singals support must check the launch configuration attribute "org.eclipse.debug.core.ATTR_MERGE_OUTPUT" and if its value is true perform the launch in a way that stderr and stdout are merged and both can be read through stdout.
                   Defaults to &lt;code&gt;false&lt;/code&gt; if not specified. This attribute was added in 4.13 release.
                </documentation>
             </annotation>
diff --git a/org.eclipse.debug.ui/META-INF/MANIFEST.MF b/org.eclipse.debug.ui/META-INF/MANIFEST.MF
index 539cd0a87..17c582b9e 100644
--- a/org.eclipse.debug.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.debug.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.debug.ui; singleton:=true
-Bundle-Version: 3.15.0.qualifier
+Bundle-Version: 3.14.200.qualifier
 Bundle-Activator: org.eclipse.debug.internal.ui.DebugUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.debug.ui/pom.xml b/org.eclipse.debug.ui/pom.xml
index ff0d26020..fb42dfb7b 100644
--- a/org.eclipse.debug.ui/pom.xml
+++ b/org.eclipse.debug.ui/pom.xml
@@ -19,7 +19,7 @@
   </parent>
   <groupId>org.eclipse.debug</groupId>
   <artifactId>org.eclipse.debug.ui</artifactId>
-  <version>3.15.0-SNAPSHOT</version>
+  <version>3.14.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <properties>
     <code.ignoredWarnings>-warn:+resource,-deprecation,unavoidableGenericProblems</code.ignoredWarnings>
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java
index 8f1191af3..a90806917 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java
@@ -727,7 +727,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab {
 
             outputFile = configuration.getAttribute(IDebugUIConstants.ATTR_CAPTURE_IN_FILE, (String)null);
             append = configuration.getAttribute(IDebugUIConstants.ATTR_APPEND_TO_FILE, false);
-			mergeOutput = configuration.getAttribute(IDebugUIConstants.ATTR_MERGE_OUTPUT, false);
+			mergeOutput = configuration.getAttribute(DebugPlugin.ATTR_MERGE_OUTPUT, false);
 			supportsMergeOutput = configuration.getType().supportsOutputMerging();
         } catch (CoreException e) {
         }
@@ -1057,9 +1057,9 @@ public class CommonTab extends AbstractLaunchConfigurationTab {
 		}
 		if (fMergeOutput != null) {
 			if (fMergeOutput.getSelection()) {
-				configuration.setAttribute(IDebugUIConstants.ATTR_MERGE_OUTPUT, true);
+				configuration.setAttribute(DebugPlugin.ATTR_MERGE_OUTPUT, true);
 			} else {
-				configuration.setAttribute(IDebugUIConstants.ATTR_MERGE_OUTPUT, (String) null);
+				configuration.setAttribute(DebugPlugin.ATTR_MERGE_OUTPUT, (String) null);
 			}
 		}
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java
index 672ba0ece..1fd65d468 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java
@@ -995,18 +995,6 @@ public interface IDebugUIConstants {
 	 */
 	String ATTR_APPEND_TO_FILE = PLUGIN_ID + ".ATTR_APPEND_TO_FILE"; //$NON-NLS-1$
 
-	/**
-	 * Launch configuration attribute - a boolean value indicating whether a
-	 * configuration should be launched with merged error and standard output.
-	 * Merging output can ensure the process output appears in console in same order
-	 * as the process produce it. On the other hand the error output can not be
-	 * colored different from standard output anymore. Default value is
-	 * <code>false</code>.
-	 *
-	 * @since 3.15
-	 */
-	String ATTR_MERGE_OUTPUT = PLUGIN_ID + ".ATTR_MERGE_OUTPUT"; //$NON-NLS-1$
-
 	// Extension points
 
 	/**