From 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 Mon Sep 17 00:00:00 2001 From: abranson Date: Thu, 4 Aug 2011 00:42:34 +0200 Subject: More code cleanup: Refactored Entity Proxy Subscription to handle generics better Rewrote RemoteMap to use TreeMap instead of the internal array for order. It now sorts its keys by number if they parse, else as strings. Removed a no-longer-in-progress outcome form class --- source/com/c2kernel/gui/MenuBuilder.java | 54 +++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 18 deletions(-) (limited to 'source/com/c2kernel/gui/MenuBuilder.java') diff --git a/source/com/c2kernel/gui/MenuBuilder.java b/source/com/c2kernel/gui/MenuBuilder.java index bf27287..6d1bfbc 100644 --- a/source/com/c2kernel/gui/MenuBuilder.java +++ b/source/com/c2kernel/gui/MenuBuilder.java @@ -5,7 +5,22 @@ import java.awt.event.ItemListener; import java.util.Enumeration; import java.util.HashMap; -import javax.swing.*; +import javax.swing.Box; +import javax.swing.ButtonGroup; +import javax.swing.Icon; +import javax.swing.JCheckBoxMenuItem; +import javax.swing.JDialog; +import javax.swing.JEditorPane; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JOptionPane; +import javax.swing.JRadioButtonMenuItem; +import javax.swing.JScrollPane; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import javax.swing.UIManager.LookAndFeelInfo; import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; import javax.swing.text.html.HTMLEditorKit; @@ -34,11 +49,11 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene protected JMenu prefMenu; protected JMenu helpMenu; protected HashMap availableMenus = new HashMap(); - + public MenuBuilder() {} - - /** Creates new DynamicMenuBuilder */ + + /** Creates new DynamicMenuBuilder */ public MenuBuilder(MainFrame parentFrame) { myParentFrame = parentFrame; @@ -63,14 +78,14 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene addServerConsoles(); ButtonGroup styleButtonGroup = new ButtonGroup(); - for (int i = 0; i < availableViews.length; i++) - addMenuItem(availableViews[i].getName(), "style", styleButtonGroup, 0); - + for (LookAndFeelInfo availableView : availableViews) + addMenuItem(availableView.getName(), "style", styleButtonGroup, 0); + addMenuItem(Language.translate("Tree Browser"), "preferences", null, MainFrame.getPref("ShowTree", "true").equals("true")?2:1); addMenuItem(Language.translate("Outcome Field Help"), "preferences", null, MainFrame.getPref("ShowHelp", "true").equals("true")?2:1); addMenuItem(Language.translate("Graph Properties"), "preferences", null, MainFrame.getPref("ShowProps", "true").equals("true")?2:1); addMenuItem(Language.translate("About"), "help", null, 0); - + add(fileMenu); add(consoleMenu); add(styleMenu); @@ -78,10 +93,10 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene add(helpMenu); } /** - * + * */ private void addServerConsoles() { - Enumeration servers = Gateway.getLDAPLookup().searchEntities(new DomainPath("/servers")); + Enumeration servers = Gateway.getLDAPLookup().searchEntities(new DomainPath("/servers")); while(servers.hasMoreElements()) { Path thisServerPath = (Path)servers.nextElement(); try { @@ -117,7 +132,7 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene myItem = new JCheckBoxMenuItem(itemName, checkBox == 2); } myItem.addActionListener(this); - JMenu myMenu = (JMenu) availableMenus.get(menuName); + JMenu myMenu = availableMenus.get(menuName); myMenu.add(myItem); } } @@ -133,6 +148,7 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene return -1; } //listens for events performed on the menu items + @Override public void actionPerformed(java.awt.event.ActionEvent e) { String s = e.getActionCommand(); @@ -180,7 +196,7 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene { Logger.error(ex); } - } + } else Logger.msg(1, "MenuBuilder.actionPerformed() - No action associated with the event received"); } @@ -189,7 +205,7 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene { JOptionPane myPane = new JOptionPane(); Box about = Box.createVerticalBox(); - + String aboutInfo; try { @@ -201,7 +217,7 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene } JLabel title = new JLabel(aboutInfo); about.add(title); - + about.add(new JLabel("Domain version: "+Resource.getDomainVersion())); about.add(new JLabel("Kernel version: "+Resource.getKernelVersion())); // get license info @@ -210,7 +226,7 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene if (domlictxt != null) lictxt.append(domlictxt); lictxt.append(Resource.getTextResource("textFiles/license.html")); - + JEditorPane license = new JEditorPane(); license.setEditable(false); license.setEditorKit(new HTMLEditorKit()); @@ -220,7 +236,7 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene JScrollPane scroll = new JScrollPane(license); scroll.setPreferredSize(new Dimension(300,200)); license.setCaretPosition(0); - + about.add(scroll); myPane.setMessage(about); myPane.setMessageType(JOptionPane.INFORMATION_MESSAGE); @@ -232,7 +248,8 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene dialog.setVisible(true); } - public void hyperlinkUpdate(HyperlinkEvent e) { + @Override +public void hyperlinkUpdate(HyperlinkEvent e) { try { if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler "+e.getURL().toString()); @@ -240,7 +257,8 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene Logger.exceptionDialog(ex); } } - + + @Override public void itemStateChanged(java.awt.event.ItemEvent e) { } -- cgit v1.2.3