From 524e73d08026607823b2115ea1535f2480eb8fea Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Sun, 31 Aug 2014 10:41:43 +0200
Subject: [PATCH] cleanup

---
 .../openapi/options/AbstractSchemesManager.java    |  3 +--
 .../openapi/options/SchemesManagerFactoryImpl.java | 14 ++++++++------
 .../openapi/options/SchemesManagerImpl.java        |  2 +-
 3 files changed, 10 insertions(+), 9 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 d1ed93f3a2be..ebb2896d2a8e 100644
--- a/platform/core-impl/src/com/intellij/openapi/options/AbstractSchemesManager.java
+++ b/platform/core-impl/src/com/intellij/openapi/options/AbstractSchemesManager.java
@@ -29,8 +29,7 @@ import java.util.*;
 
 
 public abstract class AbstractSchemesManager<T extends Scheme, E extends ExternalizableScheme> implements SchemesManager<T,E> {
-
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.options.AbstractSchemesManager");
+  private static final Logger LOG = Logger.getInstance(AbstractSchemesManager.class);
 
   protected final List<T> mySchemes = new ArrayList<T>();
   private volatile T myCurrentScheme;
diff --git a/platform/platform-impl/src/com/intellij/openapi/options/SchemesManagerFactoryImpl.java b/platform/platform-impl/src/com/intellij/openapi/options/SchemesManagerFactoryImpl.java
index 4db0e54e02bf..449a2180e3c1 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/SchemesManagerFactoryImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/SchemesManagerFactoryImpl.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.application.impl.ApplicationImpl;
 import com.intellij.openapi.components.RoamingType;
 import com.intellij.openapi.components.ServiceBean;
 import com.intellij.openapi.components.SettingsSavingComponent;
+import com.intellij.openapi.components.impl.stores.IApplicationStore;
 import com.intellij.openapi.components.impl.stores.StreamProvider;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.util.containers.ContainerUtil;
@@ -32,8 +33,7 @@ import java.util.Collections;
 import java.util.List;
 
 public class SchemesManagerFactoryImpl extends SchemesManagerFactory implements SettingsSavingComponent {
-
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.options.SchemesManagerFactoryImpl");
+  private static final Logger LOG = Logger.getInstance(SchemesManagerFactoryImpl.class);
 
   private final List<SchemesManagerImpl> myRegisteredManagers = ContainerUtil.createLockFreeCopyOnWriteList();
 
@@ -42,11 +42,13 @@ public class SchemesManagerFactoryImpl extends SchemesManagerFactory implements
                                                                                                       @NotNull SchemeProcessor<E> processor,
                                                                                                       @NotNull RoamingType roamingType) {
     final Application application = ApplicationManager.getApplication();
-    if (!(application instanceof ApplicationImpl)) return null;
-    String baseDirPath = ((ApplicationImpl)application).getStateStore().getStateStorageManager().expandMacros(fileSpec);
-
+    if (!(application instanceof ApplicationImpl)) {
+      return null;
+    }
+    IApplicationStore applicationStore = ((ApplicationImpl)application).getStateStore();
+    String baseDirPath = applicationStore.getStateStorageManager().expandMacros(fileSpec);
     if (baseDirPath != null) {
-      StreamProvider provider = ((ApplicationImpl)ApplicationManager.getApplication()).getStateStore().getStateStorageManager().getStreamProvider();
+      StreamProvider provider = applicationStore.getStateStorageManager().getStreamProvider();
       SchemesManagerImpl<T, E> manager = new SchemesManagerImpl<T, E>(fileSpec, processor, roamingType, provider, new File(baseDirPath));
       myRegisteredManagers.add(manager);
       return manager;
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 2db58ea08d94..4ff3ebba1ee9 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/SchemesManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/SchemesManagerImpl.java
@@ -52,7 +52,7 @@ import java.io.IOException;
 import java.util.*;
 
 public class SchemesManagerImpl<T extends Scheme, E extends ExternalizableScheme> extends AbstractSchemesManager<T, E> {
-  private static final Logger LOG = Logger.getInstance("#" + SchemesManagerFactoryImpl.class.getName());
+  private static final Logger LOG = Logger.getInstance(SchemesManagerFactoryImpl.class);
 
   @NonNls private static final String DEFAULT_EXT = ".xml";