From aeea38795f849113cfaf35c5ae79acdb3f5dea67 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Tue, 12 May 2015 16:29:46 +0300
Subject: [PATCH] diff: remove duplication - reuse StatusPanel

---
 .../diff/tools/binary/BinaryDiffViewer.java   | 37 +++++--------------
 .../intellij/diff/tools/util/StatusPanel.java |  2 +
 2 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/platform/diff-impl/src/com/intellij/diff/tools/binary/BinaryDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/binary/BinaryDiffViewer.java
index c82f33d9c3d4..203e13ea8119 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/binary/BinaryDiffViewer.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/binary/BinaryDiffViewer.java
@@ -17,17 +17,21 @@ package com.intellij.diff.tools.binary;
 
 import com.intellij.diff.DiffContext;
 import com.intellij.diff.actions.impl.FocusOppositePaneAction;
-import com.intellij.diff.contents.*;
+import com.intellij.diff.contents.DiffContent;
+import com.intellij.diff.contents.DocumentContent;
+import com.intellij.diff.contents.EmptyContent;
+import com.intellij.diff.contents.FileContent;
 import com.intellij.diff.requests.ContentDiffRequest;
 import com.intellij.diff.requests.DiffRequest;
+import com.intellij.diff.tools.util.StatusPanel;
 import com.intellij.diff.tools.util.base.ListenerDiffViewerBase;
 import com.intellij.diff.util.DiffUserDataKeys;
 import com.intellij.diff.util.DiffUtil;
 import com.intellij.diff.util.Side;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
@@ -48,16 +52,12 @@ import com.intellij.openapi.util.Couple;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.ui.IdeBorderFactory;
-import com.intellij.util.ui.AnimatedIcon;
-import com.intellij.util.ui.AsyncProcessIcon;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import java.awt.*;
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
 import java.io.IOException;
@@ -472,27 +472,10 @@ public class BinaryDiffViewer extends ListenerDiffViewerBase {
     return super.getData(dataId);
   }
 
-  private static class MyStatusPanel extends JPanel {
-    private final AnimatedIcon myBusySpinner;
-
-    public MyStatusPanel() {
-      super(new BorderLayout());
-      myBusySpinner = new AsyncProcessIcon("StatusPanelSpinner");
-      myBusySpinner.setVisible(false);
-
-      add(myBusySpinner, BorderLayout.WEST);
-      setBorder(IdeBorderFactory.createEmptyBorder(0, 4, 0, 4));
-    }
-
-    public void setBusy(boolean busy) {
-      if (busy) {
-        myBusySpinner.setVisible(true);
-        myBusySpinner.resume();
-      }
-      else {
-        myBusySpinner.setVisible(false);
-        myBusySpinner.suspend();
-      }
+  private static class MyStatusPanel extends StatusPanel {
+    @Override
+    protected int getChangesCount() {
+      return -1;
     }
   }
 
diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/StatusPanel.java b/platform/diff-impl/src/com/intellij/diff/tools/util/StatusPanel.java
index 2fe2db5fd8aa..1f55eb4d6094 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/util/StatusPanel.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/util/StatusPanel.java
@@ -30,6 +30,7 @@ public abstract class StatusPanel extends JPanel {
   public StatusPanel() {
     super(new BorderLayout());
     myTextLabel = new JLabel("");
+    myTextLabel.setVisible(false);
     myBusySpinner = new AsyncProcessIcon("StatusPanelSpinner");
     myBusySpinner.setVisible(false);
 
@@ -40,6 +41,7 @@ public abstract class StatusPanel extends JPanel {
 
   public void update() {
     int count = getChangesCount();
+    myTextLabel.setVisible(count != -1);
     myTextLabel.setText(DiffBundle.message("diff.count.differences.status.text", count));
   }