From db3ba747b7e1f4a5778eba4be4bdb4b50d3aec8e Mon Sep 17 00:00:00 2001 From: Evgeny Zakrevsky Date: Thu, 22 Sep 2011 21:29:45 +0400 Subject: [PATCH] constants in borders --- .../refactoring/ui/JavaVisibilityPanel.java | 14 ++++++++------ .../src/com/intellij/ui/IdeBorderFactory.java | 9 +++++++-- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/ui/JavaVisibilityPanel.java b/java/java-impl/src/com/intellij/refactoring/ui/JavaVisibilityPanel.java index ee2424451997..e12503357ddd 100644 --- a/java/java-impl/src/com/intellij/refactoring/ui/JavaVisibilityPanel.java +++ b/java/java-impl/src/com/intellij/refactoring/ui/JavaVisibilityPanel.java @@ -45,19 +45,23 @@ public class JavaVisibilityPanel extends VisibilityPanelBase { private final JRadioButton myRbPublic; public JavaVisibilityPanel(boolean hasAsIs, final boolean hasEscalate) { - setBorder(IdeBorderFactory.createTitledBorder(RefactoringBundle.message("visibility.border.title"), false, true, true, new Insets(0,UIUtil.DEFAULT_HGAP,0,0))); + setBorder(IdeBorderFactory.createTitledBorder(RefactoringBundle.message("visibility.border.title"), false, true, true, + new Insets(IdeBorderFactory.TITLED_BORDER_TOP_INSET, + UIUtil.DEFAULT_HGAP, + IdeBorderFactory.TITLED_BORDER_BOTTOM_INSET, + IdeBorderFactory.TITLED_BORDER_RIGHT_INSET))); setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); ButtonGroup bg = new ButtonGroup(); ItemListener listener = new ItemListener() { public void itemStateChanged(ItemEvent e) { - if(e.getStateChange() == ItemEvent.SELECTED) { + if (e.getStateChange() == ItemEvent.SELECTED) { myEventDispatcher.getMulticaster().stateChanged(new ChangeEvent(this)); } } }; - if(hasEscalate) { + if (hasEscalate) { myRbEscalate = new JRadioButton(); myRbEscalate.setText(RefactoringBundle.getEscalateVisibility()); myRbEscalate.addItemListener(listener); @@ -65,7 +69,7 @@ public class JavaVisibilityPanel extends VisibilityPanelBase { bg.add(myRbEscalate); } - if(hasAsIs) { + if (hasAsIs) { myRbAsIs = new JRadioButton(); myRbAsIs.setText(RefactoringBundle.getVisibilityAsIs()); myRbAsIs.addItemListener(listener); @@ -74,7 +78,6 @@ public class JavaVisibilityPanel extends VisibilityPanelBase { } - myRbPrivate = new JRadioButton(); myRbPrivate.setText(RefactoringBundle.getVisibilityPrivate()); myRbPrivate.addItemListener(listener); @@ -159,5 +162,4 @@ public class JavaVisibilityPanel extends VisibilityPanelBase { myRbPublic.setEnabled(true); myRbPublic.setSelected(true); } - } diff --git a/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java b/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java index 8e616e1cd271..dd9b1056cdde 100644 --- a/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java +++ b/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java @@ -25,6 +25,11 @@ import java.awt.*; public class IdeBorderFactory { public static final int BORDER_ROUNDNESS = 5; + public static final int TITLED_BORDER_TOP_INSET = 5; + public static final int TITLED_BORDER_LEFT_INSET = 0; + public static final int TITLED_BORDER_BOTTOM_INSET = 10; + public static final int TITLED_BORDER_RIGHT_INSET = 0; + public static final int TITLED_BORDER_INDENT = 20; private IdeBorderFactory() { } @@ -58,12 +63,12 @@ public class IdeBorderFactory { } public static IdeaTitledBorder createTitledBorder(String title, boolean hasBoldFont, boolean hasIndent, boolean hasSmallFont) { - Insets insets = new Insets(5, 0, 10, 0); + Insets insets = new Insets(TITLED_BORDER_TOP_INSET, TITLED_BORDER_LEFT_INSET, TITLED_BORDER_BOTTOM_INSET, TITLED_BORDER_RIGHT_INSET); return createTitledBorder(title, hasBoldFont, hasIndent, hasSmallFont, insets); } public static IdeaTitledBorder createTitledBorder(String title, boolean hasBoldFont, boolean hasIndent, boolean hasSmallFont, Insets insets) { - int indent = hasIndent ? 20 : 0; + int indent = hasIndent ? TITLED_BORDER_INDENT : 0; return new IdeaTitledBorder(title, hasBoldFont, hasSmallFont, indent, insets); }