diff options
| author | Jose <jose@zeroc.com> | 2013-01-02 22:37:43 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-01-02 22:37:43 +0100 |
| commit | 01a76341caefa2ea42ca7692c37873c70848810f (patch) | |
| tree | e5dbdddaf7d92114cd5b11573684a126193d5c31 /java/src | |
| parent | Fixed (ICE-5170) - IceGridAdmin copy/paste bugs (diff) | |
| download | ice-01a76341caefa2ea42ca7692c37873c70848810f.tar.bz2 ice-01a76341caefa2ea42ca7692c37873c70848810f.tar.xz ice-01a76341caefa2ea42ca7692c37873c70848810f.zip | |
Fixed (ICE-5173) - Missing menu for Enable/Disable Metrics View
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/IceGridGUI/Coordinator.java | 14 | ||||
| -rw-r--r-- | java/src/IceGridGUI/LiveDeployment/MetricsView.java | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/java/src/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/Coordinator.java index b388db41e08..109cb5ed6b0 100644 --- a/java/src/IceGridGUI/Coordinator.java +++ b/java/src/IceGridGUI/Coordinator.java @@ -410,6 +410,15 @@ public class Coordinator _appMenu.setEnabled(false); // + // Metrics View sub-menu + // + _metricsViewMenu = new JMenu("Metrics View"); + _metricsViewMenu.setEnabled(false); + toolsMenu.add(_metricsViewMenu); + _metricsViewMenu.add(_liveActionsForMenu.get(IceGridGUI.LiveDeployment.TreeNode.ENABLE_METRICS_VIEW)); + _metricsViewMenu.add(_liveActionsForMenu.get(IceGridGUI.LiveDeployment.TreeNode.DISABLE_METRICS_VIEW)); + + // // Node sub-menu // _nodeMenu = new JMenu("Node"); @@ -3380,6 +3389,9 @@ public class Coordinator _appMenu.setEnabled(true); + _metricsViewMenu.setEnabled(availableActions[IceGridGUI.LiveDeployment.TreeNode.ENABLE_METRICS_VIEW] || + availableActions[IceGridGUI.LiveDeployment.TreeNode.DISABLE_METRICS_VIEW]); + _nodeMenu.setEnabled(availableActions[IceGridGUI.LiveDeployment.TreeNode.SHUTDOWN_NODE]); _registryMenu.setEnabled(availableActions[IceGridGUI.LiveDeployment.TreeNode.SHUTDOWN_REGISTRY]); @@ -3414,6 +3426,7 @@ public class Coordinator availableActions[IceGridGUI.Application.TreeNode.NEW_TEMPLATE_SERVICE]); _appMenu.setEnabled(false); + _metricsViewMenu.setEnabled(false); _nodeMenu.setEnabled(false); _registryMenu.setEnabled(false); _signalMenu.setEnabled(false); @@ -3755,6 +3768,7 @@ public class Coordinator private JMenu _newServiceMenu; private JMenu _newTemplateMenu; private JMenu _appMenu; + private JMenu _metricsViewMenu; private JMenu _nodeMenu; private JMenu _registryMenu; private JMenu _serverMenu; diff --git a/java/src/IceGridGUI/LiveDeployment/MetricsView.java b/java/src/IceGridGUI/LiveDeployment/MetricsView.java index 6c7bd9afbe6..94aa223011f 100644 --- a/java/src/IceGridGUI/LiveDeployment/MetricsView.java +++ b/java/src/IceGridGUI/LiveDeployment/MetricsView.java @@ -92,6 +92,7 @@ class MetricsView extends TreeNode { _enabled = true; getRoot().getTreeModel().nodeChanged(MetricsView.this); + getRoot().getCoordinator().showActions(MetricsView.this); if(getRoot().getTree().getLastSelectedPathComponent() == MetricsView.this) { // @@ -160,6 +161,7 @@ class MetricsView extends TreeNode _enabled = false; _editor.show(MetricsView.this, null, 0); getRoot().getTreeModel().nodeChanged(MetricsView.this); + getRoot().getCoordinator().showActions(MetricsView.this); if(getRoot().getTree().getLastSelectedPathComponent() == MetricsView.this) { // |