From 7d149968ba5025c0f5dc77eb7ae2087450dfea01 Mon Sep 17 00:00:00 2001 From: pasynkov Date: Tue, 17 Jan 2017 15:54:46 +0100 Subject: [PATCH] Extract method which could be overridden in Upsource --- .../compiler/CompilerConfigurationImpl.java | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java b/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java index 9dfc637d0a3b..3b7bb5a9b102 100644 --- a/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java +++ b/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java @@ -112,19 +112,7 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements public CompilerConfigurationImpl(Project project) { myProject = project; - myExcludesConfiguration = new ExcludedEntriesConfiguration(project.getMessageBus().syncPublisher(ExcludedEntriesListener.TOPIC)); - Disposer.register(project, myExcludesConfiguration); - project.getMessageBus().connect().subscribe(ExcludedEntriesListener.TOPIC, new ExcludedEntriesListener() { - @Override - public void onEntryAdded(@NotNull ExcludeEntryDescription description) { - BuildManager.getInstance().clearState(myProject); - } - - @Override - public void onEntryRemoved(@NotNull ExcludeEntryDescription description) { - BuildManager.getInstance().clearState(myProject); - } - }); + myExcludesConfiguration = createExcludedEntriesConfiguration(project); MessageBusConnection connection = project.getMessageBus().connect(project); connection.subscribe(ProjectTopics.MODULES, new ModuleListener() { @Override @@ -139,6 +127,25 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements }); } + // Overridden in Upsource + @NotNull + protected ExcludedEntriesConfiguration createExcludedEntriesConfiguration(@NotNull Project project) { + final ExcludedEntriesConfiguration cfg = new ExcludedEntriesConfiguration(project.getMessageBus().syncPublisher(ExcludedEntriesListener.TOPIC)); + Disposer.register(project, cfg); + project.getMessageBus().connect().subscribe(ExcludedEntriesListener.TOPIC, new ExcludedEntriesListener() { + @Override + public void onEntryAdded(@NotNull ExcludeEntryDescription description) { + BuildManager.getInstance().clearState(project); + } + + @Override + public void onEntryRemoved(@NotNull ExcludeEntryDescription description) { + BuildManager.getInstance().clearState(project); + } + }); + return cfg; + } + private static class State { public String DEFAULT_COMPILER = JavaCompilers.JAVAC_ID; public int BUILD_PROCESS_HEAP_SIZE = DEFAULT_BUILD_PROCESS_HEAP_SIZE;