Merge branch 'master' into graal

Author: thurka

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/model/RootNode.java

@@ -32,6 +32,7 @@
 import javax.swing.SortOrder;
 import org.graalvm.visualvm.lib.jfluid.heap.Heap;
 import org.graalvm.visualvm.heapviewer.HeapContext;
+import org.graalvm.visualvm.heapviewer.ui.HeapViewerRenderer;
 import org.openide.util.Lookup;
 
 /**
@@ -66,6 +67,9 @@ public abstract class RootNode extends HeapViewerNode {
     protected abstract HeapViewerNode[] retrieveChildren(HeapViewerNode node);
 
 
+    public abstract HeapViewerRenderer resolveRenderer(HeapViewerNode node);
+    
+    
 //    public RootNode() {
 //        this(NO_NODES);
 //    }

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/HeapViewerRendererWrapper.java

@@ -26,7 +26,6 @@
 
 import javax.accessibility.AccessibleContext;
 import javax.swing.JComponent;
-import org.graalvm.visualvm.heapviewer.model.HeapViewerNode;
 
 /**
  *
@@ -38,9 +37,7 @@ public abstract class HeapViewerRendererWrapper implements HeapViewerRenderer {
 
     @Override
     public void setValue(Object value, int row) {
-        HeapViewerNode node = getNode(value);
-        renderer = getRenderer(node);
-        renderer.setValue(node, row);
+        renderer = getRenderer(value, row);
     }
 
     @Override
@@ -73,8 +70,7 @@ public AccessibleContext getAccessibleContext() {
         return renderer.getAccessibleContext();
     }
 
-    protected abstract HeapViewerNode getNode(Object value);
 
-    protected abstract HeapViewerRenderer getRenderer(HeapViewerNode node);
+    protected abstract HeapViewerRenderer getRenderer(Object value, int row);
 
 }

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/TreeTableView.java

@@ -144,6 +144,7 @@ public TreeTableView(String viewID, HeapContext context, HeapViewerActions actio
             public void updateChildren(HeapViewerNode node) { if (model != null) model.childrenChanged(root); childrenChanged(); /*if (treeTable != null) treeTable.resetExpandedNodes();*/ }
             protected HeapViewerNode[] retrieveChildren(HeapViewerNode node) { return nodesCache.retrieveChildren(node); }
             protected HeapViewerNode[] lazilyComputeChildren(Heap heap, String viewID, HeapViewerNodeFilter viewFilter, List<DataType> dataTypes, List<SortOrder> sortOrders, Progress progress) { return TreeTableView.this.computeData(root, heap, viewID, viewFilter, dataTypes, sortOrders, progress); }
+            public HeapViewerRenderer resolveRenderer(HeapViewerNode node) { return TreeTableView.this.resolveNodeRenderer(node); }
         };
         currentRoot = root;
 
@@ -403,9 +404,13 @@ private TreeTableViewRenderer getNodesRenderer() {
         return nodesRenderer;
     }
 
-    public HeapViewerRenderer getNodeRenderer(HeapViewerNode node) {
+    private HeapViewerRenderer resolveNodeRenderer(HeapViewerNode node) {
         TreeTableViewRenderer viewRenderer = getNodesRenderer();
-        HeapViewerRenderer nodeRenderer = viewRenderer.resolve(node.getClass());
+        return viewRenderer.resolve(node.getClass());
+    }
+    
+    public HeapViewerRenderer getNodeRenderer(HeapViewerNode node) {
+        HeapViewerRenderer nodeRenderer = resolveNodeRenderer(node);
         nodeRenderer.setValue(node, -1);
         return nodeRenderer;
     }