Skip to content

Commit 2d9640a

Browse files
committed
Changed groovy imports to 'java_import', avoiding a conflict with rake import
1 parent a2a639f commit 2d9640a

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

lib/groovy/repl_mirror.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ def help
3737
3838
Example:
3939
40-
def foo = 'hello! I am a local variable'
41-
foo = 'hi! I am a binding variable'
40+
def foo = 'hello! I am a local variable. I will vanish after this statement executes.'
41+
foo = 'hi! I am a binding variable. I live on!'
4242
4343
See 'http://groovy.codehaus.org/Scoping+and+the+Semantics+of+%22def%22'
4444
for more information.
@@ -49,9 +49,9 @@ class Evaluator
4949
def self.load_dependencies
5050
unless @loaded
5151
Groovy.load_dependencies
52-
import 'groovy.lang.GroovyShell'
53-
import 'java.io.PrintWriter'
54-
import 'java.io.StringWriter'
52+
java_import 'groovy.lang.GroovyShell'
53+
java_import 'java.io.PrintWriter'
54+
java_import 'java.io.StringWriter'
5555
@loaded = true
5656
end
5757
end

lib/groovy/syntax_checker.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ class SyntaxChecker < Redcar::SyntaxCheck::Checker
99
def self.load_dependencies
1010
unless @loaded
1111
Groovy.load_dependencies
12-
import 'groovy.lang.GroovyShell'
13-
import 'org.codehaus.groovy.control.CompilationFailedException'
14-
import 'org.codehaus.groovy.control.CompilerConfiguration'
12+
java_import 'groovy.lang.GroovyShell'
13+
java_import 'org.codehaus.groovy.control.CompilationFailedException'
14+
java_import 'org.codehaus.groovy.control.CompilerConfiguration'
1515
@loaded = true
1616
end
1717
end

0 commit comments

Comments
 (0)