From b30f3e1f1e999f8e53d625aa01c3662c48681b91 Mon Sep 17 00:00:00 2001 From: Alexey Pegov Date: Fri, 6 Feb 2009 18:20:59 +0300 Subject: [PATCH] IDEADEV-34531 Can't rename XML tag with namespace & IDEADEV-34532 "XML tag Rename dialog": Focus is missing --- xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameDialog.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameDialog.java b/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameDialog.java index 1ce30c78ba..ecf116fb01 100644 --- a/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameDialog.java +++ b/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameDialog.java @@ -16,11 +16,11 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.fileTypes.FileTypes; import com.intellij.openapi.help.HelpManager; import com.intellij.openapi.ui.DialogWrapper; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiReference; import com.intellij.psi.xml.XmlTag; import com.intellij.refactoring.RefactoringBundle; -import com.intellij.refactoring.rename.RenameUtil; import com.intellij.refactoring.ui.NameSuggestionsField; import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.ui.IdeBorderFactory; @@ -147,7 +147,7 @@ public class XmlTagRenameDialog extends RefactoringDialog { } public JComponent getPreferredFocusedComponent() { - return myNameSuggestionsField.getComponent(); + return myNameSuggestionsField.getFocusableComponent(); } protected JComponent createNorthPanel() { @@ -180,6 +180,6 @@ public class XmlTagRenameDialog extends RefactoringDialog { protected boolean areButtonsValid() { final String newName = getNewName(); - return RenameUtil.isValidName(myProject, myTag, newName); + return !StringUtil.containsAnyChar(newName, "\t ;*'\"\\/,()^&<>={}"); // RenameUtil.isValidName(myProject, myTag, newName); // IDEADEV-34531 } } -- 2.11.4.GIT