From 69b4839a311efb384779cb6cb64e85a09c10cda8 Mon Sep 17 00:00:00 2001 From: Charles Oliver Nutter Date: Wed, 16 Dec 2009 01:32:42 -0600 Subject: [PATCH] Clean up some imports. --- src/org/jruby/java/MiniJava.java | 1 - src/org/jruby/java/proxies/JavaInterfaceTemplate.java | 3 +-- src/org/jruby/javasupport/Java.java | 2 +- src/org/jruby/javasupport/JavaSupport.java | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/org/jruby/java/MiniJava.java b/src/org/jruby/java/MiniJava.java index a842e37373e..76eab487616 100644 --- a/src/org/jruby/java/MiniJava.java +++ b/src/org/jruby/java/MiniJava.java @@ -33,7 +33,6 @@ import org.jruby.internal.runtime.methods.DynamicMethod; import org.jruby.internal.runtime.methods.JavaMethod; import org.jruby.internal.runtime.methods.UndefinedMethod; -import org.jruby.javasupport.Java; import org.jruby.javasupport.JavaUtil; import org.jruby.javasupport.util.RuntimeHelpers; import org.jruby.runtime.Block; diff --git a/src/org/jruby/java/proxies/JavaInterfaceTemplate.java b/src/org/jruby/java/proxies/JavaInterfaceTemplate.java index 99e9aaf7101..045f7716115 100644 --- a/src/org/jruby/java/proxies/JavaInterfaceTemplate.java +++ b/src/org/jruby/java/proxies/JavaInterfaceTemplate.java @@ -5,7 +5,6 @@ import org.jruby.RubyArray; import org.jruby.RubyClass; import org.jruby.RubyModule; -import org.jruby.RubyString; import org.jruby.anno.JRubyMethod; import org.jruby.exceptions.RaiseException; import org.jruby.internal.runtime.methods.DynamicMethod; @@ -255,7 +254,7 @@ public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule claz assert self instanceof RubyClass : "new defined on non-class"; RubyClass clazzSelf = (RubyClass) self; - IRubyObject newObj = Java.newRealInterfaceImpl(clazzSelf); + IRubyObject newObj = Java.generateRealClass(clazzSelf); RuntimeHelpers.invoke(context, newObj, "initialize", args, block); diff --git a/src/org/jruby/javasupport/Java.java b/src/org/jruby/javasupport/Java.java index 6253ced2ff2..05b6af32a91 100644 --- a/src/org/jruby/javasupport/Java.java +++ b/src/org/jruby/javasupport/Java.java @@ -1046,7 +1046,7 @@ public Object invoke(Object proxy, Method method, Object[] nargs) throws Throwab } } - public static IRubyObject newRealInterfaceImpl(final RubyClass clazz) { + public static IRubyObject generateRealClass(final RubyClass clazz) { final Ruby runtime = clazz.getRuntime(); final Class[] interfaces = getInterfacesFromRubyClass(clazz); diff --git a/src/org/jruby/javasupport/JavaSupport.java b/src/org/jruby/javasupport/JavaSupport.java index 899bc558ab9..6bb30ef2040 100644 --- a/src/org/jruby/javasupport/JavaSupport.java +++ b/src/org/jruby/javasupport/JavaSupport.java @@ -43,7 +43,6 @@ import org.jruby.RubyClass; import org.jruby.RubyModule; import org.jruby.exceptions.RaiseException; -import org.jruby.java.proxies.JavaProxy; import org.jruby.javasupport.util.ObjectProxyCache; import org.jruby.runtime.builtin.IRubyObject; import org.jruby.runtime.callback.Callback;