From 6cf89ccade2e637daa9a84227112ebd95758da97 Mon Sep 17 00:00:00 2001
From: Max Medvedev <maxim.medvedev@jetbrains.com>
Date: Tue, 8 Apr 2014 10:59:53 +0400
Subject: [PATCH] fix testdata

---
 .../testdata/intentions/staticImport/OnDemand2_after.groovy   | 4 ++--
 .../convertGroovyToJava/codeBlock/anonymousFromMap.java       | 2 +-
 .../refactoring/convertGroovyToJava/codeBlock/closure.java    | 2 +-
 .../file/methodParamInClosureImplicitReturn.java              | 4 ++--
 .../convertGroovyToJava/file/refInClosureInScript.java        | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/groovy/testdata/intentions/staticImport/OnDemand2_after.groovy b/plugins/groovy/testdata/intentions/staticImport/OnDemand2_after.groovy
index 9de863d41fd9..139e971042a4 100644
--- a/plugins/groovy/testdata/intentions/staticImport/OnDemand2_after.groovy
+++ b/plugins/groovy/testdata/intentions/staticImport/OnDemand2_after.groovy
@@ -1,4 +1,4 @@
-import static Util.*
+import static Util.doSomething
 
 class Util {
   static doSomething(){}
@@ -10,4 +10,4 @@ def doSomethingElse(a){}
 
 doSomething()
 doSomething(2)
-Util.doSomethingElse(2)
\ No newline at end of file
+doSomethingElse(2)
\ No newline at end of file
diff --git a/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/anonymousFromMap.java b/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/anonymousFromMap.java
index 1cb3b2258ab6..d656375ed55f 100644
--- a/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/anonymousFromMap.java
+++ b/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/anonymousFromMap.java
@@ -1,5 +1,5 @@
 print(new java.lang.Runnable() {
-public void run(java.lang.Object it) {print("foo}");}
+public void run(java.lang.Object it) {org.codehaus.groovy.runtime.DefaultGroovyMethods.print(anonymousFromMap.this, "foo}");}
 public void run() {
 this.run(null);
 }
diff --git a/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/closure.java b/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/closure.java
index 769c8bd97d8a..e8a4f4a5501c 100644
--- a/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/closure.java
+++ b/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/closure.java
@@ -1,7 +1,7 @@
 java.util.ArrayList<java.lang.Integer> list = new java.util.ArrayList<java.lang.Integer>(java.util.Arrays.asList(1, 2, 3));
 org.codehaus.groovy.runtime.DefaultGroovyMethods.each(list, new groovy.lang.Closure<java.lang.Object>(this, this) {
 public void doCall(java.lang.Integer it) {
-print(it);
+org.codehaus.groovy.runtime.DefaultGroovyMethods.print(closure.this, it);
 }
 
 public void doCall() {
diff --git a/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/methodParamInClosureImplicitReturn.java b/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/methodParamInClosureImplicitReturn.java
index e51530135bbc..99e09df718d2 100644
--- a/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/methodParamInClosureImplicitReturn.java
+++ b/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/methodParamInClosureImplicitReturn.java
@@ -13,7 +13,7 @@ public void foo(int x) {final groovy.lang.Reference<java.lang.Integer> i = new g
 
 org.codehaus.groovy.runtime.DefaultGroovyMethods.each(new java.util.ArrayList<java.lang.Integer>(java.util.Arrays.asList(1, 2, 3)), new groovy.lang.Closure<java.lang.Integer>(this, this) {
 public java.lang.Integer doCall(java.lang.Integer it) {
-print(i.get());
+org.codehaus.groovy.runtime.DefaultGroovyMethods.print(methodParamInClosureImplicitReturn.this, i.get());
 return setGroovyRef(i, i.get() + 1);
 }
 
@@ -25,7 +25,7 @@ return doCall(null);
 
 org.codehaus.groovy.runtime.DefaultGroovyMethods.each(new java.util.ArrayList<java.lang.Integer>(java.util.Arrays.asList(1, 2, 3)), new groovy.lang.Closure<java.lang.Integer>(this, this) {
 public java.lang.Integer doCall(java.lang.Integer it) {
-print(i.get());
+org.codehaus.groovy.runtime.DefaultGroovyMethods.print(methodParamInClosureImplicitReturn.this, i.get());
 i.set(i.get()++);
 return i.get();
 }
diff --git a/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/refInClosureInScript.java b/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/refInClosureInScript.java
index 3956feec017b..346abf3e3546 100644
--- a/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/refInClosureInScript.java
+++ b/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/refInClosureInScript.java
@@ -12,7 +12,7 @@ foo.set(foo.get()++);
 foo.set(foo.get() + 2);
 foo.set(foo.get() - 1);
 foo.set(4);
-print(foo.get());
+org.codehaus.groovy.runtime.DefaultGroovyMethods.print(refInClosureInScript.this, foo.get());
 }
 
 public void doCall() {