GH-146 show static fields and full name of class

Author: thurka

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/InstanceNode.java

@@ -90,11 +90,11 @@ public JavaClass getJavaClass() {
     public String getName(Heap heap) {
         if (name == null) {
             if (heap == null) {
-                return computeName(instance, Collections.EMPTY_LIST);
+                return computeName(heap, instance, Collections.EMPTY_LIST);
             } else {
                 Collection<GCRoot> gcRoots = heap.getGCRoots(instance);
                 isGCRoot = gcRoots.isEmpty();
-                name = computeName(instance, gcRoots);
+                name = computeName(heap, instance, gcRoots);
             }
         }
         return name;
@@ -133,11 +133,21 @@ boolean isGCRoot() {
 
     static String computeName(Instance instance, Heap heap) {
         Collection<GCRoot> gcroots = heap == null ? Collections.EMPTY_LIST : heap.getGCRoots(instance);
-        return computeName(instance, gcroots);
+        return computeName(heap, instance, gcroots);
     }
 
-    private static String computeName(Instance instance, Collection<GCRoot> gcroots) {
-        String name = instance.getJavaClass().getName() + "#" + instance.getInstanceNumber(); // NOI18N
+    private static String computeName(Heap heap, Instance instance, Collection<GCRoot> gcroots) {
+        String name = null;
+        String className = instance.getJavaClass().getName();
+        if (heap != null && Class.class.getName().equals(className)) {
+            JavaClass jcls = heap.getJavaClassByID(instance.getInstanceId());
+            if (jcls != null) {
+                name = "class "+jcls.getName();     // NOI18N
+            }
+        }
+        if (name == null) {
+            name = className + "#" + instance.getInstanceNumber(); // NOI18N
+        }
         if (!gcroots.isEmpty()) {
             Set<String> gcKinds = new HashSet();
 

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaFieldsProvider.java

@@ -120,7 +120,14 @@ public boolean supportsView(Heap heap, String viewID) {
         public boolean supportsNode(HeapViewerNode parent, Heap heap, String viewID) {
             if (parent instanceof InstanceNode && !InstanceNode.Mode.INCOMING_REFERENCE.equals(((InstanceNode)parent).getMode())) {
                 Instance instance = ((InstanceNode)parent).getInstance();
-                return instance != null && !instance.getJavaClass().isArray();
+                if (instance == null) return false;
+                JavaClass jcls = instance.getJavaClass();
+                if (jcls.isArray()) return false;
+                if (Class.class.getName().equals(jcls.getName())) {
+                    JavaClass jclass = heap.getJavaClassByID(instance.getInstanceId());
+                    return jclass == null;
+                }
+                return true;
             } else {
                 return false;
             }
@@ -148,7 +155,7 @@ static List<FieldValue> getFields(HeapViewerNode parent, Heap heap, boolean inst
 
     }
 
-//    @ServiceProvider(service=HeapViewerNode.Provider.class, position = 250)
+    @ServiceProvider(service=HeapViewerNode.Provider.class, position = 250)
     @NbBundle.Messages({
         "ClassFieldsProvider_Name=static fields"
     })
@@ -159,21 +166,27 @@ public String getName() {
         }
 
         public boolean supportsView(Heap heap, String viewID) {
-            return viewID.startsWith("java_objects"); // NOI18N
+            return viewID.startsWith("java_"); // NOI18N
         }
 
         public boolean supportsNode(HeapViewerNode parent, Heap heap, String viewID) {
-            if (parent instanceof ClassNode) {
-                JavaClass javaClass = ((ClassNode)parent).getJavaClass();
-                return javaClass != null && !javaClass.isArray();
-            } else {
-                return false;
+            if (parent instanceof InstanceNode && !InstanceNode.Mode.INCOMING_REFERENCE.equals(((InstanceNode)parent).getMode())) {
+                Instance instance = ((InstanceNode)parent).getInstance();
+                if (instance == null) return false;
+                JavaClass jcls = instance.getJavaClass();
+                if (jcls.isArray()) return false;
+                if (Class.class.getName().equals(jcls.getName())) {
+                    JavaClass jclass = heap.getJavaClassByID(instance.getInstanceId());
+                    return jclass != null;
+                }
             }
+            return false;
         }
-
 
         protected List<FieldValue> getFields(HeapViewerNode parent, Heap heap) {
-            JavaClass jclass = HeapViewerNode.getValue(parent, DataType.CLASS, heap);
+            Instance instance = HeapViewerNode.getValue(parent, DataType.INSTANCE, heap);
+            if (instance == null) return null;
+            JavaClass jclass = heap.getJavaClassByID(instance.getInstanceId());
             return jclass == null ? null : jclass.getStaticFieldValues();
         }