From 01b70772661cde82980c752ee0886e7ded8e0c80 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Wed, 2 May 2012 16:23:04 +0200 Subject: [PATCH] drop obsolete "compile in background" option --- .../intellij/compiler/impl/CompileDriver.java | 4 ++-- .../compiler/options/CompilerOptionsPanel.form | 18 +++++------------- .../options/CompilerUIConfigurable.java | 4 ---- .../CompilerWorkspaceConfiguration.java | 1 - .../jetbrains/idea/maven/MavenTestCase.java | 6 ------ 5 files changed, 7 insertions(+), 26 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java index 6c32c762ce30..9f2f04988fed 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java @@ -647,7 +647,7 @@ public class CompileDriver { final String contentName = forceCompile ? CompilerBundle.message("compiler.content.name.compile") : CompilerBundle.message("compiler.content.name.make"); - final boolean compileInBackground = useServer? true : CompilerWorkspaceConfiguration.getInstance(myProject).COMPILE_IN_BACKGROUND; + final boolean compileInBackground = true; final CompilerTask compileTask = new CompilerTask(myProject, compileInBackground, contentName, ApplicationManager.getApplication().isUnitTestMode()); @@ -2250,7 +2250,7 @@ public class CompileDriver { public void executeCompileTask(final CompileTask task, final CompileScope scope, final String contentName, final Runnable onTaskFinished) { final CompilerTask progressManagerTask = - new CompilerTask(myProject, CompilerWorkspaceConfiguration.getInstance(myProject).COMPILE_IN_BACKGROUND, contentName, false); + new CompilerTask(myProject, true, contentName, false); final CompileContextImpl compileContext = new CompileContextImpl(myProject, progressManagerTask, scope, null, false, false); FileDocumentManager.getInstance().saveAllDocuments(); diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form b/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form index fceb7255b549..64a4db5bc0ac 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form +++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form @@ -1,6 +1,6 @@
- + @@ -10,7 +10,7 @@ - + @@ -69,17 +69,9 @@ - - - - - - - - - + @@ -87,7 +79,7 @@ - + @@ -95,7 +87,7 @@ - + diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java index f713c9d94977..96d884fe0cc0 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java @@ -39,7 +39,6 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura private final Project myProject; private JTextField myResourcePatternsField; - private JCheckBox myCbCompileInBackground; private JCheckBox myCbClearOutputDirectory; private JCheckBox myCbAssertNotNull; private JLabel myPatternLegendLabel; @@ -71,7 +70,6 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura final CompilerConfigurationImpl configuration = (CompilerConfigurationImpl)CompilerConfiguration.getInstance(myProject); final CompilerWorkspaceConfiguration workspaceConfiguration = CompilerWorkspaceConfiguration.getInstance(myProject); - myCbCompileInBackground.setSelected(workspaceConfiguration.COMPILE_IN_BACKGROUND); myCbAutoShowFirstError.setSelected(workspaceConfiguration.AUTO_SHOW_ERRORS_IN_EDITOR); myCbClearOutputDirectory.setSelected(workspaceConfiguration.CLEAR_OUTPUT_DIRECTORY); myCbAssertNotNull.setSelected(configuration.isAddNotNullAssertions()); @@ -99,7 +97,6 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura CompilerConfigurationImpl configuration = (CompilerConfigurationImpl)CompilerConfiguration.getInstance(myProject); final CompilerWorkspaceConfiguration workspaceConfiguration = CompilerWorkspaceConfiguration.getInstance(myProject); - workspaceConfiguration.COMPILE_IN_BACKGROUND = myCbCompileInBackground.isSelected(); workspaceConfiguration.AUTO_SHOW_ERRORS_IN_EDITOR = myCbAutoShowFirstError.isSelected(); workspaceConfiguration.CLEAR_OUTPUT_DIRECTORY = myCbClearOutputDirectory.isSelected(); boolean wasUsing = workspaceConfiguration.USE_COMPILE_SERVER; @@ -165,7 +162,6 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura public boolean isModified() { boolean isModified = false; final CompilerWorkspaceConfiguration workspaceConfiguration = CompilerWorkspaceConfiguration.getInstance(myProject); - isModified |= ComparingUtils.isModified(myCbCompileInBackground, workspaceConfiguration.COMPILE_IN_BACKGROUND); isModified |= ComparingUtils.isModified(myCbAutoShowFirstError, workspaceConfiguration.AUTO_SHOW_ERRORS_IN_EDITOR); isModified |= ComparingUtils.isModified(myCbUseCompileServer, workspaceConfiguration.USE_COMPILE_SERVER); isModified |= ComparingUtils.isModified(myCbMakeProjectOnSave, workspaceConfiguration.MAKE_PROJECT_ON_SAVE); diff --git a/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java b/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java index 3ac9cd96bb25..e1753d19ee05 100644 --- a/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java +++ b/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java @@ -37,7 +37,6 @@ import com.intellij.util.xmlb.XmlSerializerUtil; ) public class CompilerWorkspaceConfiguration implements PersistentStateComponent { - public boolean COMPILE_IN_BACKGROUND = true; public boolean AUTO_SHOW_ERRORS_IN_EDITOR = true; @Deprecated public boolean CLOSE_MESSAGE_VIEW_IF_SUCCESS = true; public boolean CLEAR_OUTPUT_DIRECTORY = true; diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java index 84cb5ac129bd..c150655db22c 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java @@ -15,7 +15,6 @@ */ package org.jetbrains.idea.maven; -import com.intellij.compiler.CompilerWorkspaceConfiguration; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.Result; import com.intellij.openapi.application.WriteAction; @@ -67,7 +66,6 @@ public abstract class MavenTestCase extends UsefulTestCase { protected VirtualFile myProjectPom; protected List myAllPoms = new ArrayList(); - private boolean myCompileInBackground; static { IdeaTestCase.initPlatformPrefix(); @@ -112,8 +110,6 @@ public abstract class MavenTestCase extends UsefulTestCase { } }); - myCompileInBackground = CompilerWorkspaceConfiguration.getInstance(myProject).COMPILE_IN_BACKGROUND; - CompilerWorkspaceConfiguration.getInstance(myProject).COMPILE_IN_BACKGROUND = false; } private static void ensureTempDirCreated() { @@ -137,8 +133,6 @@ public abstract class MavenTestCase extends UsefulTestCase { @Override protected void tearDown() throws Exception { - CompilerWorkspaceConfiguration.getInstance(myProject).COMPILE_IN_BACKGROUND = myCompileInBackground; - myProject = null; UIUtil.invokeAndWaitIfNeeded(new Runnable() { @Override