swingjs.plaf upgrade - JTable working more smoothly and efficiently

hansonr · hansonr · commit 836494b96f21 · 2018-12-09T15:46:37.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSLabelUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSLabelUI.java
@@ -18,6 +18,7 @@
  *
  */
 public class JSLabelUI extends JSLightweightUI {
+
 	protected ImageIcon icon;
 	protected int gap;
 	protected String text;
@@ -28,7 +29,6 @@ public JSLabelUI() {
 
 	@Override
 	public DOMNode updateDOMNode() {
-		label = (JLabel) jc;
 		if (domNode == null) {
 			domNode = newDOMObject("label", id);
 			textNode = newDOMObject("span", id + "_text");
@@ -40,7 +40,7 @@ public DOMNode updateDOMNode() {
 			centeringNode.appendChild(textNode);
 			domNode.appendChild(centeringNode);
 		}
-		getIconAndText(); // could be ToolTip
+		getIconAndText(); 
 		setIconAndText("label", icon, gap, text);
 		DOMNode.setStyles(domNode, "position", "absolute", "width", c.getWidth()
 				+ "px", "height", c.getHeight() + "px");
@@ -62,6 +62,8 @@ public DOMNode updateDOMNode() {
 	}
 
 	protected void getIconAndText() {	
+		// overridden in JSToolTipUI
+		label = (JLabel) jc;
 		icon = (ImageIcon) label.getIcon();
 		gap = label.getIconTextGap();
 		text = label.getText();
