MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-74540 Missing whitespace to the left of "Visibility" block in "Convert to instance method" refactoring dialog

Browse Source
This commit is contained in:
Evgeny Zakrevsky
2011-09-22 18:33:43 +04:00
parent 1ddb5645ec
commit 895d6eeac7
4 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodDialog.java
+7 -11
View File
@@ -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
java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialogBase.java
+3 -2
View File
@@ -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);
java/java-impl/src/com/intellij/refactoring/ui/JavaVisibilityPanel.java
+3 -1
View File
@@ -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();
platform/platform-resources-en/src/messages/RefactoringBundle.properties
+1 -1
View File
@@ -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: