IceGridGUI metrics fixes:

 * Update the GUI to also display disabled metrics

 * Add enable/disable popup menu to metris views, correspoding to new
   methods enableMetricsView/disableMetricsView in Metrics.ice

 * Fixed ICE-4919 ConnectionRefusedException error dialog keeps popping up

 * Fixed ICE-4917 bogus IceGrid GUI error message

1 files changed, 9 insertions, 15 deletions

diff --git a/java/src/IceGridGUI/LiveDeployment/Service.java b/java/src/IceGridGUI/LiveDeployment/Service.java
index 45ca97df936..8d73709eb29 100644
--- a/java/src/IceGridGUI/LiveDeployment/Service.java
+++ b/java/src/IceGridGUI/LiveDeployment/Service.java
@@ -30,7 +30,7 @@ public class Service extends ListArrayTreeNode
     //
     public boolean[] getAvailableActions()
     {
-        boolean[] actions = new boolean[ACTION_COUNT];
+        boolean[] actions = new boolean[IceGridGUI.LiveDeployment.TreeNode.ACTION_COUNT];
 
         ServerState serverState = ((Server)_parent).getState();
 
@@ -504,8 +504,14 @@ public class Service extends ListArrayTreeNode
                         {
                             public void run()
                             {
-                                _metricsNames = enabledViews;
-                                createMetrics(metricsAdmin);
+                                for(String name : enabledViews)
+                                {
+                                    insertSortedChild(new MetricsView(Service.this, name, metricsAdmin, true), _metrics, null);
+                                }
+                                for(String name : disabledViews)
+                                {
+                                    insertSortedChild(new MetricsView(Service.this, name, metricsAdmin, false), _metrics, null);
+                                }
                                 rebuild(Service.this);
                             }
                         });
@@ -547,17 +553,6 @@ public class Service extends ListArrayTreeNode
         }
     }
 
-    private void createMetrics(IceMX.MetricsAdminPrx metricsAdmin)
-    {
-        if(_metricsNames != null)
-        {
-            for(String name : _metricsNames)
-            {
-                insertSortedChild(new MetricsView(this, name, metricsAdmin), _metrics, null);
-            }
-        }
-    }
-
     void rebuild(Service service)
     {
         _adapters = service._adapters;
@@ -599,7 +594,6 @@ public class Service extends ListArrayTreeNode
 
     private boolean _started = false;
     private boolean _metricsRetrieved = false;
-    private String[] _metricsNames;
 
     static private ServiceEditor _editor;
     static private DefaultTreeCellRenderer _cellRenderer;