Skip to content

Commit bc9db85

Browse files
committed
Do not display Count column in Fields / References / GC Roots for no selection
1 parent e34b576 commit bc9db85

File tree

3 files changed

+27
-2
lines changed

3 files changed

+27
-2
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,13 @@ public void run() {
207207
return nodes == null || nodes.length == 0 ? new HeapViewerNode[] { new TextNode(filtered ? Bundle.JavaFieldsPlugin_NoFieldsFiltered() : Bundle.JavaFieldsPlugin_NoFields()) } : nodes;
208208
}
209209

210+
SwingUtilities.invokeLater(new Runnable() {
211+
public void run() {
212+
if (!CCONF_INSTANCE.equals(objectsView.getCurrentColumnConfiguration()))
213+
objectsView.configureColumns(CCONF_INSTANCE);
214+
}
215+
});
216+
210217
return new HeapViewerNode[] { new TextNode(Bundle.JavaFieldsPlugin_NoSelection()) };
211218
}
212219
@Override

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,16 @@ protected HeapViewerNode[] computeData(RootNode root, Heap heap, String viewID,
140140
HeapViewerNode _selected;
141141
synchronized (objectsView) { _selected = selected; }
142142

143-
if (_selected == null) return new HeapViewerNode[] { new TextNode(Bundle.JavaReferencesPlugin_NoSelection()) };
143+
if (_selected == null) {
144+
SwingUtilities.invokeLater(new Runnable() {
145+
public void run() {
146+
if (!CCONF_INSTANCE.equals(objectsView.getCurrentColumnConfiguration()))
147+
objectsView.configureColumns(CCONF_INSTANCE);
148+
}
149+
});
150+
151+
return new HeapViewerNode[] { new TextNode(Bundle.JavaReferencesPlugin_NoSelection()) };
152+
}
144153

145154
InstancesWrapper wrapper = HeapViewerNode.getValue(_selected, DataType.INSTANCES_WRAPPER, heap);
146155
if (wrapper != null) {

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,16 @@ protected HeapViewerNode[] computeData(RootNode root, Heap heap, String viewID,
135135
HeapViewerNode _selected;
136136
synchronized (objectsView) { _selected = selected; }
137137

138-
if (_selected == null) return new HeapViewerNode[] { new TextNode(Bundle.PathToGCRootPlugin_NoSelection()) };
138+
if (_selected == null) {
139+
SwingUtilities.invokeLater(new Runnable() {
140+
public void run() {
141+
if (!CCONF_INSTANCE.equals(objectsView.getCurrentColumnConfiguration()))
142+
objectsView.configureColumns(CCONF_INSTANCE);
143+
}
144+
});
145+
146+
return new HeapViewerNode[] { new TextNode(Bundle.PathToGCRootPlugin_NoSelection()) };
147+
}
139148

140149
Instance instance;
141150
InstancesWrapper wrapper = HeapViewerNode.getValue(_selected, DataType.INSTANCES_WRAPPER, heap);

0 commit comments

Comments
 (0)