Fix for 4.2 Jmol ArrayList and Enum

BobHanson · BobHanson · commit a712ed2ae046 · 2024-03-19T09:21:16.000-05:00
overstepped on trying to optimize SearchAndExecuteMethod.
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 @@
-20240301123437 
+20240316183332 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/5.0.1/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/5.0.1/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/5.0.1/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/5.0.1/timestamp
@@ -1 +1 @@
-20240301123437 
+20240316183332 
diff --git a/sources/net.sf.j2s.java.core/.classpath b/sources/net.sf.j2s.java.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src_4.2"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/sources/net.sf.j2s.java.core/dist_to_jsmol/Jmol-j2s-site.zip b/sources/net.sf.j2s.java.core/dist_to_jsmol/Jmol-j2s-site.zip
diff --git a/sources/net.sf.j2s.java.core/site-resources_4.2/jsmol/js/j2sjmol.js b/sources/net.sf.j2s.java.core/site-resources_4.2/jsmol/js/j2sjmol.js
@@ -5,6 +5,7 @@
 
 // https://github.com/BobHanson/java2script/raw/master/sources/net.sf.j2s.java.core/site-resources_4.2/jsmol/js/j2sjmol.js
 
+// BH 2024.03.18 messed up Enum and ArrayList 
 // BH 2024.03.03 fixes new Clazz.exceptionOf(e,"NullPointerException") not working
 
 LoadClazz = function() {
@@ -1526,7 +1527,7 @@ Clazz.instantialize = function(objThis, args) {
 		args = argsClone;
 	}
 
-	var c = objThis.construct;
+	var c = objThis.construct; // the actual constructor Xxx() {...}
 	if (c) {
 		if (!objThis.con$truct) { // no need to init fields
 			c.apply (objThis, args);
@@ -2115,11 +2116,13 @@ Clazz.cloneFinals = function(){
 Clazz.defineEnumConstant = function(clazzEnum, enumName, enumOrdinal, initialParams, clazzEnumExt) {
 	var o = (clazzEnumExt ? new clazzEnumExt() : new clazzEnum());
 	// BH avoids unnecessary calls to SAEM
-	o.$name = enumName;
-	o.$ordinal = enumOrdinal;
-	//Clazz.superConstructor (o, clazzEnum, [enumName, enumOrdinal]);
-	if (initialParams && initialParams.length)
-		o.construct.apply (o, initialParams);
+	if (initialParams && initialParams.length) {
+		o.constructor.apply (o, initialParams);
+//		Clazz.superConstructor (o, clazzEnum, [enumName, enumOrdinal]);
+//	} else {
+		o.$name = enumName;
+		o.$ordinal = enumOrdinal;
+//	}
 	clazzEnum[enumName] = o;
 	clazzEnum.prototype[enumName] = o;
 	if (!clazzEnum["$ values"]) {         // BH added
diff --git a/sources/net.sf.j2s.java.core/src/javajs/util/CU.java b/sources/net.sf.j2s.java.core/src/javajs/util/CU.java
@@ -34,6 +34,7 @@ public static String toCSSString(GenericColor c) {
   }
   
   private final static String[] colorNames = {
+    "contrast",             // fedcba
     "black",                // 000000
     "pewhite",              // ffffff
     "pecyan",               // 00ffff
@@ -203,6 +204,7 @@ public static String toCSSString(GenericColor c) {
   
   private final static int[] colorArgbs = {
   //#FFFFC3 hover
+    0xFFfedcba, // CONTRAST (colix = 3)
     0xFF000000, // black
     // plus the PE chain colors
     0xFFffffff, // pewhite
@@ -460,7 +462,7 @@ public static int colorPtToFFRGB(T3 pt) {
     return colorTriadToFFRGB(pt.x, pt.y, pt.z);
   }
 
-  public static void toRGB3f(int c, double[] f) {
+  public static void toRGB3(int c, double[] f) {
     f[0] = ((c >> 16) & 0xFF) / 255f; // red
     f[1] = ((c >> 8) & 0xFF) / 255f;
     f[2] = (c & 0xFF) / 255f;
diff --git a/sources/net.sf.j2s.java.core/src/javajs/util/M34d.java b/sources/net.sf.j2s.java.core/src/javajs/util/M34d.java
@@ -350,7 +350,7 @@ protected void mul33(double x) {
     m22 *= x;
   }
 
-  protected void transpose33() {
+  public void transpose33() {
     double tmp = m01;
     m01 = m10;
     m10 = tmp;
diff --git a/sources/net.sf.j2s.java.core/src_4.2/java/util/ArrayList.java b/sources/net.sf.j2s.java.core/src_4.2/java/util/ArrayList.java
@@ -45,16 +45,13 @@ public class ArrayList<E> extends AbstractList<E> implements List<E>, Cloneable,
 	private transient E[] array;
 
 	/**
-	 * @j2sIgnore
-	 * 
 	 * Constructs a new instance of ArrayList with zero capacity.
 	 */
 	public ArrayList() {
-		this(0);
+		setCapacity(0);
 	}
 
 	/**
-	 * @j2sIgnore
 	 * Constructs a new instance of ArrayList with the specified capacity.
 	 * 
 	 * @param capacity
@@ -690,7 +687,7 @@ public <T> T[] toArray(T[] contents) {
 			/**
 			 * @j2sNative
 			 * 
-			 * 			  return this.array.slice(firstIndex, firstIndex + size);
+			 * 			  return this.array.slice(this.firstIndex, this.firstIndex + size);
 			 */
 			{
 				return null;

Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,7 @@ protected void mul33(double x) {`
`350`	`350`	`m22 *= x;`
`351`	`351`	`}`
`352`	`352`
`353`		`- protected void transpose33() {`
	`353`	`+ public void transpose33() {`
`354`	`354`	`double tmp = m01;`
`355`	`355`	`m01 = m10;`
`356`	`356`	`m10 = tmp;`
Original file line number	Diff line number	Diff line change
`@@ -45,16 +45,13 @@ public class ArrayList<E> extends AbstractList<E> implements List<E>, Cloneable,`
`45`	`45`	`private transient E[] array;`
`46`	`46`
`47`	`47`	`/**`
`48`		`- * @j2sIgnore`
`49`		`- *`
`50`	`48`	`* Constructs a new instance of ArrayList with zero capacity.`
`51`	`49`	`*/`
`52`	`50`	`public ArrayList() {`
`53`		`- this(0);`
	`51`	`+ setCapacity(0);`
`54`	`52`	`}`
`55`	`53`
`56`	`54`	`/**`
`57`		`- * @j2sIgnore`
`58`	`55`	`* Constructs a new instance of ArrayList with the specified capacity.`
`59`	`56`	`*`
`60`	`57`	`* @param capacity`
`@@ -690,7 +687,7 @@ public <T> T[] toArray(T[] contents) {`
`690`	`687`	`/**`
`691`	`688`	`* @j2sNative`
`692`	`689`	`*`
`693`		`- * return this.array.slice(firstIndex, firstIndex + size);`
	`690`	`+ * return this.array.slice(this.firstIndex, this.firstIndex + size);`
`694`	`691`	`*/`
`695`	`692`	`{`
`696`	`693`	`return null;`