removes Test_EPS from Test__; adds Test_MyInterface to Test__

BobHanson · BobHanson · commit ea2fb811fc39 · 2022-01-18T08:07:12.000-06:00
removing Font.getPSName(), as this is platform specific, and Windows has
changed. Windows now assigns Dialog to TimesRoman AND Helvetica??
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 @@
-20220117224934 
+20220118073747 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/net.sf.j2s.core.jar
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 @@
-20220117224934 
+20220118073747 
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Font.java b/sources/net.sf.j2s.java.core/src/java/awt/Font.java
@@ -1271,6 +1271,8 @@ public String getPSName() {
 //    	Dialog	Dialog.plain	Dialog.bold	Dialog.italic
 //    	DialogInput	DialogInput.plain	DialogInput.bold	DialogInput.italic
 
+		// seems to have changed in Java 8+ 
+		// totally wrong to have Helvetica and TimesRoman become Dialog!
 		switch (name) {
 		case "TimesRoman":
 			name = SERIF;
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_EPS.java b/sources/net.sf.j2s.java.core/src/test/Test_EPS.java
@@ -21,7 +21,7 @@ public static void main(String[] args) {
 			
 			String s = new Font(fonts[i], Font.PLAIN, 12).getPSName();
 			String s1 = fonts[i + 1];
-			System.out.println(i + " " + fonts[i] + " " + s + " " + s1);
+			System.out.println(i + " " + fonts[i] + " " + s + " == " + s1);
 			assert(s.equals(s1));
 		}
 		System.out.println("Test_EPS OK");
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_MyInterface.java b/sources/net.sf.j2s.java.core/src/test/Test_MyInterface.java
@@ -3,8 +3,9 @@
 class Test_MyInterface extends Test_ {
 	public static void main(String[] args) {
 		MyInterfaceImpl impl = new MyInterfaceImpl();
-		System.out.println(String.valueOf(impl.getValue()));
-		System.out.println(String.valueOf(impl.getValueImpl()));
-		System.out.println(String.valueOf(impl.getValue()));
+		assert(impl.getValue() == 0);
+		assert(impl.getValueImpl() == 102);
+		assert(impl.getValue() == 0);
+		System.out.println("Test_MyInterface OK");
 	}
 }
diff --git a/sources/net.sf.j2s.java.core/src/test/Test__.java b/sources/net.sf.j2s.java.core/src/test/Test__.java
@@ -52,7 +52,7 @@ private static void _test1(String[] args) {
 		Test_Double.main(args);
 		Test_Enum.main(args);
 		Test_Enum2.main(args);
-		Test_EPS.main(args);
+//		Test_EPS.main(args); Java bug -- returns Dialog for Helevetica and TimesRoman!???
 		Test_Extends_6.main(args);
 //		Test_Extends_7.main(args);
 		// Test_Extends_JButton.main(args);
@@ -85,6 +85,7 @@ private static void _test1(String[] args) {
 		//failing on unicode char in "somewhatComplex" Test_JAXB_ORDERED.main(args);
 //		Test_Map.main(args);
 		Test_Math.main(args);
+		Test_MyInterface.main(args);
 		Test_Native.main(args);
 		Test_NoAssert.main(args);
 		Test_NoHeadless_1.main(args);

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public static void main(String[] args) {`
`21`	`21`
`22`	`22`	`String s = new Font(fonts[i], Font.PLAIN, 12).getPSName();`
`23`	`23`	`String s1 = fonts[i + 1];`
`24`		`- System.out.println(i + " " + fonts[i] + " " + s + " " + s1);`
	`24`	`+ System.out.println(i + " " + fonts[i] + " " + s + " == " + s1);`
`25`	`25`	`assert(s.equals(s1));`
`26`	`26`	`}`
`27`	`27`	`System.out.println("Test_EPS OK");`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@`
`3`	`3`	`class Test_MyInterface extends Test_ {`
`4`	`4`	`public static void main(String[] args) {`
`5`	`5`	`MyInterfaceImpl impl = new MyInterfaceImpl();`
`6`		`- System.out.println(String.valueOf(impl.getValue()));`
`7`		`- System.out.println(String.valueOf(impl.getValueImpl()));`
`8`		`- System.out.println(String.valueOf(impl.getValue()));`
	`6`	`+ assert(impl.getValue() == 0);`
	`7`	`+ assert(impl.getValueImpl() == 102);`
	`8`	`+ assert(impl.getValue() == 0);`
	`9`	`+ System.out.println("Test_MyInterface OK");`
`9`	`10`	`}`
`10`	`11`	`}`