Fixes loss of button action when removed and added to its current menu

BobHanson · BobHanson · commit 9f2f64c7d917 · 2021-09-23T06:12:47.000-05:00
diff --git a/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20210922053514 
+20210923060334 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp
@@ -1 +1 @@
-20210922053514 
+20210923060334 
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/javax/swing/JMenu.java b/sources/net.sf.j2s.java.core/src/javax/swing/JMenu.java
@@ -337,7 +337,7 @@ public void setPopupMenuVisible(boolean b) {
 //            System.out.println("in JMenu.setPopupMenuVisible " + b);
 //            // Thread.dumpStack();
 //        }
-		if (!isEnabled())
+		if (!isEnabled() || popupMenu == null)
 			return;
     	if (b && popupMenu.getPeer() == null)
     		popupMenu.addNotify();// BH SwingJS 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/ButtonListener.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/ButtonListener.java
@@ -300,7 +300,7 @@ public void mouseReleased(MouseEvent e) {
 				return;
 			b.doClick(0);
 			verifyButtonClick(b, true);
-			JSComponentUI ui = b.秘getUI();
+//			JSComponentUI ui = b.秘getUI();
 		}
 	}
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSButtonUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSButtonUI.java
@@ -224,6 +224,26 @@ else if (button.getBorder() == BorderFactory.html5Border)
 		
 	}
 
