URL issues, Gemfile update

BobHanson · BobHanson · commit 5479b7fa3518 · 2022-11-12T12:26:54.000-06:00
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
@@ -6,7 +6,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (>= 2.8.0)
       public_suffix (>= 2.0.2, < 4.0)
     coffee-script (2.4.1)
       coffee-script-source
@@ -74,7 +74,7 @@ GEM
       rouge (= 2.2.1)
       terminal-table (~> 1.4)
     github-pages-health-check (1.4.0)
-      addressable (~> 2.3)
+      addressable (>= 2.8.0)
       net-dns (~> 0.8)
       octokit (~> 4.0)
       public_suffix (~> 2.0)
@@ -86,7 +86,7 @@ GEM
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     jekyll (~> 3.7.4)
-      addressable (~> 2.4)
+      addressable (>= 2.8.0)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 0.7)
@@ -229,7 +229,7 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
     sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
+      addressable (>= 2.8.0)
       faraday (~> 0.8, < 1.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
diff --git a/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20220915081800 
+20221112121850 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/SwingJS-site.zip
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 @@
-20220915081800 
+20221112121850 
diff --git a/sources/net.sf.j2s.java.core/src/java/io/File.java b/sources/net.sf.j2s.java.core/src/java/io/File.java
@@ -391,6 +391,7 @@ else if ((p = uri.getPath()).equals(""))
 			this.path = //fs.normalize
 					(p);
 			this.prefixLength = fs.prefixLength(this.path);
+            秘bytes = uri.秘bytes;
 			return;
 		}
 		throw new IllegalArgumentException(err);
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java b/sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java
@@ -1045,7 +1045,7 @@ public void setAppletInfo(String infoKey, Object val) {
 	public URL getDocumentBase() {
 		JSFrameViewer ap = (JSFrameViewer) this.getAppletAttribute("_appletPanel");
 		try {
-			return new URL(ap.appletDocumentBase);
+			return (ap == null ? new URL("file://./"): new URL(ap.appletDocumentBase));
 		} catch (MalformedURLException e) {
 			return null;
 		}
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_URL.java b/sources/net.sf.j2s.java.core/src/test/Test_URL.java
@@ -4,6 +4,7 @@
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
 import java.io.File;
+import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -49,6 +50,12 @@ protected static String getResponseMimeType() {
 	public static void main(String[] args) {
 
 		try {
+		    URL u = Test_URL.class.getResource("ctx_test.js");
+		    System.out.println(u);
+		    System.out.println(u.toURI());
+		    File file = new File(u.toURI());
+		    BufferedReader fr = new BufferedReader(new FileReader(file));
+		    fr.close();
 			String value = "this is a test+this";
 			String s = URLEncoder.encode(value.replace(' ', '\0'), "UTF-8").replaceAll("%00", "%20");
 			System.out.println(s);
@@ -62,7 +69,7 @@ public static void main(String[] args) {
 			URL url;
 			URL jarURL;
 
-			String jarpath = /** @j2sNative "./test/test.xlsx" || */
+			String jarpath = /** @j2sNative "/test/test.xlsx" || */
 					"src/test/test.xlsx";
 			url = new URL("file", null, "C:/temp/car.trz");
 			jarURL = new URL("jar", null, url + "!/Car in a loop with friction.trk");// "!/xl/worksheets/sheet1.xml");
@@ -117,7 +124,7 @@ public static void main(String[] args) {
 
 		} catch (Exception e2) {
 			// This error thrown in Java only
-			e2.printStackTrace();
+			assert(/** @j2sNative false && */true);
 		}
 
 		dumpHeaders("http://www.opensourcephysics.org");
@@ -136,7 +143,7 @@ public static void main(String[] args) {
 			HttpURLConnection connection = (HttpURLConnection) url.openConnection();
 			assert (connection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND);
 		} catch (Exception e1) {
-			e1.printStackTrace();
+			System.out.println(e1 + " OK");
 		}
 
 		try {
@@ -160,7 +167,7 @@ public static void main(String[] args) {
 			String s = Rdr.streamToString(is);
 			is.close();
 			System.out.println(s);
-			assert (s.equals("{\"ping\":1}\n"));
+			assert (s.trim().equals("{\"ping\":1}"));
 
 			assert checkEnsembl();
 

Original file line number	Diff line number	Diff line change
`@@ -391,6 +391,7 @@ else if ((p = uri.getPath()).equals(""))`
`391`	`391`	`this.path = //fs.normalize`
`392`	`392`	`(p);`
`393`	`393`	`this.prefixLength = fs.prefixLength(this.path);`
	`394`	`+ 秘bytes = uri.秘bytes;`
`394`	`395`	`return;`
`395`	`396`	`}`
`396`	`397`	`throw new IllegalArgumentException(err);`
Original file line number	Diff line number	Diff line change
`@@ -1045,7 +1045,7 @@ public void setAppletInfo(String infoKey, Object val) {`
`1045`	`1045`	`public URL getDocumentBase() {`
`1046`	`1046`	`JSFrameViewer ap = (JSFrameViewer) this.getAppletAttribute("_appletPanel");`
`1047`	`1047`	`try {`
`1048`		`- return new URL(ap.appletDocumentBase);`
	`1048`	`+ return (ap == null ? new URL("file://./"): new URL(ap.appletDocumentBase));`
`1049`	`1049`	`} catch (MalformedURLException e) {`
`1050`	`1050`	`return null;`
`1051`	`1051`	`}`