j2sClazz.js for core/package.js

BobHanson · BobHanson · commit 0e7890486303 · 2023-02-16T12:17:41.000-06:00
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20230212221227 
+20230216091105 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp
@@ -1 +1 @@
-20230212221227 
+20230216091105 
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js
@@ -312,24 +312,6 @@ window.J2S = J2S = (function() {
 		return $.ajax(info);
 	}
 
-	J2S.$getScriptAsync = function(file, whenDone) {
-		// bad news: if the file does not exist, this fails to call any error. apparently fixed in JQuery 2.0
-		
-		if (J2S._nozcore) {
-			file = file.replace(/\.z\.js/,".js");
-		}
-		return J2S.$ajax({
-			url: file,
-			type: "GET",
-			dataType: "script",
-			cache: "NO",
-			statusCode: { 404: function() {alert("!")}},
-			success: whenDone,
-			error: whenDone
-		});
-	}
-
-
 	var fixProtocol = function(url) {
 		if (!J2S._isFile && url.indexOf("file://") >= 0)
 			url = "http" + url.substring(4);
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
@@ -2398,16 +2398,12 @@ _Loader.loadPackageClasspath = function (pkg, base, isIndex, fSuccess, mode, pt)
   if (base) // critical for multiple applets
     map["@" + pkg] = base;
   if (isIndex && !isPkgDeclared && !J2S.getGlobal(pkg + ".registered")) {
-    // pkgRefCount++;
+	  // the package idea has been deprecated
+	  // the only package is core/package.js
     if (pkg == "java")
       pkg = "core" // JSmol -- moves java/package.js to core/package.js
-    	  
-    if (fSuccess) {
-      J2S.$getScriptAsync(_Loader.getClasspathFor(pkg + ".package"), fSuccess);
-      return;
-    }
+    // not really asynchronous
     _Loader.loadClass(pkg + ".package", null, true, true, 1);
-    return;
   }
   fSuccess && fSuccess();
 };
diff --git a/sources/net.sf.j2s.java.core/srcjs/swingjs2.js b/sources/net.sf.j2s.java.core/srcjs/swingjs2.js
@@ -10998,13 +10998,6 @@ window.J2S = J2S = (function() {
 		return $.ajax(info);
 	}
 
-	J2S.$getScriptAsync = function(file, whenDone) {
-		if (J2S._nozcore) {
-			file = file.replace(/\.z\.js/,".js");
-		}
-		return $.getScript(file, whenDone);
-	}
-
 	var fixProtocol = function(url) {
 		if (!J2S._isFile && url.indexOf("file://") >= 0)
 			url = "http" + url.substring(4);
@@ -16459,16 +16452,12 @@ _Loader.loadPackageClasspath = function (pkg, base, isIndex, fSuccess, mode, pt)
   if (base) // critical for multiple applets
     map["@" + pkg] = base;
   if (isIndex && !isPkgDeclared && !J2S.getGlobal(pkg + ".registered")) {
-    // pkgRefCount++;
+	  // the package idea has been deprecated
+	  // the only package is core/package.js
     if (pkg == "java")
       pkg = "core" // JSmol -- moves java/package.js to core/package.js
-    	  
-    if (fSuccess) {
-      J2S.$getScriptAsync(_Loader.getClasspathFor(pkg + ".package"), fSuccess);
-      return;
-    }
+    // not really asynchronous
     _Loader.loadClass(pkg + ".package", null, true, true, 1);
-    return;
   }
   fSuccess && fSuccess();
 };
