From a5445b330cbbded7b905c9e6df570f702516dbfd Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Tue, 2 May 2017 16:45:09 +0300
Subject: [PATCH] vcs: cleanup - inline method

---
 .../vcs/changes/ChangeListsIndexes.java       |  1 +
 .../openapi/vcs/changes/ChangesDelta.java     | 27 +++++++------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListsIndexes.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListsIndexes.java
index 12982d68f1f1..87a9b051630a 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListsIndexes.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListsIndexes.java
@@ -160,6 +160,7 @@ public class ChangeListsIndexes {
     return new BaseRevision(data.vcsKey, data.revision, path);
   }
 
+  @NotNull
   public List<BaseRevision> getAffectedFilesUnderVcs() {
     final List<BaseRevision> result = new ArrayList<>();
     for (Map.Entry<FilePath, Data> entry : myMap.entrySet()) {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesDelta.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesDelta.java
index 00551052494e..788837477310 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesDelta.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesDelta.java
@@ -17,26 +17,25 @@ package com.intellij.openapi.vcs.changes;
 
 import com.intellij.openapi.vcs.changes.ui.PlusMinusModify;
 import com.intellij.util.BeforeAfter;
+import org.jetbrains.annotations.NotNull;
 
-import java.util.Collection;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 public class ChangesDelta {
   private final PlusMinusModify<BaseRevision> myDeltaListener;
   private boolean myInitialized;
 
-  public ChangesDelta(final PlusMinusModify<BaseRevision> deltaListener) {
+  public ChangesDelta(@NotNull PlusMinusModify<BaseRevision> deltaListener) {
     myDeltaListener = deltaListener;
   }
 
-  // true -> something changed
   public boolean notifyPathsChanged(final ChangeListsIndexes was, final ChangeListsIndexes became) {
-    List<BaseRevision> wasAffected = was.getAffectedFilesUnderVcs();
-    if (! myInitialized) {
-      sendPlus(wasAffected);
+    if (!myInitialized) {
       myInitialized = true;
+      for (BaseRevision pair : was.getAffectedFilesUnderVcs()) {
+        myDeltaListener.plus(pair);
+      }
       return true;  //+-
     }
 
@@ -48,18 +47,12 @@ public class ChangesDelta {
     for (BaseRevision pair : toRemove) {
       myDeltaListener.minus(pair);
     }
-    sendPlus(toAdd);
+    for (BaseRevision pair : toAdd) {
+      myDeltaListener.plus(pair);
+    }
     for (BeforeAfter<BaseRevision> beforeAfter : toModify) {
       myDeltaListener.modify(beforeAfter.getBefore(), beforeAfter.getAfter());
     }
-    return ! toRemove.isEmpty() || ! toAdd.isEmpty();
-  }
-
-  private void sendPlus(final Collection<BaseRevision> toAdd) {
-    if (toAdd != null) {
-      for (BaseRevision pair : toAdd) {
-        myDeltaListener.plus(pair);
-      }
-    }
+    return !toRemove.isEmpty() || !toAdd.isEmpty();
   }
 }