From 895d6eeac77f94828cec5d598cedd5277d04354d Mon Sep 17 00:00:00 2001 From: Evgeny Zakrevsky Date: Thu, 22 Sep 2011 18:12:01 +0400 Subject: [PATCH] IDEA-74540 Missing whitespace to the left of "Visibility" block in "Convert to instance method" refactoring dialog --- .../ConvertToInstanceMethodDialog.java | 18 +++++++----------- .../MoveInstanceMethodDialogBase.java | 5 +++-- .../refactoring/ui/JavaVisibilityPanel.java | 4 +++- .../src/messages/RefactoringBundle.properties | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodDialog.java b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodDialog.java index d76321c40fc5..df96bfd2a8c8 100644 --- a/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodDialog.java @@ -23,8 +23,10 @@ import com.intellij.psi.PsiVariable; import com.intellij.refactoring.HelpID; import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.move.moveInstanceMethod.MoveInstanceMethodDialogBase; +import com.intellij.util.ui.UIUtil; import javax.swing.*; +import javax.swing.border.LineBorder; import java.awt.*; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; @@ -54,17 +56,11 @@ public class ConvertToInstanceMethodDialog extends MoveInstanceMethodDialogBase } protected JComponent createCenterPanel() { - final Box vBox = Box.createVerticalBox(); - final Box labelBox = Box.createHorizontalBox(); - final JLabel label = new JLabel(); - labelBox.add(label); - labelBox.add(Box.createHorizontalGlue()); - vBox.add(labelBox); - vBox.add(Box.createVerticalStrut(4)); - - vBox.add(createListAndVisibilityPanels()); - label.setText(RefactoringBundle.message("moveInstanceMethod.select.an.instance.parameter")); - return vBox; + JPanel panel = new JPanel(new BorderLayout(UIUtil.DEFAULT_HGAP, UIUtil.DEFAULT_VGAP)); + final JLabel label = new JLabel(RefactoringBundle.message("moveInstanceMethod.select.an.instance.parameter")); + panel.add(label, BorderLayout.NORTH); + panel.add(createListAndVisibilityPanels(), BorderLayout.CENTER); + return panel; } @Override diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialogBase.java b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialogBase.java index 075c685b5aac..8f1c70780b29 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialogBase.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialogBase.java @@ -66,7 +66,7 @@ public abstract class MoveInstanceMethodDialogBase extends RefactoringDialog { gbConstraints.fill = GridBagConstraints.BOTH; gbConstraints.weightx = 1; - gbConstraints.weighty = 0; + gbConstraints.weighty = 1; gbConstraints.gridheight = 1; gbConstraints.gridx = 0; gbConstraints.gridy = 0; @@ -74,7 +74,8 @@ public abstract class MoveInstanceMethodDialogBase extends RefactoringDialog { hBox.add(scrollPane, gbConstraints); hBox.add(Box.createHorizontalStrut(4)); gbConstraints.weightx = 0; - gbConstraints.fill = GridBagConstraints.VERTICAL; + gbConstraints.fill = GridBagConstraints.NONE; + gbConstraints.anchor = GridBagConstraints.NORTH; gbConstraints.gridx++; myVisibilityPanel = createVisibilityPanel(); hBox.add (myVisibilityPanel, gbConstraints); 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 8ceba23c6e27..ee2424451997 100644 --- a/java/java-impl/src/com/intellij/refactoring/ui/JavaVisibilityPanel.java +++ b/java/java-impl/src/com/intellij/refactoring/ui/JavaVisibilityPanel.java @@ -28,9 +28,11 @@ import com.intellij.psi.PsiModifier; import com.intellij.refactoring.RefactoringBundle; import com.intellij.util.VisibilityUtil; import com.intellij.ui.IdeBorderFactory; +import com.intellij.util.ui.UIUtil; import javax.swing.*; import javax.swing.event.ChangeEvent; +import java.awt.*; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; @@ -43,7 +45,7 @@ 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)); + setBorder(IdeBorderFactory.createTitledBorder(RefactoringBundle.message("visibility.border.title"), false, true, true, new Insets(0,UIUtil.DEFAULT_HGAP,0,0))); setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); ButtonGroup bg = new ButtonGroup(); diff --git a/platform/platform-resources-en/src/messages/RefactoringBundle.properties b/platform/platform-resources-en/src/messages/RefactoringBundle.properties index 4366ea64f0e3..dcd0c9308024 100644 --- a/platform/platform-resources-en/src/messages/RefactoringBundle.properties +++ b/platform/platform-resources-en/src/messages/RefactoringBundle.properties @@ -71,7 +71,7 @@ visibility.private=Pri&vate visibility.package.local=Pac&kage local visibility.border.title=Visibility visibility.combo.title=&Visibility -moveInstanceMethod.select.an.instance.parameter=Select an &instance parameter +moveInstanceMethod.select.an.instance.parameter=Select an &instance parameter: destination.package=&Destination package: choose.destination.package=Choose Destination Package interface.name.prompt=&Interface name: