JSSlider fixes to avoid unnecessary caught early exception

hansonr · hansonr · commit 333859da685d · 2020-07-26T17:22:30.000-05:00
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
@@ -680,10 +680,7 @@ 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
 	 * getting any events.
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
@@ -31,6 +31,7 @@
 import swingjs.JSToolkit;
 import swingjs.JSUtil;
 import swingjs.api.js.DOMNode;
+import swingjs.api.js.JQueryObject;
 import swingjs.jquery.JQueryUI;
 
 /**
@@ -349,30 +350,33 @@ private void setup(boolean isNew) {
 
 	/**
 	 * Call jquery-ui-j2sslider.js _setOption
+	 * 
 	 * @param key
 	 * @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;
-		 *  jsslider.j2sslider("option",key,val);
-		 */
-		} catch (Throwable t) {
-			// System.out.println(key + ":" + val + " could not be set for " + id);
-			// ignore -- disposal problem?
+		if (sliderInitialized()) {
+			try {
+				String id = null;
+				JQueryObject jsslider = $(jqSlider);
+				/**
+				 * @j2sNative
+				 * 
+				 * 
+				 * 			id = this.jqSlider.id; jsslider.j2sslider("option",key,val);
+				 */
+			} catch (Throwable t) {
+				// System.out.println(key + ":" + val + " could not be set for " + id);
+				// ignore -- disposal problem?
+			}
+			noSnapping = isScrollBar;
+		} else {
+			noSnapping = true;
 		}
-		noSnapping = isScrollBar;
 	}
 
 	private boolean sliderInitialized() {
-		return ($data(jqSlider, "ui-j2sslider") != null);
+			return (jqSlider != null && jquery.data(jqSlider, "ui-j2sslider") != null);
 	}
 
 	public void setSlider() {
