AWT Menu/MenuBar work - preliminary

hansonr · hansonr · commit ae4840c50aeb · 2019-03-07T21:25:05.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Frame.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Frame.java
@@ -1,8 +1,13 @@
 package swingjs.a2s;
 
+import java.awt.Component;
 import java.awt.GraphicsConfiguration;
+import java.awt.MenuBar;
+import java.awt.MenuComponent;
+//import java.awt.peer.FramePeer;
 
 import javax.swing.JFrame;
+import javax.swing.JMenuBar;
 
 public class Frame extends JFrame implements A2SContainer {
 
@@ -31,7 +36,7 @@ public Frame(GraphicsConfiguration gc) {
 	public Frame(String title, GraphicsConfiguration gc) {
 		super(title, gc);
 		listener = new A2SListener();
-		//Util.setAWTWindowDefaults(this);
+		Util.setAWTWindowDefaults(this);
 	}
 
 
@@ -44,13 +49,33 @@ public void setMenuBar(MenuBar m) {
 		setJMenuBar(m);
 	}
 
-  public void unsetMenuBar() {
-  	setJMenuBar(null);
+	public void remove(MenuComponent m) {
+		JMenuBar mb = super.getJMenuBar();
+		if (mb != null)
+			mb.remove((Component) m);
+	}
+	
+    public void unsetMenuBar() {
+    	setJMenuBar(null);
 	}
 
 
 	public MenuBar getMenubar() {
 		return (MenuBar) getJMenuBar();
 	}
 
+    @Override
+	public void addNotify() {
+        synchronized (getTreeLock()) {
+        	getOrCreatePeer();
+//            FramePeer p = (FramePeer)peer;
+            if (getMenubar() != null) {
+            	getMenubar().addNotify();
+//                p.setMenuBar(menuBar);
+            }
+//            p.setMaximizedBounds(maximizedBounds);
+            super.addNotify();
+        }
+    }
+
 }
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Menu.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Menu.java
@@ -5,6 +5,7 @@
 import java.awt.MenuShortcut;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.util.Enumeration;
 
 import javax.swing.JComponent;
 import javax.swing.JMenu;
@@ -67,6 +68,16 @@ public void deleteShortcut() {
 		setAccelerator(null);
 	}
 
+	public Enumeration<MenuShortcut> shortcuts() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public void deleteShortcut(MenuShortcut s) {
+		// TODO Auto-generated method stub
+		
+	}
+
 
 
 }
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/MenuBar.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/MenuBar.java
@@ -1,15 +1,67 @@
 package swingjs.a2s;
 
+import java.awt.Component;
 import java.awt.HeadlessException;
+import java.awt.MenuComponent;
+import java.awt.MenuShortcut;
+import java.util.Enumeration;
+import java.util.Vector;
 
 import javax.swing.JMenuBar;
 
 public class MenuBar extends JMenuBar {
-	
-	public void isAWT() {}
-	
-    public MenuBar() throws HeadlessException {
-    	super();
-    }
+
+	public void isAWT() {
+	}
+
+	public MenuBar() throws HeadlessException {
+		super();
+	}
+
+	public void add(java.awt.Menu m) {
+		super.add((Component) m);
+	}
+
+	public void add(java.awt.MenuItem m) {
+		super.add((Component) m);
+	}
+
+	public void deleteShortcut(MenuShortcut s) {
+		int nmenus = getMenuCount();
+		for (int i = 0; i < nmenus; i++) {
+			((Menu) getMenu(i)).deleteShortcut(s);
+		}
+	}
+
+	public synchronized Enumeration<MenuShortcut> shortcuts() {
+		Vector<MenuShortcut> shortcuts = new Vector<>();
+		int nmenus = getMenuCount();
+		for (int i = 0; i < nmenus; i++) {
+			Enumeration<MenuShortcut> e = ((Menu) getMenu(i)).shortcuts();
+			while (e.hasMoreElements()) {
+				shortcuts.addElement(e.nextElement());
+			}
+		}
+		return shortcuts.elements();
+	}
+
+	Menu helpMenu = null;
+
+	@Override
+	public Menu getHelpMenu() {
+		return helpMenu;
+	}
+
+	public void setHelpMenu(java.awt.Menu m) {
+		helpMenu = m;
+	}
+
+	public void remove(MenuComponent m) {
+		super.remove((Component) m);
+	}
+
+	public int countMenus() {
+		return getMenuCount();
+	}
 
 }
