JEditorPane fix w/o HTMLEditorKit

BobHanson · BobHanson · commit 5278c9fe063c · 2020-03-14T18:27:29.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 @@
-20200314141453 
+20200314182519 
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 @@
-20200314141453 
+20200314182519 
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/javax/swing/JEditorPane.java b/sources/net.sf.j2s.java.core/src/javax/swing/JEditorPane.java
@@ -1437,7 +1437,8 @@ public Dimension getPreferredSize() {
 	@Override
 	public void setText(String t) {
 		try {
-			this.秘jsHTMLHelper.setText(t);
+			if (秘jsHTMLHelper != null)
+				秘jsHTMLHelper.setText(t);
 			Document doc = getDocument();
 			doc.remove(0, doc.getLength());
 			if (t == null || t.equals("")) {
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSHTMLHelper.java b/sources/net.sf.j2s.java.core/src/swingjs/JSHTMLHelper.java
@@ -104,8 +104,7 @@ public boolean handleJSEvent(Object target, int eventType, Object jQueryEvent) {
 			String left = href.substring(0, pt);
 			elem = getElementFromHref(left);
 			href = trimHRef(href.substring(pt + 9));
-
-			url = new URL(href);
+			url =  new URL(doc.getBase(), href);
 		} catch (MalformedURLException e) {
 			// ignore -- could be anything the developer wants.
 		}
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Editor.java b/sources/net.sf.j2s.java.core/src/test/Test_Editor.java
@@ -335,13 +335,13 @@ public void actionPerformed(ActionEvent e) {
 			public void actionPerformed(ActionEvent e) {
 				System.out.println("Test_Editor action " + getID(e.getSource()));
 				editor.setText("");
-				JFrame frame1 = new JFrame();
-				frame1.setLocationRelativeTo(finalB);
-				JPanel jp = new JPanel();
-				jp.setPreferredSize(new Dimension(150,150));
-				frame1.add(jp);
-				frame1.pack();
-				frame1.setVisible(true);
+//				JFrame frame1 = new JFrame();
+//				frame1.setLocationRelativeTo(finalB);
+//				JPanel jp = new JPanel();
+//				jp.setPreferredSize(new Dimension(150,150));
+//				frame1.add(jp);
+//				frame1.pack();
+//				frame1.setVisible(true);
 
 //				btop.setEnabled(!btop.isEnabled());
 			}
@@ -419,7 +419,7 @@ public void actionPerformed(ActionEvent e) {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				System.out.println("Test_Editor action " + getID(e.getSource()));
-				area.setCaretPosition(area1.getText().length());
+				area.setCaretPosition(area.getText().length());
 				area.requestFocus();
 			}
 
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
@@ -22,7 +22,7 @@ public Test_Html() {
 		editor.setEditorKit(new HTMLEditorKit());
 		editor.setText(
 				"<html>"
-				+ "<head>"
+				+ "<head><base href=http://phet.colorado.edu>"
 				+ "<style type=\"text/css\">"
 				+ "body { margin:10px 10px 10px 10px;font-size: 24pt; font-family: Dialog }"
 				+ "a { text-decoration:none;font-size:12pt;}"
@@ -31,8 +31,8 @@ public Test_Html() {
 				+ "<body>"
 				+ "<b><font color=red>PhET Interactive Simulations</font></b>"
 				+ "<br>Copyright &copy; 2004-2015 University of Colorado."
-				+ "<br><a href=http://phet.colorado.edu/about/licensing.php>Some rights reserved.</a>"
-				+ "<br>Visit <a href=http://phet.colorado.edu>http://phet.colorado.edu</a>"
+				+ "<br><a href=\"about/licensing.php\">Some rights reserved.</a>"
+				+ "<br>Visit <a href=\".\">http://phet.colorado.edu</a>"
 				+ " <a href=proxy-href>proxy</a>"
 				+ "</body>"
 				+ "</html>");
@@ -58,9 +58,11 @@ public void hyperlinkUpdate(HyperlinkEvent e) {
 			
 		});
 		HTMLDocument doc = (HTMLDocument)editor.getDocument();
+		URL base = doc.getBase();
+		System.out.println("Test_Html base=" + base);
 		Iterator iter = doc.getIterator(HTML.Tag.A);
 		while(iter.isValid()) {
-			System.out.println(iter.getAttributes());
+			System.out.println("Test_Html a=" + iter.getAttributes());
 					iter.next();
 		}
 
