diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/BuildInfoFactory.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/BuildInfoFactory.java index 15ed9db557a..eb31bceeca9 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/BuildInfoFactory.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/BuildInfoFactory.java @@ -23,7 +23,7 @@ public class BuildInfoFactory { public static final String FULL_ARGUMENTS = "buildFullArguments"; public static final String INCREMENTAL_ARGUMENTS = "buildIncrementalArguments"; public static final String STOP_ON_ERROR = "stopOnError"; - public static final String CLEAR_CONSOLE = "clearConsole"; +// public static final String CLEAR_CONSOLE = "clearConsole"; public static final String DEFAULT_BUILD_CMD = "useDefaultBuildCmd"; public static abstract class Store implements IBuildInfo { @@ -88,9 +88,9 @@ public class BuildInfoFactory { putValue(DEFAULT_BUILD_CMD, new Boolean(on).toString()); } - public boolean isClearBuildConsole() { - return getBoolean(CLEAR_CONSOLE); - } +// public boolean isClearBuildConsole() { +// return getBoolean(CLEAR_CONSOLE); +// } public boolean getBoolean(String property) { return Boolean.valueOf(getString(property)).booleanValue(); @@ -152,9 +152,9 @@ public class BuildInfoFactory { public void setDefault(String name, String def) { } - public boolean isClearBuildConsole() { - return (new Preference()).isClearBuildConsole(); - } +// public boolean isClearBuildConsole() { +// return (new Preference()).isClearBuildConsole(); +// } } public static IBuildInfo create() { diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/IBuildInfo.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/IBuildInfo.java index 4c3c1f49c6a..276341c3606 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/IBuildInfo.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/IBuildInfo.java @@ -17,7 +17,7 @@ public interface IBuildInfo { void setIncrementalBuildArguments(String arguments); void setStopOnError(boolean on); - boolean isClearBuildConsole(); +// boolean isClearBuildConsole(); boolean isDefaultBuildCmd(); void setUseDefaultBuildCmd(boolean on); diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/IConsole.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/IConsole.java index 7355b0e271d..6d13ddb050a 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/IConsole.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/IConsole.java @@ -6,10 +6,12 @@ package org.eclipse.cdt.core.resources; */ import org.eclipse.cdt.core.ConsoleOutputStream; +import org.eclipse.core.resources.IProject; public interface IConsole { - void clear(); ConsoleOutputStream getOutputStream(); + void start(IProject project); + void clear(); } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CBuilder.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CBuilder.java index ff2b0686a2a..3820b8556d4 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CBuilder.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CBuilder.java @@ -83,11 +83,13 @@ public class CBuilder extends ACBuilder { if (!makepath.isEmpty()) { // clear console if requested IConsole console = CCorePlugin.getDefault().getConsole(); + console.start(currProject); +/* if (BuildInfoFactory.create().isClearBuildConsole() && MakeUtil.getSessionConsoleMode(currProject)) { console.clear(); } - +*/ ConsoleOutputStream cos = console.getOutputStream(); // remove all markers for this project