[API change] Bugfix #603 - added GlobalPreferences.set/getDoNotShowAgain, implemented persistence for decision on keeping/deleting unresolved hosts/jmx connections

jisedlac · jisedlac · commit d0cdae12d336 · 2016-09-15T16:53:29.000+02:00
diff --git a/visualvm/core/manifest.mf b/visualvm/core/manifest.mf
@@ -1,9 +1,9 @@
-Manifest-Version: 1.0
-AutoUpdate-Show-In-Client: false
-AutoUpdate-Essential-Module: true
-OpenIDE-Module: com.sun.tools.visualvm.core/0
-OpenIDE-Module-Layer: com/sun/tools/visualvm/core/layer.xml
-OpenIDE-Module-Localizing-Bundle: com/sun/tools/visualvm/core/Bundle.properties
-OpenIDE-Module-Install: com/sun/tools/visualvm/core/Install.class
-OpenIDE-Module-Specification-Version: 1.5
-
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+AutoUpdate-Essential-Module: true
+OpenIDE-Module: com.sun.tools.visualvm.core/0
+OpenIDE-Module-Layer: com/sun/tools/visualvm/core/layer.xml
+OpenIDE-Module-Localizing-Bundle: com/sun/tools/visualvm/core/Bundle.properties
+OpenIDE-Module-Install: com/sun/tools/visualvm/core/Install.class
+OpenIDE-Module-Specification-Version: 1.6
+
diff --git a/visualvm/core/src/com/sun/tools/visualvm/core/options/GlobalPreferences.java b/visualvm/core/src/com/sun/tools/visualvm/core/options/GlobalPreferences.java
@@ -40,6 +40,7 @@
 import java.util.prefs.PreferenceChangeEvent;
 import java.util.prefs.PreferenceChangeListener;
 import java.util.prefs.Preferences;
+import org.netbeans.modules.profiler.api.ProfilerIDESettings;
 import org.openide.util.NbPreferences;
 
 /**
@@ -288,4 +289,33 @@ private void setPollingInterval(String property, int value) {
             prefs.putInt(property, value);
         }
     }
+    
+    
+    /**
+     * Allows to set or clear persistent do not show again value associated with given notification identified by the
+     * provided key.
+     *
+     * @param key A key that uniquely identifies the notification
+     * @param value The value that should be used without displaying the notification or null to clear the Do not show
+     *              again (i.e. start displaying the notifications again.
+     * 
+     * @since VisualVM 1.3.9
+     */
+    public void setDoNotShowAgain(String key, String value) {
+        ProfilerIDESettings.getInstance().setDoNotShowAgain(key, value);
+    }
+
+    /**
+     * Allows to get persistent do not show again value associated with given notification identified by the provided key.
+     *
+     * @param  key A key that uniquely identifies the notification
+     * @return The value that should be used without displaying the notification or null if the notification should
+     *         be displayed
+     *
+     * @since VisualVM 1.3.9
+     */
+    public String getDoNotShowAgain(String key) {
+        return ProfilerIDESettings.getInstance().getDoNotShowAgain(key);
+    }
+    
 }
diff --git a/visualvm/host/nbproject/project.xml b/visualvm/host/nbproject/project.xml
@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>0</release-version>
-                        <specification-version>1.4</specification-version>
+                        <specification-version>1.6</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/visualvm/host/src/com/sun/tools/visualvm/host/impl/Bundle.properties b/visualvm/host/src/com/sun/tools/visualvm/host/impl/Bundle.properties
@@ -47,3 +47,6 @@ DESCR_HostProperties=Basic host information
 LBL_Resolving=resolving...
 LBL_DnsName=DNS name\:
 LBL_IpAddress=IP address\:
+
+LBL_RememberAction=&Remember selected action
+TTP_RememberAction=Select to perform the action automatically on subsequent sessions. Can be reset using Tools | Options | General | Reset Do Not Show Again confirmations.
diff --git a/visualvm/host/src/com/sun/tools/visualvm/host/impl/HostProvider.java b/visualvm/host/src/com/sun/tools/visualvm/host/impl/HostProvider.java
@@ -38,6 +38,7 @@
 import com.sun.tools.visualvm.core.explorer.ExplorerSupport;
 import com.sun.tools.visualvm.core.datasource.descriptor.DataSourceDescriptor;
 import com.sun.tools.visualvm.core.datasource.descriptor.DataSourceDescriptorFactory;
+import com.sun.tools.visualvm.core.options.GlobalPreferences;
 import java.awt.BorderLayout;
 import java.io.File;
 import java.io.FilenameFilter;
@@ -49,6 +50,8 @@
 import java.util.concurrent.Semaphore;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.swing.BorderFactory;
+import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JPanel;
@@ -58,6 +61,7 @@
 import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
+import org.openide.awt.Mnemonics;
 import org.openide.util.NbBundle;
 import org.openide.util.RequestProcessor;
 import org.openide.windows.WindowManager;
