fix for click on submenu causes infinite loop

BobHanson · BobHanson · commit 7d54b2a9af40 · 2018-01-10T23:29:13.000-06:00
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
@@ -1296,6 +1296,8 @@ protected void processKeyEvent(KeyEvent evt) {
     @Override
 		public void doClick(int pressTime) {
         MenuElement me[] = buildMenuElementArray(this);
+        if (me == null)
+        	return;
         MenuSelectionManager.defaultManager().setSelectedPath(me);
     }
 
@@ -1327,6 +1329,9 @@ private MenuElement[] buildMenuElementArray(JMenu leaf) {
                 MenuElement me[] = new MenuElement[elements.size()];
                 elements.copyInto(me);
                 return me;
+            } else {
+            	// SwingJS - should not be here!
+            	return null;
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1296,6 +1296,8 @@ protected void processKeyEvent(KeyEvent evt) {`
`1296`	`1296`	`@Override`
`1297`	`1297`	`public void doClick(int pressTime) {`
`1298`	`1298`	`MenuElement me[] = buildMenuElementArray(this);`
	`1299`	`+ if (me == null)`
	`1300`	`+ return;`
`1299`	`1301`	`MenuSelectionManager.defaultManager().setSelectedPath(me);`
`1300`	`1302`	`}`
`1301`	`1303`
`@@ -1327,6 +1329,9 @@ private MenuElement[] buildMenuElementArray(JMenu leaf) {`
`1327`	`1329`	`MenuElement me[] = new MenuElement[elements.size()];`
`1328`	`1330`	`elements.copyInto(me);`
`1329`	`1331`	`return me;`
	`1332`	`+ } else {`
	`1333`	`+ // SwingJS - should not be here!`
	`1334`	`+ return null;`
`1330`	`1335`	`}`
`1331`	`1336`	`}`
`1332`	`1337`	`}`