From 14f8e50af23e6fba7b4e1186a935267adb5bdff6 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Thu, 28 Apr 2016 15:44:06 +0300
Subject: [PATCH] Revert "patch: apply somehow - make double click on splitter
 reset to default proportions"

This reverts commit aa69c1db045b27a23602b0c2a8e1f1ddd45d3895.
---
 .../com/intellij/diff/tools/util/DiffSplitter.java  |  6 ------
 .../util/src/com/intellij/openapi/ui/Splitter.java  | 13 ++-----------
 .../vcs/changes/patch/tool/ApplyPatchViewer.java    |  3 ++-
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/DiffSplitter.java b/platform/diff-impl/src/com/intellij/diff/tools/util/DiffSplitter.java
index 1fa807c0a35c..241843064edd 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/util/DiffSplitter.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/util/DiffSplitter.java
@@ -41,12 +41,6 @@ public class DiffSplitter extends Splitter {
   @Nullable private AnAction myBottomAction;
 
   public DiffSplitter() {
-     this(.5f);
-  }
-
-  public DiffSplitter(float proportion) {
-    super(false, proportion);
-    setDefaultProportion(proportion);
     setDividerWidth(JBUI.scale(30));
   }
 
diff --git a/platform/util/src/com/intellij/openapi/ui/Splitter.java b/platform/util/src/com/intellij/openapi/ui/Splitter.java
index 204651b6e39b..9fab5dac40db 100644
--- a/platform/util/src/com/intellij/openapi/ui/Splitter.java
+++ b/platform/util/src/com/intellij/openapi/ui/Splitter.java
@@ -57,7 +57,6 @@ public class Splitter extends JPanel implements Splittable {
   private final float myMaxProp;
 
 
-  protected float myDefaultProportion = .5f;
   protected float myProportion;// first size divided by (first + second)
 
   protected final Divider myDivider;
@@ -386,14 +385,6 @@ public class Splitter extends JPanel implements Splittable {
     repaint();
   }
 
-  public void setDefaultProportion(float value) {
-    myDefaultProportion = value;
-  }
-
-  public void resetProportion() {
-    setProportion(myDefaultProportion);
-  }
-
   /**
    * Swaps components.
    */
@@ -579,7 +570,7 @@ public class Splitter extends JPanel implements Splittable {
         new ClickListener() {
           @Override
           public boolean onClick(@NotNull MouseEvent e, int clickCount) {
-            resetProportion();
+            setProportion(.5f);
             return true;
           }
         }.installOn(splitCenterlabel);
@@ -649,7 +640,7 @@ public class Splitter extends JPanel implements Splittable {
           Splitter.this.setOrientation(!Splitter.this.getOrientation());
         }
         if (myResizeEnabled && e.getClickCount() == 2) {
-          resetProportion();
+          Splitter.this.setProportion(.5f);
         }
       }
     }
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/tool/ApplyPatchViewer.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/tool/ApplyPatchViewer.java
index 0ee619d0d890..23f7339cba56 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/tool/ApplyPatchViewer.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/tool/ApplyPatchViewer.java
@@ -98,7 +98,8 @@ class ApplyPatchViewer implements Disposable {
     patchPanel.add(myViewer.getPatchTitle(), BorderLayout.NORTH);
 
 
-    myPatchSplitter = new DiffSplitter(2f / 3);
+    myPatchSplitter = new DiffSplitter();
+    myPatchSplitter.setProportion(2f / 3);
     myPatchSplitter.setFirstComponent(myViewer.getComponent());
     myPatchSplitter.setSecondComponent(patchPanel);
     myPatchSplitter.setHonorComponentsMinimumSize(false);