JEditorPane HTML fix for local /TEMP/ file pages

hansonr · hansonr · commit 6e37ae0c0c0b · 2021-03-27T17:01:06.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSHTMLHelper.java b/sources/net.sf.j2s.java.core/src/swingjs/JSHTMLHelper.java
@@ -10,16 +10,21 @@
 import javax.swing.JEditorPane;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkEvent.EventType;
+import javax.swing.text.AttributeSet;
 import javax.swing.text.Element;
 import javax.swing.text.Style;
 import javax.swing.text.StyleContext;
+import javax.swing.text.StyleContext.NamedStyle;
 import javax.swing.text.html.HTML;
 import javax.swing.text.html.HTMLDocument;
 import javax.swing.text.html.HTMLDocument.Iterator;
 import javax.swing.text.html.HTMLEditorKit;
 import javax.swing.text.html.StyleSheet;
 
 import javajs.util.PT;
+import swingjs.api.js.DOMNode;
+import swingjs.api.js.J2SInterface;
+import swingjs.api.js.JQueryObject;
 import swingjs.plaf.JSComponentUI;
 
 /**
@@ -75,7 +80,8 @@ public String getText() {
 	@SuppressWarnings("unused")
 	public boolean handleJSEvent(Object target, int eventType, Object jQueryEvent) {
 		EventType type = null;
-		String href = /** @j2sNative jQueryEvent.target.href || */
+		JQueryObject node = JSUtil.jQuery.$(/** @j2sNative jQueryEvent.target ||*/ null).closest("a");
+		String href = /** @j2sNative node && node[0].href || */
 				null;
 		if (href == null)
 			return JSComponentUI.HANDLED;
@@ -104,6 +110,10 @@ public boolean handleJSEvent(Object target, int eventType, Object jQueryEvent) {
 			String left = href.substring(0, pt);
 			elem = getElementFromHref(left);
 			href = trimHRef(href.substring(pt + 9));
+			J2SInterface j2s = JSUtil.J2S;
+			String j2sPath = /** @j2sNative j2s.thisApplet._j2sPath || */null;
+			if (href.startsWith(j2sPath))
+				href = href.substring(j2sPath.length());
 			url =  new URL(doc.getBase(), href);
 		} catch (MalformedURLException e) {
 			// ignore -- could be anything the developer wants.
@@ -190,7 +200,8 @@ private String[] getStyles(String name) {
 		Style bodyStyle = sheet.getStyle(name);
 		if (bodyStyle != null) 
 		{
-			return( /** @j2sNative bodyStyle.attributes.attributes || */null);
+			Object r = bodyStyle.getAttribute("resolver");
+			return( /** @j2sNative (r || bodyStyle).attributes.attributes || */null);
 		}
 		return null;
 	}
@@ -207,17 +218,26 @@ private String getCSS(String id) {
 		StyleSheet sheet = doc.getStyleSheet();
 		if (sheet == null)
 			return null;
-        Enumeration styles = sheet.getStyleNames();
-        while (styles.hasMoreElements()) {
-            String name = (String) styles.nextElement();
-            // Don't write out the default style.
-            if (!name.equals(StyleContext.DEFAULT_STYLE)
-            		&& !name.equals("body")) {
-            	Style s = sheet.getStyle(name);
-            	css += s + "\n";
-            }
-        }
-        return css.replaceAll("NamedStyle:", "#" + id + " ").replaceAll("=",":").replaceAll(",", ";");
+		Enumeration styles = sheet.getStyleNames();
+		while (styles.hasMoreElements()) {
+			String name = (String) styles.nextElement();
+			// Don't write out the default style.
+			Style s = sheet.getStyle(name);
+			NamedStyle r = (NamedStyle) s.getAttribute("resolver");
+			String a;
+			if (name.equals(StyleContext.DEFAULT_STYLE) || name.equals("body")) {
+				continue;
+//				a = (r == null ? s : r).toString();
+	//			a = "#" + id + "_body" + a.substring(a.indexOf("{"));
+			} else if (r == null) {
+				a = s.toString();
+			} else {
+				r.setName(name);
+				a = r.toString();
+			}
+			css += a + "\n";
+		}
+		return css.replaceAll("NamedStyle:", "#" + id + " ").replaceAll("=", ":").replaceAll(",", ";");
 	}
 
 	public static String fixLinks(String html, URL page) {
