diff options
| author | Alex Ruiz <alruiz@google.com> | 2013-07-19 09:45:21 -0700 |
|---|---|---|
| committer | Alex Ruiz <alruiz@google.com> | 2013-07-19 10:01:10 -0700 |
| commit | 63d3f297873949b00a589174a18ef2b5330c097d (patch) | |
| tree | e811c9eea3f201da4262dc4db2aa94b60e9fa983 /java | |
| parent | f31ad4b0e3866f7031fb28a3a7104a2a05abedec (diff) | |
| download | idea-63d3f297873949b00a589174a18ef2b5330c097d.tar.gz | |
Fixed CompilerOptionsManager API to match the one in IntelliJ's repo.
Change-Id: I4e18d25557384e16b19fe721e50df91daf223c51
Diffstat (limited to 'java')
| -rw-r--r-- | java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsManager.java | 2 | ||||
| -rw-r--r-- | java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsManager.java b/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsManager.java index 05ad23b0f073..ed2973adcb49 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsManager.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsManager.java @@ -38,5 +38,5 @@ public interface CompilerOptionsManager { EXTERNAL_BUILD, AUTO_MAKE, PARALLEL_COMPILATION, REBUILD_MODULE_ON_DEPENDENCY_CHANGE, HEAP_SIZE, COMPILER_VM_OPTIONS } - boolean isAvailable(@NotNull Project project, @NotNull Setting setting); + boolean isAvailable(@NotNull Setting setting, @NotNull Project project); } 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 b842b06caa38..57eb6994f5a3 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java @@ -89,7 +89,7 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura private JLabel myEnableAutomakeLegendLabel; private JLabel myParallelCompilationLegendLabel; - public CompilerUIConfigurable(final Project project) { + public CompilerUIConfigurable(@NotNull final Project project) { myProject = project; myPatternLegendLabel.setText("<html><body>" + @@ -106,14 +106,14 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura } }); - tweakControls(); + tweakControls(project); } - private void tweakControls() { + private void tweakControls(@NotNull Project project) { CompilerOptionsManager[] managers = CompilerOptionsManager.EP_NAME.getExtensions(); boolean showExternalBuildSetting = true; for (CompilerOptionsManager manager : managers) { - showExternalBuildSetting = manager.isAvailable(myProject, Setting.EXTERNAL_BUILD); + showExternalBuildSetting = manager.isAvailable(Setting.EXTERNAL_BUILD, project); if (!showExternalBuildSetting) { myDisabledSettings.add(Setting.EXTERNAL_BUILD); break; @@ -127,7 +127,7 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura } else { for (CompilerOptionsManager manager : managers) { - if (!manager.isAvailable(myProject, setting)) { + if (!manager.isAvailable(setting, project)) { myDisabledSettings.add(setting); break; } |