@@ -77,6 +81,8 @@ public class HostProvider {
     private static final String CURRENT_SNAPSHOT_VERSION = CURRENT_SNAPSHOT_VERSION_MAJOR + SNAPSHOT_VERSION_DIVIDER + CURRENT_SNAPSHOT_VERSION_MINOR;
 
     private static final String PROPERTY_HOSTNAME = "prop_hostname";    // NOI18N
+    
+    private static final String DNSA_KEY = "HostProvider_NotifyUnresolved"; // NOI18N
 
     private static InetAddress localhostAddress2;
 
@@ -305,16 +311,35 @@ public boolean accept(File dir, String name) {
     private static void notifyUnresolvedHosts(final Set<File> unresolvedHostsF, final Set<String> unresolvedHostsS) {
         RequestProcessor.getDefault().post(new Runnable() {
             public void run() {
-                JPanel messagePanel = new JPanel(new BorderLayout(5, 5));
-                messagePanel.add(new JLabel(NbBundle.getMessage(HostProvider.class, "MSG_Unresolved_Hosts")), BorderLayout.NORTH); // NOI18N
-                JList list = new JList(unresolvedHostsS.toArray());
-                list.setVisibleRowCount(4);
-                messagePanel.add(new JScrollPane(list), BorderLayout.CENTER);
-                NotifyDescriptor dd = new NotifyDescriptor(
-                        messagePanel, NbBundle.getMessage(HostProvider.class, "Title_Unresolved_Hosts"), // NOI18N
-                        NotifyDescriptor.YES_NO_OPTION, NotifyDescriptor.ERROR_MESSAGE,
-                        null, NotifyDescriptor.YES_OPTION);
-                if (DialogDisplayer.getDefault().notify(dd) == NotifyDescriptor.NO_OPTION)
+                String s = GlobalPreferences.sharedInstance().getDoNotShowAgain(DNSA_KEY);
+                Boolean b = s == null ? null : Boolean.parseBoolean(s);
+                
+                if (b == null) {
+                    JPanel messagePanel = new JPanel(new BorderLayout(5, 5));
+                    messagePanel.add(new JLabel(NbBundle.getMessage(HostProvider.class, "MSG_Unresolved_Hosts")), BorderLayout.NORTH); // NOI18N
+                    JList list = new JList(unresolvedHostsS.toArray());
+                    list.setVisibleRowCount(4);
+                    messagePanel.add(new JScrollPane(list), BorderLayout.CENTER);
+                    JCheckBox dnsa = new JCheckBox();
+                    Mnemonics.setLocalizedText(dnsa, NbBundle.getMessage(HostProvider.class, "LBL_RememberAction")); // NOI18N
+                    dnsa.setToolTipText(NbBundle.getMessage(HostProvider.class, "TTP_RememberAction")); // NOI18N
+                    JPanel p = new JPanel(new BorderLayout());
+                    p.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 20));
+                    p.add(dnsa, BorderLayout.WEST);
+                    messagePanel.add(p, BorderLayout.SOUTH);
+                    NotifyDescriptor dd = new NotifyDescriptor(
+                            messagePanel, NbBundle.getMessage(HostProvider.class, "Title_Unresolved_Hosts"), // NOI18N
+                            NotifyDescriptor.YES_NO_OPTION, NotifyDescriptor.ERROR_MESSAGE,
+                            null, NotifyDescriptor.YES_OPTION);
+                    Object ret = DialogDisplayer.getDefault().notify(dd);
+                    
+                    if (ret == NotifyDescriptor.NO_OPTION) b = Boolean.FALSE;
+                    else if (ret == NotifyDescriptor.YES_OPTION) b = Boolean.TRUE;
+                    
+                    if (dnsa.isSelected() && b != null) GlobalPreferences.sharedInstance().setDoNotShowAgain(DNSA_KEY, b.toString());
+                }
+                
+                if (Boolean.FALSE.equals(b))
                     for (File file : unresolvedHostsF) Utils.delete(file, true);
 
                 unresolvedHostsF.clear();
diff --git a/visualvm/jmx/nbproject/project.xml b/visualvm/jmx/nbproject/project.xml
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>0</release-version>
-                        <specification-version>1.4</specification-version>
+                        <specification-version>1.6</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/visualvm/jmx/src/com/sun/tools/visualvm/jmx/impl/Bundle.properties b/visualvm/jmx/src/com/sun/tools/visualvm/jmx/impl/Bundle.properties
@@ -69,3 +69,6 @@ MSG_Insecure_SSL=<html><b>The connection to {0}<br>could not be made using SSL.
                  Note that username and password will be sent in plain text.<html>
 
 Retry_Insecure_SSL=&Do not require SSL for this connection
+
+LBL_RememberAction=&Remember selected action
+TTP_RememberAction=Select to perform the action automatically on subsequent sessions. Can be reset using Tools | Options | General | Reset Do Not Show Again confirmations.
diff --git a/visualvm/jmx/src/com/sun/tools/visualvm/jmx/impl/JmxApplicationProvider.java b/visualvm/jmx/src/com/sun/tools/visualvm/jmx/impl/JmxApplicationProvider.java
@@ -39,6 +39,7 @@
 import com.sun.tools.visualvm.core.datasupport.DataChangeListener;
 import com.sun.tools.visualvm.core.datasupport.Stateful;
 import com.sun.tools.visualvm.core.datasupport.Utils;
+import com.sun.tools.visualvm.core.options.GlobalPreferences;
 import com.sun.tools.visualvm.jmx.JmxApplicationException;
 import com.sun.tools.visualvm.jmx.JmxApplicationsSupport;
 import com.sun.tools.visualvm.tools.jmx.JmxModel;
@@ -60,12 +61,15 @@
 import java.util.Map;
 import java.util.Set;
 import javax.management.remote.JMXServiceURL;
+import javax.swing.BorderFactory;
+import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
+import org.openide.awt.Mnemonics;
 import org.openide.util.NbBundle;
 import org.openide.util.RequestProcessor;
 import org.openide.windows.WindowManager;
@@ -105,6 +109,8 @@ public class JmxApplicationProvider {
     private static final String PROPERTIES_FILE = "jmxapplication" + Storage.DEFAULT_PROPERTIES_EXT;  // NOI18N
     static final String JMX_SUFFIX = ".jmx";  // NOI18N
     
+    private static final String DNSA_KEY = "JMXApplicationProvider_NotifyUnresolved"; // NOI18N
+    
     
     private volatile boolean trackingNewHosts;
     private Map<String, Set<Storage>> persistedApplications =
@@ -479,16 +485,35 @@ public void run() {
     private static void notifyUnresolvedApplications(final Set<String> failedHostsN, final Set<Storage> failedHostsS) {
         RequestProcessor.getDefault().post(new Runnable() {
             public void run() {
-                JPanel messagePanel = new JPanel(new BorderLayout(5, 5));
-                messagePanel.add(new JLabel(NbBundle.getMessage(JmxApplicationProvider.class, "MSG_Unresolved_JMX")), BorderLayout.NORTH); // NOI18N
-                JList list = new JList(failedHostsN.toArray());
-                list.setVisibleRowCount(4);
-                messagePanel.add(new JScrollPane(list), BorderLayout.CENTER);
-                NotifyDescriptor dd = new NotifyDescriptor(
-                        messagePanel, NbBundle.getMessage(JmxApplicationProvider.class, "Title_Unresolved_JMX"), // NOI18N
-                        NotifyDescriptor.YES_NO_OPTION, NotifyDescriptor.ERROR_MESSAGE,
-                        null, NotifyDescriptor.YES_OPTION);
-                if (DialogDisplayer.getDefault().notify(dd) == NotifyDescriptor.NO_OPTION)
+                String s = GlobalPreferences.sharedInstance().getDoNotShowAgain(DNSA_KEY);
+                Boolean b = s == null ? null : Boolean.parseBoolean(s);
+                
+                if (b == null) {
+                    JPanel messagePanel = new JPanel(new BorderLayout(5, 5));
+                    messagePanel.add(new JLabel(NbBundle.getMessage(JmxApplicationProvider.class, "MSG_Unresolved_JMX")), BorderLayout.NORTH); // NOI18N
+                    JList list = new JList(failedHostsN.toArray());
+                    list.setVisibleRowCount(4);
+                    messagePanel.add(new JScrollPane(list), BorderLayout.CENTER);
+                    JCheckBox dnsa = new JCheckBox();
+                    Mnemonics.setLocalizedText(dnsa, NbBundle.getMessage(JmxApplicationProvider.class, "LBL_RememberAction")); // NOI18N
+                    dnsa.setToolTipText(NbBundle.getMessage(JmxApplicationProvider.class, "TTP_RememberAction")); // NOI18N
+                    JPanel p = new JPanel(new BorderLayout());
+                    p.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 20));
+                    p.add(dnsa, BorderLayout.WEST);
+                    messagePanel.add(p, BorderLayout.SOUTH);
+                    NotifyDescriptor dd = new NotifyDescriptor(
+                            messagePanel, NbBundle.getMessage(JmxApplicationProvider.class, "Title_Unresolved_JMX"), // NOI18N
+                            NotifyDescriptor.YES_NO_OPTION, NotifyDescriptor.ERROR_MESSAGE,
+                            null, NotifyDescriptor.YES_OPTION);
+                    Object ret = DialogDisplayer.getDefault().notify(dd);
+                    
+                    if (ret == NotifyDescriptor.NO_OPTION) b = Boolean.FALSE;
+                    else if (ret == NotifyDescriptor.YES_OPTION) b = Boolean.TRUE;
+                    
+                    if (dnsa.isSelected() && b != null) GlobalPreferences.sharedInstance().setDoNotShowAgain(DNSA_KEY, b.toString());
+                }
+                
+                if (Boolean.FALSE.equals(b))
                     for (Storage storage : failedHostsS) {
                         File appStorage = storage.getDirectory();
                         if (appStorage.isDirectory()) Utils.delete(appStorage, true);
