From 171ec9fcac516bc2b83d505c5883c213fcc652f9 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Tue, 18 Nov 2014 18:51:42 +0100
Subject: [PATCH] cleanup

---
 .../openapi/options/SchemesManager.java       | 20 ++++----
 .../options/AbstractSchemesManager.java       | 46 +++++++++----------
 .../InspectionProfileManagerImpl.java         | 13 ++----
 .../com/intellij/tools/BaseToolManager.java   |  7 ++-
 .../openapi/options/CompoundScheme.java       |  3 --
 .../colors/impl/EditorColorsManagerImpl.java  | 12 ++---
 .../keymap/impl/KeymapManagerImpl.java        |  7 ++-
 .../openapi/options/SchemesManagerImpl.java   |  6 +--
 8 files changed, 51 insertions(+), 63 deletions(-)

diff --git a/platform/core-api/src/com/intellij/openapi/options/SchemesManager.java b/platform/core-api/src/com/intellij/openapi/options/SchemesManager.java
index 6b13e51385d1..e0a011445dc7 100644
--- a/platform/core-api/src/com/intellij/openapi/options/SchemesManager.java
+++ b/platform/core-api/src/com/intellij/openapi/options/SchemesManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2014 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.
@@ -73,7 +73,7 @@ public interface SchemesManager <T extends Scheme, E extends ExternalizableSchem
     }
 
     @Override
-    public Scheme findSchemeByName(final String schemeName) {
+    public Scheme findSchemeByName(String schemeName) {
       return null;
     }
 
@@ -82,8 +82,7 @@ public interface SchemesManager <T extends Scheme, E extends ExternalizableSchem
     }
 
     @Override
-    public void setCurrentSchemeName(final String schemeName) {
-
+    public void setCurrentSchemeName(String schemeName) {
     }
 
     @Override
@@ -92,8 +91,7 @@ public interface SchemesManager <T extends Scheme, E extends ExternalizableSchem
     }
 
     @Override
-    public void removeScheme(final Scheme scheme) {
-
+    public void removeScheme(@NotNull Scheme scheme) {
     }
 
     @Override
@@ -104,7 +102,7 @@ public interface SchemesManager <T extends Scheme, E extends ExternalizableSchem
 
     @Override
     @NotNull
-    public Collection loadSharedSchemes(final Collection currentSchemeList) {
+    public Collection loadSharedSchemes(Collection currentSchemeList) {
       return loadSharedSchemes();
     }
 
@@ -114,7 +112,8 @@ public interface SchemesManager <T extends Scheme, E extends ExternalizableSchem
     }
   };
 
-  @NotNull Collection<E> loadSchemes();
+  @NotNull
+  Collection<E> loadSchemes();
 
   @Deprecated
   @SuppressWarnings({"unused", "deprecation"})
@@ -158,9 +157,10 @@ public interface SchemesManager <T extends Scheme, E extends ExternalizableSchem
   @Nullable
   T getCurrentScheme();
 
-  void removeScheme(final T scheme);
+  void removeScheme(@NotNull T scheme);
 
-  @NotNull Collection<String> getAllSchemeNames();
+  @NotNull
+  Collection<String> getAllSchemeNames();
 
   File getRootDirectory();
 }
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 a36968f3f251..4adb43543214 100644
--- a/platform/core-impl/src/com/intellij/openapi/options/AbstractSchemesManager.java
+++ b/platform/core-impl/src/com/intellij/openapi/options/AbstractSchemesManager.java
@@ -73,15 +73,16 @@ public abstract class AbstractSchemesManager<T extends Scheme, E extends Externa
 
   @Override
   public void clearAllSchemes() {
-    for (T t : getAllSchemes()) {
-      removeScheme(t);
+    for (T myScheme : mySchemes) {
+      onSchemeDeleted(myScheme);
     }
+    mySchemes.clear();
   }
 
   @Override
   @NotNull
   public List<T> getAllSchemes() {
-    return new ArrayList<T>(mySchemes);
+    return Collections.unmodifiableList(mySchemes);
   }
 
   @Override
@@ -112,37 +113,28 @@ public abstract class AbstractSchemesManager<T extends Scheme, E extends Externa
   }
 
   @Override
