From 12fd8d45add703f9f8504180dc117d1a913bb221 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@gmail.com>
Date: Sat, 21 Dec 2013 17:04:33 +0400
Subject: [PATCH] [log] simplify

Remove onSuccess, just make sure loading indicator is hidden after
setting up new table model.
---
 .../impl/src/com/intellij/vcs/log/data/VcsLogFilterer.java | 3 +--
 .../vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUI.java | 1 +
 .../com/intellij/vcs/log/ui/tables/NoGraphTableModel.java  | 7 +------
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFilterer.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFilterer.java
index e2c10b64242d..ae2472111a81 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFilterer.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFilterer.java
@@ -90,13 +90,12 @@ public class VcsLogFilterer {
     });
   }
 
-  public void requestVcs(@NotNull Collection<VcsLogFilter> filters, final Runnable onSuccess) {
+  public void requestVcs(@NotNull Collection<VcsLogFilter> filters) {
     myLogDataHolder.getFilteredDetailsFromTheVcs(filters, new Consumer<List<VcsFullCommitDetails>>() {
       @Override
       public void consume(List<VcsFullCommitDetails> details) {
         myUI.setModel(new NoGraphTableModel(myUI, details, myLogDataHolder.getDataPack().getRefsModel(), false));
         myUI.updateUI();
-        onSuccess.run();
       }
     });
   }
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUI.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUI.java
index fae4fa71d63b..e913daf84e8a 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUI.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUI.java
@@ -95,6 +95,7 @@ public class VcsLogUI {
     if (previousModel instanceof AbstractVcsLogTableModel) { // initially it is an empty DefaultTableModel
       restoreSelection(table, (AbstractVcsLogTableModel)previousModel, selectedRows, model);
     }
+    table.setPaintBusy(false);
   }
 
   private static void restoreSelection(@NotNull VcsLogGraphTable table, @NotNull AbstractVcsLogTableModel previousModel,
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/tables/NoGraphTableModel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/tables/NoGraphTableModel.java
index 639718f1a4d0..418081f8f60e 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/tables/NoGraphTableModel.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/tables/NoGraphTableModel.java
@@ -67,12 +67,7 @@ public class NoGraphTableModel extends AbstractVcsLogTableModel<CommitCell, Hash
     }
 
     myUi.getTable().setPaintBusy(true);
-    myUi.getFilterer().requestVcs(myUi.collectFilters(), new Runnable() {
-      @Override
-      public void run() {
-        myUi.getTable().setPaintBusy(false);
-      }
-    });
+    myUi.getFilterer().requestVcs(myUi.collectFilters());
     myAllowLoadingMoreRequest = false; // Don't send the request to VCS twice
   }