menu enable/disable for radio and checkbox items

BobHanson · BobHanson · commit d3bf47f807c1 · 2018-06-25T15:26:40.000+01:00
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/swingjs/plaf/JSCheckBoxMenuItemUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSCheckBoxMenuItemUI.java
@@ -3,6 +3,8 @@
 import javax.swing.JComponent;
 import javax.swing.JMenuItem;
 
+import swingjs.api.js.DOMNode;
+
 public class JSCheckBoxMenuItemUI extends JSCheckBoxUI {
 
 	public JSCheckBoxMenuItemUI() {
@@ -20,4 +22,5 @@ public void installUI(JComponent jc) {
 		menuItem = (JMenuItem) jc;
 		super.installUI(jc);
 	}
+	
 }
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
@@ -1492,6 +1492,16 @@ else if (enableNodes != null)
 	protected void enableNode(DOMNode node, boolean b) {
 		if (node == null)
 			return;
+		
+		if (isMenuItem) {
+			if (b) {
+				$(node).removeClass("ui-menu-disabled ui-state-disabled");
+			} else {
+				$(node).addClass("ui-menu-disabled ui-state-disabled");			
+			}
+			return;
+		}
+		
 		DOMNode.setAttr(node, "disabled", (b ? null : "TRUE"));
 		String pp = getPropertyPrefix();
 		if (!b && inactiveForeground == colorUNKNOWN)
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSMenuItemUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSMenuItemUI.java
@@ -47,17 +47,5 @@ public void installUI(JComponent jc) {
     LookAndFeel.installColorsAndFont(jc, "MenuItem.background", "MenuItem.foreground",
         "MenuItem.font");		
 	}
-
 	
-	@Override
-	protected void enableNode(DOMNode node, boolean b) {
-		if (node == null)
-			return;
-		if (b) {
-			$(node).removeClass("ui-menu-disabled ui-state-disabled");
-		} else {
-			$(node).addClass("ui-menu-disabled ui-state-disabled");			
-		}
-	}
-
 }
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSRadioButtonMenuItemUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSRadioButtonMenuItemUI.java
@@ -3,6 +3,8 @@
 import javax.swing.JComponent;
 import javax.swing.JMenuItem;
 
+import swingjs.api.js.DOMNode;
+
 public class JSRadioButtonMenuItemUI extends JSRadioButtonUI {
 	
 	public JSRadioButtonMenuItemUI() {
@@ -21,4 +23,5 @@ public void installUI(JComponent jc) {
 		menuItem = (JMenuItem) jc;
 		super.installUI(jc);
 	}
+	
 }

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`	`import javax.swing.JComponent;`
`4`	`4`	`import javax.swing.JMenuItem;`
`5`	`5`
	`6`	`+import swingjs.api.js.DOMNode;`
	`7`	`+`
`6`	`8`	`public class JSCheckBoxMenuItemUI extends JSCheckBoxUI {`
`7`	`9`
`8`	`10`	`public JSCheckBoxMenuItemUI() {`
`@@ -20,4 +22,5 @@ public void installUI(JComponent jc) {`
`20`	`22`	`menuItem = (JMenuItem) jc;`
`21`	`23`	`super.installUI(jc);`
`22`	`24`	`}`
	`25`	`+`
`23`	`26`	`}`