diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesModel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesModel.java index dce210ef46bb..76c57b1da42f 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesModel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesModel.java @@ -76,11 +76,6 @@ public class CodeStyleSchemesModel implements SchemesModel { } } - @Override - public boolean supportsProjectSchemes() { - return true; - } - public CodeStyleSettings getCloneSettings(final CodeStyleScheme scheme) { if (!mySettingsToClone.containsKey(scheme)) { mySettingsToClone.put(scheme, scheme.getCodeStyleSettings().clone()); diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java index dc5c6fc04729..00346648d12d 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java @@ -122,4 +122,9 @@ public class CodeStyleSchemesPanel extends SimpleSchemesPanel { public SchemesModel getModel() { return myModel; } + + @Override + protected boolean supportsProjectSchemes() { + return true; + } } diff --git a/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java b/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java index 44a3af4acc1f..40a01e241a13 100644 --- a/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java +++ b/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java @@ -276,12 +276,6 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract mySomeSchemesDeleted = mySomeSchemesDeleted || !deletedNewlyCreated; } - @Override - public boolean supportsProjectSchemes() { - return false; - } - - private void selectDefaultScheme() { DefaultColorsScheme defaultScheme = (DefaultColorsScheme)EditorColorsManager.getInstance().getScheme(EditorColorsManager.DEFAULT_SCHEME_NAME); diff --git a/platform/lang-impl/src/com/intellij/application/options/colors/SchemesPanel.java b/platform/lang-impl/src/com/intellij/application/options/colors/SchemesPanel.java index 5292b880b627..150b1f024c93 100644 --- a/platform/lang-impl/src/com/intellij/application/options/colors/SchemesPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/colors/SchemesPanel.java @@ -108,4 +108,9 @@ public class SchemesPanel extends SimpleSchemesPanel impleme public SchemesModel getModel() { return myOptions; } + + @Override + protected boolean supportsProjectSchemes() { + return false; + } } diff --git a/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemeActions.java b/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemeActions.java index 2333790bbf89..74baf1ed3c0a 100644 --- a/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemeActions.java +++ b/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemeActions.java @@ -76,7 +76,7 @@ public abstract class AbstractSchemeActions { public final Collection getActions() { List actions = new ArrayList<>(); - if (mySchemesPanel.getModel().supportsProjectSchemes()) { + if (mySchemesPanel.supportsProjectSchemes()) { actions.add(new CopyToProjectAction()); actions.add(new CopyToIDEAction()); actions.add(new Separator()); @@ -188,7 +188,7 @@ public abstract class AbstractSchemeActions { T currentScheme = getCurrentScheme(); if (currentScheme != null) { mySchemesPanel.cancelEdit(); - final boolean isProjectScheme = mySchemesPanel.getModel().supportsProjectSchemes() && getModel().isProjectScheme(currentScheme); + final boolean isProjectScheme = mySchemesPanel.supportsProjectSchemes() && getModel().isProjectScheme(currentScheme); duplicateScheme(currentScheme, SchemeNameGenerator.getUniqueName( SchemeManager.getDisplayName(currentScheme), diff --git a/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java b/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java index 56cc68767713..2860ec7c3be6 100644 --- a/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java @@ -133,6 +133,7 @@ public abstract class AbstractSchemesPanel { myComboBox = new SchemesCombo() { @Override protected boolean supportsProjectSchemes() { - return mySchemesPanel.getModel().supportsProjectSchemes(); + return mySchemesPanel.supportsProjectSchemes(); } @Override diff --git a/platform/lang-impl/src/com/intellij/application/options/schemes/SchemesModel.java b/platform/lang-impl/src/com/intellij/application/options/schemes/SchemesModel.java index db7e479d7714..327948bb0603 100644 --- a/platform/lang-impl/src/com/intellij/application/options/schemes/SchemesModel.java +++ b/platform/lang-impl/src/com/intellij/application/options/schemes/SchemesModel.java @@ -75,11 +75,4 @@ public interface SchemesModel { boolean differsFromDefault(@NotNull T scheme); void removeScheme(@NotNull T scheme); - - /** - * @return True if the panel supports project-level schemes along with IDE ones. In this case there will be - * additional "Copy to Project" and "Copy to IDE" actions for IDE and project schemes respectively and Project/IDE schemes - * separators. - */ - boolean supportsProjectSchemes(); } diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/InspectionProfileSchemesModel.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/InspectionProfileSchemesModel.java index d1d6cedac6cc..ef7ba1650c53 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/InspectionProfileSchemesModel.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/InspectionProfileSchemesModel.java @@ -100,11 +100,6 @@ public abstract class InspectionProfileSchemesModel implements SchemesModel createSchemeActions() { return new DescriptionAwareSchemeActions(this) {