Minor udpates after testing

Author: Tim Middleton

assets/coherence-visualvm-preferences.png

@@ -44,6 +44,8 @@
 
 import org.openide.awt.Mnemonics;
 
+import static com.oracle.coherence.plugin.visualvm.Localization.*;
+
 
 /**
  * A controller for Coherence options.
@@ -89,7 +91,6 @@ void load()
         m_disableMBeanCheck.setSelected(preferences.isMBeanCheckDisabled());
         m_restRequestTimout.setValue(preferences.getRestTimeout());
         m_enableRestDebug.setSelected(preferences.isRestDebugEnabled());
-        m_enableHeatMap.setSelected(preferences.isHeatMapEnabled());
         m_enableZoom.setSelected(preferences.isZoomEnabled());
         m_enablePersistenceList.setSelected(preferences.isPersistenceListEnabled());
         m_enableClusterSnapshot.setSelected(preferences.isClusterSnapshotEnabled());
@@ -107,7 +108,6 @@ void store()
         preferences.setDisableMbeanCheck(m_disableMBeanCheck.isSelected());
         preferences.setRestDebugEnabled(m_enableRestDebug.isSelected());
         preferences.setRestTimeout((Integer) m_restRequestTimout.getValue());
-        preferences.setHeatMapEnabled(m_enableHeatMap.isSelected());
         preferences.setZoomEnabled(m_enableZoom.isSelected());
         preferences.setPersistenceListEnabled(m_enablePersistenceList.isSelected());
         preferences.setClusterSnapshotEnabled(m_enableClusterSnapshot.isSelected());
@@ -145,7 +145,7 @@ private void initComponents()
 
         // ---- Refresh Time Label ----
         JLabel plottersLabel = new JLabel();
-        Mnemonics.setLocalizedText(plottersLabel, Localization.getLocalText("LBL_refresh_time"));
+        Mnemonics.setLocalizedText(plottersLabel, getLocalText("LBL_refresh_time"));
         c = new GridBagConstraints();
         c.gridx = 0;
         c.gridy = 1;
@@ -155,6 +155,7 @@ private void initComponents()
 
         // refresh time
         m_refreshTime = new JSpinner();
+        m_refreshTime.setToolTipText(getLocalText("TTIP_refresh_time"));
         plottersLabel.setLabelFor(m_refreshTime);
         m_refreshTime.setModel(new SpinnerNumberModel(30, 5, 99999, 1));
         c = new GridBagConstraints();
@@ -166,7 +167,7 @@ private void initComponents()
 
         // plottersUnits
         JLabel plottersUnits = new JLabel();
-        Mnemonics.setLocalizedText(plottersUnits, Localization.getLocalText("LBL_seconds")); // NOI18N
+        Mnemonics.setLocalizedText(plottersUnits, getLocalText("LBL_seconds")); // NOI18N
         c = new GridBagConstraints();
         c.gridx = 2;
         c.gridy = 1;
@@ -175,17 +176,19 @@ private void initComponents()
         add(plottersUnits, c);
 
         m_logQueryTimes = new JCheckBox();
+        m_logQueryTimes.setToolTipText(getLocalText("TTIP_log_query_times"));
         addCheckBox(2, "LBL_log_query_times", m_logQueryTimes);
 
         m_disableMBeanCheck = new JCheckBox();
+        m_disableMBeanCheck.setToolTipText(getLocalText("TTIP_disable_mbean_check"));
         addCheckBox(3, "LBL_disable_mbean_check", m_disableMBeanCheck);
 
         // ---- REST ----
         addHeader(4, "LBL_rest");
 
         // ---- REST Request Timeout ----
         JLabel lblRest = new JLabel();
-        Mnemonics.setLocalizedText(lblRest, Localization.getLocalText("LBL_rest_request_timeout"));
+        Mnemonics.setLocalizedText(lblRest, getLocalText("LBL_rest_request_timeout"));
         c = new GridBagConstraints();
         c.gridx = 0;
         c.gridy = 5;
@@ -194,6 +197,7 @@ private void initComponents()
         add(lblRest, c);
 
         m_restRequestTimout = new JSpinner();
+        m_restRequestTimout.setToolTipText(getLocalText("TTIP_rest_request_timeout"));
         lblRest.setLabelFor(m_restRequestTimout);
         m_restRequestTimout.setModel(new SpinnerNumberModel(30000, 1000, 99999999, 1000));
         c = new GridBagConstraints();
@@ -204,7 +208,7 @@ private void initComponents()
         add(m_restRequestTimout, c);
 
         JLabel requestUnits = new JLabel();
-        Mnemonics.setLocalizedText(requestUnits, Localization.getLocalText("LBL_millis")); // NOI18N
+        Mnemonics.setLocalizedText(requestUnits, getLocalText("LBL_millis")); // NOI18N
         c = new GridBagConstraints();
         c.gridx = 2;
         c.gridy = 5;
@@ -213,30 +217,32 @@ private void initComponents()
         add(requestUnits, c);
 
         m_enableRestDebug = new JCheckBox();
+        m_enableRestDebug.setToolTipText(getLocalText("TTIP_rest_debug"));
         addCheckBox(6, "LBL_enable_rest_debug", m_enableRestDebug);
 
         // ---- Other / Experimental ----
         addHeader(7, "LBL_other");
 
-        m_enableHeatMap = new JCheckBox();
-        addCheckBox(8, "LBL_enable_heatmap", m_enableHeatMap);
-
         m_enablePersistenceList = new JCheckBox();
-        addCheckBox(9, "LBL_enable_persistence_list", m_enablePersistenceList);
+        m_enablePersistenceList.setToolTipText(getLocalText("TTIP_persistence_list"));
+        addCheckBox(8, "LBL_enable_persistence_list", m_enablePersistenceList);
 
         m_enableZoom = new JCheckBox();
-        addCheckBox(10, "LBL_enable_zoom", m_enableZoom);
+        m_enableZoom.setToolTipText(getLocalText("TTIP_zoom_enabled"));
+        addCheckBox(9, "LBL_enable_zoom", m_enableZoom);
 
         m_enableClusterSnapshot = new JCheckBox();
-        addCheckBox(11, "LBL_enable_cluster_snapshot", m_enableClusterSnapshot);
+        m_enableClusterSnapshot.setToolTipText(getLocalText("TTIP_enable_cluster_snapshot"));
+        addCheckBox(10, "LBL_enable_cluster_snapshot", m_enableClusterSnapshot);
 
         m_adminFunctionsEnabled = new JCheckBox();
-        addCheckBox(12, "LBL_enable_admin_functions", m_adminFunctionsEnabled);
+        m_adminFunctionsEnabled.setToolTipText(getLocalText("TTIP_enable_cluster_head_dump"));
+        addCheckBox(11, "LBL_enable_admin_functions", m_adminFunctionsEnabled);
 
         JLabel appsLabel = new JLabel();
-        Mnemonics.setLocalizedText(appsLabel, Localization.getLocalText("LBL_reconnect")); // NOI18N
+        Mnemonics.setLocalizedText(appsLabel, getLocalText("LBL_reconnect")); // NOI18N
         c = new GridBagConstraints();
-        c.gridy = 13;
+        c.gridy = 12;
         c.gridwidth = GridBagConstraints.REMAINDER;
         c.anchor = GridBagConstraints.WEST;
         c.fill = GridBagConstraints.HORIZONTAL;
@@ -246,7 +252,7 @@ private void initComponents()
         // filler
         c = new GridBagConstraints();
         c.gridx = 0;
-        c.gridy = 13;
+        c.gridy = 12;
         c.weightx = 1;
         c.weighty = 1;
         c.anchor = GridBagConstraints.NORTHWEST;
@@ -265,7 +271,7 @@ private void initComponents()
     private void addCheckBox(int y, String sLabel, JCheckBox checkBox)
         {
         JLabel label = new JLabel();
-        Mnemonics.setLocalizedText(label, Localization.getLocalText(sLabel));
+        Mnemonics.setLocalizedText(label, getLocalText(sLabel));
         GridBagConstraints c = new GridBagConstraints();
         c.gridx = 0;
         c.gridy = y;
@@ -291,7 +297,7 @@ private void addCheckBox(int y, String sLabel, JCheckBox checkBox)
      */
     private void addHeader(int y, String sLabel)
         {
-        SectionSeparator sectionSeparator = UISupport.createSectionSeparator(Localization.getLocalText(sLabel));
+        SectionSeparator sectionSeparator = UISupport.createSectionSeparator(getLocalText(sLabel));
         GridBagConstraints c = new GridBagConstraints();
         c.gridy = y;
         c.gridwidth = GridBagConstraints.REMAINDER;
@@ -312,7 +318,6 @@ private void startTrackingChanges()
         m_enableRestDebug.getModel().addChangeListener(changeListener);
         m_restRequestTimout.getModel().addChangeListener(changeListener);
         m_enableZoom.getModel().addChangeListener(changeListener);
-        m_enableHeatMap.getModel().addChangeListener(changeListener);
         m_enablePersistenceList.getModel().addChangeListener(changeListener);
         m_enableClusterSnapshot.getModel().addChangeListener(changeListener);
         m_adminFunctionsEnabled.getModel().addChangeListener(changeListener);

coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/CoherenceOptionsPanel.java

@@ -97,15 +97,8 @@ private GlobalPreferences()
             isReporterDisabled();
             }
 
