1 files changed, 20 insertions, 76 deletions

diff --git a/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleManagerBase.java b/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleManagerBase.java
index cb034daeaf5a..6e65ede4e04e 100644
--- a/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleManagerBase.java
+++ b/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleManagerBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 package com.intellij.diagnostic.logging;
 
 import com.intellij.execution.configurations.RunConfigurationBase;
+import com.intellij.execution.configurations.RunProfile;
 import com.intellij.execution.process.ProcessHandler;
-import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.ui.RunnerLayoutUi;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.project.Project;
@@ -28,93 +28,42 @@ import com.intellij.ui.content.Content;
 import com.intellij.ui.content.ContentManagerAdapter;
 import com.intellij.ui.content.ContentManagerEvent;
 import com.intellij.util.ArrayUtil;
+import gnu.trove.THashMap;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.io.File;
-import java.io.Reader;
 import java.nio.charset.Charset;
-import java.util.HashMap;
 import java.util.Map;
 
-/**
- * Created by IntelliJ IDEA.
- * User: michael.golubev
- */
 public abstract class LogConsoleManagerBase implements LogConsoleManager, Disposable {
-
   private final Project myProject;
-
-  private final Map<AdditionalTabComponent, Content> myAdditionalContent = new HashMap<AdditionalTabComponent, Content>();
-
-  private ExecutionEnvironment myEnvironment;
+  private final Map<AdditionalTabComponent, Content> myAdditionalContent = new THashMap<AdditionalTabComponent, Content>();
   private final GlobalSearchScope mySearchScope;
 
-  /**
-   * @deprecated use {@link #LogConsoleManagerBase(com.intellij.openapi.project.Project, com.intellij.psi.search.GlobalSearchScope)}
-   * to remove in IDEA 15
-   */
-  @SuppressWarnings("UnusedDeclaration")
-  protected LogConsoleManagerBase(@NotNull Project project) {
-    this(project, GlobalSearchScope.allScope(project));
-  }
-
   protected LogConsoleManagerBase(@NotNull Project project, @NotNull GlobalSearchScope searchScope) {
     myProject = project;
     mySearchScope = searchScope;
   }
 
-  protected final Project getProject() {
-    return myProject;
-  }
-
-  public void setEnvironment(@NotNull ExecutionEnvironment environment) {
-    myEnvironment = environment;
-  }
-
-  protected final ExecutionEnvironment getEnvironment() {
-    return myEnvironment;
-  }
-
   @Override
-  public void addLogConsole(final String name, final String path, @NotNull Charset charset, final long skippedContent) {
-    addLogConsole(name, path, charset, skippedContent, getDefaultIcon());
+  public void addLogConsole(@NotNull String name, @NotNull String path, @NotNull Charset charset, long skippedContent, @NotNull RunConfigurationBase runConfiguration) {
+    addLogConsole(name, path, charset, skippedContent, getDefaultIcon(), runConfiguration);
   }
 
-  public void addLogConsole(final String name, final String path, @NotNull Charset charset, final long skippedContent, Icon icon) {
+  public void addLogConsole(final String name, final String path, @NotNull Charset charset, final long skippedContent, Icon icon, @Nullable RunProfile runProfile) {
     doAddLogConsole(new LogConsoleImpl(myProject, new File(path), charset, skippedContent, name, false, mySearchScope) {
-
       @Override
       public boolean isActive() {
         return isConsoleActive(path);
       }
-    }, path, icon);
-  }
-
-  @Override
-  public void addLogConsole(String name, Reader reader, final String id) {
-    addLogConsole(name, reader, id, getDefaultIcon());
-  }
-
-  public void addLogConsole(String name, Reader reader, final String id, Icon icon) {
-    doAddLogConsole(new LogConsoleBase(myProject,
-                                       reader,
-                                       name,
-                                       false,
-                                       new DefaultLogFilterModel(myProject), mySearchScope) {
-
-      @Override
-      public boolean isActive() {
-        return isConsoleActive(id);
-      }
-    }, id, icon);
+    }, path, icon, runProfile);
   }
 
-  private void doAddLogConsole(final LogConsoleBase log,
-                               final String id,
-                               Icon icon) {
-    if (myEnvironment != null && myEnvironment.getRunProfile() instanceof RunConfigurationBase) {
-      ((RunConfigurationBase)myEnvironment.getRunProfile()).customizeLogConsole(log);
+  private void doAddLogConsole(@NotNull final LogConsoleBase log, String id,  Icon icon, @Nullable RunProfile runProfile) {
+    if (runProfile instanceof RunConfigurationBase) {
+      ((RunConfigurationBase)runProfile).customizeLogConsole(log);
     }
     log.attachStopLogConsoleTrackingListener(getProcessHandler());
     addAdditionalTabComponent(log, id, icon);
@@ -133,33 +82,28 @@ public abstract class LogConsoleManagerBase implements LogConsoleManager, Dispos
   }
 
   @Override
-  public void removeLogConsole(final String path) {
-    final Content content = getUi().findContent(path);
+  public void removeLogConsole(@NotNull String path) {
+    Content content = getUi().findContent(path);
     if (content != null) {
-      final LogConsoleBase log = (LogConsoleBase)content.getComponent();
-      removeAdditionalTabComponent(log);
+      removeAdditionalTabComponent((LogConsoleBase)content.getComponent());
     }
   }
 
   @Override
-  public void addAdditionalTabComponent(final AdditionalTabComponent tabComponent, final String id) {
+  public void addAdditionalTabComponent(@NotNull AdditionalTabComponent tabComponent, @NotNull String id) {
     addAdditionalTabComponent(tabComponent, id, getDefaultIcon());
   }
 
-  public Content addAdditionalTabComponent(final AdditionalTabComponent tabComponent, String id, Icon icon) {
-    final Content logContent = createLogContent(tabComponent, id, icon);
+  public Content addAdditionalTabComponent(@NotNull AdditionalTabComponent tabComponent, @NotNull String id, @Nullable Icon icon) {
+    Content logContent = getUi().createContent(id, (ComponentWithActions)tabComponent, tabComponent.getTabTitle(), icon,
+                                               tabComponent.getPreferredFocusableComponent());
     myAdditionalContent.put(tabComponent, logContent);
     getUi().addContent(logContent);
     return logContent;
   }
 
-  protected Content createLogContent(AdditionalTabComponent tabComponent, String id, Icon icon) {
-    return getUi().createContent(id, (ComponentWithActions)tabComponent, tabComponent.getTabTitle(), icon,
-                                 tabComponent.getPreferredFocusableComponent());
-  }
-
   @Override
-  public void removeAdditionalTabComponent(AdditionalTabComponent component) {
+  public void removeAdditionalTabComponent(@NotNull AdditionalTabComponent component) {
     Disposer.dispose(component);
     final Content content = myAdditionalContent.remove(component);
     if (!getUi().isDisposed()) {