From 952d56832a3ec6bbb253c3720dd210e12d96af43 Mon Sep 17 00:00:00 2001
From: Eugene Vigdorchik <no_reply@jetbrains.com>
Date: Tue, 1 Feb 2005 14:39:37 +0300
Subject: [PATCH] (no message)

---
 .../moveClassesOrPackages/MoveClassesOrPackagesDialog.java | 4 ++--
 .../refactoring/move/moveMembers/MoveMembersDialog.java    | 7 +++----
 .../refactoring/move/moveMembers/MoveMembersImpl.java      | 2 +-
 .../refactoring/move/moveMembers/MoveMembersProcessor.java | 1 -
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/source/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java b/source/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java
index 8158507cdb26..e5060586658a 100644
--- a/source/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java
+++ b/source/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java
@@ -220,13 +220,13 @@ public class MoveClassesOrPackagesDialog extends RefactoringDialog {
   }
 
   private void validateOKButton() {
-    String name = myTextFieldWithBrowseButton.getText();
+    String name = myTextFieldWithBrowseButton.getText().trim();
     if (name.length() == 0) {
       setOKActionEnabled(true);
     }
     else {
       PsiManager manager = myManager;
-      setOKActionEnabled(manager.getNameHelper().isQualifiedName(name.trim()));
+      setOKActionEnabled(manager.getNameHelper().isQualifiedName(name));
     }
   }
 
diff --git a/source/com/intellij/refactoring/move/moveMembers/MoveMembersDialog.java b/source/com/intellij/refactoring/move/moveMembers/MoveMembersDialog.java
index 93621dc39cfd..103448521760 100644
--- a/source/com/intellij/refactoring/move/moveMembers/MoveMembersDialog.java
+++ b/source/com/intellij/refactoring/move/moveMembers/MoveMembersDialog.java
@@ -1,7 +1,6 @@
 package com.intellij.refactoring.move.moveMembers;
 
 import com.intellij.ide.util.PackageUtil;
-import com.intellij.ide.util.TreeClassChooserDialog;
 import com.intellij.ide.util.TreeClassChooser;
 import com.intellij.ide.util.TreeClassChooserFactory;
 import com.intellij.openapi.application.ApplicationManager;
@@ -52,12 +51,12 @@ public class MoveMembersDialog extends RefactoringDialog implements MoveMembersO
   private MemberInfo[] myMemberInfos;
   private final TextFieldWithBrowseButton myTfTargetClassName;
   private MemberSelectionTable myTable;
-  private Set myPreselectMembers;
+  private Set<PsiMember> myPreselectMembers;
 
   VisibilityPanel myVisibilityPanel;
 
   public MoveMembersDialog(Project project, PsiClass sourceClass, final PsiClass initialTargetClass,
-                           Set preselectMembers, Callback callback) {
+                           Set<PsiMember> preselectMembers, Callback callback) {
 
 
     super(project, true);
@@ -199,7 +198,7 @@ public class MoveMembersDialog extends RefactoringDialog implements MoveMembersO
   }
 
   public String getTargetClassName() {
-    return myTfTargetClassName.getText();
+    return myTfTargetClassName.getText().trim();
   }
 
   protected void doAction() {
diff --git a/source/com/intellij/refactoring/move/moveMembers/MoveMembersImpl.java b/source/com/intellij/refactoring/move/moveMembers/MoveMembersImpl.java
index 7970add7d8b8..e702f30bb9a4 100644
--- a/source/com/intellij/refactoring/move/moveMembers/MoveMembersImpl.java
+++ b/source/com/intellij/refactoring/move/moveMembers/MoveMembersImpl.java
@@ -33,7 +33,7 @@ public class MoveMembersImpl {
     } else {
       return;
     }
-    final Set preselectMembers = new HashSet();
+    final Set<PsiMember> preselectMembers = new HashSet<PsiMember>();
     for (int idx = 0; idx < elements.length; idx++) {
       PsiElement element = elements[idx];
       if (!sourceClass.equals(element.getParent())) {
diff --git a/source/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java b/source/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java
index 2590161b2345..979694d2599c 100644
--- a/source/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java
+++ b/source/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java
@@ -8,7 +8,6 @@ import com.intellij.codeInsight.ChangeContextUtil;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
-import com.intellij.openapi.wm.WindowManager;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.search.GlobalSearchScope;