diff --git a/platform/platform-impl/src/com/intellij/ui/SplitterWithSecondHideable.java b/platform/platform-impl/src/com/intellij/ui/SplitterWithSecondHideable.java index 85110581c2e1..49839748a5db 100644 --- a/platform/platform-impl/src/com/intellij/ui/SplitterWithSecondHideable.java +++ b/platform/platform-impl/src/com/intellij/ui/SplitterWithSecondHideable.java @@ -20,7 +20,7 @@ import com.intellij.openapi.ui.Divider; import com.intellij.openapi.ui.PseudoSplitter; import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.vcs.changes.RefreshablePanel; -import com.intellij.util.ui.UIUtil; +import com.intellij.util.ui.JBUI; import javax.swing.*; import java.awt.*; @@ -29,12 +29,6 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseMotionListener; import java.awt.event.MouseWheelEvent; -/** - * Created by IntelliJ IDEA. - * User: Irina.Chernushina - * Date: 8/22/11 - * Time: 2:33 PM - */ public abstract class SplitterWithSecondHideable { public interface OnOffListener { void on(T t); @@ -43,17 +37,15 @@ public abstract class SplitterWithSecondHideable { private final PseudoSplitter mySplitter; private final AbstractTitledSeparatorWithIcon myTitledSeparator; - private final boolean myVertical; private final OnOffListener myListener; private final JPanel myFictivePanel; private Splitter.DividerImpl mySuperDivider; private float myPreviousProportion; - public SplitterWithSecondHideable(final boolean vertical, - final String separatorText, - final JComponent firstComponent, - final OnOffListener listener) { - myVertical = vertical; + public SplitterWithSecondHideable(boolean vertical, + String separatorText, + JComponent firstComponent, + OnOffListener listener) { myListener = listener; myFictivePanel = new JPanel(new BorderLayout()); Icon icon; @@ -119,8 +111,7 @@ public abstract class SplitterWithSecondHideable { myTitledSeparator.mySeparator.addMouseListener(new MouseAdapter() { @Override public void mouseEntered(MouseEvent e) { - myTitledSeparator.mySeparator - .setCursor(myTitledSeparator.myOn ? new Cursor(Cursor.S_RESIZE_CURSOR) : new Cursor(Cursor.DEFAULT_CURSOR)); + myTitledSeparator.mySeparator.setCursor(new Cursor(myTitledSeparator.myOn ? Cursor.S_RESIZE_CURSOR : Cursor.DEFAULT_CURSOR)); ((MyDivider)mySuperDivider).processMouseEvent(e); } @@ -179,7 +170,7 @@ public abstract class SplitterWithSecondHideable { mySuperDivider = new MyDivider(); mySuperDivider.add(myTitledSeparator, new GridBagConstraints(0, 0, 1, 1, 1, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, - new Insets(0, 0, 0, 0), 0, 0)); + JBUI.emptyInsets(), 0, 0)); return mySuperDivider; } @@ -211,10 +202,6 @@ public abstract class SplitterWithSecondHideable { myTitledSeparator.setText(value); } - public void setEnabledColor(final boolean enabled) { - myTitledSeparator.myLabel.setForeground(enabled ? UIUtil.getActiveTextColor() : UIUtil.getInactiveTextColor()); - } - public Splitter getComponent() { return mySplitter; } diff --git a/platform/util/src/com/intellij/openapi/ui/PseudoSplitter.java b/platform/util/src/com/intellij/openapi/ui/PseudoSplitter.java index ff8c67c1b561..e54397364574 100644 --- a/platform/util/src/com/intellij/openapi/ui/PseudoSplitter.java +++ b/platform/util/src/com/intellij/openapi/ui/PseudoSplitter.java @@ -17,12 +17,6 @@ package com.intellij.openapi.ui; import javax.swing.*; -/** - * Created by IntelliJ IDEA. - * User: Irina.Chernushina - * Date: 12/3/11 - * Time: 6:13 PM - */ public class PseudoSplitter extends Splitter { private boolean myFirstIsFixed; private boolean mySecondIsFixed; @@ -35,16 +29,6 @@ public class PseudoSplitter extends Splitter { mySecondIsFixed = false; } - public PseudoSplitter(boolean vertical, float proportion) { - super(vertical, proportion); - myFirstIsFixed = true; - } - - public PseudoSplitter(boolean vertical, float proportion, float minProp, float maxProp) { - super(vertical, proportion, minProp, maxProp); - myFirstIsFixed = true; - } - private int getSizeForComp(final JComponent component) { return getOrientation() ? component.getHeight() : component.getWidth(); } @@ -64,13 +48,6 @@ public class PseudoSplitter extends Splitter { mySecondIsFixed = false; } - public void fixSecond() { - assert getSecondComponent() != null; - mySecondFixedSize = getSizeForComp(getSecondComponent()); - myFirstIsFixed = false; - mySecondIsFixed = true; - } - public void freeAll() { myFirstIsFixed = false; mySecondIsFixed = false;