-        sValue = System.getProperty(PROP_HEATMAP_ENABLED);
-        if (sValue != null)
-            {
-            setHeatMapEnabled(Boolean.parseBoolean(sValue));
-            }
-        else
-            {
-            isHeatMapEnabled();
-            }
+        // always set heat map enabled
+        setHeatMapEnabled(true);
 
         sValue = System.getProperty(PROP_ZOOM_ENABLED);
         if (sValue != null)

coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/GlobalPreferences.java

@@ -333,8 +333,10 @@ protected DataViewComponent createComponent()
 
         m_dvc.selectDetailsView(clusterOverview);
 
-        // create a timer that will refresh the TAB's as required
-        m_timer = new Timer(GlobalPreferences.sharedInstance().getMonitoredDataPoll() * 1000, new ActionListener()
+        // create a timer that will refresh the TAB's as required every 3 seconds
+        // the reason for 3 seconds is so that with the min cluster data refresh time of
+        // 5 seconds, the updates will be smoother
+        m_timer = new Timer(3000, new ActionListener()
             {
             public void actionPerformed(ActionEvent e)
                 {

coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/VisualVMView.java

@@ -25,21 +25,11 @@
 
 package com.oracle.coherence.plugin.visualvm.datasource;
 
-import com.fasterxml.jackson.databind.JsonNode;
-
-import com.oracle.coherence.plugin.visualvm.Localization;
 import com.oracle.coherence.plugin.visualvm.VisualVMView;
 
-import com.oracle.coherence.plugin.visualvm.helper.HttpRequestSender;
-import javax.swing.SwingUtilities;
 import org.graalvm.visualvm.core.ui.DataSourceView;
 import org.graalvm.visualvm.core.ui.DataSourceViewProvider;
 import org.graalvm.visualvm.core.ui.DataSourceViewsManager;
-import org.openide.DialogDisplayer;
-import org.openide.NotifyDescriptor;
-import org.openide.awt.StatusDisplayer;
-
-import static com.oracle.coherence.plugin.visualvm.Localization.getLocalText;
 
 /**
  * The {@link DataSourceViewProvider} for {@link CoherenceClusterDataSource}.
@@ -56,36 +46,8 @@ public class CoherenceClusterDataSourceViewProvider
     @Override
     protected boolean supportsViewFor(CoherenceClusterDataSource coherenceClusterDataSource)
         {
-        String sUrl = coherenceClusterDataSource.getUrl();
-        HttpRequestSender requestSender = new HttpRequestSender(sUrl);
-        final StatusDisplayer.Message[] status = new StatusDisplayer.Message[1];
-
-        String sText = getLocalText("LBL_testing_connection", sUrl);
-        SwingUtilities.invokeLater(()->status[0] = StatusDisplayer.getDefault().setStatusText(sText, 2400));
-
-        // BUG 29213475 - Check for a valid HttpRequestSender URL before we start the refresh
-        String sMessage = Localization.getLocalText("ERR_Invalid_URL", sUrl);
-        try
-            {
-            JsonNode rootClusterMembers = requestSender.getListOfClusterMembers();
-            if (rootClusterMembers == null)
-                {
-                DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(sMessage));
-                }
-            }
-        catch (Exception e)
-            {
-            sMessage = sMessage + "\nError: " + e.getMessage();
-            DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(sMessage));
-            return false;
-            }
-        finally
-            {
-            if (status[0] != null )
-                {
-                status[0].clear(1000);
-                }
-            }
+        // we don't do the test here as this can cause delays and
+        // confusion if a user clicks on a a URL that doesn't exist
         return true;
         }
 

coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/datasource/CoherenceClusterDataSourceViewProvider.java

@@ -177,6 +177,15 @@ public Data processReporterData(Object[] aoColumns, VisualVMModel model)
             data.setColumn(ServiceMemberData.REQUEST_AVERAGE_DURATION, Float.valueOf(aoColumns[nStart++].toString()));
             data.setColumn(ServiceMemberData.TASK_AVERAGE_DURATION, Float.valueOf(aoColumns[nStart++].toString()));
 
+            if ((Integer) data.getColumn(ServiceMemberData.THREAD_IDLE_COUNT) == -1)
+                {
+                data.setColumn(ServiceMemberData.THREAD_IDLE_COUNT, 0);
+                }
+            if ((Float) data.getColumn(ServiceMemberData.TASK_AVERAGE_DURATION) == -1.0f)
+                {
+                data.setColumn(ServiceMemberData.TASK_AVERAGE_DURATION, 0);
+                }
+
             if ((Integer) data.getColumn(ServiceMemberData.THREAD_COUNT) > 0)
                 {
                 float threadUtil = ((float) ((Integer) data.getColumn(ServiceMemberData.THREAD_COUNT)

coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/ServiceMemberData.java

@@ -64,11 +64,10 @@ LBL_refresh_date=Refresh Date
 LBL_cluster_statusha=Cluster StatusHA
 BTN_admin=Cluster Heap Dump
 TTIP_admin=Generate a heap dump across all members.
-LBL_heap_dump_completed=Please check the logs files for location of the heap dumps.
+LBL_heap_dump_completed=Please check the coherence logs files for location of the heap dumps.
 LBL_heap_dump_failed=Heap dump failed: {0}.
 LBL_heap_dump_question=WARNING: This operation will have a performance impact on your running Cluster. \nAre you sure you want to instruct the cluster to perform a head dump across all members?
 LBL_heap_dump_confirm=Please confirm heap dump
-LBL_testing_connection=Testing connection to {0}...
 
 # CoherenceCachePanel (spaces before are for label spacing)
 LBL_total_caches=Total Caches
@@ -516,7 +515,7 @@ ERR_Failed_to_run_report=The report {0} failed to run with exception {1}. Fallin
 # Options
 OptionsCategory_Name_Coherence=Coherence
 LBL_general=General
-LBL_refresh_time=Refresh Time\:
+LBL_refresh_time=Data Refresh Time\:
 LBL_seconds=sec.
 LBL_log_query_times=Log Query Times\:
 LBL_disable_mbean_check=Disable MBean Check* \:
@@ -528,6 +527,15 @@ LBL_other=Other / Experimental
 LBL_enable_heatmap=Enable Heat Map* \:
 LBL_enable_zoom=Enable Zoom on Graphs* \:
 LBL_enable_cluster_snapshot=Enable Cluster Snapshot Tab* \:
-LBL_enable_admin_functions=Enable Admin Functions* \:
+LBL_enable_admin_functions=Enable Cluster Heap Dump* \:
 LBL_enable_persistence_list=Enable Persistence List* \:
-LBL_reconnect=Items marked with (*) take effect when you reconnect to a Coherence cluster.
+LBL_reconnect=Items marked with (*) take effect when you reconnect to a Coherence cluster.
+TTIP_refresh_time=Time (in seconds) between refreshing data from the cluster. Do not set too low as this could adversely affect performance in large clusters.
+TTIP_log_query_times=Enables logging of query times to the VisualVM logfile when retrieving data.
+TTIP_disable_mbean_check=Disables the MBean check when connecting to WebLogic Server. This allows the plugin to startup without checking for Cluster MBean.
+TTIP_rest_request_timeout=The request timeout (in ms) when using REST to connect to a cluster.
+TTIP_rest_debug=Enables HTTP request debugging when using REST to connect to a cluster.
+TTIP_persistence_list=Enables dropdown list of snapshots rather than having to enter the snapshot when performing snapshot operations.
+TTIP_zoom_enabled=Enables additional zoom function for all graphs.
+TTIP_enable_cluster_snapshot=Enables experimental cluster snapshot tab.
+TTIP_enable_cluster_head_dump=Enables the cluster heap dump button on the Cluster Overview tab.