From 8cf40f276283a5f5dbff0334180235f16048ed3e Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Wed, 26 Oct 2011 17:26:52 +0400
Subject: [PATCH] fix compilation

---
 .../java-psi-api/src/com/intellij/psi/JVMElementFactory.java | 3 ++-
 .../java-psi-api/src/com/intellij/psi/PsiElementFactory.java | 3 +++
 .../plugins/groovy/lang/psi/GroovyPsiElementFactory.java     | 5 +++--
 .../groovy/lang/psi/impl/GroovyPsiElementFactoryImpl.java    | 3 ++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/java/java-psi-api/src/com/intellij/psi/JVMElementFactory.java b/java/java-psi-api/src/com/intellij/psi/JVMElementFactory.java
index 6f88ab5afde7..b8d163e4d517 100644
--- a/java/java-psi-api/src/com/intellij/psi/JVMElementFactory.java
+++ b/java/java-psi-api/src/com/intellij/psi/JVMElementFactory.java
@@ -125,5 +125,6 @@ public interface JVMElementFactory {
   @NotNull
   PsiAnnotation createAnnotationFromText(@NotNull @NonNls String annotationText, @Nullable PsiElement context) throws IncorrectOperationException;
 
-  PsiElement createExpressionFromText(String text, PsiElement ctx) throws IncorrectOperationException;
+  @NotNull
+  PsiElement createExpressionFromText(@NotNull @NonNls String text, @Nullable PsiElement context) throws IncorrectOperationException;
 }
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiElementFactory.java b/java/java-psi-api/src/com/intellij/psi/PsiElementFactory.java
index bdaf595cea87..d833c1dd893d 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiElementFactory.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiElementFactory.java
@@ -453,4 +453,7 @@ public interface PsiElementFactory extends PsiJavaParserFacade, JVMElementFactor
    */
   @NotNull
   PsiCatchSection createCatchSection(@NotNull PsiType exceptionType, @NotNull String exceptionName, @Nullable PsiElement context) throws IncorrectOperationException;
+  
+  @NotNull 
+  PsiExpression createExpressionFromText(@NotNull String text, PsiElement context) throws IncorrectOperationException;
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyPsiElementFactory.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyPsiElementFactory.java
index b32078927371..b6270ac0c57a 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyPsiElementFactory.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyPsiElementFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2011 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.
@@ -106,7 +106,8 @@ public abstract class GroovyPsiElementFactory implements JVMElementFactory {
     return createExpressionFromText(exprText, null);
   }
 
-  public abstract GrExpression createExpressionFromText(String exprText, @Nullable PsiElement context);
+  @NotNull
+  public abstract GrExpression createExpressionFromText(@NotNull String exprText, @Nullable PsiElement context);
 
   public abstract GrVariableDeclaration createFieldDeclaration(String[] modifiers, String identifier, @Nullable GrExpression initializer, @Nullable PsiType type);
   public abstract GrVariableDeclaration createFieldDeclarationFromText(String text);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiElementFactoryImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiElementFactoryImpl.java
index 9fcfea253076..3d43ad43138e 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiElementFactoryImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiElementFactoryImpl.java
@@ -141,7 +141,8 @@ public class GroovyPsiElementFactoryImpl extends GroovyPsiElementFactory {
     return createReferenceExpressionFromText(text);
   }
 
-  public GrExpression createExpressionFromText(String text, PsiElement context) {
+  @NotNull
+  public GrExpression createExpressionFromText(@NotNull String text, PsiElement context) {
     GroovyFileImpl file = (GroovyFileImpl)createGroovyFile(text, false, context);
     GrTopStatement[] topStatements = file.getTopStatements();
     if (topStatements.length == 0 || !(topStatements[0] instanceof GrExpression)) {