From cdeafa405bcbf3ed12fbc04139274d36af74da7b Mon Sep 17 00:00:00 2001
From: "Anton.Makeev" <Anton.Makeev@jetbrains.com>
Date: Thu, 3 Dec 2009 19:30:47 +0300
Subject: [PATCH] Maven: rename handlers

---
 .../idea/maven/dom/refactorings/MavenPropertyRenameHandler.java       | 4 +---
 .../idea/maven/dom/refactorings/MavenVetoModelRenameCondition.java    | 3 ++-
 .../java/org/jetbrains/idea/maven/dom/references/MavenTargetUtil.java | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/MavenPropertyRenameHandler.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/MavenPropertyRenameHandler.java
index 7292471206..8098a46c93 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/MavenPropertyRenameHandler.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/MavenPropertyRenameHandler.java
@@ -55,8 +55,6 @@ public class MavenPropertyRenameHandler extends PsiElementRenameHandler {
   }
 
   private PsiElement findTarget(DataContext context) {
-    PsiElement target = MavenTargetUtil.getRefactorTarget(PlatformDataKeys.EDITOR.getData(context),
-                                                          LangDataKeys.PSI_FILE.getData(context));
-    return isVetoed(target) ? null : target;
+    return MavenTargetUtil.getRefactorTarget(PlatformDataKeys.EDITOR.getData(context), LangDataKeys.PSI_FILE.getData(context));
   }
 }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/MavenVetoModelRenameCondition.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/MavenVetoModelRenameCondition.java
index 957cd95d05..9ff7fd088c 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/MavenVetoModelRenameCondition.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/MavenVetoModelRenameCondition.java
@@ -18,9 +18,10 @@ package org.jetbrains.idea.maven.dom.refactorings;
 import com.intellij.openapi.util.Condition;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.idea.maven.dom.MavenDomUtil;
+import org.jetbrains.idea.maven.dom.references.MavenPsiElementWrapper;
 
 public class MavenVetoModelRenameCondition implements Condition<PsiElement> {
   public boolean value(PsiElement target) {
-    return MavenDomUtil.isMavenFile(target) && !MavenDomUtil.isMavenProperty(target);
+    return target instanceof MavenPsiElementWrapper || MavenDomUtil.isMavenFile(target);
   }
 }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenTargetUtil.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenTargetUtil.java
index 1fad11be78..18ecd76db4 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenTargetUtil.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenTargetUtil.java
@@ -28,7 +28,7 @@ import org.jetbrains.idea.maven.dom.MavenDomUtil;
 public class MavenTargetUtil {
   public static PsiElement getRefactorTarget(Editor editor, PsiFile file) {
     PsiElement target = getFindTarget(editor, file);
-    return target == null || !MavenDomUtil.isMavenFile(target) ? null : target;
+    return target == null || !MavenDomUtil.isMavenProperty(target) ? null : target;
   }
 
   public static PsiElement getFindTarget(Editor editor, PsiFile file) {
-- 
2.11.4.GIT