diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsManager.java b/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsManager.java
new file mode 100644
index 000000000000..89f22b47a5c3
--- /dev/null
+++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsManager.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2000-2013 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.compiler.options;
+
+import com.intellij.openapi.extensions.ExtensionPointName;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Compiler settings page (Project Settings | Compiler) offers number of controls. However, there is a possible case that
+ * some of them should be 'frozen' at particular environment (e.g. there is no point in disable external compiler
+ * in case of AndroidStudio).
+ *
+ * This interface defines api which allows extensions to control compiler options availability.
+ *
+ * @author Denis Zhdanov
+ * @since 7/18/13 12:40 PM
+ */
+public interface CompilerOptionsManager {
+
+ ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.compiler.optionsManager");
+
+ enum Setting {
+ RESOURCE_PATTERNS, CLEAR_OUTPUT_DIR_ON_REBUILD, ADD_NOT_NULL_ASSERTIONS, AUTO_SHOW_FIRST_ERROR_IN_EDITOR,
+ EXTERNAL_BUILD, AUTO_MAKE, PARALLEL_COMPILATION, REBUILD_MODULE_ON_DEPENDENCY_CHANGE, HEAP_SIZE, COMPILER_VM_OPTIONS
+ }
+
+ boolean isAvailable(@NotNull Setting setting);
+}
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 028857486890..179dbe28409b 100644
--- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form
+++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form
@@ -21,7 +21,7 @@
-
+
@@ -132,7 +132,7 @@
-
+
@@ -140,7 +140,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 968be1f77908..0a018182ee07 100644
--- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java
+++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java
@@ -38,14 +38,14 @@ import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
+import java.util.*;
+
+import static com.intellij.compiler.options.CompilerOptionsManager.*;
public class CompilerUIConfigurable implements SearchableConfigurable, Configurable.NoScroll {
private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.options.CompilerUIConfigurable");
- public static final Function> LINE_PARSER = new Function>() {
+ public static final Function> LINE_PARSER = new Function>() {
@Override
public List fun(String text) {
final ArrayList result = ContainerUtilRt.newArrayList();
@@ -56,29 +56,38 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura
return result;
}
};
- public static final Function, String> LINE_JOINER = new Function, String>() {
+ public static final Function, String> LINE_JOINER = new Function, String>() {
@Override
public String fun(List strings) {
return StringUtil.join(strings, ";");
}
};
+ private static final Set EXTERNAL_BUILD_SETTINGS = EnumSet.of(
+ Setting.EXTERNAL_BUILD, Setting.AUTO_MAKE, Setting.PARALLEL_COMPILATION, Setting.REBUILD_MODULE_ON_DEPENDENCY_CHANGE,
+ Setting.HEAP_SIZE, Setting.COMPILER_VM_OPTIONS
+ );
- private JPanel myPanel;
+ private final Set myDisabledSettings = EnumSet.noneOf(Setting.class);
+
+ private JPanel myPanel;
private final Project myProject;
private RawCommandLineEditor myResourcePatternsField;
- private JCheckBox myCbClearOutputDirectory;
- private JCheckBox myCbAssertNotNull;
- private JBLabel myPatternLegendLabel;
- private JCheckBox myCbAutoShowFirstError;
- private JCheckBox myCbUseExternalBuild;
- private JCheckBox myCbEnableAutomake;
- private JCheckBox myCbParallelCompilation;
- private JTextField myHeapSizeField;
- private JTextField myVMOptionsField;
- private JLabel myHeapSizeLabel;
- private JLabel myVMOptionsLabel;
- private JCheckBox myCbRebuildOnDependencyChange;
+ private JCheckBox myCbClearOutputDirectory;
+ private JCheckBox myCbAssertNotNull;
+ private JBLabel myPatternLegendLabel;
+ private JCheckBox myCbAutoShowFirstError;
+ private JCheckBox myCbUseExternalBuild;
+ private JCheckBox myCbEnableAutomake;
+ private JCheckBox myCbParallelCompilation;
+ private JTextField myHeapSizeField;
+ private JTextField myVMOptionsField;
+ private JLabel myHeapSizeLabel;
+ private JLabel myVMOptionsLabel;
+ private JCheckBox myCbRebuildOnDependencyChange;
+ private JLabel myResourcePatternsLabel;
+ private JLabel myEnableAutomakeLegendLabel;
+ private JLabel myParallelCompilationLegendLabel;
public CompilerUIConfigurable(final Project project) {
myProject = project;
@@ -96,6 +105,58 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura
updateExternalMakeOptionControls(myCbUseExternalBuild.isSelected());
}
});
+
+ tweakControls();
+ }
+
+ private void tweakControls() {
+ CompilerOptionsManager[] managers = CompilerOptionsManager.EP_NAME.getExtensions();
+ boolean showExternalBuildSetting = true;
+ for (CompilerOptionsManager manager : managers) {
+ showExternalBuildSetting = manager.isAvailable(Setting.EXTERNAL_BUILD);
+ if (!showExternalBuildSetting) {
+ myDisabledSettings.add(Setting.EXTERNAL_BUILD);
+ break;
+ }
+ }
+
+ for (Setting setting : Setting.values()) {
+ if (!showExternalBuildSetting && EXTERNAL_BUILD_SETTINGS.contains(setting)) {
+ // Disable all nested external compiler settings if 'use external build' is unavailable.
+ myDisabledSettings.add(setting);
+ }
+ else {
+ for (CompilerOptionsManager manager : managers) {
+ if (!manager.isAvailable(setting)) {
+ myDisabledSettings.add(setting);
+ break;
+ }
+ }
+ }
+ }
+
+ Map> controls = ContainerUtilRt.newHashMap();
+ controls.put(Setting.RESOURCE_PATTERNS,
+ ContainerUtilRt.newArrayList(myResourcePatternsLabel, myResourcePatternsField, myPatternLegendLabel));
+ controls.put(Setting.CLEAR_OUTPUT_DIR_ON_REBUILD, Collections.singleton(myCbClearOutputDirectory));
+ controls.put(Setting.ADD_NOT_NULL_ASSERTIONS, Collections.singleton(myCbAutoShowFirstError));
+ controls.put(Setting.AUTO_SHOW_FIRST_ERROR_IN_EDITOR, Collections.singleton(myCbAutoShowFirstError));
+ controls.put(Setting.EXTERNAL_BUILD, ContainerUtilRt.newArrayList(myCbUseExternalBuild));
+ controls.put(Setting.AUTO_MAKE, ContainerUtilRt.newArrayList(myCbEnableAutomake, myEnableAutomakeLegendLabel));
+ controls.put(Setting.PARALLEL_COMPILATION,
+ ContainerUtilRt.newArrayList(myCbParallelCompilation, myParallelCompilationLegendLabel));
+ controls.put(Setting.REBUILD_MODULE_ON_DEPENDENCY_CHANGE, ContainerUtilRt.newArrayList(myCbRebuildOnDependencyChange));
+ controls.put(Setting.HEAP_SIZE, ContainerUtilRt.newArrayList(myHeapSizeLabel, myHeapSizeField));
+ controls.put(Setting.COMPILER_VM_OPTIONS, ContainerUtilRt.newArrayList(myVMOptionsLabel, myVMOptionsField));
+
+ for (Setting setting : myDisabledSettings) {
+ Collection components = controls.get(setting);
+ if (components != null) {
+ for (JComponent component : components) {
+ component.setVisible(false);
+ }
+ }
+ }
}
public void reset() {
@@ -111,7 +172,7 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura
myCbRebuildOnDependencyChange.setSelected(workspaceConfiguration.REBUILD_ON_DEPENDENCY_CHANGE);
myHeapSizeField.setText(String.valueOf(workspaceConfiguration.COMPILER_PROCESS_HEAP_SIZE));
final String options = workspaceConfiguration.COMPILER_PROCESS_ADDITIONAL_VM_OPTIONS;
- myVMOptionsField.setText(options == null? "" : options.trim());
+ myVMOptionsField.setText(options == null ? "" : options.trim());
updateExternalMakeOptionControls(myCbUseExternalBuild.isSelected());
configuration.convertPatterns();
@@ -134,25 +195,45 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura
CompilerConfigurationImpl configuration = (CompilerConfigurationImpl)CompilerConfiguration.getInstance(myProject);
final CompilerWorkspaceConfiguration workspaceConfiguration = CompilerWorkspaceConfiguration.getInstance(myProject);
- workspaceConfiguration.AUTO_SHOW_ERRORS_IN_EDITOR = myCbAutoShowFirstError.isSelected();
- workspaceConfiguration.CLEAR_OUTPUT_DIRECTORY = myCbClearOutputDirectory.isSelected();
+ if (!myDisabledSettings.contains(Setting.AUTO_SHOW_FIRST_ERROR_IN_EDITOR)) {
+ workspaceConfiguration.AUTO_SHOW_ERRORS_IN_EDITOR = myCbAutoShowFirstError.isSelected();
+ }
+ if (!myDisabledSettings.contains(Setting.CLEAR_OUTPUT_DIR_ON_REBUILD)) {
+ workspaceConfiguration.CLEAR_OUTPUT_DIRECTORY = myCbClearOutputDirectory.isSelected();
+ }
boolean wasUsingExternalMake = workspaceConfiguration.USE_COMPILE_SERVER;
- workspaceConfiguration.USE_COMPILE_SERVER = myCbUseExternalBuild.isSelected();
- workspaceConfiguration.MAKE_PROJECT_ON_SAVE = myCbEnableAutomake.isSelected();
- workspaceConfiguration.PARALLEL_COMPILATION = myCbParallelCompilation.isSelected();
- workspaceConfiguration.REBUILD_ON_DEPENDENCY_CHANGE = myCbRebuildOnDependencyChange.isSelected();
- try {
- workspaceConfiguration.COMPILER_PROCESS_HEAP_SIZE = Integer.parseInt(myHeapSizeField.getText().trim());
+ if (!myDisabledSettings.contains(Setting.EXTERNAL_BUILD)) {
+ workspaceConfiguration.USE_COMPILE_SERVER = myCbUseExternalBuild.isSelected();
+ if (!myDisabledSettings.contains(Setting.AUTO_MAKE)) {
+ workspaceConfiguration.MAKE_PROJECT_ON_SAVE = myCbEnableAutomake.isSelected();
+ }
+ if (!myDisabledSettings.contains(Setting.PARALLEL_COMPILATION)) {
+ workspaceConfiguration.PARALLEL_COMPILATION = myCbParallelCompilation.isSelected();
+ }
+ if (!myDisabledSettings.contains(Setting.REBUILD_MODULE_ON_DEPENDENCY_CHANGE)) {
+ workspaceConfiguration.REBUILD_ON_DEPENDENCY_CHANGE = myCbRebuildOnDependencyChange.isSelected();
+ }
+ if (!myDisabledSettings.contains(Setting.HEAP_SIZE)) {
+ try {
+ workspaceConfiguration.COMPILER_PROCESS_HEAP_SIZE = Integer.parseInt(myHeapSizeField.getText().trim());
+ }
+ catch (NumberFormatException ignored) {
+ LOG.info(ignored);
+ }
+ }
+ if (!myDisabledSettings.contains(Setting.COMPILER_VM_OPTIONS)) {
+ workspaceConfiguration.COMPILER_PROCESS_ADDITIONAL_VM_OPTIONS = myVMOptionsField.getText().trim();
+ }
}
- catch (NumberFormatException ignored) {
- LOG.info(ignored);
- }
- workspaceConfiguration.COMPILER_PROCESS_ADDITIONAL_VM_OPTIONS = myVMOptionsField.getText().trim();
- configuration.setAddNotNullAssertions(myCbAssertNotNull.isSelected());
- configuration.removeResourceFilePatterns();
- String extensionString = myResourcePatternsField.getText().trim();
- applyResourcePatterns(extensionString, (CompilerConfigurationImpl)CompilerConfiguration.getInstance(myProject));
+ if (!myDisabledSettings.contains(Setting.ADD_NOT_NULL_ASSERTIONS)) {
+ configuration.setAddNotNullAssertions(myCbAssertNotNull.isSelected());
+ }
+ if (!myDisabledSettings.contains(Setting.RESOURCE_PATTERNS)) {
+ configuration.removeResourceFilePatterns();
+ String extensionString = myResourcePatternsField.getText().trim();
+ applyResourcePatterns(extensionString, (CompilerConfigurationImpl)CompilerConfiguration.getInstance(myProject));
+ }
if (wasUsingExternalMake != workspaceConfiguration.USE_COMPILE_SERVER) {
myProject.getMessageBus().syncPublisher(ExternalBuildOptionListener.TOPIC).externalBuildOptionChanged(workspaceConfiguration.USE_COMPILE_SERVER);
}
@@ -193,20 +274,29 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura
}
public boolean isModified() {
- boolean isModified = false;
final CompilerWorkspaceConfiguration workspaceConfiguration = CompilerWorkspaceConfiguration.getInstance(myProject);
- isModified |= ComparingUtils.isModified(myCbAutoShowFirstError, workspaceConfiguration.AUTO_SHOW_ERRORS_IN_EDITOR);
- isModified |= ComparingUtils.isModified(myCbUseExternalBuild, workspaceConfiguration.USE_COMPILE_SERVER);
- isModified |= ComparingUtils.isModified(myCbEnableAutomake, workspaceConfiguration.MAKE_PROJECT_ON_SAVE);
- isModified |= ComparingUtils.isModified(myCbParallelCompilation, workspaceConfiguration.PARALLEL_COMPILATION);
- isModified |= ComparingUtils.isModified(myCbRebuildOnDependencyChange, workspaceConfiguration.REBUILD_ON_DEPENDENCY_CHANGE);
- isModified |= ComparingUtils.isModified(myHeapSizeField, workspaceConfiguration.COMPILER_PROCESS_HEAP_SIZE);
- isModified |= ComparingUtils.isModified(myVMOptionsField, workspaceConfiguration.COMPILER_PROCESS_ADDITIONAL_VM_OPTIONS);
+ boolean isModified = !myDisabledSettings.contains(Setting.AUTO_SHOW_FIRST_ERROR_IN_EDITOR)
+ && ComparingUtils.isModified(myCbAutoShowFirstError, workspaceConfiguration.AUTO_SHOW_ERRORS_IN_EDITOR);
+ isModified |= !myDisabledSettings.contains(Setting.EXTERNAL_BUILD)
+ && ComparingUtils.isModified(myCbUseExternalBuild, workspaceConfiguration.USE_COMPILE_SERVER);
+ isModified |= !myDisabledSettings.contains(Setting.AUTO_MAKE)
+ && ComparingUtils.isModified(myCbEnableAutomake, workspaceConfiguration.MAKE_PROJECT_ON_SAVE);
+ isModified |= !myDisabledSettings.contains(Setting.PARALLEL_COMPILATION)
+ && ComparingUtils.isModified(myCbParallelCompilation, workspaceConfiguration.PARALLEL_COMPILATION);
+ isModified |= !myDisabledSettings.contains(Setting.REBUILD_MODULE_ON_DEPENDENCY_CHANGE)
+ && ComparingUtils.isModified(myCbRebuildOnDependencyChange, workspaceConfiguration.REBUILD_ON_DEPENDENCY_CHANGE);
+ isModified |= !myDisabledSettings.contains(Setting.HEAP_SIZE)
+ && ComparingUtils.isModified(myHeapSizeField, workspaceConfiguration.COMPILER_PROCESS_HEAP_SIZE);
+ isModified |= !myDisabledSettings.contains(Setting.COMPILER_VM_OPTIONS)
+ && ComparingUtils.isModified(myVMOptionsField, workspaceConfiguration.COMPILER_PROCESS_ADDITIONAL_VM_OPTIONS);
final CompilerConfigurationImpl compilerConfiguration = (CompilerConfigurationImpl)CompilerConfiguration.getInstance(myProject);
- isModified |= ComparingUtils.isModified(myCbAssertNotNull, compilerConfiguration.isAddNotNullAssertions());
- isModified |= ComparingUtils.isModified(myCbClearOutputDirectory, workspaceConfiguration.CLEAR_OUTPUT_DIRECTORY);
- isModified |= ComparingUtils.isModified(myResourcePatternsField, patternsToString(compilerConfiguration.getResourceFilePatterns()));
+ isModified |= !myDisabledSettings.contains(Setting.ADD_NOT_NULL_ASSERTIONS)
+ && ComparingUtils.isModified(myCbAssertNotNull, compilerConfiguration.isAddNotNullAssertions());
+ isModified |= !myDisabledSettings.contains(Setting.CLEAR_OUTPUT_DIR_ON_REBUILD)
+ && ComparingUtils.isModified(myCbClearOutputDirectory, workspaceConfiguration.CLEAR_OUTPUT_DIRECTORY);
+ isModified |= !myDisabledSettings.contains(Setting.RESOURCE_PATTERNS)
+ && ComparingUtils.isModified(myResourcePatternsField, patternsToString(compilerConfiguration.getResourceFilePatterns()));
return isModified;
}
diff --git a/resources/src/idea/RichPlatformPlugin.xml b/resources/src/idea/RichPlatformPlugin.xml
index 302b7793998e..ee1bca19c2e4 100644
--- a/resources/src/idea/RichPlatformPlugin.xml
+++ b/resources/src/idea/RichPlatformPlugin.xml
@@ -50,6 +50,9 @@
+
+