From 0562509fa2d1ff8e3bee3a4c8a3e809f7e539e1f Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Tue, 18 Nov 2014 10:41:02 +0100 Subject: [PATCH] cleanup --- .../options/AbstractSchemesManager.java | 40 +++--- .../source/codeStyle/CodeStyleSchemeImpl.java | 5 +- .../codeStyle/CodeStyleSchemesImpl.java | 4 +- .../openapi/actionSystem/ex/QuickList.java | 115 ++---------------- .../colors/impl/EditorColorsManagerImpl.java | 6 +- .../com/intellij/openapi/util/JDOMUtil.java | 4 + .../util/UniqueFileNamesProvider.java | 10 +- .../util/text/UniqueNameGenerator.java | 1 - 8 files changed, 41 insertions(+), 144 deletions(-) diff --git a/platform/core-impl/src/com/intellij/openapi/options/AbstractSchemesManager.java b/platform/core-impl/src/com/intellij/openapi/options/AbstractSchemesManager.java index ebb2896d2a8e..3b2cfdcae3d5 100644 --- a/platform/core-impl/src/com/intellij/openapi/options/AbstractSchemesManager.java +++ b/platform/core-impl/src/com/intellij/openapi/options/AbstractSchemesManager.java @@ -17,18 +17,18 @@ package com.intellij.openapi.options; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.WriteExternalException; import com.intellij.util.UniqueFileNamesProvider; -import com.intellij.util.containers.HashSet; import com.intellij.util.text.UniqueNameGenerator; import gnu.trove.THashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Set; - -public abstract class AbstractSchemesManager implements SchemesManager { +public abstract class AbstractSchemesManager implements SchemesManager { private static final Logger LOG = Logger.getInstance(AbstractSchemesManager.class); protected final List mySchemes = new ArrayList(); @@ -42,7 +42,7 @@ public abstract class AbstractSchemesManager collectExistingNames(final Collection schemes) { - HashSet result = new HashSet(); + Set result = new THashSet(); for (T scheme : schemes) { result.add(scheme.getName()); } @@ -92,24 +94,20 @@ public abstract class AbstractSchemesManager getAllSchemes() { - return Collections.unmodifiableList(new ArrayList(mySchemes)); + return new ArrayList(mySchemes); } @Override @Nullable public T findSchemeByName(final String schemeName) { for (T scheme : mySchemes) { - if (Comparing.equal(scheme.getName(),schemeName)) { + if (Comparing.equal(scheme.getName(), schemeName)) { return scheme; } } - return null; } - @Override - public abstract void save() throws WriteExternalException; - @Override public void setCurrentSchemeName(final String schemeName) { myCurrentSchemeName = schemeName; @@ -140,17 +138,15 @@ public abstract class AbstractSchemesManager getAllSchemeNames() { @@ -165,12 +161,12 @@ public abstract class AbstractSchemesManager ids = new ArrayList(); - + List ids = new SmartList(); for (Object action : element.getChildren(ACTION_TAG)) { - Element actionElement = (Element)action; - ids.add(actionElement.getAttributeValue(ID_TAG)); - } myActionIds = ArrayUtil.toStringArray(ids); - } - - public void setDisplayName(final String name) { - myDisplayName = name; - } - - + @Override @NotNull - public ExternalInfo getExternalInfo() { - return myExternalInfo; - } - - + @Override public void setName(@NotNull final String newName) { - setDisplayName(newName); - } - } 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 7f83539afc5a..d1e092a33d41 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 @@ -86,7 +86,7 @@ public class EditorColorsManagerImpl extends EditorColorsManager implements Name loadSchemesFromBeans(); } - loadAllSchemes(); + mySchemesManager.loadSchemes(); loadAdditionalTextAttributes(); @@ -280,10 +280,6 @@ public class EditorColorsManagerImpl extends EditorColorsManager implements Name // Routines responsible for loading & saving colors schemes. // ------------------------------------------------------------------------- - private void loadAllSchemes() { - mySchemesManager.loadSchemes(); - } - private static File getColorsDir(boolean create) { @NonNls String directoryPath = PathManager.getConfigPath() + File.separator + "colors"; File directory = new File(directoryPath); diff --git a/platform/util/src/com/intellij/openapi/util/JDOMUtil.java b/platform/util/src/com/intellij/openapi/util/JDOMUtil.java index 9b0ede67d11e..e4ba11b57c04 100644 --- a/platform/util/src/com/intellij/openapi/util/JDOMUtil.java +++ b/platform/util/src/com/intellij/openapi/util/JDOMUtil.java @@ -99,6 +99,8 @@ public class JDOMUtil { return addToHash(0, root); } + @SuppressWarnings("unused") + @Deprecated public static int getTreeHash(@NotNull Document document) { return getTreeHash(document.getRootElement()); } @@ -158,6 +160,8 @@ public class JDOMUtil { return list.toArray(new Element[list.size()]); } + @Deprecated + @SuppressWarnings("unused") @NotNull public static String concatTextNodesValues(@NotNull final Object[] nodes) { StringBuilder result = new StringBuilder(); diff --git a/platform/util/src/com/intellij/util/UniqueFileNamesProvider.java b/platform/util/src/com/intellij/util/UniqueFileNamesProvider.java index dc403ddd4268..fcd11ea486eb 100644 --- a/platform/util/src/com/intellij/util/UniqueFileNamesProvider.java +++ b/platform/util/src/com/intellij/util/UniqueFileNamesProvider.java @@ -15,10 +15,13 @@ */ package com.intellij.util; +import com.intellij.openapi.util.text.StringUtil; + import java.util.ArrayList; +import java.util.List; public class UniqueFileNamesProvider { - private final ArrayList myExistingNames; + private final List myExistingNames; public UniqueFileNamesProvider() { myExistingNames = new ArrayList(); @@ -50,10 +53,11 @@ public class UniqueFileNamesProvider { } public static String convertName(String s) { - if (s == null || s.isEmpty()) { + if (StringUtil.isEmpty(s)) { return "_"; } - StringBuffer buf = new StringBuffer(); + + StringBuilder buf = new StringBuilder(); for (int i = 0; i < s.length(); i++) { char c = s.charAt(i); if (Character.isJavaIdentifierPart(c) || c == ' ') { diff --git a/platform/util/src/com/intellij/util/text/UniqueNameGenerator.java b/platform/util/src/com/intellij/util/text/UniqueNameGenerator.java index 656b41d46329..78c519caf08c 100644 --- a/platform/util/src/com/intellij/util/text/UniqueNameGenerator.java +++ b/platform/util/src/com/intellij/util/text/UniqueNameGenerator.java @@ -108,5 +108,4 @@ public class UniqueNameGenerator implements Condition { public String generateUniqueName(final String defaultName) { return generateUniqueName(defaultName, "", ""); } - }