From abc2662e503fdb09ee3b1f3a9b0e9b386d52d1fd Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 16 Jul 2012 17:00:01 +0200 Subject: [PATCH] find rename handler in context (IDEA-88760) --- .../src/com/siyeh/ig/fixes/RenameFix.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/RenameFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/RenameFix.java index 5595a48cc97a..d1f7e0ec47a5 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/RenameFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/RenameFix.java @@ -21,10 +21,10 @@ import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; -import com.intellij.refactoring.RefactoringActionHandler; -import com.intellij.refactoring.RefactoringActionHandlerFactory; import com.intellij.refactoring.RefactoringFactory; import com.intellij.refactoring.RenameRefactoring; +import com.intellij.refactoring.rename.RenameHandler; +import com.intellij.refactoring.rename.RenameHandlerRegistry; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.InspectionGadgetsFix; import org.jetbrains.annotations.NonNls; @@ -71,12 +71,10 @@ public class RenameFix extends InspectionGadgetsFix { final PsiElement nameIdentifier = descriptor.getPsiElement(); final PsiElement elementToRename = nameIdentifier.getParent(); if (m_targetName == null) { - final RefactoringActionHandlerFactory factory = - RefactoringActionHandlerFactory.getInstance(); - final RefactoringActionHandler renameHandler = - factory.createRenameHandler(); final DataManager dataManager = DataManager.getInstance(); final DataContext dataContext = dataManager.getDataContext(); + final RenameHandler renameHandler = RenameHandlerRegistry.getInstance().getRenameHandler(dataContext); + if (renameHandler == null) return; Runnable runnable = new Runnable() { public void run() { renameHandler.invoke(project, new PsiElement[]{elementToRename},