From 670f81064cf8befd0c859746805ac2d5f6b993e6 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Tue, 18 Nov 2014 17:51:17 +0100 Subject: [PATCH] cleanup --- .../psi/codeStyle/CodeStyleSchemes.java | 1 - .../template/impl/TemplateSettings.java | 3 +- .../InspectionProfileManagerImpl.java | 1 + .../com/intellij/tools/ToolsProcessor.java | 1 + .../actionSystem/ex/QuickListsManager.java | 2 ++ .../colors/impl/EditorColorsManagerImpl.java | 8 ++--- .../fileTypes/impl/AbstractFileType.java | 33 +++++++++++++------ 7 files changed, 32 insertions(+), 17 deletions(-) diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSchemes.java b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSchemes.java index 9b0c60f485df..cbd1d691fc4e 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSchemes.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSchemes.java @@ -23,7 +23,6 @@ import org.jetbrains.annotations.Nullable; * Date: Jul 19, 2002 */ public abstract class CodeStyleSchemes { - public static CodeStyleSchemes getInstance(){ CodeStyleSchemes schemes = ServiceManager.getService(CodeStyleSchemes.class); if (!schemes.isLoaded()) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java index e1dc8b36bd21..f3b77703bd23 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java @@ -186,8 +186,8 @@ public class TemplateSettings implements PersistentStateComponent() { - @Override @Nullable + @Override public TemplateGroup readScheme(@NotNull Element element) throws InvalidDataException { return readTemplateFile(element, element.getAttributeValue("group"), false, false, getClass().getClassLoader()); @@ -523,7 +523,6 @@ public class TemplateSettings implements PersistentStateComponent processor = new BaseSchemeProcessor() { + @NotNull @Override public InspectionProfileImpl readScheme(@NotNull Element element) { InspectionProfileImpl profile = new InspectionProfileImpl(InspectionProfileLoadUtil.getProfileName(element), myRegistrar, InspectionProfileManagerImpl.this); diff --git a/platform/lang-impl/src/com/intellij/tools/ToolsProcessor.java b/platform/lang-impl/src/com/intellij/tools/ToolsProcessor.java index e0999ec11ec8..7587601afbc6 100644 --- a/platform/lang-impl/src/com/intellij/tools/ToolsProcessor.java +++ b/platform/lang-impl/src/com/intellij/tools/ToolsProcessor.java @@ -54,6 +54,7 @@ abstract public class ToolsProcessor extends BaseSchemeProcessor @NonNls private static final String ELEMENT_OPTION = "option"; @NonNls private static final String ATTRIBUTE_VALUE = "value"; + @NotNull @Override public ToolsGroup readScheme(@NotNull Element root) throws InvalidDataException, IOException, JDOMException { if (!TOOL_SET.equals(root.getName())) { diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java index 2aea9ec1976e..2a6df505f8e7 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java @@ -62,6 +62,7 @@ public class QuickListsManager implements ExportableApplicationComponent, NamedJ myActionManager = actionManagerEx; mySchemesManager = schemesManagerFactory.createSchemesManager(StoragePathMacros.ROOT_CONFIG + "/quicklists", new BaseSchemeProcessor() { + @NotNull @Override public QuickList readScheme(@NotNull Element element) { return loadListFromDocument(element); @@ -86,6 +87,7 @@ public class QuickListsManager implements ExportableApplicationComponent, NamedJ registerActions(); } + @NotNull private static QuickList loadListFromDocument(@NotNull Element element) { QuickList list = new QuickList(); list.readExternal(element); diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java index 6a7153b38e7d..6a26c2350e0e 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java @@ -54,6 +54,7 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; +import java.util.List; public class EditorColorsManagerImpl extends EditorColorsManager implements NamedJDOMExternalizable, ExportableComponent, NamedComponent { private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.colors.impl.EditorColorsManagerImpl"); @@ -213,7 +214,7 @@ public class EditorColorsManagerImpl extends EditorColorsManager implements Name @NotNull @Override public EditorColorsScheme[] getAllSchemes() { - ArrayList schemes = new ArrayList(mySchemesManager.getAllSchemes()); + List schemes = new ArrayList(mySchemesManager.getAllSchemes()); Collections.sort(schemes, new Comparator() { @Override public int compare(@NotNull EditorColorsScheme s1, @NotNull EditorColorsScheme s2) { @@ -370,10 +371,9 @@ public class EditorColorsManagerImpl extends EditorColorsManager implements Name } private final class MySchemeProcessor extends BaseSchemeProcessor implements SchemeExtensionProvider { + @NotNull @Override - public EditorColorsSchemeImpl readScheme(@NotNull Element element) - throws InvalidDataException { - + public EditorColorsSchemeImpl readScheme(@NotNull Element element) throws InvalidDataException { return loadSchemeFromDocument(element, true); } diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/AbstractFileType.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/AbstractFileType.java index de74d6760915..c2a124dfd9ff 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/AbstractFileType.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/AbstractFileType.java @@ -93,10 +93,12 @@ public class AbstractFileType extends UserFileType implements mySyntaxTable = syntaxTable; } + @Override public AbstractFileType clone() { return (AbstractFileType)super.clone(); } + @Override public void copyFrom(UserFileType newType) { super.copyFrom(newType); if (newType instanceof AbstractFileType) { @@ -105,10 +107,12 @@ public class AbstractFileType extends UserFileType implements } } + @Override public boolean isBinary() { return false; } + @Override public void readExternal(final Element typeElement) throws InvalidDataException { Element element = typeElement.getChild(ELEMENT_HIGHLIGHTING); if (element != null) { @@ -119,12 +123,11 @@ public class AbstractFileType extends UserFileType implements } } - public static SyntaxTable readSyntaxTable(Element root) { + @NotNull + public static SyntaxTable readSyntaxTable(@NotNull Element root) { SyntaxTable table = new SyntaxTable(); - for (final Object o : root.getChildren()) { - Element element = (Element)o; - + for (Element element : root.getChildren()) { if (ELEMENT_OPTIONS.equals(element.getName())) { for (final Object o1 : element.getChildren(ELEMENT_OPTION)) { Element e = (Element)o1; @@ -156,7 +159,8 @@ public class AbstractFileType extends UserFileType implements } else if (VALUE_HAS_PARENS.equals(name)) { table.setHasParens(Boolean.valueOf(value).booleanValue()); - } else if (VALUE_HAS_STRING_ESCAPES.equals(name)) { + } + else if (VALUE_HAS_STRING_ESCAPES.equals(name)) { table.setHasStringEscapes(Boolean.valueOf(value).booleanValue()); } } @@ -184,7 +188,9 @@ public class AbstractFileType extends UserFileType implements XMLOutputter outputter = JDOMUtil.createOutputter("\n"); try { outputter.output((Element)element.getContent().get(0), System.out); - } catch (IOException ex) {} + } + catch (IOException ignored) { + } } return table; } @@ -203,9 +209,9 @@ public class AbstractFileType extends UserFileType implements } } + @Override public void writeExternal(final Element element) throws WriteExternalException { - SyntaxTable table = getSyntaxTable(); - writeTable(element, table); + writeTable(element, getSyntaxTable()); } private static void writeTable(Element element, SyntaxTable table) { @@ -270,10 +276,13 @@ public class AbstractFileType extends UserFileType implements } private static void addElementOption(final Element optionsElement, final String valueHasParens, final boolean hasParens) { - if (!hasParens) return; + if (!hasParens) { + return; + } + Element supportParens = new Element(ELEMENT_OPTION); supportParens.setAttribute(ATTRIBUTE_NAME, valueHasParens); - supportParens.setAttribute(ATTRIBUTE_VALUE, String.valueOf(hasParens)); + supportParens.setAttribute(ATTRIBUTE_VALUE, String.valueOf(true)); optionsElement.addContent(supportParens); } @@ -301,10 +310,12 @@ public class AbstractFileType extends UserFileType implements return keywordsElement; } + @Override public void markDefaultSettings() { myDefaultSyntaxTable = mySyntaxTable; } + @Override public boolean isModified() { return !Comparing.equal(myDefaultSyntaxTable, getSyntaxTable()); } @@ -399,6 +410,7 @@ public class AbstractFileType extends UserFileType implements return mapping; } + @Override public SettingsEditor getEditor() { return new CustomFileTypeEditor(); } @@ -407,6 +419,7 @@ public class AbstractFileType extends UserFileType implements myCommenter = commenter; } + @Override @NotNull public ExternalInfo getExternalInfo() { return myExternalInfo;