JTree working, JEditorPane fix for HTML text, ScrollPaneLayout fixed for

BobHanson · BobHanson · commit 3aa4a3b8e82a · 2020-02-06T15:46:03.000-06:00
miscalculation of border
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 @@
-20200205213103 
+20200206154055 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.8/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.8/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.8/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.8/timestamp
@@ -1 +1 @@
-20200205213103 
+20200206154055 
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
@@ -476,7 +476,7 @@ public void setPage(URL page) throws IOException {
                 // Either we do not have POST data, or should submit the data
                 // synchronously.
                 InputStream in = getStream(page);
-                if (kit != null) {
+                if (getEditorKit() != null) { // BH SwingJS was just kit != null, but then initial page in TreeDemo does not load
                     Document doc = initializeModel(kit, page);
 
                     // At this point, one could either load up the model with no
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/ScrollPaneLayout.java b/sources/net.sf.j2s.java.core/src/javax/swing/ScrollPaneLayout.java
@@ -476,7 +476,9 @@ public Dimension preferredLayoutSize(Container parent)
         vsbPolicy = scrollPane.getVerticalScrollBarPolicy();
         hsbPolicy = scrollPane.getHorizontalScrollBarPolicy();
 
-        Insets insets = parent.getInsets();
+        // BH -- this was a problem when the scrollpane was in a split pane in SetXMLControlElement test OSP
+        Insets insets = new Insets(0,0,0,0);//
+        // parent.getInsets(); because these are interior?
         int prefWidth = insets.left + insets.right;
         int prefHeight = insets.top + insets.bottom;
 
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/tree/DefaultTreeCellEditor.java b/sources/net.sf.j2s.java.core/src/javax/swing/tree/DefaultTreeCellEditor.java
@@ -738,11 +738,11 @@ public void paint(Graphics g) {
             }
 
             // Border selection color
-            Color       background = getBorderSelectionColor();
-            if(background != null) {
-                g.setColor(background);
-                g.drawRect(0, 0, width - 1, height - 1);
-            }
+//            Color       background = getBorderSelectionColor();
+//            if(background != null) {
+//                g.setColor(background);
+//                g.drawRect(0, 0, width - 1, height - 1);
+//            }
             super.paint(g);
         }
 
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/tree/DefaultTreeCellRenderer.java b/sources/net.sf.j2s.java.core/src/javax/swing/tree/DefaultTreeCellRenderer.java
@@ -512,6 +512,9 @@ else if (imageOffset == -1) {
     }
 
 	private void paintFocus(Graphics g, int x, int y, int w, int h, Color notColor) {
+		
+		if (true)
+			return;
 		Color bsColor = getBorderSelectionColor();
 
 		if (bsColor != null && (selected || !drawDashedFocusIndicator)) {
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/api/js/JQueryObject.java b/sources/net.sf.j2s.java.core/src/swingjs/api/js/JQueryObject.java
@@ -100,6 +100,10 @@ public interface J2SCB extends JQueryObject {
 		
 		
 	}
+
+	public static DOMNode getDOMNode(JQueryObject jnode) {
+		return (jnode == null ? null : ((DOMNode[]) (Object) jnode)[0]);
+	}
 	
 
 }
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSEditorPaneUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSEditorPaneUI.java
@@ -61,6 +61,8 @@ public class JSEditorPaneUI extends JSTextUI {
 	
 	private static final String JSTAB = "<span class='j2stab'>&nbsp;&nbsp;&nbsp;&nbsp;</span>";
 	private static final int SPACES_PER_TAB = 4;
+	
+	protected boolean isTextPane = false;
 
 	public JSEditorPaneUI() {
 		isEditorPane = isTextView = true;
@@ -203,7 +205,7 @@ public DOMNode updateDOMNode() {
 		}
 		textListener.checkDocument();
 		setCssFont(domNode, c.getFont());
-		DOMNode.setAttrs(domNode, "contentEditable", TRUE, "spellcheck", FALSE);
+		DOMNode.setAttrs(domNode, "contentEditable", editor.isEditable() ? TRUE : FALSE, "spellcheck", FALSE);
 		if (jc.getTopLevelAncestor() != null) {
 			if (editor.getText() != mytext) {
 				setText(null);
@@ -290,7 +292,7 @@ public void propertyChange(PropertyChangeEvent e) {
 //
 	private int getJSDocOffset(DOMNode node) {
 		int pt = 0;
-		while (node != domNode) {
+		while (node != domNode && node != null) {
 			DOMNode sib = DOMNode.getPreviousSibling(node);
 			while (sib != null) {
 				 pt += getJSCharCount(sib);
@@ -328,12 +330,19 @@ public void setText(String text) {
 		if (text == null)
 			text = editor.getText();
 		mytext = text;
+		isHTML = text.startsWith("<html");
+		String html;
+		if (isHTML) {
+			DOMNode.setAttrs(domNode, "contentEditable", FALSE);
+			html = getInner(text, "body");
+		} else {
 		isStyled = ((JEditorPane)editor).getEditorKit() instanceof StyledEditorKit;
 		fromJava(text, sb, d.getRootElements()[0], true, null);
 		//System.out.println("JSEPUI setText " + text.replace('\n', '.').replace('\t', '^'));
 		// This added 5 px is necessary for the last line when scrolled to appear in full. 
 		// Don't know why. Maybe the scrollbar just needs one last div?
-		String html = sb.toString() + "<div style='height:5px'><br></div>";
+		 html = sb.toString() + "<div style='height:5px'><br></div>";
+		}
 		//System.out.println(html);
 		if (html == currentHTML)
 			return;
@@ -352,6 +361,17 @@ public void setText(String text) {
 		}
 	}
 
+	private String getInner(String html, String body) {
+		int pt = html.indexOf("<" + body);
+		if (pt >= 0) {
+			html = html.substring(html.indexOf(">", pt) + 1);
+			pt = html.lastIndexOf("</" + body + ">");
+			if (pt >= 0)
+				html = html.substring(0, pt);
+		}
+		return html;
+	}
+
 	/**
 	 * after setting text, it is necessary to update all descendents to be clickable
 	 */
@@ -420,6 +440,9 @@ else if (isSup)
 			if (t.indexOf('\t') >= 0) {
 				t = PT.rep(t,  "\t", JSTAB);
 			}
+			if (t.indexOf('<') >= 0) {
+				t = PT.rep(t,  "<", "&lt;");
+			}
 			sb.append(t);
 		}
 		if (isSup)
@@ -764,7 +787,6 @@ private void fixTabRange(Object[] r) {
 		DOMNode node = (DOMNode)r[0];
 		boolean isStart = /** @j2sNative r[1] == 0|| */false;
 		if (isJSTAB(node)) {
-			System.out.println("fixtab");
 			if (isStart) {
 				
 			} else {
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTextPaneUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTextPaneUI.java
@@ -26,6 +26,13 @@
 
 public class JSTextPaneUI extends JSEditorPaneUI {
 
+	
+	public JSTextPaneUI() {
+		super();
+		isTextPane = true;
+	}
+	
+
     @Override
 	protected String getPropertyPrefix() {
         return "TextPane";
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTreeUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTreeUI.java

Original file line number	Diff line number	Diff line change
`@@ -512,6 +512,9 @@ else if (imageOffset == -1) {`
`512`	`512`	`}`
`513`	`513`
`514`	`514`	`private void paintFocus(Graphics g, int x, int y, int w, int h, Color notColor) {`
	`515`	`+`
	`516`	`+ if (true)`
	`517`	`+ return;`
`515`	`518`	`Color bsColor = getBorderSelectionColor();`
`516`	`519`
`517`	`520`	`if (bsColor != null && (selected \|\| !drawDashedFocusIndicator)) {`
Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,10 @@ public interface J2SCB extends JQueryObject {`
`100`	`100`
`101`	`101`
`102`	`102`	`}`
	`103`	`+`
	`104`	`+ public static DOMNode getDOMNode(JQueryObject jnode) {`
	`105`	`+ return (jnode == null ? null : ((DOMNode[]) (Object) jnode)[0]);`
	`106`	`+ }`
`103`	`107`
`104`	`108`
`105`	`109`	`}`