From d8e59ff645d1dd687f9a4cd5f7a73bb059b40da7 Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Thu, 16 Feb 2012 12:03:09 +0400
Subject: [PATCH] util

---
 .../groovy/refactoring/GroovyRefactoringUtil.java  |  4 ++--
 .../groovy/refactoring/extract/ExtractUtil.java    |  3 +--
 .../inline/GroovyInlineLocalHandler.java           |  2 +-
 .../introduce/field/GrIntroduceFieldDialog.java    | 14 +++++---------
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringUtil.java
index 8155cb2b594e..a42a0d478165 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringUtil.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringUtil.java
@@ -197,8 +197,8 @@ public abstract class GroovyRefactoringUtil {
     });
   }
 
-  public static boolean isLocalVariable(GrVariable variable) {
-    return !(variable instanceof GrField || variable instanceof GrParameter);
+  public static boolean isLocalVariable(PsiElement variable) {
+    return variable instanceof GrVariable && !(variable instanceof GrField || variable instanceof GrParameter);
   }
 
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/ExtractUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/ExtractUtil.java
index 9fba7b1ef897..7efdf2b4d150 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/ExtractUtil.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/ExtractUtil.java
@@ -210,8 +210,7 @@ public class ExtractUtil {
       @Override
       public void visitReferenceExpression(GrReferenceExpression ref) {
         final PsiElement resolved = ref.resolve();
-        if ((resolved instanceof GrParameter ||
-             resolved instanceof GrVariable && GroovyRefactoringUtil.isLocalVariable((GrVariable)resolved)) && resolved.isPhysical()) {
+        if ((resolved instanceof GrParameter || GroovyRefactoringUtil.isLocalVariable(resolved)) && resolved.isPhysical()) {
           final int offset = resolved.getTextRange().getStartOffset();
           //var is declared outside of selected code
           if (offset < start || end <= offset) {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineLocalHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineLocalHandler.java
index ea6ca9de9276..9afe19011e0d 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineLocalHandler.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineLocalHandler.java
@@ -59,7 +59,7 @@ public class GroovyInlineLocalHandler extends InlineActionHandler {
 
   @Override
   public boolean canInlineElement(PsiElement element) {
-    return element instanceof GrVariable && GroovyRefactoringUtil.isLocalVariable((GrVariable)element);
+    return GroovyRefactoringUtil.isLocalVariable(element);
   }
 
   @Override
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrIntroduceFieldDialog.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrIntroduceFieldDialog.java
index 91501e3c265b..a0c832dad1c3 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrIntroduceFieldDialog.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrIntroduceFieldDialog.java
@@ -332,10 +332,8 @@ public class GrIntroduceFieldDialog extends DialogWrapper implements GrIntroduce
   private static String getInvokedOnLocalVar(GrExpression expression) {
     if (expression instanceof GrReferenceExpression) {
       final PsiElement resolved = ((GrReferenceExpression)expression).resolve();
-      if (resolved instanceof GrVariable) {
-        if (GroovyRefactoringUtil.isLocalVariable((GrVariable)resolved)) {
-          return ((GrVariable)resolved).getName();
-        }
+      if (GroovyRefactoringUtil.isLocalVariable(resolved)) {
+        return ((GrVariable)resolved).getName();
       }
     }
     return null;
@@ -348,11 +346,9 @@ public class GrIntroduceFieldDialog extends DialogWrapper implements GrIntroduce
 
     if (expression instanceof GrReferenceExpression) {
       final PsiElement resolved = ((GrReferenceExpression)expression).resolve();
-      if (resolved instanceof GrVariable) {
-        if (GroovyRefactoringUtil.isLocalVariable((GrVariable)resolved)) {
-          expression = ((GrVariable)resolved).getInitializerGroovy();
-          if (expression == null) return false;
-        }
+      if (GroovyRefactoringUtil.isLocalVariable(resolved)) {
+        expression = ((GrVariable)resolved).getInitializerGroovy();
+        if (expression == null) return false;
       }
     }