AWT Checkbox setState needs to bypass listeners but still set ui

hansonr · hansonr · commit 334a72b7ee28 · 2019-02-21T05:55:51.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/DefaultButtonModel.java b/sources/net.sf.j2s.java.core/src/javax/swing/DefaultButtonModel.java
@@ -232,16 +232,8 @@ public void setEnabled(boolean b) {
      */
     @Override
 		public void setSelected(boolean b) {
-        if (this.isSelected() == b) {
-            return;
-        }
-
-        if (b) {
-            stateMask |= SELECTED;
-        } else {
-            stateMask &= ~SELECTED;
-        }
-
+    	if (!setStateNoFire(b))
+    		return;
         fireItemStateChanged(
                 new ItemEvent(this,
                               ItemEvent.ITEM_STATE_CHANGED,
@@ -252,17 +244,16 @@ public void setSelected(boolean b) {
 
     }
 
-	public void setStateNoFire(boolean b) {
+	public boolean setStateNoFire(boolean b) {
         if (this.isSelected() == b) {
-            return;
+            return false;
         }
-
         if (b) {
             stateMask |= SELECTED;
         } else {
             stateMask &= ~SELECTED;
         }
-
+        return true;
 	}
 
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Checkbox.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Checkbox.java
@@ -9,6 +9,8 @@
 import javax.swing.JCheckBox;
 import javax.swing.JRadioButton;
 
+import swingjs.plaf.JSCheckBoxUI;
+
 public class Checkbox extends JCheckBox {
 
 	
@@ -73,7 +75,8 @@ public boolean getState() {
 	}
 
 	public void setState(boolean b) {
-		((DefaultButtonModel) model).setStateNoFire(b);
+		if (((DefaultButtonModel) model).setStateNoFire(b))
+			((JSCheckBoxUI) (Object) getUI()).updateDOMNode();
 	}   
 	
 	public void setCheckboxGroup(java.awt.CheckboxGroup group) throws HeadlessException {

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@`
`9`	`9`	`import javax.swing.JCheckBox;`
`10`	`10`	`import javax.swing.JRadioButton;`
`11`	`11`
	`12`	`+import swingjs.plaf.JSCheckBoxUI;`
	`13`	`+`
`12`	`14`	`public class Checkbox extends JCheckBox {`
`13`	`15`
`14`	`16`
`@@ -73,7 +75,8 @@ public boolean getState() {`
`73`	`75`	`}`
`74`	`76`
`75`	`77`	`public void setState(boolean b) {`
`76`		`- ((DefaultButtonModel) model).setStateNoFire(b);`
	`78`	`+ if (((DefaultButtonModel) model).setStateNoFire(b))`
	`79`	`+ ((JSCheckBoxUI) (Object) getUI()).updateDOMNode();`
`77`	`80`	`}`
`78`	`81`
`79`	`82`	`public void setCheckboxGroup(java.awt.CheckboxGroup group) throws HeadlessException {`