diff --git a/java/debugger/impl/src/com/intellij/debugger/DefaultDebugEnvironment.java b/java/debugger/impl/src/com/intellij/debugger/DefaultDebugEnvironment.java index dc2e1afdc547..e0f463eccf90 100644 --- a/java/debugger/impl/src/com/intellij/debugger/DefaultDebugEnvironment.java +++ b/java/debugger/impl/src/com/intellij/debugger/DefaultDebugEnvironment.java @@ -23,10 +23,9 @@ import com.intellij.execution.filters.ExceptionFilters; import com.intellij.execution.filters.Filter; import com.intellij.execution.filters.TextConsoleBuilder; import com.intellij.execution.runners.ProgramRunner; -import com.intellij.openapi.module.Module; +import com.intellij.execution.runners.RunContentBuilder; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; -import org.jetbrains.annotations.NotNull; import java.util.List; @@ -58,26 +57,7 @@ public class DefaultDebugEnvironment implements DebugEnvironment { myRemoteConnection = remoteConnection; myPollConnection = pollConnection; - mySearchScope = createSearchScope(project, runProfile); - } - - @NotNull - public static GlobalSearchScope createSearchScope(Project project, RunProfile runProfile) { - Module[] modules = null; - if (runProfile instanceof ModuleRunProfile) { - modules = ((ModuleRunProfile)runProfile).getModules(); - } - if (modules == null || modules.length == 0) { - return GlobalSearchScope.allScope(project); - } - else { - GlobalSearchScope scope = GlobalSearchScope.moduleRuntimeScope(modules[0], true); - for (int idx = 1; idx < modules.length; idx++) { - Module module = modules[idx]; - scope = scope.uniteWith(GlobalSearchScope.moduleRuntimeScope(module, true)); - } - return scope; - } + mySearchScope = RunContentBuilder.createSearchScope(project, runProfile); } @Override diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerSessionTab.java b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerSessionTab.java index 9c73e63e3d09..c189e4b64dab 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerSessionTab.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerSessionTab.java @@ -86,14 +86,10 @@ public class DebuggerSessionTab extends DebuggerSessionTabBase implements Dispos private final ThreadsPanel myThreadsPanel; private static final String THREAD_DUMP_CONTENT_PREFIX = "Dump"; - private final Icon myIcon; - public DebuggerSessionTab(final Project project, - final String sessionName, - @NotNull final DebugUIEnvironment environment, - DebuggerSession debuggerSession) throws ExecutionException { - super(project, "JavaDebugger", sessionName); - myIcon = environment.getIcon(); + public DebuggerSessionTab(final Project project, final String sessionName, @NotNull final DebugUIEnvironment environment, + @NotNull DebuggerSession debuggerSession) throws ExecutionException { + super(project, "JavaDebugger", sessionName, debuggerSession.getSearchScope()); myDebuggerSession = debuggerSession; myDebugUIEnvironment = environment; @@ -204,7 +200,8 @@ public class DebuggerSessionTab extends DebuggerSessionTabBase implements Dispos ExecutionResult executionResult = debuggerSession.getProcess().getExecutionResult(); myConsole = executionResult.getExecutionConsole(); - myRunContentDescriptor = new RunContentDescriptor(myConsole, executionResult.getProcessHandler(), myUi.getComponent(), getSessionName(), myIcon); + myRunContentDescriptor = new RunContentDescriptor(myConsole, executionResult.getProcessHandler(), myUi.getComponent(), getSessionName(), + environment.getIcon()); initUI(executionResult); } @@ -516,8 +513,6 @@ public class DebuggerSessionTab extends DebuggerSessionTabBase implements Dispos private class AutoVarsSwitchAction extends ToggleAction { private volatile boolean myAutoModeEnabled; - private static final String myAutoModeText = "Auto-Variables Mode"; - private static final String myDefaultModeText = "All-Variables Mode"; public AutoVarsSwitchAction() { super("", "", AllIcons.Debugger.AutoVariablesMode); @@ -528,7 +523,7 @@ public class DebuggerSessionTab extends DebuggerSessionTabBase implements Dispos super.update(e); final Presentation presentation = e.getPresentation(); final boolean autoModeEnabled = (Boolean)presentation.getClientProperty(SELECTED_PROPERTY); - presentation.setText(autoModeEnabled ? myDefaultModeText : myAutoModeText); + presentation.setText(autoModeEnabled ? "All-Variables Mode" : "Auto-Variables Mode"); } public boolean isSelected(AnActionEvent e) { diff --git a/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java b/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java index 697a51bbd103..bfe8dd65e02f 100644 --- a/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java +++ b/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java @@ -86,10 +86,8 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner { onProcessStarted(env.getRunnerSettings(), executionResult); - final RunContentBuilder contentBuilder = new RunContentBuilder(project, this, executor); + final RunContentBuilder contentBuilder = new RunContentBuilder(project, this, executor, executionResult, env); Disposer.register(project, contentBuilder); - contentBuilder.setExecutionResult(executionResult); - contentBuilder.setEnvironment(env); if (shouldAddDefaultActions) { addDefaultActions(contentBuilder); } diff --git a/platform/core-api/src/com/intellij/openapi/editor/colors/TextAttributesKey.java b/platform/core-api/src/com/intellij/openapi/editor/colors/TextAttributesKey.java index 9c24635699a8..721f51ed7f0c 100644 --- a/platform/core-api/src/com/intellij/openapi/editor/colors/TextAttributesKey.java +++ b/platform/core-api/src/com/intellij/openapi/editor/colors/TextAttributesKey.java @@ -110,12 +110,14 @@ public final class TextAttributesKey implements Comparable, J */ public TextAttributes getDefaultAttributes() { if (myDefaultAttributes == NULL_ATTRIBUTES) { - // E.g. if one text key reuse default attributes of some other predefined key myDefaultAttributes = null; final TextAttributeKeyDefaultsProvider provider = ourDefaultsProvider.getValue(); if (provider != null) myDefaultAttributes = provider.getDefaultAttributes(this); } + else if (myDefaultAttributes == null) { + myDefaultAttributes = NULL_ATTRIBUTES; + } return myDefaultAttributes; } diff --git a/platform/lang-api/src/com/intellij/openapi/editor/SyntaxHighlighterColors.java b/platform/lang-api/src/com/intellij/openapi/editor/SyntaxHighlighterColors.java index 248a994459d7..fe4ee2a70a72 100644 --- a/platform/lang-api/src/com/intellij/openapi/editor/SyntaxHighlighterColors.java +++ b/platform/lang-api/src/com/intellij/openapi/editor/SyntaxHighlighterColors.java @@ -23,21 +23,37 @@ import com.intellij.openapi.editor.colors.TextAttributesKey; * @deprecated Use DefaultLanguageHighlighterColors to inherit default attributes. */ public class SyntaxHighlighterColors { - public static final TextAttributesKey LINE_COMMENT = TextAttributesKey.createTextAttributesKey("JAVA_LINE_COMMENT"); - public static final TextAttributesKey JAVA_BLOCK_COMMENT = TextAttributesKey.createTextAttributesKey("JAVA_BLOCK_COMMENT"); - public static final TextAttributesKey DOC_COMMENT = TextAttributesKey.createTextAttributesKey("JAVA_DOC_COMMENT"); - public static final TextAttributesKey KEYWORD = TextAttributesKey.createTextAttributesKey("JAVA_KEYWORD"); - public static final TextAttributesKey NUMBER = TextAttributesKey.createTextAttributesKey("JAVA_NUMBER"); - public static final TextAttributesKey STRING = TextAttributesKey.createTextAttributesKey("JAVA_STRING"); - public static final TextAttributesKey OPERATION_SIGN = TextAttributesKey.createTextAttributesKey("JAVA_OPERATION_SIGN"); - public static final TextAttributesKey PARENTHS = TextAttributesKey.createTextAttributesKey("JAVA_PARENTH"); - public static final TextAttributesKey BRACKETS = TextAttributesKey.createTextAttributesKey("JAVA_BRACKETS"); - public static final TextAttributesKey BRACES = TextAttributesKey.createTextAttributesKey("JAVA_BRACES"); - public static final TextAttributesKey COMMA = TextAttributesKey.createTextAttributesKey("JAVA_COMMA"); - public static final TextAttributesKey DOT = TextAttributesKey.createTextAttributesKey("JAVA_DOT"); - public static final TextAttributesKey JAVA_SEMICOLON = TextAttributesKey.createTextAttributesKey("JAVA_SEMICOLON"); - public static final TextAttributesKey DOC_COMMENT_TAG = TextAttributesKey.createTextAttributesKey("JAVA_DOC_TAG"); - public static final TextAttributesKey DOC_COMMENT_MARKUP = TextAttributesKey.createTextAttributesKey("JAVA_DOC_MARKUP"); - public static final TextAttributesKey VALID_STRING_ESCAPE = TextAttributesKey.createTextAttributesKey("JAVA_VALID_STRING_ESCAPE"); - public static final TextAttributesKey INVALID_STRING_ESCAPE = TextAttributesKey.createTextAttributesKey("JAVA_INVALID_STRING_ESCAPE"); + public static final TextAttributesKey LINE_COMMENT = + TextAttributesKey.createTextAttributesKey("JAVA_LINE_COMMENT", DefaultLanguageHighlighterColors.LINE_COMMENT); + public static final TextAttributesKey JAVA_BLOCK_COMMENT = + TextAttributesKey.createTextAttributesKey("JAVA_BLOCK_COMMENT", DefaultLanguageHighlighterColors.BLOCK_COMMENT); + public static final TextAttributesKey DOC_COMMENT = + TextAttributesKey.createTextAttributesKey("JAVA_DOC_COMMENT", DefaultLanguageHighlighterColors.DOC_COMMENT); + public static final TextAttributesKey KEYWORD = + TextAttributesKey.createTextAttributesKey("JAVA_KEYWORD", DefaultLanguageHighlighterColors.KEYWORD); + public static final TextAttributesKey NUMBER = + TextAttributesKey.createTextAttributesKey("JAVA_NUMBER", DefaultLanguageHighlighterColors.NUMBER); + public static final TextAttributesKey STRING = + TextAttributesKey.createTextAttributesKey("JAVA_STRING", DefaultLanguageHighlighterColors.STRING); + public static final TextAttributesKey OPERATION_SIGN = + TextAttributesKey.createTextAttributesKey("JAVA_OPERATION_SIGN", DefaultLanguageHighlighterColors.OPERATION_SIGN); + public static final TextAttributesKey PARENTHS = + TextAttributesKey.createTextAttributesKey("JAVA_PARENTH", DefaultLanguageHighlighterColors.PARENTHESES); + public static final TextAttributesKey BRACKETS = + TextAttributesKey.createTextAttributesKey("JAVA_BRACKETS", DefaultLanguageHighlighterColors.BRACKETS); + public static final TextAttributesKey BRACES = + TextAttributesKey.createTextAttributesKey("JAVA_BRACES", DefaultLanguageHighlighterColors.BRACES); + public static final TextAttributesKey COMMA = + TextAttributesKey.createTextAttributesKey("JAVA_COMMA", DefaultLanguageHighlighterColors.COMMA); + public static final TextAttributesKey DOT = TextAttributesKey.createTextAttributesKey("JAVA_DOT", DefaultLanguageHighlighterColors.DOT); + public static final TextAttributesKey JAVA_SEMICOLON = + TextAttributesKey.createTextAttributesKey("JAVA_SEMICOLON", DefaultLanguageHighlighterColors.SEMICOLON); + public static final TextAttributesKey DOC_COMMENT_TAG = + TextAttributesKey.createTextAttributesKey("JAVA_DOC_TAG", DefaultLanguageHighlighterColors.DOC_COMMENT_TAG); + public static final TextAttributesKey DOC_COMMENT_MARKUP = + TextAttributesKey.createTextAttributesKey("JAVA_DOC_MARKUP", DefaultLanguageHighlighterColors.DOC_COMMENT_MARKUP); + public static final TextAttributesKey VALID_STRING_ESCAPE = + TextAttributesKey.createTextAttributesKey("JAVA_VALID_STRING_ESCAPE", DefaultLanguageHighlighterColors.VALID_STRING_ESCAPE); + public static final TextAttributesKey INVALID_STRING_ESCAPE = + TextAttributesKey.createTextAttributesKey("JAVA_INVALID_STRING_ESCAPE", DefaultLanguageHighlighterColors.INVALID_STRING_ESCAPE); } diff --git a/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleBase.java b/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleBase.java index 96781ff93033..fc5895ba353d 100644 --- a/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleBase.java +++ b/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleBase.java @@ -37,6 +37,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Key; +import com.intellij.psi.search.GlobalSearchScope; import com.intellij.ui.FilterComponent; import com.intellij.util.Alarm; import com.intellij.util.containers.ContainerUtil; @@ -54,7 +55,6 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.OutputStream; import java.io.Reader; -import java.util.ArrayList; import java.util.List; /** @@ -98,7 +98,12 @@ public abstract class LogConsoleBase extends AdditionalTabComponent implements L private JComboBox myLogFilterCombo; private JPanel myTextFilterWrapper; - public LogConsoleBase(Project project, @Nullable Reader reader, String title, final boolean buildInActions, LogFilterModel model) { + public LogConsoleBase(@NotNull Project project, @Nullable Reader reader, String title, final boolean buildInActions, LogFilterModel model) { + this(project, reader, title, buildInActions, model, GlobalSearchScope.allScope(project)); + } + + public LogConsoleBase(@NotNull Project project, @Nullable Reader reader, String title, final boolean buildInActions, LogFilterModel model, + @NotNull GlobalSearchScope scope) { super(new BorderLayout()); myProject = project; myTitle = title; @@ -106,7 +111,7 @@ public abstract class LogConsoleBase extends AdditionalTabComponent implements L myFilters = myModel.getLogFilters(); myReaderThread = new ReaderThread(reader); myBuildInActions = buildInActions; - TextConsoleBuilder builder = TextConsoleBuilderFactory.getInstance().createBuilder(project); + TextConsoleBuilder builder = TextConsoleBuilderFactory.getInstance().createBuilder(project, scope); myConsole = builder.getConsole(); myConsole.attachToProcess(myProcessHandler); myDisposed = false; diff --git a/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleImpl.java b/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleImpl.java index 60bd74544a06..6c79dee769d9 100644 --- a/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleImpl.java +++ b/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleImpl.java @@ -18,6 +18,7 @@ package com.intellij.diagnostic.logging; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -36,8 +37,27 @@ public abstract class LogConsoleImpl extends LogConsoleBase { private final Charset myCharset; private long myOldLength = 0; - public LogConsoleImpl(Project project, @NotNull File file, @NotNull Charset charset, long skippedContents, String title, final boolean buildInActions) { - super(project, getReader(file, charset, skippedContents),title, buildInActions, new DefaultLogFilterModel(project)); + /** + * @deprecated use {@link #LogConsoleImpl(com.intellij.openapi.project.Project, java.io.File, java.nio.charset.Charset, long, String, boolean, com.intellij.psi.search.GlobalSearchScope)} + */ + public LogConsoleImpl(Project project, + @NotNull File file, + @NotNull Charset charset, + long skippedContents, + String title, + final boolean buildInActions) { + this(project, file, charset, skippedContents, title, buildInActions, GlobalSearchScope.allScope(project)); + } + + public LogConsoleImpl(Project project, + @NotNull File file, + @NotNull Charset charset, + long skippedContents, + String title, + final boolean buildInActions, + final GlobalSearchScope searchScope) { + super(project, getReader(file, charset, skippedContents), title, buildInActions, new DefaultLogFilterModel(project), + searchScope); myPath = file.getAbsolutePath(); myFile = file; myCharset = charset; 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 28778252a7a6..820a8a78c352 100644 --- a/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleManagerBase.java +++ b/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleManagerBase.java @@ -23,12 +23,12 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.ComponentWithActions; import com.intellij.openapi.util.Disposer; +import com.intellij.psi.search.GlobalSearchScope; import com.intellij.ui.content.Content; import com.intellij.ui.content.ContentManagerAdapter; import com.intellij.ui.content.ContentManagerEvent; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.io.File; @@ -48,9 +48,18 @@ public abstract class LogConsoleManagerBase implements LogConsoleManager, Dispos private final Map myAdditionalContent = new HashMap(); private ExecutionEnvironment myEnvironment; + private GlobalSearchScope mySearchScope; + /** + * @deprecated use {@link #LogConsoleManagerBase(com.intellij.openapi.project.Project, com.intellij.psi.search.GlobalSearchScope)} + */ 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() { @@ -71,7 +80,7 @@ public abstract class LogConsoleManagerBase implements LogConsoleManager, Dispos } public void addLogConsole(final String name, final String path, @NotNull Charset charset, final long skippedContent, Icon icon) { - doAddLogConsole(new LogConsoleImpl(myProject, new File(path), charset, skippedContent, name, false) { + doAddLogConsole(new LogConsoleImpl(myProject, new File(path), charset, skippedContent, name, false, mySearchScope) { @Override public boolean isActive() { @@ -90,7 +99,7 @@ public abstract class LogConsoleManagerBase implements LogConsoleManager, Dispos reader, name, false, - new DefaultLogFilterModel(myProject)) { + new DefaultLogFilterModel(myProject), mySearchScope) { @Override public boolean isActive() { diff --git a/platform/lang-impl/src/com/intellij/execution/runners/DefaultProgramRunner.java b/platform/lang-impl/src/com/intellij/execution/runners/DefaultProgramRunner.java index dd31ed9c2a8f..1377d5a55f6e 100644 --- a/platform/lang-impl/src/com/intellij/execution/runners/DefaultProgramRunner.java +++ b/platform/lang-impl/src/com/intellij/execution/runners/DefaultProgramRunner.java @@ -35,9 +35,7 @@ public abstract class DefaultProgramRunner extends GenericProgramRunner { ExecutionResult executionResult = state.execute(executor, this); if (executionResult == null) return null; - final RunContentBuilder contentBuilder = new RunContentBuilder(project, this, executor); - contentBuilder.setExecutionResult(executionResult); - contentBuilder.setEnvironment(env); + final RunContentBuilder contentBuilder = new RunContentBuilder(project, this, executor, executionResult, env); return contentBuilder.showRunContent(contentToReuse); } diff --git a/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java b/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java index 9c26da2482ef..999417963cc2 100644 --- a/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java +++ b/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java @@ -19,6 +19,7 @@ import com.intellij.diagnostic.logging.LogConsoleManagerBase; import com.intellij.diagnostic.logging.LogFilesManager; import com.intellij.diagnostic.logging.OutputFileUtil; import com.intellij.execution.*; +import com.intellij.execution.configurations.ModuleRunProfile; import com.intellij.execution.configurations.RunConfigurationBase; import com.intellij.execution.configurations.RunProfile; import com.intellij.execution.impl.ConsoleViewImpl; @@ -31,8 +32,10 @@ import com.intellij.ide.actions.ContextHelpAction; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; +import com.intellij.psi.search.GlobalSearchScope; import com.intellij.ui.content.Content; import com.intellij.ui.content.tabs.PinToolwindowTabAction; import org.jetbrains.annotations.NonNls; @@ -57,6 +60,22 @@ public class RunContentBuilder extends LogConsoleManagerBase { private RunnerLayoutUi myUi; private final Executor myExecutor; + public RunContentBuilder(@NotNull Project project, + ProgramRunner runner, + Executor executor, + ExecutionResult executionResult, + @NotNull ExecutionEnvironment environment) { + super(project, createSearchScope(project, environment.getRunProfile())); + myRunner = runner; + myExecutor = executor; + myManager = new LogFilesManager(project, this, this); + myExecutionResult = executionResult; + setEnvironment(environment); + } + + /** + * @deprecated use {@link #RunContentBuilder(com.intellij.openapi.project.Project, ProgramRunner, com.intellij.execution.Executor, com.intellij.execution.ExecutionResult, ExecutionEnvironment)} + */ public RunContentBuilder(final Project project, final ProgramRunner runner, Executor executor) { super(project); myRunner = runner; @@ -64,10 +83,30 @@ public class RunContentBuilder extends LogConsoleManagerBase { myManager = new LogFilesManager(project, this, this); } + @NotNull + public static GlobalSearchScope createSearchScope(Project project, RunProfile runProfile) { + Module[] modules = null; + if (runProfile instanceof ModuleRunProfile) { + modules = ((ModuleRunProfile)runProfile).getModules(); + } + if (modules == null || modules.length == 0) { + return GlobalSearchScope.allScope(project); + } + else { + GlobalSearchScope scope = GlobalSearchScope.moduleRuntimeScope(modules[0], true); + for (int idx = 1; idx < modules.length; idx++) { + Module module = modules[idx]; + scope = scope.uniteWith(GlobalSearchScope.moduleRuntimeScope(module, true)); + } + return scope; + } + } + public ExecutionResult getExecutionResult() { return myExecutionResult; } + @Deprecated public void setExecutionResult(final ExecutionResult executionResult) { myExecutionResult = executionResult; } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java index c96f5501a93a..d1aa0f2a33a5 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java @@ -623,8 +623,13 @@ public final class WindowManagerImpl extends WindowManagerEx implements Applicat frame.setFileTitle(null, null); myProject2Frame.remove(project); - Disposer.dispose(frame.getStatusBar()); - frame.dispose(); + if (myProject2Frame.isEmpty()) { + myProject2Frame.put(null, frame); + } + else { + Disposer.dispose(frame.getStatusBar()); + frame.dispose(); + } } public final void disposeRootFrame() { diff --git a/platform/platform-resources/src/DefaultColorSchemesManager.xml b/platform/platform-resources/src/DefaultColorSchemesManager.xml index e7fb5070a869..8e08ee1404f7 100644 --- a/platform/platform-resources/src/DefaultColorSchemesManager.xml +++ b/platform/platform-resources/src/DefaultColorSchemesManager.xml @@ -189,78 +189,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -