CommandLineState initializes its own ConsoleBuilder, remove redundant code which does it externally

java/execution/impl/src/com/intellij/execution/applet/AppletConfiguration.java

@@ -17,7 +17,6 @@ package com.intellij.execution.applet;
 
 import com.intellij.execution.*;
 import com.intellij.execution.configurations.*;
-import com.intellij.execution.filters.TextConsoleBuilderFactory;
 import com.intellij.execution.junit.RefactoringListeners;
 import com.intellij.execution.process.OSProcessHandler;
 import com.intellij.execution.process.ProcessAdapter;
@@ -82,7 +81,7 @@ public class AppletConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
   }
 
   public RunProfileState getState(@NotNull final Executor executor, @NotNull final ExecutionEnvironment env) throws ExecutionException {
-    final JavaCommandLineState state = new JavaCommandLineState(env) {
+    return new JavaCommandLineState(env) {
       private AppletHtmlFile myHtmlURL = null;
 
       protected JavaParameters createJavaParameters() throws ExecutionException {
@@ -117,8 +116,6 @@ public class AppletConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
         return handler;
       }
     };
-    state.setConsoleBuilder(TextConsoleBuilderFactory.getInstance().createBuilder(getProject()));
-    return state;
   }
 
   public SettingsEditor<? extends RunConfiguration> getConfigurationEditor() {

java/java-impl/src/com/intellij/javadoc/JavadocConfiguration.java

@@ -21,8 +21,6 @@ import com.intellij.execution.ExecutionException;
 import com.intellij.execution.Executor;
 import com.intellij.execution.configurations.*;
 import com.intellij.execution.filters.RegexpFilter;
-import com.intellij.execution.filters.TextConsoleBuilder;
-import com.intellij.execution.filters.TextConsoleBuilderFactory;
 import com.intellij.execution.process.OSProcessHandler;
 import com.intellij.execution.process.ProcessAdapter;
 import com.intellij.execution.process.ProcessEvent;
@@ -138,10 +136,8 @@ public class JavadocConfiguration implements ModuleRunProfile, JDOMExternalizabl
       super(null);
       myGenerationOptions = generationOptions;
       myProject = project;
-      TextConsoleBuilder builder = TextConsoleBuilderFactory.getInstance().createBuilder(project);
-      builder.addFilter(new RegexpFilter(project, "$FILE_PATH$:$LINE$:[^\\^]+\\^"));
-      builder.addFilter(new RegexpFilter(project, "$FILE_PATH$:$LINE$: warning - .+$"));
-      setConsoleBuilder(builder);
+      addConsoleFilters(new RegexpFilter(project, "$FILE_PATH$:$LINE$:[^\\^]+\\^"),
+                        new RegexpFilter(project, "$FILE_PATH$:$LINE$: warning - .+$"));
     }
 
     protected GeneralCommandLine createCommandLine() throws ExecutionException {

platform/lang-api/src/com/intellij/execution/configurations/CommandLineState.java

@@ -17,7 +17,9 @@ package com.intellij.execution.configurations;
 
 import com.intellij.execution.*;
 import com.intellij.execution.executors.DefaultRunExecutor;
+import com.intellij.execution.filters.Filter;
 import com.intellij.execution.filters.TextConsoleBuilder;
+import com.intellij.execution.filters.TextConsoleBuilderFactory;
 import com.intellij.execution.process.ProcessHandler;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.runners.ProgramRunner;
@@ -41,6 +43,7 @@ public abstract class CommandLineState implements RunProfileState {
 
   protected CommandLineState(ExecutionEnvironment environment) {
     myEnvironment = environment;
+    myConsoleBuilder = TextConsoleBuilderFactory.getInstance().createBuilder(myEnvironment.getProject());
   }
 
   public ExecutionEnvironment getEnvironment() {
@@ -56,6 +59,12 @@ public abstract class CommandLineState implements RunProfileState {
     return myEnvironment.getExecutionTarget();
   }
 
+  public void addConsoleFilters(Filter... filters) {
+    for (Filter filter : filters) {
+      myConsoleBuilder.addFilter(filter);
+    }
+  }
+
   @Override
   @NotNull
   public ExecutionResult execute(@NotNull final Executor executor, @NotNull final ProgramRunner runner) throws ExecutionException {

plugins/devkit/src/run/PluginRunConfiguration.java

@@ -19,7 +19,6 @@ import com.intellij.execution.CantRunException;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.Executor;
 import com.intellij.execution.configurations.*;
-import com.intellij.execution.filters.TextConsoleBuilderFactory;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.module.Module;
@@ -187,7 +186,6 @@ public class PluginRunConfiguration extends RunConfigurationBase implements Modu
       }
     };
 
-    state.setConsoleBuilder(TextConsoleBuilderFactory.getInstance().createBuilder(getProject()));
     return state;
   }
 

plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunConfiguration.java

@@ -18,7 +18,6 @@ package org.jetbrains.plugins.groovy.mvc;
 
 import com.intellij.execution.*;
 import com.intellij.execution.configurations.*;
-import com.intellij.execution.filters.TextConsoleBuilderFactory;
 import com.intellij.execution.process.OSProcessHandler;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.openapi.components.PathMacroManager;
@@ -31,7 +30,6 @@ import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.JDOMExternalizer;
-import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.WriteExternalException;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.containers.HashMap;
@@ -219,9 +217,7 @@ public abstract class MvcRunConfiguration extends ModuleBasedConfiguration<RunCo
       throw CantRunException.noJdkForModule(module);
     }
 
-    final JavaCommandLineState state = createCommandLineState(environment, module);
-    state.setConsoleBuilder(TextConsoleBuilderFactory.getInstance().createBuilder(getProject()));
-    return state;
+    return createCommandLineState(environment, module);
 
   }
 

plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java

@@ -17,7 +17,6 @@ package org.jetbrains.plugins.groovy.runner;
 
 import com.intellij.execution.*;
 import com.intellij.execution.configurations.*;
-import com.intellij.execution.filters.TextConsoleBuilderFactory;
 import com.intellij.execution.process.OSProcessHandler;
 import com.intellij.execution.process.ProcessAdapter;
 import com.intellij.execution.process.ProcessEvent;
@@ -184,7 +183,7 @@ public class GroovyScriptRunConfiguration extends ModuleBasedConfiguration<RunCo
 
     final boolean tests = ProjectRootManager.getInstance(getProject()).getFileIndex().isInTestSourceContent(script);
 
-    final JavaCommandLineState state = new JavaCommandLineState(environment) {
+    return new JavaCommandLineState(environment) {
       @NotNull
       @Override
       protected OSProcessHandler startProcess() throws ExecutionException {
@@ -212,9 +211,6 @@ public class GroovyScriptRunConfiguration extends ModuleBasedConfiguration<RunCo
         return params;
       }
     };
-
-    state.setConsoleBuilder(TextConsoleBuilderFactory.getInstance().createBuilder(getProject()));
-    return state;
   }
 
   public void setScriptParameters(String scriptParameters) {

plugins/ui-designer/src/com/intellij/uiDesigner/actions/PreviewFormAction.java

@@ -22,7 +22,6 @@ import com.intellij.compiler.instrumentation.InstrumentationClassFinder;
 import com.intellij.execution.*;
 import com.intellij.execution.configurations.*;
 import com.intellij.execution.executors.DefaultRunExecutor;
-import com.intellij.execution.filters.TextConsoleBuilderFactory;
 import com.intellij.execution.process.ProcessAdapter;
 import com.intellij.execution.process.ProcessEvent;
 import com.intellij.execution.runners.ExecutionEnvironment;
@@ -55,7 +54,6 @@ import com.intellij.uiDesigner.compiler.FormErrorInfo;
 import com.intellij.uiDesigner.compiler.Utils;
 import com.intellij.uiDesigner.designSurface.GuiEditor;
 import com.intellij.uiDesigner.lw.*;
-import org.jetbrains.jps.incremental.java.CopyResourcesUtil;
 import com.intellij.uiDesigner.make.Form2ByteCodeCompiler;
 import com.intellij.uiDesigner.make.PreviewNestedFormLoader;
 import com.intellij.util.PathsList;
@@ -63,6 +61,7 @@ import com.intellij.util.containers.HashSet;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jps.incremental.java.CopyResourcesUtil;
 
 import javax.swing.*;
 import java.io.File;
@@ -330,7 +329,7 @@ public final class PreviewFormAction extends AnAction{
     }
 
     public RunProfileState getState(@NotNull final Executor executor, @NotNull final ExecutionEnvironment env) throws ExecutionException {
-      final JavaCommandLineState state = new JavaCommandLineState(env) {
+      return new JavaCommandLineState(env) {
         protected JavaParameters createJavaParameters() {
           return myParams;
         }
@@ -356,8 +355,6 @@ public final class PreviewFormAction extends AnAction{
           }
         }
       };
-      state.setConsoleBuilder(TextConsoleBuilderFactory.getInstance().createBuilder(myModule.getProject()));
-      return state;
     }
 
     public String getName() {