allows checking first in class package for Class.forName(name, init,

hansonr · hansonr · commit 2cdeaf02729d · 2019-03-07T21:22:34.000-06:00
ClassLoader)
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/Class.java b/sources/net.sf.j2s.java.core/src/java/lang/Class.java
@@ -720,7 +720,12 @@ private String getName0() {
 	 * @see java.lang.RuntimePermission
 	 */
 	public ClassLoader getClassLoader() {
-		return getClassLoader0();
+		ClassLoader cl = getClassLoader0();
+		/**
+		 * @j2sNative
+		 * cl.baseClass = this;
+		 */
+		return cl;
 //		SecurityManager sm = System.getSecurityManager();
 //		if (sm != null) {
 //			ClassLoader ccl = ClassLoader.getCallerClassLoader();
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Reflect.java b/sources/net.sf.j2s.java.core/src/test/Test_Reflect.java
@@ -1,5 +1,6 @@
 package test;
 
+import java.awt.Button;
 import java.lang.reflect.Field;
 
 class Test_Reflect extends Test_ {
@@ -68,6 +69,22 @@ public void test(String s, float[][] aaf) {
 	 */
 
 	public static void main(String[] args) {
+		
+		String name = "";
+		try {
+			Test_Path tp = (Test_Path) Class.forName(name = "Test_Path", true, Test_Reflect.class.getClassLoader()).newInstance();
+			assert(tp != null);
+			System.out.println("class loaded: " + tp.getClass().getName());
+
+			Button b = (Button) Class.forName(name = "java.awt.Button", true, Test_Reflect.class.getClassLoader()).newInstance();
+			assert(b != null);
+			System.out.println("class loaded: " + b.getClass().getName());
+
+		} catch (Throwable t) {
+			System.out.println("problems loading " + name);
+			assert(false);
+		}
+		
 		Test_Reflect tr = new Test_Reflect();
   		  // Field is not implemented
 //			Field f = Test_Reflect.class.getDeclaredField("s");
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
@@ -303,8 +303,19 @@ Clazz.exceptionOf = function(e, clazz) {
     || clazz == NullPointerException && _isNPEExceptionPredicate(e));
 };
 
-Clazz.forName = function(name, initialize, loader) {
-  return Clazz._4Name(name, null, null, false, initialize);
+Clazz.forName = function(name, initialize, loader, isQuiet) {
+  // we need to consider loading a class from the path of the calling class. 
+ var cl = null;
+ if (loader) {
+	try {
+		isQuiet = true;
+		var className = loader.baseClass.getName$(); // set in java.lang.Class.getClassLoader$()
+		var i = className.lastIndexOf(".");
+		var name1 = className.substring(0, i + 1) + name;
+		cl = Clazz._4Name(name1, null, null, false, initialize, true);
+	} catch (e) {}
+ }
+ return cl || Clazz._4Name(name, null, null, false, initialize, isQuiet);
 }
 
 Clazz.getClass = function(cl, methodList) {
@@ -2487,7 +2498,7 @@ var evaluate = function(file, js) {
   }
 }
 
-Clazz._4Name = function(clazzName, applet, state, asClazz, initialize) {
+Clazz._4Name = function(clazzName, applet, state, asClazz, initialize, isQuiet) {
   if (clazzName.indexOf("[") == 0)
 	return getArrayClass(clazzName);
   if (clazzName.indexOf(".") < 0)
@@ -2524,6 +2535,8 @@ Clazz._4Name = function(clazzName, applet, state, asClazz, initialize) {
   }
   var cl = evalType(clazzName);
   if (!cl){
+	if (isQuiet)
+		return null;
     alert(clazzName + " could not be loaded");
     doDebugger();
   }
