From a712f87da8946d5fb30bb90745d0cf404f51c779 Mon Sep 17 00:00:00 2001
From: Max Medvedev <maxim.medvedev@jetbrains.com>
Date: Sat, 17 Aug 2013 12:58:15 +0400
Subject: [PATCH] pull up 'isQualified()' method

---
 .../groovy/lang/psi/GrQualifiedReference.java |  5 +++--
 .../expressions/GrReferenceExpression.java    |  2 --
 .../lang/psi/impl/GrReferenceElementImpl.java |  3 +++
 .../GrReferenceExpressionImpl.java            |  4 ----
 .../GrThisSuperReferenceExpressionBase.java   | 20 +++++++++++++++++++
 .../GrLightClassReferenceElement.java         |  5 +++++
 6 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GrQualifiedReference.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GrQualifiedReference.java
index 5d0369d5112d..bb48e122b9ab 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GrQualifiedReference.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GrQualifiedReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package org.jetbrains.plugins.groovy.lang.psi;
 
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiQualifiedReference;
 import com.intellij.psi.PsiQualifiedReferenceElement;
 import org.jetbrains.annotations.Nullable;
 
@@ -31,4 +30,6 @@ public interface GrQualifiedReference<Qualifier extends PsiElement> extends PsiQ
 
   @Nullable
   PsiElement getReferenceNameElement();
+
+  boolean isQualified();
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/expressions/GrReferenceExpression.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/expressions/GrReferenceExpression.java
index 0781a026e596..91c4c31fcdc1 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/expressions/GrReferenceExpression.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/expressions/GrReferenceExpression.java
@@ -32,8 +32,6 @@ public interface GrReferenceExpression extends GrExpression, GrReferenceElement<
   @Nullable
   GrExpression getQualifierExpression();
 
-  boolean isQualified();
-
   @Nullable
   IElementType getDotTokenType();
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrReferenceElementImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrReferenceElementImpl.java
index 5295cf33b55f..4627abef3a68 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrReferenceElementImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrReferenceElementImpl.java
@@ -191,4 +191,7 @@ public abstract class GrReferenceElementImpl<Q extends PsiElement> extends Groov
     return whiteSpaceAndComments;
   }
 
+  public boolean isQualified() {
+    return getQualifier() != null;
+  }
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java
index 7bfdf31e164b..583ba9bb4ce4 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java
@@ -857,10 +857,6 @@ public class GrReferenceExpressionImpl extends GrReferenceElementImpl<GrExpressi
     return findExpressionChild(this);
   }
 
-  public boolean isQualified() {
-    return getQualifierExpression() != null;
-  }
-
   @Nullable
   public PsiElement getDotToken() {
     return findChildByType(TokenSets.DOTS);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrThisSuperReferenceExpressionBase.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrThisSuperReferenceExpressionBase.java
index 15e0ea7571b8..0e450d76bd4c 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrThisSuperReferenceExpressionBase.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrThisSuperReferenceExpressionBase.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions;
 
 import com.intellij.lang.ASTNode;
@@ -47,6 +62,11 @@ public abstract class GrThisSuperReferenceExpressionBase extends GrExpressionImp
     return getLastChild();
   }
 
+  @Override
+  public boolean isQualified() {
+    return getQualifier() != null;
+  }
+
   @Override
   public PsiElement getElement() {
     return this;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightClassReferenceElement.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightClassReferenceElement.java
index 3fa5a2153155..993974268013 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightClassReferenceElement.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightClassReferenceElement.java
@@ -124,6 +124,11 @@ public class GrLightClassReferenceElement extends LightElement implements GrCode
     return null;
   }
 
+  @Override
+  public boolean isQualified() {
+    return false;
+  }
+
   @Override
   public void accept(GroovyElementVisitor visitor) {
     //todo ???