From 5e4a31b0397c2fddfbb5e8f3f9d5185c2d5cee47 Mon Sep 17 00:00:00 2001
From: Eugene Vigdorchik <no_reply@jetbrains.com>
Date: Tue, 15 Mar 2005 13:46:04 +0300
Subject: [PATCH] IDEADEV-595

---
 .../extractInterface/ExtractInterfaceDialog.java       |  6 +++---
 .../extractSuperclass/ExtractSuperclassDialog.java     | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/com/intellij/refactoring/extractInterface/ExtractInterfaceDialog.java b/source/com/intellij/refactoring/extractInterface/ExtractInterfaceDialog.java
index c9ca840887c0..3885392d7b93 100644
--- a/source/com/intellij/refactoring/extractInterface/ExtractInterfaceDialog.java
+++ b/source/com/intellij/refactoring/extractInterface/ExtractInterfaceDialog.java
@@ -6,7 +6,6 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.help.HelpManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.psi.*;
 import com.intellij.refactoring.HelpID;
 import com.intellij.refactoring.RefactoringSettings;
@@ -17,6 +16,7 @@ import com.intellij.refactoring.util.JavaDocPolicy;
 import com.intellij.refactoring.util.RefactoringMessageUtil;
 import com.intellij.refactoring.util.classMembers.DelegatingMemberInfoModel;
 import com.intellij.refactoring.util.classMembers.MemberInfo;
+import com.intellij.ui.ReferenceEditorWithBrowseButton;
 import com.intellij.util.IncorrectOperationException;
 
 import javax.swing.*;
@@ -33,7 +33,7 @@ class ExtractInterfaceDialog extends ExtractSuperBaseDialog {
   private MemberInfo[] myMemberInfos;
 
   private JTextField myInterfaceNameField;
-  private final TextFieldWithBrowseButton myPackageNameField;
+  private final ReferenceEditorWithBrowseButton myPackageNameField;
   private JTextField mySourceClassField;
 
   private JavaDocPanel myJavaDocPanel;
@@ -47,7 +47,7 @@ class ExtractInterfaceDialog extends ExtractSuperBaseDialog {
     myProject = project;
     myClass = aClass;
 
-    myPackageNameField = new TextFieldWithBrowseButton();
+    myPackageNameField = new ReferenceEditorWithBrowseButton(null, "", PsiManager.getInstance(myProject), false);
     init();
   }
 
diff --git a/source/com/intellij/refactoring/extractSuperclass/ExtractSuperclassDialog.java b/source/com/intellij/refactoring/extractSuperclass/ExtractSuperclassDialog.java
index d804bf07c158..bc67445752b4 100644
--- a/source/com/intellij/refactoring/extractSuperclass/ExtractSuperclassDialog.java
+++ b/source/com/intellij/refactoring/extractSuperclass/ExtractSuperclassDialog.java
@@ -5,7 +5,6 @@ import com.intellij.ide.util.PackageUtil;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.help.HelpManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.psi.*;
 import com.intellij.refactoring.HelpID;
 import com.intellij.refactoring.RefactoringSettings;
@@ -15,6 +14,7 @@ import com.intellij.refactoring.ui.MemberSelectionPanel;
 import com.intellij.refactoring.util.JavaDocPolicy;
 import com.intellij.refactoring.util.RefactoringMessageUtil;
 import com.intellij.refactoring.util.classMembers.*;
+import com.intellij.ui.ReferenceEditorWithBrowseButton;
 import com.intellij.util.IncorrectOperationException;
 
 import javax.swing.*;
@@ -42,7 +42,7 @@ class ExtractSuperclassDialog extends ExtractSuperBaseDialog {
   private PsiDirectory myTargetDirectory;
   private JTextField mySourceClassField;
   private JTextField myClassNameField;
-  private final TextFieldWithBrowseButton myTfPackageName;
+  private final ReferenceEditorWithBrowseButton myTfPackageName;
   private PsiClass mySourceClass;
 
   private JavaDocPanel myJavaDocPanel;
@@ -60,7 +60,7 @@ class ExtractSuperclassDialog extends ExtractSuperBaseDialog {
     setTitle(ExtractSuperclassHandler.REFACTORING_NAME);
     mySourceClass = sourceClass;
 
-    myTfPackageName = new TextFieldWithBrowseButton();
+    myTfPackageName = new ReferenceEditorWithBrowseButton(null, targetPackageName, PsiManager.getInstance(myProject), false);
 
     init();
     updateDialogForExtractSuperclass();
@@ -68,14 +68,14 @@ class ExtractSuperclassDialog extends ExtractSuperBaseDialog {
   }
 
   public MemberInfo[] getSelectedMemberInfos() {
-    ArrayList list = new ArrayList(myMemberInfos.length);
+    ArrayList<MemberInfo> list = new ArrayList<MemberInfo>(myMemberInfos.length);
     for (int idx = 0; idx < myMemberInfos.length; idx++) {
       MemberInfo info = myMemberInfos[idx];
       if (info.isChecked()) {
         list.add(info);
       }
     }
-    return (MemberInfo[])list.toArray(new MemberInfo[list.size()]);
+    return list.toArray(new MemberInfo[list.size()]);
   }
 
   InterfaceContainmentVerifier getContainmentVerifier() {