From 05896df3fe7070b5f486a3baa1ad8f0a098c0cce Mon Sep 17 00:00:00 2001
From: Maxim Medvedev <maxim.medvedev@jetbrains.com>
Date: Wed, 30 Mar 2011 15:55:15 +0400
Subject: [PATCH] some api methods

---
 .../groovy/lang/psi/api/auxiliary/GrCondition.java  |  1 -
 .../lang/psi/api/statements/GrLoopStatement.java    |  3 +--
 .../psi/api/statements/GrVariableDeclaration.java   |  2 ++
 .../impl/statements/GrVariableDeclarationBase.java  | 13 ++++++-------
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/auxiliary/GrCondition.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/auxiliary/GrCondition.java
index a27f3e7ed4a6..7b58691ab94f 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/auxiliary/GrCondition.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/auxiliary/GrCondition.java
@@ -24,5 +24,4 @@ import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement;
  * @author ilyas
  */
 public interface GrCondition extends GroovyPsiElement {
-  public static final GrCondition[] EMPTY_ARRAY = new GrCondition[0];
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrLoopStatement.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrLoopStatement.java
index 9a66baf3e709..52d7f358a4f8 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrLoopStatement.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrLoopStatement.java
@@ -23,7 +23,6 @@ import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.GrCondition;
  * @author ilyas
  */
 public interface GrLoopStatement extends GrStatement {
-
   GrCondition replaceBody (GrCondition statement) throws IncorrectOperationException;
-  GrCondition getBody();
+  GrStatement getBody();
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrVariableDeclaration.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrVariableDeclaration.java
index 78d94ae8bb23..a97024c6001d 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrVariableDeclaration.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrVariableDeclaration.java
@@ -34,4 +34,6 @@ public interface GrVariableDeclaration extends GrStatement, GrMembersDeclaration
 
   @Nullable
   GrTypeElement getTypeElementGroovyForVariable(GrVariable var);
+
+  GrTupleDeclaration getTupleDeclaration();
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableDeclarationBase.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableDeclarationBase.java
index 8499b565aa18..e99f315fba66 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableDeclarationBase.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableDeclarationBase.java
@@ -115,7 +115,11 @@ public abstract class GrVariableDeclarationBase extends GrStubElementBase<EmptyS
 
   @Override
   public boolean isTuple() {
-    return findChildByClass(GrTupleDeclaration.class) != null;
+    return getTupleDeclaration() != null;
+  }
+
+  public GrTupleDeclaration getTupleDeclaration() {
+    return findChildByClass(GrTupleDeclaration.class);
   }
 
   @Override
@@ -173,18 +177,13 @@ public abstract class GrVariableDeclarationBase extends GrStubElementBase<EmptyS
       return "Multiple variable definitions";
     }
 
-    @NotNull
-    public GrTupleDeclaration getTuple(){
-      return findChildByClass(GrTupleDeclaration.class);
-    }
-
     @Nullable
     public GrExpression getInitializerGroovy(){
       return findChildByClass(GrExpression.class);
     }
 
     public GrVariable[] getVariables() {
-      return getTuple().getVariables();
+      return getTupleDeclaration().getVariables();
     }
 
     public GrMember[] getMembers() {