Use the new API to resolve renderer for a node

Author: jisedlac

visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleObjectMergedFields.java

@@ -43,6 +43,7 @@
 import org.graalvm.visualvm.heapviewer.model.HeapViewerNodeFilter;
 import org.graalvm.visualvm.heapviewer.model.HeapViewerNodeWrapper;
 import org.graalvm.visualvm.heapviewer.model.Progress;
+import org.graalvm.visualvm.heapviewer.model.RootNode;
 import org.graalvm.visualvm.heapviewer.truffle.dynamicobject.DynamicObject;
 import org.graalvm.visualvm.heapviewer.truffle.dynamicobject.DynamicObjectNode;
 import org.graalvm.visualvm.heapviewer.ui.HeapViewerRenderer;
@@ -511,13 +512,12 @@ public String getShortName() {
     private static class ObjectFieldValueNodeRenderer extends HeapViewerRendererWrapper {
 
         @Override
-        protected HeapViewerNode getNode(Object value) {
-            return ((TruffleObjectMergedFields.ObjectFieldValueNode)value).getNode();
-        }
-        
-        @Override
-        protected HeapViewerRenderer getRenderer(HeapViewerNode node) {
-            return TruffleObjectPropertyPlugin.resolveRenderer(node);
+        protected HeapViewerRenderer getRenderer(Object value, int row) {
+            TruffleObjectMergedFields.ObjectFieldValueNode vnode = (TruffleObjectMergedFields.ObjectFieldValueNode)value;
+            HeapViewerNode node = vnode.getNode();
+            HeapViewerRenderer renderer = RootNode.get(vnode).resolveRenderer(node);
+            renderer.setValue(node, row);
+            return renderer;
         }
 
     }

visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleObjectMergedReferences.java

@@ -40,6 +40,7 @@
 import org.graalvm.visualvm.heapviewer.model.HeapViewerNodeFilter;
 import org.graalvm.visualvm.heapviewer.model.HeapViewerNodeWrapper;
 import org.graalvm.visualvm.heapviewer.model.Progress;
+import org.graalvm.visualvm.heapviewer.model.RootNode;
 import org.graalvm.visualvm.heapviewer.model.TextNode;
 import org.graalvm.visualvm.heapviewer.truffle.nodes.TruffleObjectReferenceNode;
 import org.graalvm.visualvm.heapviewer.ui.HeapViewerRenderer;
@@ -99,7 +100,7 @@ protected HeapViewerNode[] getNodes(HeapViewerNode parent, String viewID, HeapVi
 
         final Map<Long, Integer> values = new HashMap();
         FieldValue refFV = null;
-
+        
         progress.setupKnownSteps(objectsCount());
 
         Iterator<O> objectsI = objectsIterator();
@@ -243,28 +244,15 @@ protected Object getValue(DataType type, Heap heap) {
     }
 
 
-//    private static class MergedObjectReferenceNodeRenderer extends HeapViewerRendererWrapper {
-//        
-//        @Override
-//        protected HeapViewerNode getNode(Object value) {
-//            return ((TruffleObjectMergedReferences.MergedObjectReferenceNode)value).getNode();
-//        }
-//        
-//        @Override
-//        protected HeapViewerRenderer getRenderer(HeapViewerNode node) {
-//            return TruffleObjectPropertyPlugin.resolveRenderer(node);
-//        }
-//        
-//    }
-    
-    private static class MergedObjectReferenceNodeRenderer2 extends NormalBoldGrayRenderer implements HeapViewerRenderer {
+    private static class MergedObjectReferenceNodeRenderer extends NormalBoldGrayRenderer implements HeapViewerRenderer {
 
         private HeapViewerRenderer renderer;
 
         @Override
         public void setValue(Object value, int row) {
-            HeapViewerNode node = ((TruffleObjectMergedReferences.MergedObjectReferenceNode)value).getNode();
-            renderer = TruffleObjectPropertyPlugin.resolveRenderer(node);
+            TruffleObjectMergedReferences.MergedObjectReferenceNode vnode = (TruffleObjectMergedReferences.MergedObjectReferenceNode)value;
+            HeapViewerNode node = vnode.getNode();
+            renderer = RootNode.get(vnode).resolveRenderer(node);
             renderer.setValue(node, row);
 
             if (renderer instanceof NormalBoldGrayRenderer) {
@@ -314,7 +302,7 @@ public boolean supportsView(HeapContext context, String viewID) {
 
         @Override
         public void registerRenderers(Map<Class<? extends HeapViewerNode>, HeapViewerRenderer> renderers, HeapContext context) {
-            renderers.put(TruffleObjectMergedReferences.MergedObjectReferenceNode.class, new MergedObjectReferenceNodeRenderer2());
+            renderers.put(TruffleObjectMergedReferences.MergedObjectReferenceNode.class, new MergedObjectReferenceNodeRenderer());
         }
 
     }

visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleObjectPropertyPlugin.java

@@ -45,7 +45,6 @@
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JPopupMenu;
 import javax.swing.SwingUtilities;
-import org.graalvm.visualvm.heapviewer.ui.HeapViewerRenderer;
 import org.openide.util.NbBundle;
 import org.openide.util.NbPreferences;
 
@@ -76,14 +75,6 @@ public class TruffleObjectPropertyPlugin<O extends TruffleObject, T extends Truf
     private final TreeTableView objectsView;
 
 
-    // TODO: temporary workaround, delete ASAP!
-    private static TreeTableView SHARED_VIEW;
-    // TODO: temporary workaround, delete ASAP!
-    static HeapViewerRenderer resolveRenderer(HeapViewerNode node) {
-        return SHARED_VIEW == null ? null : SHARED_VIEW.getNodeRenderer(node);
-    }
-    
-
     public TruffleObjectPropertyPlugin(String name, String description, Icon icon, String viewID, HeapContext context, HeapViewerActions actions, TruffleObjectPropertyProvider<O, T, F, L, ? extends Object> provider) {
         super(name, description, icon);
 
@@ -160,7 +151,6 @@ public void run() {
                 });
             }
         };
-        if (SHARED_VIEW == null) SHARED_VIEW = objectsView;
     }
 
     protected JComponent createComponent() {