// BH 8/19/2018 -- refactored to simplify $finals$

hansonr · hansonr · commit 2075cb674e32 · 2018-08-19T23:10:46.000-05:00
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/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20180818152911 
+20180819230621 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/timestamp
@@ -1 +1 @@
-20180818152911 
+20180819230621 
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java
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/awt/font/TextHitInfo.java b/sources/net.sf.j2s.java.core/src/java/awt/font/TextHitInfo.java
@@ -39,7 +39,6 @@
  */
 
 package java.awt.font;
-import java.lang.String;
 
 /**
  * The <code>TextHitInfo</code> class represents a character position in a
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/font/TransformAttribute.java b/sources/net.sf.j2s.java.core/src/java/awt/font/TransformAttribute.java
@@ -100,7 +100,7 @@ public boolean isIdentity() {
     public static final TransformAttribute IDENTITY = new TransformAttribute(null);
 
     private void writeObject(java.io.ObjectOutputStream s)
-      throws java.lang.ClassNotFoundException,
+      throws ClassNotFoundException,
              java.io.IOException
     {
         // sigh -- 1.3 expects transform is never null, so we need to always write one out
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_.java b/sources/net.sf.j2s.java.core/src/test/Test_.java
@@ -99,7 +99,7 @@ public static void main(String[] args) {
 		Test_Double.main(args);
 		Test_Enum.main(args);
 		Test_Extends_6.main(args);
-		Test_Extends_7.main(args);
+//		Test_Extends_7.main(args);
 		// Test_Extends_JButton.main(args);
 		Test_Extends.main(args);
 		Test_Final.main(args);
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Anon.java b/sources/net.sf.j2s.java.core/src/test/Test_Anon.java
@@ -28,7 +28,7 @@ public boolean isAnonymous() {
   public Test_Anon() {}
   
   public static void main(String[] args) { 
-	  int z = 3;
+	  int z = x;
 	  boolean a = !(Test_Class.Test_Class_Inner.i == 3);
 	  System.out.println(EMPTY_ENUMERATION.hasMoreElements());
 	  assert(EMPTY_ENUMERATION.hasMoreElements());
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Class2.java b/sources/net.sf.j2s.java.core/src/test/Test_Class2.java
@@ -6,7 +6,6 @@
 import java.beans.PropertyChangeListener;
 import java.util.Hashtable;
 
-@SuppressWarnings("rawtypes")
 class Test_Class2 extends Test_ {
 
 	static String s = "test";
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Class3.java b/sources/net.sf.j2s.java.core/src/test/Test_Class3.java
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Extends_6.java b/sources/net.sf.j2s.java.core/src/test/Test_Extends_6.java
@@ -2,44 +2,55 @@
 
 public class Test_Extends_6 extends Test_Extends_7 {
 
-  public int[] test6 = new int[6];
+	public int[] test6 = new int[6];
 
-  public String a = "test_6_a";
+	public String a = "test_6_a";
 
-  
-  public Test_Extends_6() {
-	  super();
+	public int i0 = 6;
+
+	public Test_Extends_6() {
+		super();
+		System.out.println("Test_6.constructor " + i0 + " " + super.i0);
+		assert ((i0 + " " + super.i0).equals("6 8"));
 		System.out.println("calling x_1 in Test_6 constructor");
-	  x_1();
-	try {
-		System.out.println(Test_Extends_7.class.getConstructor(new Class[]{int[].class}));
-	} catch (NoSuchMethodException | SecurityException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
+		x_1();
+		try {
+			System.out.println(Test_Extends_7.class.getConstructor(new Class[] { int[].class }));
+		} catch (NoSuchMethodException | SecurityException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		System.out.println("test6");
 	}
-  	System.out.println("test6");
-  }
-  
-    public Test_Extends_6(int i) {
+
+	public Test_Extends_6(int i) {
 		System.out.println("Test_6 constructor int=" + i);
 		x_2();
-    }
+	}
 
-    public Test_Extends_6(double d) {
+	public Test_Extends_6(double d) {
 		System.out.println("Test_6 constructor double=" + d);
-    }
+	}
 
 	public void x_2() {
 		System.out.println("Test_6 x_2 calling x_1 from Test_6.x_2");
 		x_1();
-    }
+	}
+
 	public void x_1() {
 		System.out.println("x_1 in Test_6");
 	}
 
 	public static void main(String[] args) {
-		new Test_Extends_6();
+		Test_Extends_6 t6 = new Test_Extends_6();
+		t6.test8();
+		t6.getSuper0();
+
 	}
 
+	public void getSuper0() {
+		System.out.println("Test_6.getSuper0 " + i0 + " " + super.i0);
+		assert ((i0 + " " + super.i0).equals("6 8"));
+	}
 
 }
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Extends_7.java b/sources/net.sf.j2s.java.core/src/test/Test_Extends_7.java
@@ -1,7 +1,10 @@
 package test;
 
-public class Test_Extends_7 extends Test_Extends_8 {
+public abstract class Test_Extends_7 extends Test_Extends_8 {
 
+	Test_Extends_7() {
+		super();
+	}
 //  Java Sequence is:
 // 
 //	7.0 main
@@ -31,8 +34,8 @@ public Test_Extends_7(float... floats) {
 		System.out.println("7.3 construct float[]");
 	}
 
-	public static void main(String[] args) {
-	  System.out.println("7.0 main");
-		new Test_Extends_7();
-	}
+//	public static void main(String[] args) {
+//	  System.out.println("7.0 main");
+//		new Test_Extends_7();
+//	}
 }
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Extends_8.java b/sources/net.sf.j2s.java.core/src/test/Test_Extends_8.java
@@ -2,6 +2,14 @@
 
 abstract public class Test_Extends_8 extends Test_Extends_9 {
 
+	public int i0 = 8;
+	
+	public Test_Extends_8() {
+		super();
+		System.out.println("Test_Extends_8 contructor i0 super.i0 " + i0 + " " + super.i0);
+		  assert((i0 + " " + super.i0).equals("8 0"));
+	}
+	
 	{
 	  System.out.println("8.1 init");
 	}
@@ -12,8 +20,12 @@ abstract public class Test_Extends_8 extends Test_Extends_9 {
 	}
 
 
+	abstract void getSuper0();
+	
 	public void test8(){
 		System.out.println("Test_Extends_8.test8()");
+		System.out.println("Test_Extends_8.test8() " + i0 + " " + super.i0);
+		  assert((i0 + " " + super.i0).equals("8 0"));
 	};
 
 //	public Test_8(){
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Extends_8b.java b/sources/net.sf.j2s.java.core/src/test/Test_Extends_8b.java
@@ -0,0 +1,46 @@
+package test;
+
+public class Test_Extends_8b extends Test_Extends_8 {
+
+	int i0 = -8;
+	
+	public Test_Extends_8b() {
+		super();
+		System.out.println("Test_Extend_8b i0 super.i0 " + i0 + " " + super.i0);
+		  assert((i0 + " " + super.i0).equals("-8 8"));
+	}
+	
+	{
+	  System.out.println("8.1 init");
+	}
+
+	{
+		//int[] test8 = new int[8];
+		System.out.println("8.2 init - prepare fields");
+	}
+
+
+	public void test8(){
+		System.out.println("Test_Extends_8.test8()");
+		System.out.println(i0 + " " + super.i0);
+		  assert((i0 + " " + super.i0).equals("8 8"));
+	}
+
+
+	@Override
+	void getSuper0() {
+		// TODO Auto-generated method stub
+		
+	};
+
+//	public Test_8(){
+//	  System.out.println("8.3 construct()");
+//	};
+
+//	public Test_8(int... ints){
+//	  System.out.println("8.3 construct()");
+//		// nah, this is not the default constructor
+//		System.out.println("constructor 8 [], ...)");
+//	};
+
+}
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Extends_9.java b/sources/net.sf.j2s.java.core/src/test/Test_Extends_9.java
@@ -2,6 +2,9 @@
 
 abstract public class Test_Extends_9 extends Test_ {
 
+	public int i0 = 0; 
+	
+
 	{
 	  System.out.println("9.1 init");
 	}
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Final.java b/sources/net.sf.j2s.java.core/src/test/Test_Final.java
@@ -10,7 +10,7 @@ public class Test_Final extends Test_ {
 	public Test_Final(int i) {
 		String finalStr = "testing" + TEST++;
 		finalStr2 += "?";
-		Test_Extends_8 t = new Test_Extends_8() {
+		Test_Extends_8 t = new Test_Extends_8b() {
 			public void test8() {
 				System.out.println("anon Test_8 finalStr is " + finalStr + " " + finalStr2);
 				assert(finalStr.equals("testing" + i) && finalStr2.equals("??"));
diff --git a/sources/net.sf.j2s.java.core/srcjs/swingjs2.js b/sources/net.sf.j2s.java.core/srcjs/swingjs2.js
@@ -13462,6 +13462,7 @@ if (!J2S._version)
 // TODO: CharacterSequence does not implement Java 8 default methods chars() or codePoints()
 //       It is possible that these might be loaded dynamically.
 
+// BH 8/19/2017 3.2.2.04 fixes Enum .name being .$name
 // BH 8/16/2018 3.2.2.04 fixes Character.toTitleCase$C, [Integer,Long,Short,Byte].toString(i,radix)
 // BH 8/13/2018 3.2.2.04 $finals to $finals$ -- basically variables are $xxx, methods are xxx$, and special values are $xxx$
 // BH 8/12/2018 3.2.2 adding J2S.onClazzLoaded hook for Clazz loaded
@@ -13954,7 +13955,7 @@ Clazz.newClass = function (prefix, name, clazz, clazzSuper, interfacez, type) {
 
 Clazz.newEnumConst = function(vals, c, enumName, enumOrdinal, args, cl) {
   var o = Clazz.new_(c, args, cl);
-  o.name = enumName;
+  o.name = o.$name = enumName;
   o.ordinal = enumOrdinal;
   o.$isEnumConst = true;
   var clazzEnum = c.exClazz;

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public boolean isIdentity() {`
`100`	`100`	`public static final TransformAttribute IDENTITY = new TransformAttribute(null);`
`101`	`101`
`102`	`102`	`private void writeObject(java.io.ObjectOutputStream s)`
`103`		`- throws java.lang.ClassNotFoundException,`
	`103`	`+ throws ClassNotFoundException,`
`104`	`104`	`java.io.IOException`
`105`	`105`	`{`
`106`	`106`	`// sigh -- 1.3 expects transform is never null, so we need to always write one out`