JSlider ui fix for remove/add cycle

BobHanson · BobHanson · commit a3caa51b958b · 2020-01-23T21:08:40.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/api/js/JQuery.java b/sources/net.sf.j2s.java.core/src/swingjs/api/js/JQuery.java
@@ -10,4 +10,6 @@ public interface JQuery {
 
   Object parseJSON(String json);
 
+  Object data(Object node, String attr);
+
 }
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java
@@ -684,6 +684,9 @@ private void uninstallJS() {
 	protected JQueryObject $(Object node) {
 		return jquery.$(node);
 	}
+	protected Object $data(DOMNode node, String attr) {
+		return (node == null ? null : jquery.data(node,attr));
+	}
 
 	/**
 	 * Set the associated JComponent. Setting comp null will disable this UI from
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSSliderUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSSliderUI.java
@@ -96,7 +96,7 @@ public DOMNode updateDOMNode() {
 		boolean isHoriz = (slider.getOrientation() == SwingConstants.HORIZONTAL);
 		boolean isVerticalScrollBar = (isScrollBar && !isHoriz);
 		boolean isInverted = isVerticalScrollBar || !isScrollBar && slider.getInverted();
-		boolean isChanged = false;
+		boolean isChanged = sliderDisposed;
 		if (isHoriz != this.isHoriz || isVerticalScrollBar != this.isVerticalScrollBar
 				|| isInverted != this.isInverted) {
 			this.isHoriz = isHoriz;
@@ -107,8 +107,6 @@ public DOMNode updateDOMNode() {
 		boolean isNew = (domNode == null);
 		if (isNew) {
 			domNode = wrap("div", id + "_wrap", jqSlider = DOMNode.createElement("div", id));
-			$(domNode).addClass("swingjs"); // ??
-			$(domNode).addClass("ui-j2sslider-wrap"); // ??
 			setJQuerySliderAndEvents();
 			setTainted();
 		} else if (isChanged) {
@@ -126,6 +124,7 @@ public DOMNode updateDOMNode() {
 	}
 	
 	private String foreColor = null;
+	private boolean sliderDisposed;
 	@Override
 	public void setForeground(Color c) {
 		if (!paintTicks && !paintLabels)
@@ -188,11 +187,17 @@ protected void setBackgroundImpl(Color color) {
 	}
 
 	private void disposeSlider() {
-		Object slider = $(jqSlider);
-		/**
-		 * @j2sNative slider.j2sslider("destroy");
-		 * 
-		 */
+		if (sliderInitialized()) {
+			Object slider = $(jqSlider);
+			/**
+			 * 
+			 * @j2sNative
+			 * 
+			 * 
+			 * 			slider.j2sslider("destroy");
+			 *
+			 */
+		}
 		DOMNode.dispose(jqSlider);
 	}
 
@@ -209,8 +214,15 @@ private void setSliderFields() {
 			jScrollBar = (JScrollBar) jc;
 	}
 
-	private void setJQuerySliderAndEvents() {
+	@Override
+	public void dispose() {
+		sliderDisposed = true;
+		super.dispose();
+	}
 
+	void setJQuerySliderAndEvents() {
+		$(domNode).addClass("swingjs");
+		$(domNode).addClass("ui-j2sslider-wrap"); // for mouse-down event in jquery-ui-j2sslider.js
 		Object slider = $(jqSlider);
 		/**
 		 * @j2sNative
@@ -306,6 +318,7 @@ private void setup(boolean isNew) {
 			setDataComponent(domNode);
 			setDataComponent(sliderHandle);
 		}
+		sliderDisposed = false;
 	}
 
 	/**
@@ -314,13 +327,15 @@ private void setup(boolean isNew) {
 	 * @param val
 	 */
 	protected void setSliderAttr(String key, float val) {
+		if (!sliderInitialized())
 		noSnapping = true;
 		String id = null;
 		try {
 		Object jsslider = $(jqSlider);
 		/**
 		 * @j2sNative
-		 *   id = this.jqSlider.id;
+		 * 
+		 *  id = this.jqSlider.id;
 		 *  jsslider.j2sslider("option",key,val);
 		 */
 		} catch (Throwable t) {
@@ -330,6 +345,10 @@ protected void setSliderAttr(String key, float val) {
 		noSnapping = isScrollBar;
 	}
 
+	private boolean sliderInitialized() {
+		return ($data(jqSlider, "ui-j2sslider") != null);
+	}
+
 	public void setSlider() {
 		setSliderAttr("min", min);
 		// hack is for list to not show bottom line
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
@@ -65,6 +65,10 @@ public class Test_Applet_Scroll extends JApplet implements ChangeListener, Mouse
 
 	private JPanel panel2;
 
+	private JSlider vslider;
+
+	private JPanel vp;
+
 	void setSize(JComponent c, int x, int y) {
 		if (preferred)
 			c.setPreferredSize(new Dimension(x, y));
@@ -157,6 +161,8 @@ public void actionPerformed(ActionEvent event) {
 				label.setBackground(button2.isSelected() ? Color.green : Color.yellow);
 				tf.setBackground(Color.green);
 				label.setText("btn2");
+				vp.remove(vslider);
+				vp.add(vslider);
 				JFrame frame1 = new JFrame();
 				frame1.setLocationRelativeTo(button2);
 				JPanel jp = new JPanel();
@@ -216,6 +222,8 @@ public void actionPerformed(ActionEvent event) {
 		mkBar(p, tf, Adjustable.VERTICAL, 20, 200);
 		mkSlider(p, tf, Adjustable.VERTICAL, 20, 200);
 		JSlider slider = mkSlider(p, tf, Adjustable.VERTICAL, 70, 200);
+		vslider = slider;
+		vp = p;
 		slider.setInverted(false);
         slider.setPaintTicks(true);
         slider.setPaintLabels(true);

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,6 @@ public interface JQuery {`
`10`	`10`
`11`	`11`	`Object parseJSON(String json);`
`12`	`12`
	`13`	`+ Object data(Object node, String attr);`
	`14`	`+`
`13`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -684,6 +684,9 @@ private void uninstallJS() {`
`684`	`684`	`protected JQueryObject $(Object node) {`
`685`	`685`	`return jquery.$(node);`
`686`	`686`	`}`
	`687`	`+ protected Object $data(DOMNode node, String attr) {`
	`688`	`+ return (node == null ? null : jquery.data(node,attr));`
	`689`	`+ }`
`687`	`690`
`688`	`691`	`/**`
`689`	`692`	`* Set the associated JComponent. Setting comp null will disable this UI from`