diff core/src/luan/modules/JavaLuan.java @ 297:899253043270

remove PackageLuan.load_lib() git-svn-id: https://luan-java.googlecode.com/svn/trunk@298 21e917c8-12df-6dd8-5cb6-c86387c605b9
author fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
date Tue, 16 Dec 2014 03:26:43 +0000
parents 8ac3eaf8ecd9
children a74559240b4f
line wrap: on
line diff
--- a/core/src/luan/modules/JavaLuan.java	Mon Dec 15 08:03:32 2014 +0000
+++ b/core/src/luan/modules/JavaLuan.java	Tue Dec 16 03:26:43 2014 +0000
@@ -27,21 +27,9 @@
 
 public final class JavaLuan {
 
-	public static final LuanFunction LOADER = new LuanFunction() {
-		@Override public Object call(LuanState luan,Object[] args) throws LuanException {
-			LuanTable module = Luan.newTable();
-			try {
-				module.put( "class", new LuanJavaFunction(JavaLuan.class.getMethod("getClass",LuanState.class,String.class),null) );
-				add( module, "proxy", LuanState.class, Static.class, LuanTable.class, Object.class );
-			} catch(NoSuchMethodException e) {
-				throw new RuntimeException(e);
-			}
-			return module;
-		}
-	};
-
 	private static boolean isLoaded(LuanState luan) {
-		return PackageLuan.loaded(luan).get("luan:Java") != null;
+//		return PackageLuan.loaded(luan).get("luan:Java") != null;
+		return true;
 	}
 
 	static LuanFunction javaLoader(LuanState luan,String modName) throws LuanException {
@@ -58,14 +46,6 @@
 		return loader;
 	}
 
-	private static void add(LuanTable t,String method,Class<?>... parameterTypes) {
-		try {
-			t.put( method, new LuanJavaFunction(JavaLuan.class.getMethod(method,parameterTypes),null) );
-		} catch(NoSuchMethodException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
 	public static Object __index(LuanState luan,Object obj,Object key) throws LuanException {
 		if( obj instanceof Static ) {
 			if( key instanceof String ) {
@@ -123,6 +103,7 @@
 			}
 		}
 //		throw luan.exception("invalid member '"+key+"' for java object: "+obj);
+//System.out.println("invalid member '"+key+"' for java object: "+obj);
 		return null;
 	}
 
@@ -138,13 +119,13 @@
 					return rtn instanceof Object[] ? Arrays.asList((Object[])rtn) : rtn;
 				} else {
 					Method method = (Method)member;
-					return new LuanJavaFunction(method,obj,true);
+					return new LuanJavaFunction(method,obj);
 				}
 			} else {
 				List<LuanJavaFunction> fns = new ArrayList<LuanJavaFunction>();
 				for( Member member : members ) {
 					Method method = (Method)member;
-					fns.add(new LuanJavaFunction(method,obj,true));
+					fns.add(new LuanJavaFunction(method,obj));
 				}
 				return new AmbiguousJavaFunction(fns);
 			}