Improved support for experimental events

 - correctly shown/hidden experimental properties for generic loader

Author: jisedlac

visualvm/jfr.generic/src/org/graalvm/visualvm/jfr/generic/model/impl/DisplayableSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 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
@@ -78,7 +78,8 @@ private IAccessorKey computeNext() {
             }
 
             private boolean isDisplayable(IAccessorKey key) {
-                return !ID_STACKTRACE.equals(key.getIdentifier());
+                if (ID_STACKTRACE.equals(key.getIdentifier())) return false;
+                return includeExperimental || !isExperimental(key);
             }
         };
     }
@@ -94,6 +95,13 @@ static JFRDataDescriptor getDataDescriptor(IAccessorKey key) {
     }
 
 
+    private static boolean isExperimental(IAccessorKey key) {
+        // TODO: should be turned into regexp and test matching, not startsWith!
+        String accessorName = TypeHandling.getValueString(key);
+        return accessorName.startsWith(JFRGenericEventType.EXPERIMENTAL_PREFIX);
+    }
+    
+    
     private DisplayableSupport() {}
 
 

visualvm/jfr.generic/src/org/graalvm/visualvm/jfr/generic/model/impl/JFRGenericEventType.java

@@ -41,7 +41,7 @@
  */
 final class JFRGenericEventType extends JFREventType {
 
-    private static final String EXPERIMENTAL_PREFIX = Messages.getString(Messages.TypeManager_EXPERIMENTAL_TYPE).replace("{0}", "").trim(); // NOI18N
+    static final String EXPERIMENTAL_PREFIX = Messages.getString(Messages.TypeManager_EXPERIMENTAL_TYPE).replace("{0}", "").trim(); // NOI18N
 
 
     private final long typeId;