Heap Dump on OOME action in context menu is now a checkbox

Author: jisedlac

visualvm/heapdump/nbproject/project.xml

@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.0</specification-version>
+                        <specification-version>2.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

visualvm/heapdump/src/org/graalvm/visualvm/heapdump/impl/Bundle.properties

@@ -29,13 +29,17 @@ LBL_Heap_Dump=Heap Dump
 
 LBL_Heap_Dumps=Heap Dumps
 
-LBL_Disable_Heap_Dump_on_OOME=&Disable Heap Dump on OOME
+LBL_Heap_Dump_on_OOME=Heap Dump on &OOME
 
-DESCR_Disable_Heap_Dump_on_OOME=Disable Heap Dump on OOME
+DESCR_Heap_Dump_on_OOME=Control whether to dump heap when an OOME occurs
 
-LBL_Enable_Heap_Dump_on_OOME=&Enable Heap Dump on OOME
+#LBL_Disable_Heap_Dump_on_OOME=&Disable Heap Dump on OOME
 
-DESCR_Enable_Heap_Dump_on_OOME=Enable Heap Dump on OOME
+#DESCR_Disable_Heap_Dump_on_OOME=Disable Heap Dump on OOME
+
+#LBL_Enable_Heap_Dump_on_OOME=&Enable Heap Dump on OOME
+
+#DESCR_Enable_Heap_Dump_on_OOME=Enable Heap Dump on OOME
 
 MSG_Cannot_take_heap_dump=Cannot take heap dump for 
 

visualvm/heapdump/src/org/graalvm/visualvm/heapdump/impl/HeapDumpOnOOMEAction.java

@@ -35,15 +35,19 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.Set;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JMenuItem;
+import org.openide.awt.Mnemonics;
 import org.openide.util.NbBundle;
+import org.openide.util.actions.Presenter;
 
 /**
  *
  * @author Jiri Sedlacek
  * @author Tomas Hurka
  * @author Luis-Miguel Alventosa
  */
-class HeapDumpOnOOMEAction extends SingleDataSourceAction<Application> {
+class HeapDumpOnOOMEAction extends SingleDataSourceAction<Application> implements Presenter.Popup {
 
     private boolean oomeEnabled;
     private Application lastSelectedApplication;
@@ -81,13 +85,6 @@ protected boolean isEnabled(Application application) {
 
     private void updateState(Jvm jvm) {
         oomeEnabled = jvm.isDumpOnOOMEnabled();
-        if (oomeEnabled) {
-            putValue(NAME, NbBundle.getMessage(HeapDumpOnOOMEAction.class, "LBL_Disable_Heap_Dump_on_OOME"));  // NOI18N
-            putValue(SHORT_DESCRIPTION, NbBundle.getMessage(HeapDumpOnOOMEAction.class, "DESCR_Disable_Heap_Dump_on_OOME"));  // NOI18N
-        } else {
-            putValue(NAME, NbBundle.getMessage(HeapDumpOnOOMEAction.class, "LBL_Enable_Heap_Dump_on_OOME"));  // NOI18N
-            putValue(SHORT_DESCRIPTION, NbBundle.getMessage(HeapDumpOnOOMEAction.class, "DESCR_Enable_Heap_Dump_on_OOME"));  // NOI18N
-        }
     }
 
     protected void updateState(Set<Application> applications) {
@@ -99,6 +96,15 @@ protected void updateState(Set<Application> applications) {
     }
 
 
+    @Override
+    public JMenuItem getPopupPresenter() {
+        JMenuItem presenter = new JCheckBoxMenuItem(this);
+        Mnemonics.setLocalizedText(presenter, NbBundle.getMessage(HeapDumpOnOOMEAction.class, "LBL_Heap_Dump_on_OOME")); // NOI18N
+        presenter.setSelected(oomeEnabled);
+        return presenter;
+    }
+    
+    
     private HeapDumpOnOOMEAction() {
         super(Application.class);
     }