-  public void removeScheme(final T scheme) {
-    String schemeName = scheme.getName();
-    Scheme toDelete = findSchemeToDelete(schemeName);
+  public void removeScheme(@NotNull T scheme) {
+    for (int i = 0, n = mySchemes.size(); i < n; i++) {
+      T s = mySchemes.get(i);
+      if (scheme.getName().equals(s.getName())) {
+        onSchemeDeleted(s);
+        mySchemes.remove(i);
+        break;
+      }
+    }
+  }
 
-    //noinspection SuspiciousMethodCalls
-    mySchemes.remove(toDelete);
+  protected void onSchemeDeleted(@NotNull Scheme toDelete) {
     if (myCurrentScheme == toDelete) {
       myCurrentScheme = null;
     }
-
-    onSchemeDeleted(toDelete);
-  }
-
-  protected abstract void onSchemeDeleted(@NotNull Scheme toDelete);
-
-  private Scheme findSchemeToDelete(final String schemeName) {
-    for (T scheme : mySchemes) {
-      if (Comparing.equal(schemeName, scheme.getName())) return scheme;
-    }
-    return null;
   }
 
   @Override
   @NotNull
   public Collection<String> getAllSchemeNames() {
-    return getAllSchemeNames(mySchemes);
-  }
-
-  public Collection<String> getAllSchemeNames(@NotNull Collection<T> schemes) {
-    Set<String> names = new THashSet<String>(schemes.size());
-    for (T scheme : schemes) {
+    List<String> names = new ArrayList<String>(mySchemes.size());
+    for (T scheme : mySchemes) {
       names.add(scheme.getName());
     }
     return names;
@@ -181,6 +173,10 @@ public abstract class AbstractSchemesManager<T extends Scheme, E extends Externa
     return false;
   }
 
+  @Override
+  public void exportScheme(@NotNull final E scheme, final String name, final String description) {
+  }
+
   protected boolean isExternalizable(final T scheme) {
     return scheme instanceof ExternalizableScheme;
   }
diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/InspectionProfileManagerImpl.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/InspectionProfileManagerImpl.java
index 4450ee99f94e..7d8c01c82d81 100644
--- a/platform/lang-impl/src/com/intellij/profile/codeInspection/InspectionProfileManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/InspectionProfileManagerImpl.java
@@ -193,7 +193,7 @@ public class InspectionProfileManagerImpl extends InspectionProfileManager imple
   @Override
   public void initProfiles() {
     if (myProfilesAreInitialized.getAndSet(true)) {
-      if (mySchemesManager.getAllSchemeNames().isEmpty()) {
+      if (mySchemesManager.getAllSchemes().isEmpty()) {
         createDefaultProfile();
       }
       return;
@@ -201,8 +201,7 @@ public class InspectionProfileManagerImpl extends InspectionProfileManager imple
     if (!LOAD_PROFILES) return;
 
     mySchemesManager.loadSchemes();
-    final Collection<Profile> profiles = mySchemesManager.getAllSchemes();
-
+    Collection<Profile> profiles = mySchemesManager.getAllSchemes();
     if (profiles.isEmpty()) {
       createDefaultProfile();
     }
@@ -337,8 +336,7 @@ public class InspectionProfileManagerImpl extends InspectionProfileManager imple
   @Override
   @NotNull
   public String[] getAvailableProfileNames() {
-    final Collection<String> names = mySchemesManager.getAllSchemeNames();
-    return ArrayUtil.toStringArray(names);
+    return ArrayUtil.toStringArray(mySchemesManager.getAllSchemeNames());
   }
 
   @Override
@@ -346,11 +344,6 @@ public class InspectionProfileManagerImpl extends InspectionProfileManager imple
     return getProfile(name, true);
   }
 
-  @NotNull
-  public SchemesManager<Profile, InspectionProfileImpl> getSchemesManager() {
-    return mySchemesManager;
-  }
-
   public static void onProfilesChanged() {
     //cleanup caches blindly for all projects in case ide profile was modified
     for (final Project project : ProjectManager.getInstance().getOpenProjects()) {
diff --git a/platform/lang-impl/src/com/intellij/tools/BaseToolManager.java b/platform/lang-impl/src/com/intellij/tools/BaseToolManager.java
index 478f60eed51a..3db9e9206140 100644
--- a/platform/lang-impl/src/com/intellij/tools/BaseToolManager.java
+++ b/platform/lang-impl/src/com/intellij/tools/BaseToolManager.java
@@ -20,9 +20,12 @@ package com.intellij.tools;
 import com.intellij.openapi.actionSystem.ex.ActionManagerEx;
 import com.intellij.openapi.components.ExportableApplicationComponent;
 import com.intellij.openapi.components.RoamingType;
-import com.intellij.openapi.options.*;
+import com.intellij.openapi.options.SchemeProcessor;
+import com.intellij.openapi.options.SchemesManager;
+import com.intellij.openapi.options.SchemesManagerFactory;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.util.ArrayUtil;
+import com.intellij.util.SmartList;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -77,7 +80,7 @@ public abstract class BaseToolManager<T extends Tool> implements ExportableAppli
   }
 
   public List<T> getTools() {
-    ArrayList<T> result = new ArrayList<T>();
+    List<T> result = new SmartList<T>();
     for (ToolsGroup group : mySchemesManager.getAllSchemes()) {
       result.addAll(group.getElements());
     }
diff --git a/platform/platform-api/src/com/intellij/openapi/options/CompoundScheme.java b/platform/platform-api/src/com/intellij/openapi/options/CompoundScheme.java
index 9380f2780beb..93c45716dbdd 100644
--- a/platform/platform-api/src/com/intellij/openapi/options/CompoundScheme.java
+++ b/platform/platform-api/src/com/intellij/openapi/options/CompoundScheme.java
@@ -24,7 +24,6 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-
 public class CompoundScheme<T extends SchemeElement> implements ExternalizableScheme {
 
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.options.CompoundScheme");
@@ -49,8 +48,6 @@ public class CompoundScheme<T extends SchemeElement> implements ExternalizableSc
     }
   }
 
-
-
   public List<T> getElements() {
     return Collections.unmodifiableList(new ArrayList<T>(myElements));
   }
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 6a26c2350e0e..d2cae4a2d4f6 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
@@ -51,8 +51,7 @@ import org.jetbrains.annotations.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 
@@ -214,18 +213,17 @@ public class EditorColorsManagerImpl extends EditorColorsManager implements Name
   @NotNull
   @Override
   public EditorColorsScheme[] getAllSchemes() {
-    List<EditorColorsScheme> schemes = new ArrayList<EditorColorsScheme>(mySchemesManager.getAllSchemes());
-    Collections.sort(schemes, new Comparator<EditorColorsScheme>() {
+    List<EditorColorsScheme> schemes = mySchemesManager.getAllSchemes();
+    EditorColorsScheme[] result = schemes.toArray(new EditorColorsScheme[schemes.size()]);
+    Arrays.sort(result, new Comparator<EditorColorsScheme>() {
       @Override
       public int compare(@NotNull EditorColorsScheme s1, @NotNull EditorColorsScheme s2) {
         if (isDefaultScheme(s1) && !isDefaultScheme(s2)) return -1;
         if (!isDefaultScheme(s1) && isDefaultScheme(s2)) return 1;
-
         return s1.getName().compareToIgnoreCase(s2.getName());
       }
     });
-
-    return schemes.toArray(new EditorColorsScheme[schemes.size()]);
+    return result;
   }
 
   @Override
diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java
index 30956c28a412..0cdf59cd8d80 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java
@@ -164,15 +164,18 @@ public class KeymapManagerImpl extends KeymapManagerEx implements PersistentStat
   }
 
   public void removeAllKeymapsExceptUnmodifiable() {
-    for (Keymap keymap : mySchemesManager.getAllSchemes()) {
+    List<Keymap> schemes = mySchemesManager.getAllSchemes();
+    for (int i = schemes.size() - 1; i >= 0; i--) {
+      Keymap keymap = schemes.get(i);
       if (keymap.canModify()) {
         mySchemesManager.removeScheme(keymap);
       }
     }
+
     mySchemesManager.setCurrentSchemeName(null);
 
     Collection<Keymap> keymaps = mySchemesManager.getAllSchemes();
-    if (keymaps.size() > 0) {
+    if (!keymaps.isEmpty()) {
       mySchemesManager.setCurrentSchemeName(keymaps.iterator().next().getName());
     }
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/options/SchemesManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/options/SchemesManagerImpl.java
index 0a571c9fdf0c..a3c07d4483a0 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/SchemesManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/SchemesManagerImpl.java
@@ -431,10 +431,6 @@ public class SchemesManagerImpl<T extends Scheme, E extends ExternalizableScheme
     return myFileSpec + '/' + subPath;
   }
 
-  @Override
-  public void exportScheme(@NotNull final E scheme, final String name, final String description) throws WriteExternalException, IOException {
-  }
-
   @Override
   public boolean isImportAvailable() {
     return false;
@@ -632,6 +628,8 @@ public class SchemesManagerImpl<T extends Scheme, E extends ExternalizableScheme
 
   @Override
   protected void onSchemeDeleted(@NotNull Scheme toDelete) {
+    super.onSchemeDeleted(toDelete);
+
     if (toDelete instanceof ExternalizableScheme) {
       ContainerUtilRt.addIfNotNull(myFilesToDelete, ((ExternalizableScheme)toDelete).getExternalInfo().getCurrentFileName());
     }