From 32453bd768677fd4582ec83ea2d228caf1482d0e Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Tue, 26 Nov 2013 12:40:42 +0100
Subject: [PATCH] cleanup

---
 .../impl/stores/CompoundSaveSession.java      | 30 ++++++++-----------
 .../impl/stores/StateStorageManagerImpl.java  | 22 +++++++-------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/CompoundSaveSession.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/CompoundSaveSession.java
index 0c20859283e1..51cc717726f3 100644
--- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/CompoundSaveSession.java
+++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/CompoundSaveSession.java
@@ -17,33 +17,30 @@ package com.intellij.openapi.components.impl.stores;
 
 import com.intellij.openapi.components.StateStorage;
 import com.intellij.openapi.components.StateStorageException;
+import com.intellij.util.SmartList;
 import com.intellij.util.io.fs.IFile;
+import gnu.trove.THashMap;
 
-import java.util.*;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author mike
  */
 public class CompoundSaveSession {
-  private final Map<StateStorage, StateStorage.SaveSession> mySaveSessions = new HashMap<StateStorage, StateStorage.SaveSession>();
+  private final Map<StateStorage, StateStorage.SaveSession> mySaveSessions = new THashMap<StateStorage, StateStorage.SaveSession>();
 
   public CompoundSaveSession(final CompoundExternalizationSession compoundExternalizationSession) {
-    final Collection<StateStorage> stateStorages = compoundExternalizationSession.getStateStorages();
-
-    for (StateStorage stateStorage : stateStorages) {
+    for (StateStorage stateStorage : compoundExternalizationSession.getStateStorages()) {
       mySaveSessions.put(stateStorage, stateStorage.startSave(compoundExternalizationSession.getExternalizationSession(stateStorage)));
     }
   }
 
   public List<IFile> getAllStorageFilesToSave() throws StateStorageException {
-    List<IFile> result = new ArrayList<IFile>();
-
-    for (StateStorage stateStorage : mySaveSessions.keySet()) {
-      final StateStorage.SaveSession saveSession = mySaveSessions.get(stateStorage);
-
+    List<IFile> result = new SmartList<IFile>();
+    for (StateStorage.SaveSession saveSession : mySaveSessions.values()) {
       result.addAll(saveSession.getStorageFilesToSave());
     }
-
     return result;
   }
 
@@ -56,11 +53,11 @@ public class CompoundSaveSession {
   public void finishSave() {
     RuntimeException re = null;
     for (StateStorage stateStorage : mySaveSessions.keySet()) {
-      final StateStorage.SaveSession saveSession = mySaveSessions.get(stateStorage);
       try {
-        stateStorage.finishSave(saveSession);
-      } catch(RuntimeException t) {
-        re = t;
+        stateStorage.finishSave(mySaveSessions.get(stateStorage));
+      }
+      catch (RuntimeException e) {
+        re = e;
       }
     }
 
@@ -74,11 +71,10 @@ public class CompoundSaveSession {
   }
 
   public List<IFile> getAllStorageFiles() {
-    List<IFile> result = new ArrayList<IFile>();
+    List<IFile> result = new SmartList<IFile>();
     for (StateStorage.SaveSession saveSession : mySaveSessions.values()) {
       result.addAll(saveSession.getAllStorageFiles());
     }
-
     return result;
   }
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StateStorageManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StateStorageManagerImpl.java
index c7c4aec145d0..1b7da8fc2144 100644
--- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StateStorageManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StateStorageManagerImpl.java
@@ -31,6 +31,7 @@ import com.intellij.util.ObjectUtils;
 import com.intellij.util.SmartList;
 import com.intellij.util.io.fs.IFile;
 import gnu.trove.THashMap;
+import gnu.trove.THashSet;
 import gnu.trove.TObjectLongHashMap;
 import org.jdom.Document;
 import org.jdom.Element;
@@ -468,19 +469,18 @@ public abstract class StateStorageManagerImpl implements StateStorageManager, Di
     @Override
     @Nullable
     public Set<String> analyzeExternalChanges(@NotNull final Set<Pair<VirtualFile, StateStorage>> changedFiles) {
-      Set<String> result = new HashSet<String>();
-
-      nextStorage:
+      Set<String> result = new THashSet<String>();
       for (Pair<VirtualFile, StateStorage> pair : changedFiles) {
-        final StateStorage stateStorage = pair.second;
-        final StateStorage.SaveSession saveSession = myCompoundSaveSession.getSaveSession(stateStorage);
-        if (saveSession == null) continue nextStorage;
-        final Set<String> s = saveSession.analyzeExternalChanges(changedFiles);
-
-        if (s == null) return null;
-        result.addAll(s);
+        final StateStorage.SaveSession saveSession = myCompoundSaveSession.getSaveSession(pair.second);
+        if (saveSession == null) {
+          continue;
+        }
+        final Set<String> changes = saveSession.analyzeExternalChanges(changedFiles);
+        if (changes == null) {
+          return null;
+        }
+        result.addAll(changes);
       }
-
       return result;
     }
   }