From bbe1515a2d31405b1d0478675377bf8c59d9cdee Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 20 May 2010 17:20:45 +0400 Subject: [PATCH] merge CodeStyleCustomizationsConsumer into LanguageCodeStyleSettingsProvider --- .../JavaCodeStyleOptionsCustomizer.java | 34 ------------------- ...JavaLanguageCodeStyleSettingsProvider.java | 12 +++++++ .../codeStyle/CodeStyleOptionsCustomizer.java | 31 ----------------- .../codeStyle/CodeStyleBlankLinesPanel.java | 5 ++- .../codeStyle/CodeStyleSpacesPanel.java | 5 ++- .../LanguageCodeStyleSettingsProvider.java | 7 ++++ .../src/META-INF/LangExtensionPoints.xml | 2 -- resources/src/META-INF/IdeaPlugin.xml | 2 -- 8 files changed, 23 insertions(+), 75 deletions(-) delete mode 100644 java/java-impl/src/com/intellij/application/options/JavaCodeStyleOptionsCustomizer.java delete mode 100644 platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleOptionsCustomizer.java diff --git a/java/java-impl/src/com/intellij/application/options/JavaCodeStyleOptionsCustomizer.java b/java/java-impl/src/com/intellij/application/options/JavaCodeStyleOptionsCustomizer.java deleted file mode 100644 index 058a9c9e44b6..000000000000 --- a/java/java-impl/src/com/intellij/application/options/JavaCodeStyleOptionsCustomizer.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2000-2010 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.application.options; - -import com.intellij.psi.codeStyle.CodeStyleCustomizationsConsumer; -import com.intellij.psi.codeStyle.CodeStyleOptionsCustomizer; - -/** - * @author yole - */ -public class JavaCodeStyleOptionsCustomizer extends CodeStyleOptionsCustomizer { - @Override - public void customizeSpacingOptions(CodeStyleCustomizationsConsumer consumer) { - consumer.showAllStandardOptions(); - } - - @Override - public void customizeBlankLinesOptions(CodeStyleCustomizationsConsumer consumer) { - consumer.showAllStandardOptions(); - } -} diff --git a/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java b/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java index 823e663f284b..858faf1254c2 100644 --- a/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java +++ b/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java @@ -18,6 +18,7 @@ package com.intellij.ide; import com.intellij.application.options.codeStyle.LanguageCodeStyleSettingsProvider; import com.intellij.lang.Language; import com.intellij.lang.StdLanguages; +import com.intellij.psi.codeStyle.CodeStyleCustomizationsConsumer; import org.jetbrains.annotations.NotNull; /** @@ -44,6 +45,17 @@ public class JavaLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSett return GENERAL_CODE_SAMPLE; } + @Override + public void customizeSpacingOptions(CodeStyleCustomizationsConsumer consumer) { + consumer.showAllStandardOptions(); + } + + @Override + public void customizeBlankLinesOptions(CodeStyleCustomizationsConsumer consumer) { + consumer.showAllStandardOptions(); + } + + private static final String GENERAL_CODE_SAMPLE = "public class Foo {\n" + " public int[] X = new int[]{1, 3, 5 7, 9, 11};\n" + "\n" + diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleOptionsCustomizer.java b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleOptionsCustomizer.java deleted file mode 100644 index 43f52f822051..000000000000 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleOptionsCustomizer.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2000-2010 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.psi.codeStyle; - -import com.intellij.openapi.extensions.ExtensionPointName; - -/** - * @author yole - */ -public abstract class CodeStyleOptionsCustomizer { - public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.codeStyleOptionsCustomizer"); - - public void customizeSpacingOptions(CodeStyleCustomizationsConsumer consumer) { - } - - public void customizeBlankLinesOptions(CodeStyleCustomizationsConsumer consumer) { - } -} diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesPanel.java index 7c1286455774..b5c1e73da957 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesPanel.java @@ -20,7 +20,6 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.extensions.Extensions; import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleCustomizationsConsumer; -import com.intellij.psi.codeStyle.CodeStyleOptionsCustomizer; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CustomCodeStyleSettings; import com.intellij.ui.OptionGroup; @@ -43,8 +42,8 @@ public class CodeStyleBlankLinesPanel extends MultilanguageCodeStyleAbstractPane public CodeStyleBlankLinesPanel(CodeStyleSettings settings) { super(settings); - for(CodeStyleOptionsCustomizer customizer: Extensions.getExtensions(CodeStyleOptionsCustomizer.EP_NAME)) { - customizer.customizeBlankLinesOptions(this); + for(LanguageCodeStyleSettingsProvider provider: Extensions.getExtensions(LanguageCodeStyleSettingsProvider.EP_NAME)) { + provider.customizeBlankLinesOptions(this); } myPanel diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSpacesPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSpacesPanel.java index cb0bd3cc03fb..abfd213b5cc4 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSpacesPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSpacesPanel.java @@ -18,7 +18,6 @@ package com.intellij.application.options.codeStyle; import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.util.Trinity; -import com.intellij.psi.codeStyle.CodeStyleOptionsCustomizer; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CustomCodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleCustomizationsConsumer; @@ -47,8 +46,8 @@ public class CodeStyleSpacesPanel extends OptionTreeWithPreviewPanel implements protected void initTables() { myAllowedOptions = new HashSet(); myCustomOptions = new MultiMap, String, String>>(); - for(CodeStyleOptionsCustomizer contributor: Extensions.getExtensions(CodeStyleOptionsCustomizer.EP_NAME)) { - contributor.customizeSpacingOptions(this); + for(LanguageCodeStyleSettingsProvider provider: Extensions.getExtensions(LanguageCodeStyleSettingsProvider.EP_NAME)) { + provider.customizeSpacingOptions(this); } initBooleanField("SPACE_BEFORE_METHOD_CALL_PARENTHESES", ApplicationBundle.message("checkbox.spaces.method.call.parentheses"), BEFORE_PARENTHESES); diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/LanguageCodeStyleSettingsProvider.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/LanguageCodeStyleSettingsProvider.java index d3529925cccf..fa500465c80a 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/LanguageCodeStyleSettingsProvider.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/LanguageCodeStyleSettingsProvider.java @@ -18,6 +18,7 @@ package com.intellij.application.options.codeStyle; import com.intellij.lang.Language; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.extensions.Extensions; +import com.intellij.psi.codeStyle.CodeStyleCustomizationsConsumer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -41,6 +42,12 @@ public abstract class LanguageCodeStyleSettingsProvider { public abstract String getCodeSample(@NotNull SettingsType settingsType); + public void customizeSpacingOptions(CodeStyleCustomizationsConsumer consumer) { + } + + public void customizeBlankLinesOptions(CodeStyleCustomizationsConsumer consumer) { + } + public static Language[] getLanguagesWithCodeStyleSettings() { ArrayList langs = new ArrayList(); for (LanguageCodeStyleSettingsProvider provider : Extensions.getExtensions(EP_NAME)) { diff --git a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml index b3792d05f479..8e40f85f82df 100644 --- a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml +++ b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml @@ -59,8 +59,6 @@ - diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml index b9d570152642..dcdc083b16bd 100644 --- a/resources/src/META-INF/IdeaPlugin.xml +++ b/resources/src/META-INF/IdeaPlugin.xml @@ -720,8 +720,6 @@ - -