From 30c34a2342dbc809d4bd000647f67cbd2232faab Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Wed, 18 Feb 2015 07:54:30 +0100
Subject: [PATCH] cleanup

---
 .../intellij/openapi/options/SchemesManager.java    |  2 +-
 .../openapi/options/AbstractSchemesManager.java     | 13 +++++++------
 .../editor/colors/impl/EditorColorsManagerImpl.java |  4 ++--
 3 files changed, 10 insertions(+), 9 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 2eb5875cee28..cef94aefcc06 100644
--- a/platform/core-api/src/com/intellij/openapi/options/SchemesManager.java
+++ b/platform/core-api/src/com/intellij/openapi/options/SchemesManager.java
@@ -94,7 +94,7 @@ public interface SchemesManager <T extends Scheme, E extends ExternalizableSchem
 
   void save();
 
-  void setCurrentSchemeName(final String schemeName);
+  void setCurrentSchemeName(@Nullable String schemeName);
 
   @Nullable
   T getCurrentScheme();
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 a1f4d8a1b3e0..ba12a9d04ea6 100644
--- a/platform/core-impl/src/com/intellij/openapi/options/AbstractSchemesManager.java
+++ b/platform/core-impl/src/com/intellij/openapi/options/AbstractSchemesManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 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.
@@ -55,15 +55,16 @@ public abstract class AbstractSchemesManager<T extends Scheme, E extends Externa
     checkCurrentScheme(scheme);
   }
 
-  protected void checkCurrentScheme(final Scheme scheme) {
-    if (myCurrentScheme == null && myCurrentSchemeName != null && myCurrentSchemeName.equals(scheme.getName())) {
+  protected void checkCurrentScheme(@NotNull Scheme scheme) {
+    if (myCurrentScheme == null && scheme.getName().equals(myCurrentSchemeName)) {
       //noinspection unchecked
       myCurrentScheme = (T)scheme;
     }
   }
 
-  private Collection<String> collectExistingNames(final Collection<T> schemes) {
-    Set<String> result = new THashSet<String>();
+  @NotNull
+  private Collection<String> collectExistingNames(@NotNull Collection<T> schemes) {
+    Set<String> result = new THashSet<String>(schemes.size());
     for (T scheme : schemes) {
       result.add(scheme.getName());
     }
@@ -96,7 +97,7 @@ public abstract class AbstractSchemesManager<T extends Scheme, E extends Externa
   }
 
   @Override
-  public void setCurrentSchemeName(final String schemeName) {
+  public void setCurrentSchemeName(@Nullable String schemeName) {
     myCurrentSchemeName = schemeName;
     myCurrentScheme = schemeName == null ? null : findSchemeByName(schemeName);
   }
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 99da2de076c0..e9aaec4b4d9f 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
@@ -69,6 +69,7 @@ public class EditorColorsManagerImpl extends EditorColorsManager implements Name
   private final SchemesManager<EditorColorsScheme, EditorColorsSchemeImpl> mySchemesManager;
   @NonNls private static final String NAME_ATTR = "name";
   private static final String FILE_SPEC = StoragePathMacros.ROOT_CONFIG + "/colors";
+  @NonNls
   private static final String FILE_EXT = ".icls";
 
   public EditorColorsManagerImpl(DefaultColorSchemesManager defaultColorSchemesManager, SchemesManagerFactory schemesManagerFactory) {
@@ -237,8 +238,7 @@ public class EditorColorsManagerImpl extends EditorColorsManager implements Name
   }
 
   private void setGlobalSchemeInner(@Nullable EditorColorsScheme scheme) {
-    String newValue = scheme == null ? getDefaultScheme().getName() : scheme.getName();
-    mySchemesManager.setCurrentSchemeName(newValue);
+    mySchemesManager.setCurrentSchemeName(scheme == null ? getDefaultScheme().getName() : scheme.getName());
   }
 
   @NotNull