StatefulDataSource added

Author: thurka

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

@@ -27,12 +27,11 @@
 
 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.datasource.StatefulDataSource;
 import org.graalvm.visualvm.core.datasupport.DataRemovedListener;
 import org.graalvm.visualvm.core.options.GlobalPreferences;
 import org.graalvm.visualvm.core.ui.DataSourceWindowListener;
@@ -44,7 +43,7 @@
  *
  * @author Jiri Sedlacek
  */
-public abstract class Application extends DataSource implements Stateful {
+public abstract class Application extends StatefulDataSource {
 
     /**
      * Instance representing actually running VisualVM application.
@@ -58,8 +57,6 @@ public abstract class Application extends DataSource implements Stateful {
 
     private String id;
     private Host host;
-    private int state = STATE_AVAILABLE;
-    private int modCount;
 
 
     /**
@@ -112,28 +109,6 @@ public final boolean isLocalApplication() {
         return Host.LOCALHOST.equals(getHost());
     }
 
-    
-    public final synchronized int getState() {
-        return state;
-    }
-    
-    public final int getModCount() {
-        return modCount;
-    }
-
-    protected final synchronized void setState(final int newState) {
-        final int oldState = state;
-        state = newState;
-        if (oldState != newState && newState == STATE_AVAILABLE) {
-            modCount++;
-        }
-        if (DataSource.EVENT_QUEUE.isRequestProcessorThread())
-            getChangeSupport().firePropertyChange(PROPERTY_STATE, oldState, newState);
-        else DataSource.EVENT_QUEUE.post(new Runnable() {
-            public void run() { getChangeSupport().firePropertyChange(PROPERTY_STATE, oldState, newState); };
-        });
-    }
-    
     protected boolean supportsFinishedRemove() {
         return true;
     }

visualvm/core/src/org/graalvm/visualvm/core/datasource/StatefulDataSource.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2020, 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.visualvm.core.datasource;
+
+import org.graalvm.visualvm.core.datasupport.Stateful;
+
+/**
+ *
+ * @author Tomas Hurka
+ * @author Jiri Sedlacek
+ */
+public abstract class StatefulDataSource extends DataSource implements Stateful {
+
+    private int state = STATE_AVAILABLE;
+    private int modCount;
+    private final Object stateLock = new Object();
+
+    public final int getState() {
+        synchronized (stateLock) {
+            return state;
+        }
+    }
+
+    public final int getModCount() {
+        synchronized (stateLock) {
+            return modCount;
+        }
+    }
+
+    protected final void setState(final int newState) {
+        synchronized (stateLock) {
+            final int oldState = state;
+            state = newState;
+            if (oldState != newState && newState == STATE_AVAILABLE) {
+                modCount++;
+            }
+            if (DataSource.EVENT_QUEUE.isRequestProcessorThread()) {
+                getChangeSupport().firePropertyChange(PROPERTY_STATE, oldState, newState);
+            } else {
+                DataSource.EVENT_QUEUE.post(new Runnable() {
+                    public void run() {
+                        getChangeSupport().firePropertyChange(PROPERTY_STATE, oldState, newState);
+                    }
+                });
+            }
+        }
+    }
+}

visualvm/host/src/org/graalvm/visualvm/host/Host.java

@@ -27,16 +27,15 @@
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import org.graalvm.visualvm.core.datasource.DataSource;
-import org.graalvm.visualvm.core.datasupport.Stateful;
+import org.graalvm.visualvm.core.datasource.StatefulDataSource;
 
 /**
  * Abstract implementation of Host.
  * Each host is defined by a hostname/ip if resolvable or hostname/ip and InetAddress.
  *
  * @author Jiri Sedlacek
  */
-public abstract class Host extends DataSource implements Stateful {
+public abstract class Host extends StatefulDataSource {
 
     /**
      * Instance representing the localhost.
@@ -50,8 +49,6 @@ public abstract class Host extends DataSource implements Stateful {
 
     private final String hostName;
     private InetAddress inetAddress;
-    private int state = STATE_AVAILABLE;
-    private int modCount;
 
 
     /**
@@ -97,24 +94,6 @@ public final InetAddress getInetAddress() {
         return inetAddress;
     }
 
-    public synchronized int getState() {
-        return state;
-    }
-    
-    public int getModCount() {
-        return modCount;
-    }
-
-    protected final synchronized void setState(int newState) {
-        int oldState = state;
-        state = newState;
-        if (oldState != newState && newState == STATE_AVAILABLE) {
-            modCount++;
-        }
-        getChangeSupport().firePropertyChange(PROPERTY_STATE, oldState, newState);
-    }
-    
-    
     public int hashCode() {
         if (Host.UNKNOWN_HOST == this) return super.hashCode();
         InetAddress address = getInetAddress();