diff options
| -rwxr-xr-x | java/src/IceGridGUI/ApplicationActions.java | 34 | ||||
| -rwxr-xr-x | java/src/IceGridGUI/Coordinator.java | 50 | ||||
| -rwxr-xr-x | java/src/IceGridGUI/LiveActions.java | 10 | ||||
| -rwxr-xr-x | java/src/IceGridGUI/LiveDeployment/Server.java | 2 |
4 files changed, 51 insertions, 45 deletions
diff --git a/java/src/IceGridGUI/ApplicationActions.java b/java/src/IceGridGUI/ApplicationActions.java index f9051d2ada8..7fb5e8256e6 100755 --- a/java/src/IceGridGUI/ApplicationActions.java +++ b/java/src/IceGridGUI/ApplicationActions.java @@ -56,7 +56,7 @@ public class ApplicationActions final int MENU_MASK = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(); _array[TreeNode.NEW_ADAPTER] = new AbstractAction( - popup ? "New adapter" : "Adapter") + popup ? "New Adapter" : "Adapter") { public void actionPerformed(ActionEvent e) { @@ -65,7 +65,7 @@ public class ApplicationActions }; _array[TreeNode.NEW_DBENV] = new AbstractAction( - popup ? "New database environment" : "Database environment") + popup ? "New Database Environment" : "Database Environment") { public void actionPerformed(ActionEvent e) { @@ -74,7 +74,7 @@ public class ApplicationActions }; _array[TreeNode.NEW_NODE] = new AbstractAction( - popup ? "New node" : "Node") + popup ? "New Node" : "Node") { public void actionPerformed(ActionEvent e) { @@ -83,7 +83,7 @@ public class ApplicationActions }; _array[TreeNode.NEW_PROPERTY_SET] = new AbstractAction( - popup ? "New property set" : "Property set") + popup ? "New Property Set" : "Property Set") { public void actionPerformed(ActionEvent e) { @@ -92,7 +92,7 @@ public class ApplicationActions }; _array[TreeNode.NEW_REPLICA_GROUP] = new AbstractAction( - popup ? "New replica group" : "Replica group" ) + popup ? "New Replica Group" : "Replica Group" ) { public void actionPerformed(ActionEvent e) { @@ -101,7 +101,7 @@ public class ApplicationActions }; _array[TreeNode.NEW_SERVER] = new AbstractAction( - popup ? "New server" : "Server") + popup ? "New Server" : "Server") { public void actionPerformed(ActionEvent e) { @@ -110,7 +110,7 @@ public class ApplicationActions }; _array[TreeNode.NEW_SERVER_ICEBOX] = new AbstractAction( - popup ? "New IceBox server" : "IceBox server") + popup ? "New IceBox Server" : "IceBox Server") { public void actionPerformed(ActionEvent e) { @@ -119,7 +119,7 @@ public class ApplicationActions }; _array[TreeNode.NEW_SERVER_FROM_TEMPLATE] = new AbstractAction( - popup ? "New server from template" : "Server from template") + popup ? "New Server from Template" : "Server from Template") { public void actionPerformed(ActionEvent e) { @@ -129,7 +129,7 @@ public class ApplicationActions _array[TreeNode.NEW_SERVICE] = new AbstractAction( - popup ? "New service" : "Service") + popup ? "New Service" : "Service") { public void actionPerformed(ActionEvent e) { @@ -138,7 +138,7 @@ public class ApplicationActions }; _array[TreeNode.NEW_SERVICE_FROM_TEMPLATE] = new AbstractAction( - popup ? "New service from template" : "Service from template") + popup ? "New Service from Template" : "Service from Template") { public void actionPerformed(ActionEvent e) { @@ -147,7 +147,7 @@ public class ApplicationActions }; _array[TreeNode.NEW_TEMPLATE_SERVER] = new AbstractAction( - popup ? "New Server template" : "Server template") + popup ? "New Server Template" : "Server Template") { public void actionPerformed(ActionEvent e) { @@ -156,7 +156,7 @@ public class ApplicationActions }; _array[TreeNode.NEW_TEMPLATE_SERVER_ICEBOX] = new AbstractAction( - popup ? "New IceBox server template" : "IceBox server template") + popup ? "New IceBox Server Template" : "IceBox Server Template") { public void actionPerformed(ActionEvent e) { @@ -166,7 +166,7 @@ public class ApplicationActions _array[TreeNode.NEW_TEMPLATE_SERVICE] = new AbstractAction( - popup ? "New service template" : "Service template") + popup ? "New Service Template" : "Service Template") { public void actionPerformed(ActionEvent e) { @@ -202,7 +202,7 @@ public class ApplicationActions }; _array[TreeNode.SHOW_VARS] = new - AbstractAction("Show variables") + AbstractAction("Show Variables") { public void actionPerformed(ActionEvent e) { @@ -215,7 +215,7 @@ public class ApplicationActions _array[TreeNode.SUBSTITUTE_VARS] = new - AbstractAction("Substitute variables") + AbstractAction("Substitute Variables") { public void actionPerformed(ActionEvent e) { @@ -228,7 +228,7 @@ public class ApplicationActions "Substitute variables and parameters with their values in the Properties pane"); - _array[TreeNode.MOVE_UP] = new AbstractAction("Move up") + _array[TreeNode.MOVE_UP] = new AbstractAction("Move Up") { public void actionPerformed(ActionEvent e) { @@ -236,7 +236,7 @@ public class ApplicationActions } }; - _array[TreeNode.MOVE_DOWN] = new AbstractAction("Move down") + _array[TreeNode.MOVE_DOWN] = new AbstractAction("Move Down") { public void actionPerformed(ActionEvent e) { diff --git a/java/src/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/Coordinator.java index b7821807165..8eb970bda40 100755 --- a/java/src/IceGridGUI/Coordinator.java +++ b/java/src/IceGridGUI/Coordinator.java @@ -447,7 +447,7 @@ public class Coordinator _serverMenu.add(_liveActionsForMenu.get( IceGridGUI.LiveDeployment.TreeNode.WRITE_MESSAGE)); _serverMenu.addSeparator(); - _signalMenu = new JMenu("Send signal"); + _signalMenu = new JMenu("Send Signal"); _serverMenu.add(_signalMenu); _signalMenu.add(_liveActionsForMenu.get(IceGridGUI.LiveDeployment.TreeNode.SIGHUP)); _signalMenu.add(_liveActionsForMenu.get(IceGridGUI.LiveDeployment.TreeNode.SIGINT)); @@ -1649,9 +1649,6 @@ public class Coordinator if(args.value.length > 0) { - // - // TODO: use proper logging - // System.err.println("WARNING: extra command-line arguments"); for(int i = 0; i < args.value.length; ++i) { @@ -1731,7 +1728,7 @@ public class Coordinator }; _newApplicationWithDefaultTemplates = - new AbstractAction("Application with default templates from registry") + new AbstractAction("Application with Default Templates from Registry") { public void actionPerformed(ActionEvent e) { @@ -1748,7 +1745,7 @@ public class Coordinator } }; _login.putValue(Action.SHORT_DESCRIPTION, - "Log into an IceGrid registry"); + "Log into an IceGrid Registry"); _logout = new AbstractAction("Logout") { @@ -1760,7 +1757,7 @@ public class Coordinator _logout.putValue(Action.SHORT_DESCRIPTION, "Logout"); _logout.setEnabled(false); - _acquireExclusiveWriteAccess = new AbstractAction("Acquire exclusive write access") + _acquireExclusiveWriteAccess = new AbstractAction("Acquire Exclusive Write Access") { public void actionPerformed(ActionEvent e) { @@ -1781,7 +1778,7 @@ public class Coordinator _acquireExclusiveWriteAccess.setEnabled(false); - _releaseExclusiveWriteAccess = new AbstractAction("Release exclusive write access") + _releaseExclusiveWriteAccess = new AbstractAction("Release Exclusive Write Access") { public void actionPerformed(ActionEvent e) { @@ -1794,7 +1791,7 @@ public class Coordinator "Release exclusive write access on the registry"); _releaseExclusiveWriteAccess.setEnabled(false); - _openApplicationFromFile = new AbstractAction("Application from file") + _openApplicationFromFile = new AbstractAction("Application from File") { public void actionPerformed(ActionEvent e) { @@ -1820,7 +1817,7 @@ public class Coordinator _openApplicationFromFile.putValue(Action.SHORT_DESCRIPTION, "Open application from file"); _openApplicationFromFile.setEnabled(true); - _openApplicationFromRegistry = new AbstractAction("Application from registry") + _openApplicationFromRegistry = new AbstractAction("Application from Registry") { public void actionPerformed(ActionEvent e) { @@ -1856,7 +1853,7 @@ public class Coordinator _openApplicationFromRegistry.putValue(Action.SHORT_DESCRIPTION, "Open application from registry"); _openApplicationFromRegistry.setEnabled(false); - _closeApplication = new AbstractAction("Close application") + _closeApplication = new AbstractAction("Close Application") { public void actionPerformed(ActionEvent e) { @@ -1869,8 +1866,17 @@ public class Coordinator } }; _closeApplication.putValue(Action.SHORT_DESCRIPTION, "Close application"); - _closeApplication.putValue(Action.ACCELERATOR_KEY, - KeyStroke.getKeyStroke(KeyEvent.VK_F4, MENU_MASK)); + + if(System.getProperty("os.name").startsWith("Mac OS")) + { + _closeApplication.putValue(Action.ACCELERATOR_KEY, + KeyStroke.getKeyStroke("ctrl w")); + } + else + { + _closeApplication.putValue(Action.ACCELERATOR_KEY, + KeyStroke.getKeyStroke(KeyEvent.VK_F4, MENU_MASK)); + } _closeApplication.setEnabled(false); @@ -1887,7 +1893,7 @@ public class Coordinator _save.putValue(Action.SHORT_DESCRIPTION, "Save"); - _saveToRegistry = new AbstractAction("Save to registry") + _saveToRegistry = new AbstractAction("Save to Registry") { public void actionPerformed(ActionEvent e) { @@ -1898,7 +1904,7 @@ public class Coordinator _saveToRegistry.putValue(Action.SHORT_DESCRIPTION, "Save to registry"); - _saveToFile = new AbstractAction("Save to file") + _saveToFile = new AbstractAction("Save to File") { public void actionPerformed(ActionEvent e) { @@ -1909,7 +1915,7 @@ public class Coordinator _saveToFile.putValue(Action.SHORT_DESCRIPTION, "Save to file"); - _discardUpdates = new AbstractAction("Discard updates") + _discardUpdates = new AbstractAction("Discard Updates") { public void actionPerformed(ActionEvent e) { @@ -1931,7 +1937,7 @@ public class Coordinator _exit.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke("alt F4")); - _back = new AbstractAction("Go back to the previous node") + _back = new AbstractAction("Go Back to the Previous Node") { public void actionPerformed(ActionEvent e) { @@ -1941,7 +1947,7 @@ public class Coordinator _back.setEnabled(false); _back.putValue(Action.SHORT_DESCRIPTION, "Go back to the previous node"); - _forward = new AbstractAction("Go to the next node") + _forward = new AbstractAction("Go to the Next Node") { public void actionPerformed(ActionEvent e) { @@ -1949,7 +1955,7 @@ public class Coordinator } }; _forward.setEnabled(false); - _forward.putValue(Action.SHORT_DESCRIPTION, "Go to the next node"); + _forward.putValue(Action.SHORT_DESCRIPTION, "Go to the mext node"); _helpContents = new AbstractAction("Contents") { @@ -1967,7 +1973,7 @@ public class Coordinator } }; - _patchApplication = new AbstractAction("Patch distribution") + _patchApplication = new AbstractAction("Patch Distribution") { public void actionPerformed(ActionEvent e) { @@ -2019,8 +2025,8 @@ public class Coordinator KeyStroke.getKeyStroke("DELETE")); _delete.putValue(Action.SHORT_DESCRIPTION, "Delete"); - _moveUp = new ActionWrapper("Move up"); - _moveDown = new ActionWrapper("Move down"); + _moveUp = new ActionWrapper("Move Up"); + _moveDown = new ActionWrapper("Move Down"); _showVarsMenuItem = new JCheckBoxMenuItem(_appActionsForMenu.get(IceGridGUI.Application.TreeNode.SHOW_VARS)); diff --git a/java/src/IceGridGUI/LiveActions.java b/java/src/IceGridGUI/LiveActions.java index 8fe48b81fea..df5d8e18af5 100755 --- a/java/src/IceGridGUI/LiveActions.java +++ b/java/src/IceGridGUI/LiveActions.java @@ -120,7 +120,7 @@ public class LiveActions _array[TreeNode.SIGUSR2] = new SendSignal("SIGUSR2"); _array[TreeNode.SIGTERM] = new SendSignal("SIGTERM"); - _array[TreeNode.WRITE_MESSAGE] = new AbstractAction("Write message") + _array[TreeNode.WRITE_MESSAGE] = new AbstractAction("Write Message") { public void actionPerformed(ActionEvent e) { @@ -131,7 +131,7 @@ public class LiveActions "Write message to stdout or stderr"); - _array[TreeNode.RETRIEVE_STDOUT] = new AbstractAction("Retrieve stdout") + _array[TreeNode.RETRIEVE_STDOUT] = new AbstractAction("Retrieve Stdout") { public void actionPerformed(ActionEvent e) { @@ -141,7 +141,7 @@ public class LiveActions _array[TreeNode.RETRIEVE_STDOUT].putValue(Action.SHORT_DESCRIPTION, "Retrieve stdout"); - _array[TreeNode.RETRIEVE_STDERR] = new AbstractAction("Retrieve stderr") + _array[TreeNode.RETRIEVE_STDERR] = new AbstractAction("Retrieve Stderr") { public void actionPerformed(ActionEvent e) { @@ -169,7 +169,7 @@ public class LiveActions }; _array[TreeNode.PATCH_SERVER] = - new AbstractAction("Patch distribution") + new AbstractAction("Patch Distribution") { public void actionPerformed(ActionEvent e) { @@ -178,7 +178,7 @@ public class LiveActions }; _array[TreeNode.ADD_OBJECT] = - new AbstractAction("Add well-known object") + new AbstractAction("Add Well-known Object") { public void actionPerformed(ActionEvent e) { diff --git a/java/src/IceGridGUI/LiveDeployment/Server.java b/java/src/IceGridGUI/LiveDeployment/Server.java index 9aa3a57d973..03ba6c925a3 100755 --- a/java/src/IceGridGUI/LiveDeployment/Server.java +++ b/java/src/IceGridGUI/LiveDeployment/Server.java @@ -369,7 +369,7 @@ class Server extends ListArrayTreeNode _popup.add(la.get(RETRIEVE_STDERR)); _popup.addSeparator(); - JMenu signalMenu = new JMenu("Send signal"); + JMenu signalMenu = new JMenu("Send Signal"); _popup.add(signalMenu); signalMenu.add(la.get(SIGHUP)); |