More Profiler settings improvements

 - updated tooltips
 - higlight empty settings
 - code cleanup

Author: jisedlac

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

@@ -31,7 +31,6 @@
 import com.sun.tools.visualvm.core.ui.DataSourceView;
 import com.sun.tools.visualvm.core.ui.DesktopUtils;
 import com.sun.tools.visualvm.core.ui.components.DataViewComponent;
-import com.sun.tools.visualvm.core.ui.components.DataViewComponent.DetailsView;
 import com.sun.tools.visualvm.profiling.presets.PresetSelector;
 import com.sun.tools.visualvm.profiling.presets.ProfilerPresets;
 import com.sun.tools.visualvm.uisupport.HTMLLabel;
@@ -143,20 +142,16 @@ protected DataViewComponent createComponent() {
         Application application = (Application)getDataSource();
         ProfilingResultsSupport profilingResultsSupport = new ProfilingResultsSupport();
 
-        final DetailsView cpuSettingsView = cpuSettings.getDetailsView();
-        final DetailsView memorySettingsView = memorySettings.getDetailsView();
-        final DetailsView jdbcSettingsView = jdbcSettings.getDetailsView();
-        
         masterViewSupport = new MasterViewSupport(application, profilingResultsSupport, cpuSettings, memorySettings, jdbcSettings, classSharingBreaksProfiling) {
             void showCPUSettings() {
                 if (dvc != null) {
-                    dvc.selectDetailsView(cpuSettingsView);
+                    cpuSettings.highlightInvalidSettings(dvc);
                     dvc.showDetailsArea(DataViewComponent.TOP_RIGHT);
                 }
             }
             void showMemorySettings() {
                 if (dvc != null) {
-                    dvc.selectDetailsView(memorySettingsView);
+                    memorySettings.highlightInvalidSettings(dvc);
                     dvc.showDetailsArea(DataViewComponent.TOP_RIGHT);
                 }
             }
@@ -167,9 +162,9 @@ void showMemorySettings() {
         dvc.addDetailsView(profilingResultsSupport.getDetailsView(), DataViewComponent.TOP_LEFT);
 
         dvc.configureDetailsArea(new DataViewComponent.DetailsAreaConfiguration(NbBundle.getMessage(ApplicationProfilerView.class, "LBL_Settings"), true), DataViewComponent.TOP_RIGHT);   // NOI18N
-        dvc.addDetailsView(cpuSettingsView, DataViewComponent.TOP_RIGHT);
-        dvc.addDetailsView(memorySettingsView, DataViewComponent.TOP_RIGHT);
-        dvc.addDetailsView(jdbcSettingsView, DataViewComponent.TOP_RIGHT);
+        dvc.addDetailsView(cpuSettings.getDetailsView(), DataViewComponent.TOP_RIGHT);
+        dvc.addDetailsView(memorySettings.getDetailsView(), DataViewComponent.TOP_RIGHT);
+        dvc.addDetailsView(jdbcSettings.getDetailsView(), DataViewComponent.TOP_RIGHT);
 //        dvc.hideDetailsArea(DataViewComponent.TOP_RIGHT);
 
         return dvc;

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

@@ -47,11 +47,16 @@ public abstract class CPUSettingsSupport {
     private ProfilerCPUPanel panel;
     private PresetSelector selector;
 
+    private DataViewComponent.DetailsView detailsView;
+    
 
     DataViewComponent.DetailsView getDetailsView() {
-        return new DataViewComponent.DetailsView(NbBundle.getMessage(
-                CPUSettingsSupport.class, "LBL_Cpu_settings"), null, 10, // NOI18N
-                new ScrollableContainer(getComponent()), null);
+        if (detailsView == null) {
+            detailsView = new DataViewComponent.DetailsView(NbBundle.getMessage(
+                          CPUSettingsSupport.class, "LBL_Cpu_settings"), null, 10, // NOI18N
+                          new ScrollableContainer(getComponent()), null);
+        }
+        return detailsView;
     }
 
     public JComponent getComponent() {
@@ -75,6 +80,11 @@ void copySettings(CPUSettingsSupport settings) {
 
     public boolean settingsValid() { return panel.settingsValid(); }
 
+    public void highlightInvalidSettings(DataViewComponent dvc) {
+        panel.highlighInvalid();
+        dvc.selectDetailsView(getDetailsView());
+    }
+    
     public abstract PresetSelector createSelector(Runnable presetSynchronizer);
 
 

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

@@ -47,11 +47,16 @@ public abstract class MemorySettingsSupport {
     private ProfilerMemoryPanel panel;
     private PresetSelector selector;
 
+    private DataViewComponent.DetailsView detailsView;
+    
 
     DataViewComponent.DetailsView getDetailsView() {
-        return new DataViewComponent.DetailsView(NbBundle.getMessage(
-                MemorySettingsSupport.class, "LBL_Memory_settings"), null, 20, // NOI18N
-                new ScrollableContainer(getComponent()), null);
+        if (detailsView == null) {
+            detailsView = new DataViewComponent.DetailsView(NbBundle.getMessage(
+                          MemorySettingsSupport.class, "LBL_Memory_settings"), null, 20, // NOI18N
+                          new ScrollableContainer(getComponent()), null);
+        }
+        return detailsView;
     }
 
     public JComponent getComponent() {
@@ -75,6 +80,11 @@ void copySettings(MemorySettingsSupport settings) {
 
     public boolean settingsValid() { return panel.settingsValid(); }
 
+    public void highlightInvalidSettings(DataViewComponent dvc) {
+        panel.highlighInvalid();
+        dvc.selectDetailsView(getDetailsView());
+    }
+    
     public abstract PresetSelector createSelector(Runnable presetSynchronizer);
 
 

visualvm/profiling/src/com/sun/tools/visualvm/profiling/presets/Bundle.properties

@@ -57,7 +57,7 @@ LBL_Profile_Incl_S=&Profile only packages\:
 
 LBL_Profile_Excl_S=&Do not profile packages\:
 
-TOOLTIP_Root_Classes=<html>Profile methods of these classes or packages:<br><br><code>&nbsp;org.mypackage.**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</code>all classes in package and subpackages<br><code>&nbsp;org.mypackage.*&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</code>all classes in package<br><code>&nbsp;org.mypackage.MyClass&nbsp;&nbsp;</code>single class<br></html>
+TOOLTIP_Root_Classes=<html>Profile methods of these classes or packages:<br><br><code>&nbsp;org.mypackage.**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</code>all classes in package and subpackages<br><code>&nbsp;org.mypackage.*&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</code>all classes in package<br><code>&nbsp;org.mypackage.MyClass&nbsp;&nbsp;</code>single class<br><br>Special case:<br><br><code>&nbsp;* or **</code>&nbsp;&nbsp;include all classes<br></html>
 
 TOOLTIP_Query_Filter=<html>Limit profiled SQL queries based on the text filter (contains).<br><br>Empty filter profiles all SQL queries.</html>
 
@@ -71,7 +71,7 @@ TOOLTIP_Inclusive_Filter_S=Only code of these packages will be profiled
 
 TOOLTIP_Exclusive_Filter_S=All code except these packages will be profiled
 
-TOOLTIP_Instrumentation_Filter=<html>Include/exclude profiling outgoing calls from these classes or packages:<br><br><code>&nbsp;org.mypackage.**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</code>all classes in package and subpackages<br><code>&nbsp;org.mypackage.*&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</code>all classes in package<br><code>&nbsp;org.mypackage.MyClass&nbsp;&nbsp;</code>single class<br><br>Special case:<br><br><code>&nbsp;&lt;empty&gt;</code> or <code>*&nbsp;&nbsp;</code>include all classes<br></html>
+TOOLTIP_Instrumentation_Filter=<html>Include/exclude profiling outgoing calls from these classes or packages:<br><br><code>&nbsp;org.mypackage.**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</code>all classes in package and subpackages<br><code>&nbsp;org.mypackage.*&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</code>all classes in package<br><code>&nbsp;org.mypackage.MyClass&nbsp;&nbsp;</code>single class<br><br>Special case:<br><br><code>&nbsp;&lt;empty&gt; or * or **</code>&nbsp;&nbsp;include all classes<br></html>
 
 TOOLTIP_Allocations=Only object allocations are recorded
 

visualvm/profiling/src/com/sun/tools/visualvm/profiling/presets/ProfilerCPUPanel.java

@@ -115,6 +115,10 @@ public ProfilingSettings getSettings() {
 
     public boolean settingsValid() { return rootsValid && filtersValid; }
 
+    public void highlighInvalid() {
+        if (getRootsValue().isEmpty()) rootsArea.getTextArea().setText(ProfilerPresets.DEFINE_CLASSES);
+    }
+    
     public void loadFromPreset(ProfilerPreset preset) {
         if (preset == null) return;
 

visualvm/profiling/src/com/sun/tools/visualvm/profiling/presets/ProfilerMemoryPanel.java

@@ -104,6 +104,10 @@ public ProfilingSettings getSettings() {
 
     public boolean settingsValid() { return rootsValid; }
 
+    public void highlighInvalid() {
+        if (getFilterValue().isEmpty()) filtersArea.getTextArea().setText(ProfilerPresets.DEFINE_CLASSES);
+    }
+    
     public void loadFromPreset(ProfilerPreset preset) {
         if (preset == null) return;
 

visualvm/profiling/src/com/sun/tools/visualvm/profiling/presets/ProfilerPresets.java

@@ -70,6 +70,8 @@ public final class ProfilerPresets {
     private ProfilerPreset presetToCreate;
 
     private final Set<WeakReference<PresetSelector>> selectors;
+    
+    static final String DEFINE_CLASSES = NbBundle.getMessage(ProfilerPresets.class, "HINT_Define_roots"); // NOI18N
 
 
     public static synchronized ProfilerPresets getInstance() {
@@ -253,12 +255,9 @@ private static String getDefaultFiltersS() {
     }
 
     private static String getDefaultRootsP(Application application) {
-        if (application == null) return NbBundle.getMessage(
-                ProfilerPresets.class, "HINT_Define_roots"); // NOI18N
+        if (application == null) return DEFINE_CLASSES;
         String mainClass = getMainClass(application);
-        if ("".equals(mainClass)) { // unknown main class
-            return NbBundle.getMessage(ProfilerPresets.class, "HINT_Define_roots"); // NOI18N
-        }
+        if ("".equals(mainClass)) return DEFINE_CLASSES; // unknown main class
         int dotIndex = mainClass.lastIndexOf("."); // NOI18N
         if (dotIndex == -1) return mainClass;  // default package
         else return mainClass.substring(0, dotIndex + 1) + "**"; // NOI18N
@@ -274,7 +273,7 @@ private static String getDefaultFiltersP(String defaultRoots) {
     }
 
     private static String getDefaultMemoryFilterP(Application application) {
-        return NbBundle.getMessage(ProfilerPresets.class, "HINT_Define_roots"); // NOI18N
+        return DEFINE_CLASSES; // NOI18N
     }