Fixed bug that *.css path is not correct when #registerCSS is called from

jossonsmith · jossonsmith · commit 01c340214113 · 2006-08-07T17:09:11.000Z
*.z.js (e.g TabFolder.z.js, the normal class path should be TabFolder.js)
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/ClassExt.js b/sources/net.sf.j2s.java.core/src/java/lang/ClassExt.js
@@ -841,6 +841,8 @@ Clazz.registerCSS = function (clazzName, cssText) {
 				/*
 				 * TODO: Keep eyes open on IE. Maybe IE won't initialize this 
 				 * javascript-kind of CSS!
+				 * FIXME: IE7 (or IE6 sp2) does not support this kind of 
+				 * CSS loading!
 				 */
 				document.createStyleSheet ("javascript:Clazz.cssForIE (\"" + cssID + "\");");
 			} else {
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/ClassLoader.js b/sources/net.sf.j2s.java.core/src/java/lang/ClassLoader.js
@@ -387,30 +387,38 @@ ClazzLoader.registerPackages = function (prefix, pkgs) {
 ClazzLoader.getClasspathFor = function (clazz, forRoot, ext) {
 	//error ("check js path : " + clazz);
 	var path = ClazzLoader.classpathMap["#" + clazz];
-	if (path != null) {
-		return path;
-	}
-	/*
-	path = ClazzLoader.classpathMap["@" + clazz]; // package
-	if (path != null) {
-		return ClazzLoader.assureBase (path) + clazz.replace (/\./g, "/") + "/";
-	}
-	*/
 	var base = null;
-	var idx = clazz.lastIndexOf (".");
-	/*
-	while (idx != -1) {
-		var pkg = clazz.substring (0, idx);
-		base = ClazzLoader.classpathMap["@" + pkg];
-		if (base != null) {
-			break;
+	if (path != null) {
+		if (!forRoot && ext == null) { // return directly
+			return path;
+		} else {
+			var idx = path.lastIndexOf (clazz.replace (/\./g, "/"));
+			if (idx != -1) {
+				base = path.substring (0, idx);
+			}
+		}
+	} else {
+		/*
+		path = ClazzLoader.classpathMap["@" + clazz]; // package
+		if (path != null) {
+			return ClazzLoader.assureBase (path) + clazz.replace (/\./g, "/") + "/";
+		}
+		*/
+		var idx = clazz.lastIndexOf (".");
+		/*
+		while (idx != -1) {
+			var pkg = clazz.substring (0, idx);
+			base = ClazzLoader.classpathMap["@" + pkg];
+			if (base != null) {
+				break;
+			}
+			idx = clazz.lastIndexOf (".", idx - 2);
+		}
+		*/
+		if (idx != -1) {
+			var pkg = clazz.substring (0, idx);
+			base = ClazzLoader.classpathMap["@" + pkg];
 		}
-		idx = clazz.lastIndexOf (".", idx - 2);
-	}
-	*/
-	if (idx != -1) {
-		var pkg = clazz.substring (0, idx);
-		base = ClazzLoader.classpathMap["@" + pkg];
 	}
 	
 	base = ClazzLoader.assureBase (base);