+	@Override
+	public void dispose() {
+		if (isUIDisabled)
+			return;
+		super.dispose();
+		if (menuAnchorNode != null) {
+			// This is set in j2sMenu.js; we set it null here
+			// re-establish events when this button is added again
+			DOMNode.setAttr(menuAnchorNode, "_menu", null);
+		}
+	}
+
+	@Override
+	protected void undisposeUI(DOMNode node) {
+		if (!isDisposed)
+			return;
+		super.undisposeUI(node);
+	}
+
+
 	/**
 	 * called by j2sApplet.js
 	 * 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSPopupMenuUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSPopupMenuUI.java
@@ -232,8 +232,11 @@ public void setVisible(boolean b) {
 					menu = (JPopupMenu) jc;
 					j2sSwingMenu.setMenu(menu);
 					isTainted = false;
-					JSComponent.秘getTopInvokableAncestor(jc, true).removeMouseListener(this);
-					JSComponent.秘getTopInvokableAncestor(jc, true).addMouseListener(this);
+					Component top = JSComponent.秘getTopInvokableAncestor(jc, true);
+					if (top != null) {
+						top.removeMouseListener(this);
+						top.addMouseListener(this);
+					}
 				} else {
 					updateMenu(true);
 				}
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Anything.java b/sources/net.sf.j2s.java.core/src/test/Test_Anything.java
@@ -15,6 +15,7 @@ public Test_Anything() {
 		
 		JMenuBar mb2 = new JMenuBar();
 		mb2.add(new JMenu("testing2"));
+		
 		setJMenuBar(mb2);
 		JTextField tf = new JTextField("test");
 		System.out.println(tf.getPreferredSize());
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Editor.java b/sources/net.sf.j2s.java.core/src/test/Test_Editor.java
@@ -56,6 +56,8 @@
 import javax.swing.Timer;
 import javax.swing.event.CaretEvent;
 import javax.swing.event.CaretListener;
+import javax.swing.event.MenuEvent;
+import javax.swing.event.MenuListener;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.DefaultCaret;
 import javax.swing.text.Document;
@@ -758,6 +760,10 @@ public void addNotify() {
 		};
 
 		JMenuItem mb1a = new JMenuItem("test-1");
+		mb1a.addActionListener((e)->{
+			System.out.println("test-1 clicked");
+		});
+		
 		JMenuItem mb1b = new JMenuItem("test-2");
 		JMenuItem mb1c = new JMenuItem("test-3");
 		JMenuItem mb1d = new JMenuItem("test-4");
@@ -773,10 +779,33 @@ public void addNotify() {
 		mb1e.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_W, KeyEvent.CTRL_MASK));
 
 		mb1.add(mb1a);
-		mb1.add(mb1b);
-		mb1.add(mb1c);
-		mb1.add(mb1d);
-		mb1.add(mb1e);
+//		mb1.add(mb1b);
+//		mb1.add(mb1c);
+//		mb1.add(mb1d);
+//		mb1.add(mb1e);
+		mb1.addMenuListener(new MenuListener() {
+
+			@Override
+			public void menuSelected(MenuEvent e) {
+				mb1.removeAll();
+				mb1.add(mb1a);
+				// TODO Auto-generated method stub
+				
+			}
+
+			@Override
+			public void menuDeselected(MenuEvent e) {
+				// TODO Auto-generated method stub
+				
+			}
+
+			@Override
+			public void menuCanceled(MenuEvent e) {
+				// TODO Auto-generated method stub
+				
+			}
+			
+		});
 
 		KeyStroke[] a = mb1.getRegisteredKeyStrokes();
 		System.out.println("menubar menu registration: " + a.length);
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Menu.java b/sources/net.sf.j2s.java.core/src/test/Test_Menu.java
@@ -0,0 +1,146 @@
+package test;
+
+import java.awt.BorderLayout;
+//import java.awt.Button;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.DefaultKeyboardFocusManager;
+import java.awt.Dimension;
+import java.awt.Font;
+//import java.awt.TextArea;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.awt.dnd.DnDConstants;
+import java.awt.dnd.DropTarget;
+import java.awt.dnd.DropTargetDragEvent;
+import java.awt.dnd.DropTargetDropEvent;
+import java.awt.dnd.DropTargetEvent;
+import java.awt.dnd.DropTargetListener;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JDesktopPane;
+import javax.swing.JFrame;
+import javax.swing.JInternalFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.JTextPane;
+import javax.swing.KeyStroke;
+import javax.swing.MenuElement;
+import javax.swing.MenuSelectionManager;
+import javax.swing.Timer;
+import javax.swing.event.CaretEvent;
+import javax.swing.event.CaretListener;
+import javax.swing.event.MenuEvent;
+import javax.swing.event.MenuListener;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.DefaultCaret;
+import javax.swing.text.Document;
+import javax.swing.text.Element;
+import javax.swing.text.JTextComponent;
+import javax.swing.text.MutableAttributeSet;
+import javax.swing.text.SimpleAttributeSet;
+import javax.swing.text.Style;
+import javax.swing.text.StyleConstants;
+
+public class Test_Menu extends JFrame {
+	public static void main(String[] args) {
+		new Test_Menu();
+	}
+
+
+	protected boolean done;
+
+	public Test_Menu() {
+
+			setJMenuBar(getMenuBar());
+			pack();
+			setVisible(true);
+		}
+
+
+	private JMenuBar getMenuBar() {
+		JMenuBar mb = new JMenuBar();
+		JMenu mb1 = new JMenu("Test1");
+		JMenu mb2 = new JMenu("Test2");
+		JMenuItem mb1a = new JMenuItem("test-1");
+		mb1a.addActionListener((e)->{
+			System.out.println("test-1 clicked");
+			mb2.removeAll();
+			mb1.add(mb1a);
+			System.out.println("test-1 removed and re-added");
+			done = true;
+		});
+
+		
+		mb1.setMnemonic('t');
+		mb1a.setMnemonic('1');
+
+		mb1.add(mb1a);
+		mb1.addMenuListener(new MenuListener() {
+
+			@Override
+			public void menuSelected(MenuEvent e) {
+				mb1.add(mb1a);
+				// TODO Auto-generated method stub
+				
+			}
+
+			@Override
+			public void menuDeselected(MenuEvent e) {
+				// TODO Auto-generated method stub
+				
+			}
+
+			@Override
+			public void menuCanceled(MenuEvent e) {
+				// TODO Auto-generated method stub
+				
+			}
+			
+		});
+
+
+		mb.add(mb1);
+		mb.add(mb2);
+
+		ActionListener al = new ActionListener() {
+
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				System.out.println("Test_Editor action " + e);
+			}
+
+		};
+
+		mb1a.addActionListener(al);
+
+		return mb;
+	}
+
+}

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ public void mouseReleased(MouseEvent e) {`
`300`	`300`	`return;`
`301`	`301`	`b.doClick(0);`
`302`	`302`	`verifyButtonClick(b, true);`
`303`		`- JSComponentUI ui = b.秘getUI();`
	`303`	`+// JSComponentUI ui = b.秘getUI();`
`304`	`304`	`}`
`305`	`305`	`}`
`306`	`306`