Prototype of improved JMX and Jvmstat applications

 - can be resurrected from STATE_UNAVAILABLE back to STATE_AVAILABLE
 - opened views can be reloaded when needed

Author: jisedlac

visualvm/application/src/org/graalvm/visualvm/application/Application.java

@@ -25,11 +25,14 @@
 
 package org.graalvm.visualvm.application;
 
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import org.graalvm.visualvm.core.datasource.DataSource;
 import org.graalvm.visualvm.core.datasource.Storage;
 import org.graalvm.visualvm.core.datasupport.Stateful;
 import org.graalvm.visualvm.host.Host;
 import java.io.File;
+import java.util.Objects;
 import org.graalvm.visualvm.core.datasupport.DataRemovedListener;
 import org.graalvm.visualvm.core.options.GlobalPreferences;
 import org.graalvm.visualvm.core.ui.DataSourceWindowListener;
@@ -123,14 +126,13 @@ protected final synchronized void setState(final int newState) {
         });
     }
 
-    protected boolean autoRemoveWhenTerminated() {
-        return !DataSourceWindowManager.sharedInstance().isDataSourceOpened(this) &&
-               getRepository().getDataSources().isEmpty();
+    protected boolean supportsFinishedRemove() {
+        return true;
     }
 
     protected boolean handleControlledRemove() {
         if (!canRemoveFinished_Opened()) {
-            class ApplicationListener implements DataSourceWindowListener<Application>, DataRemovedListener<Application> {
+            class ApplicationListener implements DataSourceWindowListener<Application>, DataRemovedListener<Application>, PropertyChangeListener {
                 private boolean done;
 
                 public void windowClosed(Application application) {
@@ -149,14 +151,24 @@ public void dataRemoved(Application application) {
                     }
                 }
 
+                public void propertyChange(PropertyChangeEvent evt) {
+                    if (PROPERTY_STATE.equals(evt.getPropertyName()) &&
+                        !Objects.equals(evt.getNewValue(), STATE_UNAVAILABLE))
+                            synchronized (ApplicationListener.this) {
+                                if (!done) unregister();
+                            }
+                }
+                
                 void register() {
                     Application.this.notifyWhenRemoved(this);
+                    Application.this.addPropertyChangeListener(PROPERTY_STATE, this);
                     DataSourceWindowManager.sharedInstance().addWindowListener(Application.this, this);
                 }
 
                 void unregister() {
                     done = true;
                     DataSourceWindowManager.sharedInstance().removeWindowListener(Application.this, this);
+                    Application.this.removePropertyChangeListener(this);
                 }
             }
 

visualvm/application/src/org/graalvm/visualvm/application/RemoveFinishedApplicationsAction.java

@@ -110,7 +110,7 @@ private void removeApplications(Set<Host> hosts) {
 
 
     private static boolean isRemovable(Application application) {
-        return application.getState() != Stateful.STATE_AVAILABLE && application.supportsUserRemove();
+        return application.getState() == Stateful.STATE_UNAVAILABLE && application.supportsFinishedRemove();
     }
 
 

visualvm/core/src/org/graalvm/visualvm/core/explorer/ExplorerModelBuilder.java

@@ -397,8 +397,11 @@ public void propertyChange(final PropertyChangeEvent evt) {
                 final ExplorerNode node = getNodeFor(dataSource);
                 if (node != null) SwingUtilities.invokeLater(new Runnable() {
                     public void run() {
-                        ((ExplorerNode)node.getParent()).sortChildren();
-                        updateContainer(node.getParent());
+                        ExplorerNode parent = (ExplorerNode)node.getParent();
+                        if (parent != null) {
+                            parent.sortChildren();
+                            updateContainer(parent);
+                        }
                     }
                 });
             }

visualvm/core/src/org/graalvm/visualvm/core/model/ModelFactory.java

@@ -169,6 +169,10 @@ public final boolean unregisterProvider(ModelProvider<M, D> oldProvider) {
          }
     }
 
+    public final void clearModel(D dataSource) {
+        modelCache.remove(new DataSourceKey(dataSource));
+    }
+    
     /**
      * Add data change listener. Data change is fired when 
      * {@link ModelProvider} is registered/unregister. 

visualvm/core/src/org/graalvm/visualvm/core/ui/Bundle.properties

@@ -23,3 +23,6 @@
 # questions.
 
 LBL_Opening=Opening {0}...
+
+DataSourceCaption_LBL_Reload=The view is not up to date, click to reload obsolete data\:
+DataSourceCaption_BTN_Reload=Reload