Skip to content

Commit 089ea36

Browse files
committed
GH-57 Initial implementation of comparing heap dumps
1 parent 4b04116 commit 089ea36

15 files changed

+1480
-30
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
build.xml.data.CRC32=226f27cb
1+
build.xml.data.CRC32=4d39fe49
22
build.xml.script.CRC32=018997e7
33
build.xml.stylesheet.CRC32=[email protected]
44
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
55
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6-
nbproject/build-impl.xml.data.CRC32=226f27cb
6+
nbproject/build-impl.xml.data.CRC32=4d39fe49
77
nbproject/build-impl.xml.script.CRC32=98bf6af8
88
nbproject/build-impl.xml.stylesheet.CRC32=[email protected]

visualvm/heapviewer/nbproject/project.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,14 @@
102102
<specification-version>7.43</specification-version>
103103
</run-dependency>
104104
</dependency>
105+
<dependency>
106+
<code-name-base>org.openide.filesystems</code-name-base>
107+
<build-prerequisite/>
108+
<compile-dependency/>
109+
<run-dependency>
110+
<specification-version>9.11</specification-version>
111+
</run-dependency>
112+
</dependency>
105113
<dependency>
106114
<code-name-base>org.openide.util</code-name-base>
107115
<build-prerequisite/>

visualvm/heapviewer/src/com/sun/tools/visualvm/heapviewer/java/impl/ClassHierarchyPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public boolean isLeaf() {
144144
public static class Provider extends HeapViewPlugin.Provider {
145145

146146
public HeapViewPlugin createPlugin(HeapContext context, HeapViewerActions actions, String viewID) {
147-
if (JavaHeapFragment.isJavaHeap(context)) return new ClassHierarchyPlugin(context, actions);
147+
if (!viewID.startsWith("diff") && JavaHeapFragment.isJavaHeap(context)) return new ClassHierarchyPlugin(context, actions); // NOI18N
148148
return null;
149149
}
150150

visualvm/heapviewer/src/com/sun/tools/visualvm/heapviewer/java/impl/JavaClassesProvider.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,20 +66,20 @@ public class JavaClassesProvider {
6666
"Classes_Messages_NoPackages=<no packages>",
6767
"Classes_Messages_NoPackagesFilter=<no packages matching the filter>"
6868
})
69-
private static final class Classes_Messages {
70-
private static String getMoreNodesString(String moreNodesCount) {
69+
static final class Classes_Messages {
70+
static String getMoreNodesString(String moreNodesCount) {
7171
return Bundle.Classes_Messages_MoreNodes(moreNodesCount);
7272
}
73-
private static String getSamplesContainerString(String objectsCount) {
73+
static String getSamplesContainerString(String objectsCount) {
7474
return Bundle.Classes_Messages_SamplesContainer(objectsCount);
7575
}
76-
private static String getNodesContainerString(String firstNodeIdx, String lastNodeIdx) {
76+
static String getNodesContainerString(String firstNodeIdx, String lastNodeIdx) {
7777
return Bundle.Classes_Messages_NodesContainer(firstNodeIdx, lastNodeIdx);
7878
}
79-
private static String getNoClassesString(HeapViewerNodeFilter viewFilter) {
79+
static String getNoClassesString(HeapViewerNodeFilter viewFilter) {
8080
return viewFilter == null ? Bundle.Classes_Messages_NoClasses() : Bundle.Classes_Messages_NoClassesFilter();
8181
}
82-
private static String getNoPackagesString(HeapViewerNodeFilter viewFilter) {
82+
static String getNoPackagesString(HeapViewerNodeFilter viewFilter) {
8383
return viewFilter == null ? Bundle.Classes_Messages_NoPackages() : Bundle.Classes_Messages_NoPackagesFilter();
8484
}
8585
}
@@ -111,7 +111,7 @@ protected String getNodesContainerString(String firstNodeIdx, String lastNodeIdx
111111
return nodes.length == 0 ? new HeapViewerNode[] { new TextNode(Classes_Messages.getNoClassesString(viewFilter)) } : nodes;
112112
}
113113

114-
114+
115115
public static HeapViewerNode[] getHeapPackages(HeapViewerNode parent, Heap heap, String viewID, HeapViewerNodeFilter viewFilter, List<DataType> dataTypes, List<SortOrder> sortOrders, Progress progress) {
116116
List<HeapViewerNode> nodes = new ArrayList();
117117
Map<String, ClassesContainer.Objects> packages = new HashMap();
@@ -141,7 +141,7 @@ public static HeapViewerNode[] getHeapPackages(HeapViewerNode parent, Heap heap,
141141
nodes.toArray(HeapViewerNode.NO_NODES);
142142
}
143143

144-
144+
145145
@NbBundle.Messages({
146146
"GCRoots_Messages_MoreNodes=<another {0} GC roots left>",
147147
"GCRoots_Messages_SamplesContainer=<sample {0} GC roots>",

0 commit comments

Comments
 (0)