Updating Profiler to the latest NetBeans profiler features

 - updating settings for CPU & Memory profiling
 - added JDBC profiling

Author: jisedlac

visualvm/profiler/manifest.mf

@@ -5,5 +5,5 @@ OpenIDE-Module: com.sun.tools.visualvm.profiler/0
 OpenIDE-Module-Layer: com/sun/tools/visualvm/profiler/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: com/sun/tools/visualvm/profiler/Bundle.properties
 OpenIDE-Module-Provides: org.netbeans.lib.profiler.common.Profiler
-OpenIDE-Module-Specification-Version: 1.5
+OpenIDE-Module-Specification-Version: 1.6
 

visualvm/profiler/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=7374b11b
+build.xml.data.CRC32=fee5938e
 build.xml.script.CRC32=03a7511e
 build.xml.stylesheet.CRC32=[email protected]
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=7374b11b
+nbproject/build-impl.xml.data.CRC32=fee5938e
 nbproject/build-impl.xml.script.CRC32=6c1a4403
 nbproject/build-impl.xml.stylesheet.CRC32=[email protected]

visualvm/profiler/nbproject/project.xml

@@ -47,7 +47,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>0</release-version>
-                        <specification-version>1.3</specification-version>
+                        <specification-version>1.5</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -83,7 +83,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.140</specification-version>
+                        <specification-version>1.145</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

visualvm/profiler/src/com/sun/tools/visualvm/profiler/ApplicationProfilerView.java

@@ -76,6 +76,8 @@ LBL_Cpu=CPU
 
 LBL_Memory=Memory
 
+LBL_JDBC=JDBC
+
 LBL_Stop=Stop
 
 LBL_Status=Status:
@@ -101,6 +103,8 @@ LBL_Cpu_settings=CPU settings
 
 LBL_Memory_settings=Memory settings
 
+LBL_JDBC_settings=JDBC settings
+
 CAP_Calibrate_java=Calibrate Java
 # Please select Java 7 64bit binary:
 MSG_Calibration_required_arch=The profiler will calibrate the Java platform to be used for profiling.<br>Please select {0} {1} binary:

visualvm/profiler/src/com/sun/tools/visualvm/profiler/Bundle.properties

@@ -162,20 +162,6 @@ private void initUI(Application application) {
         // --- Results ---------------------------------------------------------
 
         cpuView = new LiveCPUView(null) {
-//            protected ProfilerClient getProfilerClient() {
-//                return MethodsFeatureUI.this.getProfilerClient();
-//            }
-//            protected boolean isSampling() {
-//                return MethodsFeatureUI.this.getProfilerClient().getCurrentInstrType() == ProfilerClient.INSTR_NONE_SAMPLING;
-//            }
-//            protected void requestResults() throws ClientUtils.TargetAppOrVMTerminated {
-//                MethodsFeatureUI.this.getProfilerClient().forceObtainedResultsDump(true);
-//            }
-//            protected CPUResultsSnapshot getResults() throws ClientUtils.TargetAppOrVMTerminated, CPUResultsSnapshot.NoDataAvailableException {
-//                ProfilerClient client = MethodsFeatureUI.this.getProfilerClient();
-//                return client.getStatus().getInstrMethodClasses() == null ?
-//                       null : client.getCPUProfilingResultsSnapshot(false);
-//            }
             protected boolean showSourceSupported() {
                 return GoToSource.isAvailable();
             }
@@ -236,29 +222,30 @@ protected void foundInReverseCalls() {
             protected void fireItemStateChanged(ItemEvent event) {
                 boolean paused = isSelected();
                 updater.setPaused(paused);
+                lrRefreshButton.setEnabled(paused);
                 if (!paused) try {
                     updater.setForceRefresh(true);
                     updater.update();
                 } catch (ClientUtils.TargetAppOrVMTerminated ex) {
-                    Exceptions.printStackTrace(ex);
+                    cleanup();
                 }
 //////                refreshToolbar(getSessionState());
             }
         };
         lrPauseButton.setToolTipText(Bundle.MethodsFeatureUI_pauseResults());
-        lrPauseButton.setEnabled(false);
-
+        
         lrRefreshButton = new JButton(Icons.getIcon(GeneralIcons.UPDATE_NOW)) {
             protected void fireActionPerformed(ActionEvent e) {
                 try {
                     updater.setForceRefresh(true);
                     updater.update();
                 } catch (ClientUtils.TargetAppOrVMTerminated ex) {
-                    Exceptions.printStackTrace(ex);
+                    cleanup();
                 }
             }
         };
         lrRefreshButton.setToolTipText(Bundle.MethodsFeatureUI_updateResults());
+        lrRefreshButton.setEnabled(false);
 
         Icon icon = Icons.getIcon(ProfilerIcons.DELTA_RESULTS);
         lrDeltasButton = new JToggleButton(icon) {
@@ -281,7 +268,7 @@ protected void fireActionPerformed(ActionEvent e) {
                     updater.setForceRefresh(true);
                     updater.update();
                 } catch (ClientUtils.TargetAppOrVMTerminated ex) {
-                    Exceptions.printStackTrace(ex);
+                    cleanup();
                 }
             }
         };
@@ -301,7 +288,7 @@ protected void fireActionPerformed(ActionEvent e) {
                     updater.setForceRefresh(true);
                     updater.update();
                 } catch (ClientUtils.TargetAppOrVMTerminated ex) {
-                    Exceptions.printStackTrace(ex);
+                    cleanup();
                 }
             }
         };
@@ -321,7 +308,7 @@ protected void fireActionPerformed(ActionEvent e) {
                     updater.setForceRefresh(true);
                     updater.update();
                 } catch (ClientUtils.TargetAppOrVMTerminated ex) {
-                    Exceptions.printStackTrace(ex);
+                    cleanup();
                 }
             }
         };
@@ -420,11 +407,18 @@ public void run() {
 
 
     void refreshResults() {
-        try {
-            refreshData();
-        } catch (ClientUtils.TargetAppOrVMTerminated ex) {
-            cleanup();
-        }
+        RESULTS_PROCESSOR.post(new Runnable() {
+            public void run() {
+                try {
+                    refreshData();
+                } catch (ClientUtils.TargetAppOrVMTerminated ex) {
+                    cleanup();
+                } catch (Throwable t) {
+                    Exceptions.printStackTrace(t);
+                    cleanup();
+                }
+            }
+        });
     }
 
 }