Fixed sorting & toString() of some nodes

Author: jisedlac

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

@@ -29,16 +29,11 @@
 import org.graalvm.visualvm.lib.jfluid.heap.Instance;
 import org.graalvm.visualvm.lib.jfluid.heap.ObjectFieldValue;
 import org.graalvm.visualvm.lib.jfluid.heap.Value;
-import org.openide.util.NbBundle;
 
 /**
  *
  * @author Jiri Sedlacek
  */
-@NbBundle.Messages({
-    "InstanceReferenceNode_NodeNameField={0} {1}",
-    "InstanceReferenceNode_NodeNameReference={0} in {1}"
-})
 public abstract class InstanceReferenceNode extends InstanceNode.IncludingNull {
 
     private final Mode mode;
@@ -89,8 +84,8 @@ public String getFieldName() {
 
     public String toString() {
         // TODO: should not be called directly when sorting the tree
-        if (Mode.INCOMING_REFERENCE.equals(mode)) return Bundle.InstanceReferenceNode_NodeNameReference(getFieldName(), getName(null));
-        else return Bundle.InstanceReferenceNode_NodeNameField(getFieldName(), getName(null));
+        if (Mode.INCOMING_REFERENCE.equals(mode)) return getFieldName() + " in " + getName(null); // NOI18N
+        else return getFieldName() + " = " + getName(null); // NOI18N
     }
 
     public boolean equals(Object o) {

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

@@ -53,12 +53,16 @@ public String getFieldName() {
     public abstract String getValue();
 
 
+    private String getName() {
+        return getFieldName() + " = " + getType() + " " + getValue(); // NOI18N
+    }
+    
     public String toString() {
-        return getFieldName();
+        return getName();
     }
 
     protected Object getValue(DataType type, Heap heap) {
-        if (type == DataType.NAME) return getFieldName();
+        if (type == DataType.NAME) return getName();
         if (type == DataType.OWN_SIZE) return DataType.OWN_SIZE.getNoValue();
         if (type == DataType.RETAINED_SIZE) return DataType.RETAINED_SIZE.getNoValue();
         if (type == DataType.OBJECT_ID) return DataType.OBJECT_ID.getNoValue();

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

@@ -337,11 +337,13 @@ int getValuesCount() {
             return valuesCount;
         }
 
-        public String toString() {
+        
+        private String getName() {
             if (valuesCount == -1) return fieldName;
             else return fieldName + " " + Bundle.JavaFieldsPlugin_ValuesCountHint(valuesCount); // NOI18N
         }
 
+        
         abstract int instancesCount();
 
         abstract InterruptibleIterator<Instance> instancesIterator();
@@ -460,6 +462,18 @@ protected String getNodesContainerString(String firstNodeIdx, String lastNodeIdx
 
         }
 
+        
+        protected Object getValue(DataType type, Heap heap) {
+            if (type == DataType.NAME) return getName();
+
+            return super.getValue(type, heap);
+        }
+        
+        
+        public String toString() {
+            return getName();
+        }
+        
     }
 
 
@@ -495,7 +509,17 @@ public int getValuesCount() {
         abstract InterruptibleIterator<Instance> instancesIterator();
 
 
+        public String getName() {
+             return getType() + " " + getValue();
+        }
+        
+        public String toString() {
+            return getName();
+        }
+        
+        
         protected Object getValue(DataType type, Heap heap) {
+            if (type == DataType.NAME) return getName();
             if (type == DataType.COUNT) return getValuesCount();
 
             return super.getValue(type, heap);