_applet._j2sFullPath and JSUtil.getJ2SPath()

hansonr · hansonr · commit 194152c4f015 · 2020-12-14T21:38:04.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java b/sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java
@@ -1219,7 +1219,8 @@ public Promise importModule(String resource, Function<Object, Object> resolve, F
 		Object o = DOMNode.class;
 		loadStaticResource("/_ES6/jsutil.js");
 		if (resource.startsWith("$J2S$/"))
-			resource = getJ2SPath() + resource.substring(6);
+			resource = getJ2SPath() + resource.substring(5);
+		System.out.println("JSUtil.importModule " + resource);
 		return /** @j2sNative J2S._ES6.jsutil.importModule(resource, resolve, reject) ||*/null;
 	}
 
@@ -1249,9 +1250,12 @@ public void accept(Object o) {
 		
 	}
 
+	/**
+	 * this path does not end in /
+	 */
 	@Override
 	public String getJ2SPath() {
-		return (String) getAppletAttribute("_codePath");
+		return (String) getAppletAttribute("_j2sFullPath");
 	}
 
 	
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js
@@ -2780,6 +2780,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
 						base[base.length - 1] = codePath;
 					codePath = base.join("/");
 				}
+				applet._j2sFullPath = codePath.substring(0, codePath.length);
 				if (applet.__Info.code)
 					codePath += applet.__Info.code.replace(/\./g, "/");
 				codePath = codePath.substring(0,

Original file line number	Diff line number	Diff line change
`@@ -1219,7 +1219,8 @@ public Promise importModule(String resource, Function<Object, Object> resolve, F`
`1219`	`1219`	`Object o = DOMNode.class;`
`1220`	`1220`	`loadStaticResource("/_ES6/jsutil.js");`
`1221`	`1221`	`if (resource.startsWith("$J2S$/"))`
`1222`		`- resource = getJ2SPath() + resource.substring(6);`
	`1222`	`+ resource = getJ2SPath() + resource.substring(5);`
	`1223`	`+ System.out.println("JSUtil.importModule " + resource);`
`1223`	`1224`	`return /** @j2sNative J2S._ES6.jsutil.importModule(resource, resolve, reject) \|\|*/null;`
`1224`	`1225`	`}`
`1225`	`1226`
`@@ -1249,9 +1250,12 @@ public void accept(Object o) {`
`1249`	`1250`
`1250`	`1251`	`}`
`1251`	`1252`
	`1253`	`+ /**`
	`1254`	`+ * this path does not end in /`
	`1255`	`+ */`
`1252`	`1256`	`@Override`
`1253`	`1257`	`public String getJ2SPath() {`
`1254`		`- return (String) getAppletAttribute("_codePath");`
	`1258`	`+ return (String) getAppletAttribute("_j2sFullPath");`
`1255`	`1259`	`}`
`1256`	`1260`
`1257`	`1261`
Original file line number	Diff line number	Diff line change
`@@ -2780,6 +2780,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {`
`2780`	`2780`	`base[base.length - 1] = codePath;`
`2781`	`2781`	`codePath = base.join("/");`
`2782`	`2782`	`}`
	`2783`	`+ applet._j2sFullPath = codePath.substring(0, codePath.length);`
`2783`	`2784`	`if (applet.__Info.code)`
`2784`	`2785`	`codePath += applet.__Info.code.replace(/\./g, "/");`
`2785`	`2786`	`codePath = codePath.substring(0,`