From df35560e35b39dfa61307e3d78c852600c202e29 Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 20 Oct 2009 18:18:28 +0400 Subject: [PATCH] introduce parameter object: fill current package name (IDEADEV-40924) --- .../IntroduceParameterObjectDialog.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectDialog.java b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectDialog.java index 92dca63d6bfd..ea79fec62207 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectDialog.java @@ -100,10 +100,7 @@ public class IntroduceParameterObjectDialog extends RefactoringDialog { buttonGroup.add(myCreateInnerClassRadioButton); createNewClassButton.setSelected(true); init(); - final PsiFile file = sourceMethod.getContainingFile(); - if (file instanceof PsiJavaFile) { - packageTextField.setText(((PsiJavaFile)file).getPackageName()); - } + final ActionListener listener = new ActionListener() { public void actionPerformed(ActionEvent actionEvent) { @@ -267,8 +264,9 @@ public class IntroduceParameterObjectDialog extends RefactoringDialog { } private void createUIComponents() { + final PsiFile file = sourceMethod.getContainingFile(); packageTextField = - new PackageNameReferenceEditorCombo("", myProject, RECENTS_KEY, RefactoringBundle.message("choose.destination.package")); + new PackageNameReferenceEditorCombo(file instanceof PsiJavaFile ? ((PsiJavaFile)file).getPackageName() : "", myProject, RECENTS_KEY, RefactoringBundle.message("choose.destination.package")); final Document document = packageTextField.getChildComponent().getDocument(); final com.intellij.openapi.editor.event.DocumentAdapter adapter = new com.intellij.openapi.editor.event.DocumentAdapter() { public void documentChanged(com.intellij.openapi.editor.event.DocumentEvent e) {