From c22842de830236a075c1df69c63db21ad4cbc7dc Mon Sep 17 00:00:00 2001
From: Paul Pazderski
Date: Fri, 5 Jul 2019 14:09:35 +0200
Subject: Bug 32205 - Move "merge output" launch attribute constant from ui to
 core

Change-Id: I8c3c6be953954443f4be3adb053b404140d83816
Signed-off-by: Paul Pazderski <paul-eclipse@ppazderski.de>---
 org.eclipse.debug.ui/META-INF/MANIFEST.MF                    |  2 +-
 org.eclipse.debug.ui/pom.xml                                 |  2 +-
 org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java  |  6 +++---
 .../ui/org/eclipse/debug/ui/IDebugUIConstants.java           | 12 ------------
 4 files changed, 5 insertions(+), 17 deletions(-)

(limited to 'org.eclipse.debug.ui')

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
 
 	/**
-- 
cgit v1.2.3