diff --git a/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java b/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java index 1de1eebfcf70..d719e245f094 100644 --- a/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java +++ b/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java @@ -24,11 +24,9 @@ package com.intellij.compiler; import com.intellij.CommonBundle; import com.intellij.ProjectTopics; import com.intellij.compiler.impl.javaCompiler.BackendCompiler; -import com.intellij.compiler.impl.javaCompiler.api.CompilerAPICompiler; import com.intellij.compiler.impl.javaCompiler.eclipse.EclipseCompiler; import com.intellij.compiler.impl.javaCompiler.eclipse.EclipseEmbeddedCompiler; import com.intellij.compiler.impl.javaCompiler.javac.JavacCompiler; -import com.intellij.compiler.impl.javaCompiler.jikes.JikesCompiler; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.application.ex.ApplicationManagerEx; @@ -271,8 +269,8 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements myRegisteredCompilers.add(JAVAC_EXTERNAL_BACKEND); if (!ApplicationManager.getApplication().isUnitTestMode()) { - final BackendCompiler JIKES_BACKEND = new JikesCompiler(myProject); - myRegisteredCompilers.add(JIKES_BACKEND); + //final BackendCompiler JIKES_BACKEND = new JikesCompiler(myProject); + //myRegisteredCompilers.add(JIKES_BACKEND); if (EclipseCompiler.isInitialized()) { final EclipseCompiler eclipse = new EclipseCompiler(myProject); @@ -289,13 +287,13 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements } } - try { - CompilerAPICompiler inProcessJavaCompiler = new CompilerAPICompiler(myProject); - myRegisteredCompilers.add(inProcessJavaCompiler); - } - catch (NoClassDefFoundError e) { - // wrong JDK - } + //try { + // CompilerAPICompiler inProcessJavaCompiler = new CompilerAPICompiler(myProject); + // myRegisteredCompilers.add(inProcessJavaCompiler); + //} + //catch (NoClassDefFoundError e) { + // // wrong JDK + //} } final BackendCompiler[] compilers = Extensions.getExtensions(BackendCompiler.EP_NAME, myProject); 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 08fe139d1b3a..a4b5075c0fe0 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 @@ - + @@ -77,15 +77,15 @@ - + - + - + - + @@ -93,14 +93,6 @@ - - - - - - - - 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 32d6466371af..68d1296b30c8 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java @@ -44,9 +44,8 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura private JCheckBox myCbAssertNotNull; private JLabel myPatternLegendLabel; private JCheckBox myCbAutoShowFirstError; - private JCheckBox myCbUseCompileServer; - private JCheckBox myCbMakeProjectOnSave; - private JCheckBox myCbAllowAutomakeWhileRunningApplication; + private JCheckBox myCbUseExternalBuild; + private JCheckBox myCbEnableAutomake; public CompilerUIConfigurable(final Project project) { myProject = project; @@ -57,13 +56,10 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura "/ — path separator; /**/ — any number of directories; " + "<dir_name>:<pattern> — restrict to source roots with the specified name" + ""); - myCbAllowAutomakeWhileRunningApplication.setVisible(false); - myCbUseCompileServer.addItemListener(new ItemListener() { + myCbUseExternalBuild.addItemListener(new ItemListener() { @Override public void itemStateChanged(ItemEvent e) { - final boolean enabled = myCbUseCompileServer.isSelected(); - myCbMakeProjectOnSave.setEnabled(enabled); - myCbAllowAutomakeWhileRunningApplication.setEnabled(enabled); + myCbEnableAutomake.setEnabled(myCbUseExternalBuild.isSelected()); } }); } @@ -75,9 +71,9 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura myCbAutoShowFirstError.setSelected(workspaceConfiguration.AUTO_SHOW_ERRORS_IN_EDITOR); myCbClearOutputDirectory.setSelected(workspaceConfiguration.CLEAR_OUTPUT_DIRECTORY); myCbAssertNotNull.setSelected(configuration.isAddNotNullAssertions()); - myCbUseCompileServer.setSelected(workspaceConfiguration.USE_COMPILE_SERVER); - myCbMakeProjectOnSave.setSelected(workspaceConfiguration.MAKE_PROJECT_ON_SAVE); - myCbAllowAutomakeWhileRunningApplication.setEnabled(workspaceConfiguration.USE_COMPILE_SERVER); + myCbUseExternalBuild.setSelected(workspaceConfiguration.USE_COMPILE_SERVER); + myCbEnableAutomake.setSelected(workspaceConfiguration.MAKE_PROJECT_ON_SAVE); + myCbEnableAutomake.setEnabled(myCbUseExternalBuild.isSelected()); configuration.convertPatterns(); @@ -85,7 +81,7 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura } private static String patternsToString(final String[] patterns) { - final StringBuffer extensionsString = new StringBuffer(); + final StringBuilder extensionsString = new StringBuilder(); for (int idx = 0; idx < patterns.length; idx++) { if (idx > 0) { extensionsString.append(";"); @@ -102,9 +98,8 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura workspaceConfiguration.AUTO_SHOW_ERRORS_IN_EDITOR = myCbAutoShowFirstError.isSelected(); workspaceConfiguration.CLEAR_OUTPUT_DIRECTORY = myCbClearOutputDirectory.isSelected(); boolean wasUsingExternalMake = workspaceConfiguration.USE_COMPILE_SERVER; - workspaceConfiguration.USE_COMPILE_SERVER = myCbUseCompileServer.isSelected(); - workspaceConfiguration.MAKE_PROJECT_ON_SAVE = myCbMakeProjectOnSave.isSelected(); - workspaceConfiguration.ALLOW_AUTOMAKE_WHILE_RUNNING_APPLICATION = myCbAllowAutomakeWhileRunningApplication.isSelected(); + workspaceConfiguration.USE_COMPILE_SERVER = myCbUseExternalBuild.isSelected(); + workspaceConfiguration.MAKE_PROJECT_ON_SAVE = myCbEnableAutomake.isSelected(); configuration.setAddNotNullAssertions(myCbAssertNotNull.isSelected()); configuration.removeResourceFilePatterns(); @@ -115,6 +110,7 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura final TranslatingCompilerFilesMonitor monitor = TranslatingCompilerFilesMonitor.getInstance(); if (workspaceConfiguration.USE_COMPILE_SERVER) { monitor.suspendProject(myProject); + //noinspection SSBasedInspection SwingUtilities.invokeLater(new Runnable() { public void run() { CompileServerManager.getInstance().sendReloadRequest(myProject); @@ -160,7 +156,7 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura } if (errors.size() > 0) { - final StringBuffer pattersnsWithErrors = new StringBuffer(); + final StringBuilder pattersnsWithErrors = new StringBuilder(); for (final Object error : errors) { String[] pair = (String[])error; pattersnsWithErrors.append("\n"); @@ -179,9 +175,8 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura boolean isModified = false; final CompilerWorkspaceConfiguration workspaceConfiguration = CompilerWorkspaceConfiguration.getInstance(myProject); 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); - isModified |= ComparingUtils.isModified(myCbAllowAutomakeWhileRunningApplication, workspaceConfiguration.allowAutoMakeWhileRunningApplication()); + isModified |= ComparingUtils.isModified(myCbUseExternalBuild, workspaceConfiguration.USE_COMPILE_SERVER); + isModified |= ComparingUtils.isModified(myCbEnableAutomake, workspaceConfiguration.MAKE_PROJECT_ON_SAVE); final CompilerConfigurationImpl compilerConfiguration = (CompilerConfigurationImpl)CompilerConfiguration.getInstance(myProject); isModified |= ComparingUtils.isModified(myCbAssertNotNull, compilerConfiguration.isAddNotNullAssertions()); diff --git a/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java b/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java index 8683b7e33d18..97e7dff8db72 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 @@ public class CompilerWorkspaceConfiguration implements PersistentStateComponent< public boolean CLEAR_OUTPUT_DIRECTORY = true; public boolean USE_COMPILE_SERVER = false; public boolean MAKE_PROJECT_ON_SAVE = false; - public boolean ALLOW_AUTOMAKE_WHILE_RUNNING_APPLICATION = false; public static CompilerWorkspaceConfiguration getInstance(Project project) { return ServiceManager.getService(project, CompilerWorkspaceConfiguration.class);