Fixes newer Java8 Jar-related files; implements proper Random.nextLong()

BobHanson · BobHanson · commit 9d9dae7ff45c · 2022-07-13T23:19:29.000+05:30
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 @@
-20220627235431 
+20220713221322 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1-j11/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1-j11/SwingJS-site.zip
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 @@
-20220627234904 
+20220713221322 
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/src/java/security/cert/CertPathHelperImpl.java b/sources/net.sf.j2s.java.core/src/java/security/cert/CertPathHelperImpl.java
@@ -63,4 +63,10 @@ protected void implSetPathToNames(X509CertSelector sel,
     protected void implSetDateAndTime(X509CRLSelector sel, Date date, long skew) {
         sel.setDateAndTime(date, skew);
     }
+
+	@Override
+	protected boolean implIsJdkCA(TrustAnchor arg0) {
+		// TODO Auto-generated method stub
+		return false;
+	}
 }
diff --git a/sources/net.sf.j2s.java.core/src/java/util/Random.java b/sources/net.sf.j2s.java.core/src/java/util/Random.java
@@ -287,11 +287,7 @@ public int nextInt(int n) {
 	 * 
 	 */
 	public long nextLong() {
-		JSUtil.notImplemented(null);
-		return nextInt();
-//		{
-//		return ((long) next(32) << 32) + next(32);
-//		}
+		return ((long) next(32) << 32) + next(32);
 	}
 
 	/**
diff --git a/sources/net.sf.j2s.java.core/src/java/util/jar/JarInputStream.java b/sources/net.sf.j2s.java.core/src/java/util/jar/JarInputStream.java
@@ -96,7 +96,7 @@ private JarEntry checkManifest(JarEntry e)
             closeEntry();
             if (doVerify) {
                 jv = new JarVerifier(bytes);
-                mev = new ManifestEntryVerifier(man);
+                mev = new ManifestEntryVerifier(man, null);
             }
             return (JarEntry)super.getNextEntry();
         }
diff --git a/sources/net.sf.j2s.java.core/src/java/util/jar/JarVerifier.java b/sources/net.sf.j2s.java.core/src/java/util/jar/JarVerifier.java
@@ -270,7 +270,7 @@ private void processEntry(ManifestEntryVerifier mev)
                             }
 
                             sfv.setSignatureFile(bytes);
-                            sfv.process(sigFileSigners, manifestDigests);
+                            sfv.process(sigFileSigners, manifestDigests, null);
                         }
                     }
                     return;
@@ -313,7 +313,7 @@ private void processEntry(ManifestEntryVerifier mev)
                         sfv.setSignatureFile(bytes);
                     }
                 }
-                sfv.process(sigFileSigners, manifestDigests);
+                sfv.process(sigFileSigners, manifestDigests, null);
 
             } catch (IOException ioe) {
                 // e.g. sun.security.pkcs.ParsingException
@@ -448,7 +448,7 @@ static class VerifierStream extends java.io.InputStream {
         {
             this.is = is;
             this.jv = jv;
-            this.mev = new ManifestEntryVerifier(man);
+            this.mev = new ManifestEntryVerifier(man, null);
             this.jv.beginEntry(je, mev);
             this.numLeft = je.getSize();
             if (this.numLeft == 0)
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Long.java b/sources/net.sf.j2s.java.core/src/test/Test_Long.java
@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.io.PushbackInputStream;
 import java.util.BitSet;
+import java.util.Random;
 
 /**
  * test full 64-bit long/Long support in JavaScript. Also see Test_BigInt
@@ -29,7 +30,7 @@ public class Test_Long extends Test_ {
 	
 	public static void main(String[] args) {
 
-		
+
 		long j = Long.parseLong("2"), k = 10, l = 1, m = 12;
 		Long J = Long.valueOf(j);
 		assert(J == 2);
@@ -62,10 +63,19 @@ public static void main(String[] args) {
 		testStatic();
 		testBoxed();
 		testExtended(j,k,l,m);		
+		testRandom();
 
 		System.out.println("Test_Long OK");
 	}
 
+	private static void testRandom() {
+			Random r = new Random();
+			for (int i = 0; i < 10; i++) {
+				long l = ((long) r.nextInt() << 32) + r.nextInt();
+				System.out.println("random long = " + l);
+			}
+	}
+
 	private static void testLongMath(long j, long k, long l) {
 		
 		k = -230842039822340L;
diff --git a/sources/net.sf.j2s.java.core/unused/sun/font/FontStrikeDisposer.java b/sources/net.sf.j2s.java.core/unused/sun/font/FontStrikeDisposer.java
@@ -94,7 +94,7 @@ public FontStrikeDisposer(Font2D font2D, FontStrikeDesc desc) {
 
     public synchronized void dispose() {
         if (!disposed) {
-            font2D.removeFromCache(desc);
+//            font2D.removeFromCache(desc);
             StrikeCache.disposeStrike(this);
             disposed = true;
         }

Original file line number	Diff line number	Diff line change
`@@ -63,4 +63,10 @@ protected void implSetPathToNames(X509CertSelector sel,`
`63`	`63`	`protected void implSetDateAndTime(X509CRLSelector sel, Date date, long skew) {`
`64`	`64`	`sel.setDateAndTime(date, skew);`
`65`	`65`	`}`
	`66`	`+`
	`67`	`+ @Override`
	`68`	`+ protected boolean implIsJdkCA(TrustAnchor arg0) {`
	`69`	`+ // TODO Auto-generated method stub`
	`70`	`+ return false;`
	`71`	`+ }`
`66`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -287,11 +287,7 @@ public int nextInt(int n) {`
`287`	`287`	`*`
`288`	`288`	`*/`
`289`	`289`	`public long nextLong() {`
`290`		`- JSUtil.notImplemented(null);`
`291`		`- return nextInt();`
`292`		`-// {`
`293`		`-// return ((long) next(32) << 32) + next(32);`
`294`		`-// }`
	`290`	`+ return ((long) next(32) << 32) + next(32);`
`295`	`291`	`}`
`296`	`292`
`297`	`293`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ private JarEntry checkManifest(JarEntry e)`
`96`	`96`	`closeEntry();`
`97`	`97`	`if (doVerify) {`
`98`	`98`	`jv = new JarVerifier(bytes);`
`99`		`- mev = new ManifestEntryVerifier(man);`
	`99`	`+ mev = new ManifestEntryVerifier(man, null);`
`100`	`100`	`}`
`101`	`101`	`return (JarEntry)super.getNextEntry();`
`102`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ private void processEntry(ManifestEntryVerifier mev)`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`sfv.setSignatureFile(bytes);`
`273`		`- sfv.process(sigFileSigners, manifestDigests);`
	`273`	`+ sfv.process(sigFileSigners, manifestDigests, null);`
`274`	`274`	`}`
`275`	`275`	`}`
`276`	`276`	`return;`
`@@ -313,7 +313,7 @@ private void processEntry(ManifestEntryVerifier mev)`
`313`	`313`	`sfv.setSignatureFile(bytes);`
`314`	`314`	`}`
`315`	`315`	`}`
`316`		`- sfv.process(sigFileSigners, manifestDigests);`
	`316`	`+ sfv.process(sigFileSigners, manifestDigests, null);`
`317`	`317`
`318`	`318`	`} catch (IOException ioe) {`
`319`	`319`	`// e.g. sun.security.pkcs.ParsingException`
`@@ -448,7 +448,7 @@ static class VerifierStream extends java.io.InputStream {`
`448`	`448`	`{`
`449`	`449`	`this.is = is;`
`450`	`450`	`this.jv = jv;`
`451`		`- this.mev = new ManifestEntryVerifier(man);`
	`451`	`+ this.mev = new ManifestEntryVerifier(man, null);`
`452`	`452`	`this.jv.beginEntry(je, mev);`
`453`	`453`	`this.numLeft = je.getSize();`
`454`	`454`	`if (this.numLeft == 0)`