From d3ecd5925f00cd592fb3dc051929b4bf0dff3041 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Tue, 12 May 2015 16:08:24 +0300
Subject: [PATCH] diff: remove duplication - merge same method implementations

---
 .../src/com/intellij/diff/tools/binary/BinaryDiffViewer.java | 5 -----
 .../intellij/diff/tools/fragmented/OnesideDiffViewer.java    | 5 -----
 .../src/com/intellij/diff/tools/util/base/DiffPanelBase.java | 4 ----
 .../com/intellij/diff/tools/util/base/DiffViewerBase.java    | 2 +-
 .../diff/tools/util/threeside/ThreesideTextDiffViewer.java   | 5 -----
 .../diff/tools/util/twoside/TwosideTextDiffViewer.java       | 5 -----
 6 files changed, 1 insertion(+), 25 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 f8a9b63b4d70..c82f33d9c3d4 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
@@ -390,11 +390,6 @@ public class BinaryDiffViewer extends ListenerDiffViewerBase {
   // Misc
   //
 
-  @Override
-  protected boolean tryRediffSynchronously() {
-    return myPanel.isWindowFocused();
-  }
-
   @Nullable
   @Override
   protected OpenFileDescriptor getOpenFileDescriptor() {
diff --git a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideDiffViewer.java
index 4146860c90f5..9365db857bca 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideDiffViewer.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideDiffViewer.java
@@ -785,11 +785,6 @@ public class OnesideDiffViewer extends TextDiffViewerBase {
   // Misc
   //
 
-  @Override
-  protected boolean tryRediffSynchronously() {
-    return myPanel.isWindowFocused();
-  }
-
   @Nullable
   @Override
   protected OpenFileDescriptor getOpenFileDescriptor() {
diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffPanelBase.java b/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffPanelBase.java
index 4a87aa5fc675..2c7932f522f6 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffPanelBase.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffPanelBase.java
@@ -82,10 +82,6 @@ public abstract class DiffPanelBase extends JPanel implements DataProvider {
     return null;
   }
 
-  public boolean isWindowFocused() {
-    return myContext.isWindowFocused();
-  }
-
   public boolean isFocused() {
     return myContext.isFocused();
   }
diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java b/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java
index cb611e72397e..5f41070aa91f 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java
@@ -157,7 +157,7 @@ public abstract class DiffViewerBase implements DiffViewer, DataProvider {
 
   @CalledInAwt
   protected boolean tryRediffSynchronously() {
-    return true;
+    return myContext.isWindowFocused();
   }
 
   @Nullable
diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/threeside/ThreesideTextDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/util/threeside/ThreesideTextDiffViewer.java
index 0a594fd791ec..811f21787420 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/util/threeside/ThreesideTextDiffViewer.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/util/threeside/ThreesideTextDiffViewer.java
@@ -302,11 +302,6 @@ public abstract class ThreesideTextDiffViewer extends TextDiffViewerBase {
   // Misc
   //
 
-  @Override
-  protected boolean tryRediffSynchronously() {
-    return myPanel.isWindowFocused();
-  }
-
   @Nullable
   @Override
   protected OpenFileDescriptor getOpenFileDescriptor() {
diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideTextDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideTextDiffViewer.java
index 4678f4b7cbf9..d97fd764a900 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideTextDiffViewer.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideTextDiffViewer.java
@@ -352,11 +352,6 @@ public abstract class TwosideTextDiffViewer extends TextDiffViewerBase {
   // Misc
   //
 
-  @Override
-  protected boolean tryRediffSynchronously() {
-    return myPanel.isWindowFocused();
-  }
-
   @Nullable
   @Override
   protected OpenFileDescriptor getOpenFileDescriptor() {