From edd8ac03a62733a19c23b97998f7d09d6479749c Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 17 Oct 2014 17:28:02 +0200
Subject: [PATCH] cleanup

---
 .../template/impl/TemplateSettings.java       | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

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 02fe604990f0..c06f720aef02 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
@@ -88,7 +88,7 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
   @NonNls private static final String KEY = "key";
   @NonNls private static final String ID = "id";
 
-  private final MultiMap<String,TemplateImpl> myTemplates = MultiMap.createLinked();
+  private final MultiMap<String, TemplateImpl> myTemplates = MultiMap.createLinked();
     
   private final Map<String,Template> myTemplatesById = new LinkedHashMap<String,Template>();
   private final Map<TemplateKey,TemplateImpl> myDefaultTemplates = new LinkedHashMap<TemplateKey, TemplateImpl>();
@@ -158,7 +158,6 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
   private TemplateKey myLastSelectedTemplate;
 
   public TemplateSettings(SchemesManagerFactory schemesManagerFactory) {
-
     SchemeProcessor<TemplateGroup> processor = new BaseSchemeProcessor<TemplateGroup>() {
       @Override
       @Nullable
@@ -221,6 +220,10 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
     loadTemplates();
   }
 
+  public static TemplateSettings getInstance() {
+    return ServiceManager.getService(TemplateSettings.class);
+  }
+
   private boolean differsFromDefault(TemplateImpl t) {
     TemplateImpl def = getDefaultTemplate(t);
     if (def == null) return true;
@@ -232,10 +235,6 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
     return myDefaultTemplates.get(TemplateKey.keyOf(t));
   }
 
-  public static TemplateSettings getInstance() {
-    return ServiceManager.getService(TemplateSettings.class);
-  }
-
   @Override
   public void loadState(Element parentNode) {
     Element element = parentNode.getChild(DEFAULT_SHORTCUT);
@@ -256,9 +255,7 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
     else {
       Element deleted = parentNode.getChild(DELETED_TEMPLATES);
       if (deleted != null) {
-        List children = deleted.getChildren();
-        for (final Object aChildren : children) {
-          Element child = (Element)aChildren;
+        for (Element child : deleted.getChildren()) {
           myDeletedTemplates.add(new TemplateKey(child.getAttributeValue(GROUP), child.getAttributeValue(NAME)));
         }
       }
@@ -266,20 +263,17 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
 
     for (TemplateKey templateKey : myDeletedTemplates) {
       if (templateKey.groupName == null) {
-        final Collection<TemplateImpl> templates = new ArrayList<TemplateImpl>(myTemplates.get(templateKey.key));
-        for (TemplateImpl template : templates) {
+        for (TemplateImpl template : new ArrayList<TemplateImpl>(myTemplates.get(templateKey.key))) {
           removeTemplate(template);
         }
       }
       else {
-        final TemplateImpl toDelete = getTemplate(templateKey.key, templateKey.groupName);
+        TemplateImpl toDelete = getTemplate(templateKey.key, templateKey.groupName);
         if (toDelete != null) {
           removeTemplate(toDelete);
         }
       }
     }
-
-    //TODO lesya reload schemes
   }
 
   @Override
@@ -309,6 +303,7 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
     myLastSelectedTemplate = group == null ? null : new TemplateKey(group, key);
   }
 
+  @SuppressWarnings("unused")
   public Collection<? extends TemplateImpl> getTemplatesAsList() {
     return myTemplates.values();
   }
@@ -398,19 +393,15 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
     }
   }
 
-  public void removeTemplate(Template template) {
+  public void removeTemplate(@NotNull Template template) {
     myTemplates.remove(template.getKey(), (TemplateImpl)template);
 
-    TemplateImpl templateImpl = (TemplateImpl)template;
-    String groupName = templateImpl.getGroupName();
-    TemplateGroup group = mySchemesManager.findSchemeByName(groupName);
-
+    TemplateGroup group = mySchemesManager.findSchemeByName(((TemplateImpl)template).getGroupName());
     if (group != null) {
       group.removeElement((TemplateImpl)template);
       if (group.isEmpty()) {
         mySchemesManager.removeScheme(group);
       }
-
     }
   }