mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
(no message)
This commit is contained in:
+2
-2
@@ -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));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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())) {
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user