Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Pazderski2019-07-05 08:09:35 -0400
committerPaul Pazderski2019-07-05 11:30:50 -0400
commitc22842de830236a075c1df69c63db21ad4cbc7dc (patch)
treed7d2fe2ea8ad1ed554aa69b7de4a8c4fa9a9e1a8 /org.eclipse.debug.ui/ui
parentf78e7e1356098a74bd1019d95fc6808dcb6ebdc7 (diff)
downloadeclipse.platform.debug-c22842de830236a075c1df69c63db21ad4cbc7dc.tar.gz
eclipse.platform.debug-c22842de830236a075c1df69c63db21ad4cbc7dc.tar.xz
eclipse.platform.debug-c22842de830236a075c1df69c63db21ad4cbc7dc.zip
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>
Diffstat (limited to 'org.eclipse.debug.ui/ui')
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java12
2 files changed, 3 insertions, 15 deletions
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
/**

Back to the top