From b5fb14660717782f9be2a2127215434c351e66c0 Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 12 Sep 2011 13:23:17 +0200 Subject: [PATCH] add mnemonic to member chooser on move --- .../move/moveMembers/MoveMembersDialog.java | 30 +++++++------------ .../src/messages/RefactoringBundle.properties | 2 +- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersDialog.java b/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersDialog.java index 25e597a511f6..a68a2a75d3e0 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersDialog.java @@ -36,6 +36,7 @@ import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.classMembers.MemberInfoChange; import com.intellij.refactoring.move.MoveCallback; import com.intellij.refactoring.ui.JavaVisibilityPanel; +import com.intellij.refactoring.ui.MemberSelectionPanel; import com.intellij.refactoring.ui.MemberSelectionTable; import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.util.CommonRefactoringUtil; @@ -141,15 +142,6 @@ public class MoveMembersDialog extends RefactoringDialog implements MoveMembersO return "#com.intellij.refactoring.move.moveMembers.MoveMembersDialog"; } - private JTable createTable() { - myMemberInfoModel = new MyMemberInfoModel(); - myTable = new MemberSelectionTable(myMemberInfos, null); - myTable.setMemberInfoModel(myMemberInfoModel); - myTable.addMemberInfoChangeListener(myMemberInfoModel); - myMemberInfoModel.memberInfoChanged(new MemberInfoChange(myMemberInfos)); - return myTable; - } - protected JComponent createNorthPanel() { JPanel panel = new JPanel(new BorderLayout()); @@ -190,16 +182,14 @@ public class MoveMembersDialog extends RefactoringDialog implements MoveMembersO protected JComponent createCenterPanel() { JPanel panel = new JPanel(new BorderLayout()); - JTable table = createTable(); - if (table.getRowCount() > 0) { - table.getSelectionModel().addSelectionInterval(0, 0); - } - JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(table); - Border border = IdeBorderFactory.createTitledBorder( - RefactoringBundle.message("move.members.members.to.be.moved.border.title"), false, false, true); - scrollPane.setBorder(border); - scrollPane.setBackground(UIUtil.getPanelBackground()); - panel.add(scrollPane, BorderLayout.CENTER); + final String title = RefactoringBundle.message("move.members.members.to.be.moved.border.title"); + final MemberSelectionPanel selectionPanel = new MemberSelectionPanel(title, myMemberInfos, null); + myTable = selectionPanel.getTable(); + myMemberInfoModel = new MyMemberInfoModel(); + myMemberInfoModel.memberInfoChanged(new MemberInfoChange(myMemberInfos)); + selectionPanel.getTable().setMemberInfoModel(myMemberInfoModel); + selectionPanel.getTable().addMemberInfoChangeListener(myMemberInfoModel); + panel.add(selectionPanel, BorderLayout.CENTER); myVisibilityPanel = new JavaVisibilityPanel(true, true); myVisibilityPanel.setVisibility(null); @@ -262,7 +252,7 @@ public class MoveMembersDialog extends RefactoringDialog implements MoveMembersO @Override protected void canRun() throws ConfigurationException { - if (getTargetClassName().length() == 0) throw new ConfigurationException("Destination class name not found"); + //if (getTargetClassName().length() == 0) throw new ConfigurationException("Destination class name not found"); } private String validateInputData() { diff --git a/platform/platform-resources-en/src/messages/RefactoringBundle.properties b/platform/platform-resources-en/src/messages/RefactoringBundle.properties index eabc2b9c3b08..1fe7945e758d 100644 --- a/platform/platform-resources-en/src/messages/RefactoringBundle.properties +++ b/platform/platform-resources-en/src/messages/RefactoringBundle.properties @@ -389,7 +389,7 @@ there.are.multiple.exit.points.in.the.selected.code.fragment=There are multiple move.members.elements.header=Members to be moved move.members.move.members.from.label=Move members from: move.members.to.fully.qualified.name.label=To (fully qualified name): -move.members.members.to.be.moved.border.title=Members to be moved (static only) +move.members.members.to.be.moved.border.title=Mem&bers to be moved (static only) no.destination.class.specified=No destination class specified 0.is.not.a.legal.fq.name=''{0}'' is not a legal FQ-name create.class.command=Create class {0}