new tests, SwingJS-site.zip

BobHanson · BobHanson · commit 677227e0f96e · 2020-04-08T08:59:52.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/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20200405214840 
+20200408084722 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp
@@ -1 +1 @@
-20200405214840 
+20200408084722 
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/test/Test_Applet_Scroll.java b/sources/net.sf.j2s.java.core/src/test/Test_Applet_Scroll.java
@@ -401,7 +401,7 @@ public void paintComponent(Graphics g) {
 		label.setHorizontalAlignment(SwingConstants.RIGHT);
 		label.setVerticalAlignment(SwingConstants.CENTER);
 
-		final JTextField tf = new JTextField(/** @j2sNative "JS" ||*/null, "12.5", 8);
+		final JTextField tf = new JTextField(/** @j2sNative "null" ||*/null, "12.5", 8);
 //		final JTextField tf = new JTextField(new PlainDocument() {
 //			@Override
 //			public void getText(int offset, int length, Segment txt) throws BadLocationException {
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Html.java b/sources/net.sf.j2s.java.core/src/test/Test_Html.java
@@ -1,12 +1,15 @@
 package test;
 
+import java.awt.Font;
 import java.net.URL;
 
+import javax.swing.JButton;
 import javax.swing.JEditorPane;
 import javax.swing.JFrame;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
 import javax.swing.text.AttributeSet;
+import javax.swing.text.Document;
 import javax.swing.text.Element;
 import javax.swing.text.html.HTML;
 import javax.swing.text.html.HTMLDocument;
@@ -20,6 +23,10 @@ public Test_Html() {
 		JEditorPane editor = new JEditorPane();
 		editor.setEditable(false);
 		editor.setEditorKit(new HTMLEditorKit());
+		HTMLDocument document = (HTMLDocument) editor.getDocument();
+	    document.getStyleSheet().addRule(getBodyStyle());  	
+	    document.getStyleSheet().addRule(getH1Style());  	
+	    document.getStyleSheet().addRule(getH2Style()); 
 		editor.setText(
 				"<html>"
 				+ "<head><base href=http://phet.colorado.edu>"
@@ -29,7 +36,7 @@ public Test_Html() {
 				+ "</style>"
 				+ "</head>"
 				+ "<body>"
-				+ "<b><font color=red>PhET Interactive Simulations</font></b>"
+				+ "<b><h2><font color=red>PhET Interactive Simulations</font></h2></b>"
 				+ "<br>Copyright &copy; 2004-2015 University of Colorado."
 				+ "<br><a href=\"about/licensing.php\">Some rights reserved.</a>"
 				+ "<br>Visit <a href=\".\">http://phet.colorado.edu</a>"
@@ -79,4 +86,49 @@ public static void main(String[] args) {
 
 	}
 
+	  /**
+	   * Returns the body style for a stylesheet.
+	   * 
+	   * @return the body style
+	   */
+	  protected static String getBodyStyle() {
+			return 
+					"body {\n"+ //$NON-NLS-1$
+					"  font-family: Verdana, Arial, Helvetica, sans-serif;\n"+ //$NON-NLS-1$
+					"  font-size: "+bodyFont.getSize()+"pt;\n"+ //$NON-NLS-1$ //$NON-NLS-2$
+					"  color: #405050;\n"+ //$NON-NLS-1$
+					"  background-color: #FFFFFF;\n"+ //$NON-NLS-1$
+					"}\n"; //$NON-NLS-1$
+	  }
+	  
+	  /**
+	   * Returns the H1 heading style for a stylesheet.
+	   * 
+	   * @return the H1 heading style
+	   */
+	  protected static String getH1Style() {
+			return 
+					"h1 {\n"+ 
+					"  font-size: "+h1Font.getSize()+"pt;\n"+ 
+					"  text-align: center;\n"+
+					"}\n"; 
+	  }
+	  
+	  /**
+	   * Returns the H2 heading style for a stylesheet.
+	   * 
+	   * @return the H2 heading style
+	   */
+	  protected static String getH2Style() {
+			return 
+					"h2 {\n"+
+					"  font-size: "+h2Font.getSize()+"pt;\n"+ 
+					"}\n"; 
+	  }
+	  
+	  protected static Font bodyFont = new JButton().getFont().deriveFont(12f);
+	  protected static Font h1Font = bodyFont.deriveFont(24f);
+	  protected static Font h2Font = bodyFont.deriveFont(16f);
+	  
+
 }
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Map.java b/sources/net.sf.j2s.java.core/src/test/Test_Map.java
@@ -53,11 +53,14 @@ class Test_Map extends Test_ {
 
 	public static void main(String[] args) {
 
+		
 		System.out.println("Equivalence tests asserted");
 		assert(new Integer(3) == 3);
 		assert(new Integer(3) != new Integer(3));
 
 		String a = "x";
+		String sa = new String("x");
+		
 		assert("xxx" == "xx" + "x"); 
 		assert("xxx" == ("xx" + a).intern()); 
 		
@@ -249,13 +252,17 @@ private static void testIdentity() {
 		
 		System.out.println("HashMap should have 9 members:");
 		HashMap<Object, Object> hm = new HashMap<>();
+
+		hm.put("testing", "testing4");               // same
+		assert(hm.get(new String("testing")) == "testing4");
+
+		hm.clear(); 
 		
 		hm.put(new String("testing"), "testing1");   // same
 		hm.put("testing", "testing2");               // same
 		String ing = "ing";
-		hmi.put("test" + ing, "testing3");               // same
+		hm.put("test" + ing, "testing3");               // same
 		hm.put("testing", "testing4");               // same
-		
 
 		try {
 			hm.put(new Integer(null), "126new"); // unique
diff --git a/sources/net.sf.j2s.java.core/srcjs/swingjs2.js b/sources/net.sf.j2s.java.core/srcjs/swingjs2.js
@@ -11485,6 +11485,17 @@ if (database == "_" && J2S._serverUrl.indexOf("//your.server.here/") >= 0) {
 			".bin?", ".smol?", ".spartan?", ".mrc?", ".pse?", ".map?",
 			".omap?", ".dcd?", ".mp3?", ".ogg?", ".wav?", ".au?" ];
 
+	J2S.addBinaryFileType = function(ext) {
+		if (!ext.indexOf(".") == 0)
+			ext = "." + ext;
+		if (!ext.indexOf("?") == ext.length - 1)
+			ext += "?";
+		for (var i = J2S._binaryTypes.length; --i >= 0;)
+			if (J2S._binaryTypes[i] == ext)
+				return;
+		J2S._binaryTypes.push(ext);
+	}
+	
 	J2S.isBinaryUrl = function(url) {
 		url = url.toLowerCase() + "?";
 		for (var i = J2S._binaryTypes.length; --i >= 0;)
