Skip to content

Commit 0eda52f

Browse files
thurkathurka
committed
some javac warnings fixed
1 parent 1a4ba7f commit 0eda52f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+134
-130
lines changed

‎visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/HeapContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ public static HeapContext[] allContexts(HeapViewer heapViewer) {
7575
Lookup.Provider project = heapViewer.getProject();
7676

7777
List<HeapFragment> fragments = heapViewer.getFragments();
78-
List<HeapContext> contexts = new ArrayList(fragments.size());
78+
List<HeapContext> contexts = new ArrayList<>(fragments.size());
7979

8080
for (HeapFragment fragment : fragments)
8181
contexts.add(new HeapContext(file, project, fragment));
8282

8383
for (HeapContext context : contexts) {
84-
List<HeapContext> otherContexts = new ArrayList(contexts);
84+
List<HeapContext> otherContexts = new ArrayList<>(contexts);
8585
otherContexts.remove(context);
8686
context.otherContexts = Collections.unmodifiableCollection(otherContexts);
8787
}

‎visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/HeapViewer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ private static List<HeapFragment> computeHeapFragments(File heapDumpFile, Lookup
139139

140140
Collection<? extends HeapFragment.Provider> providers = Lookup.getDefault().lookupAll(HeapFragment.Provider.class);
141141

142-
List<HeapFragment> fragments = new ArrayList(providers.size());
142+
List<HeapFragment> fragments = new ArrayList<>(providers.size());
143143
for (HeapFragment.Provider provider : providers) {
144144
List<HeapFragment> fragmentsL = provider.getFragments(heapDumpFile, heapDumpProject, heap);
145145
if (fragmentsL != null) fragments.addAll(fragmentsL);

‎visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/InstanceNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ boolean isGCRoot() {
135135

136136
static String computeName(Instance instance) {
137137
Heap heap = instance.getJavaClass().getHeap();
138-
Collection<GCRoot> gcroots = heap == null ? Collections.EMPTY_LIST : heap.getGCRoots(instance);
138+
Collection<GCRoot> gcroots = heap == null ? Collections.emptyList() : heap.getGCRoots(instance);
139139
return computeName(heap, instance, gcroots);
140140
}
141141

@@ -152,7 +152,7 @@ private static String computeName(Heap heap, Instance instance, Collection<GCRoo
152152
name = className + "#" + instance.getInstanceNumber(); // NOI18N
153153
}
154154
if (!gcroots.isEmpty()) {
155-
Set<String> gcKinds = new HashSet();
155+
Set<String> gcKinds = new HashSet<>();
156156

157157
for (GCRoot gcroot : gcroots) {
158158
gcKinds.add(gcroot.getKind());

‎visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/ThreadStateNodeRenderer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public String getShortName() {
6161
}
6262

6363
private static final int THREAD_ICON_SIZE = 9;
64-
private static final Map<Thread.State, Icon> STATE_ICONS_CACHE = new HashMap();
64+
private static final Map<Thread.State, Icon> STATE_ICONS_CACHE = new HashMap<>();
6565

6666
private static Icon getIcon(Thread.State state) {
6767
Icon icon = STATE_ICONS_CACHE.get(state);

‎visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/ClassHierarchyPlugin.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
import org.graalvm.visualvm.heapviewer.ui.HeapViewerActions;
4545
import org.graalvm.visualvm.heapviewer.ui.TreeTableView;
4646
import org.graalvm.visualvm.heapviewer.ui.TreeTableViewColumn;
47+
import org.graalvm.visualvm.lib.jfluid.heap.Field;
48+
import org.graalvm.visualvm.lib.jfluid.heap.FieldValue;
4749
import org.graalvm.visualvm.lib.jfluid.heap.Heap;
4850
import org.graalvm.visualvm.lib.jfluid.heap.Instance;
4951
import org.graalvm.visualvm.lib.jfluid.heap.JavaClass;
@@ -121,7 +123,7 @@ protected void childrenChanged() {
121123
HeapViewerNode root = (HeapViewerNode)getRoot();
122124
while (root != null) {
123125
expandNode(root);
124-
root = root.getNChildren() > 0 ? (HeapViewerNode)root.getChild(0) : null;
126+
root = root.getNChildren() > 0 ? root.getChild(0) : null;
125127
}
126128
}
127129
};
@@ -179,16 +181,16 @@ private static class FakeClass implements JavaClass {
179181
@Override public Instance getClassLoader() { throw new UnsupportedOperationException("Not supported."); } // NOI18N
180182
@Override public ObjectArrayInstance getSigners() { throw new UnsupportedOperationException("Not supported."); } // NOI18N
181183
@Override public Instance getProtectionDomain() { throw new UnsupportedOperationException("Not supported."); } // NOI18N
182-
@Override public List getFields() { throw new UnsupportedOperationException("Not supported."); } // NOI18N
184+
@Override public List<Field> getFields() { throw new UnsupportedOperationException("Not supported."); } // NOI18N
183185
@Override public int getInstanceSize() { throw new UnsupportedOperationException("Not supported."); } // NOI18N
184-
@Override public List getInstances() { throw new UnsupportedOperationException("Not supported."); } // NOI18N
185-
@Override public Iterator getInstancesIterator() { throw new UnsupportedOperationException("Not supported."); } // NOI18N
186+
@Override public List<Instance> getInstances() { throw new UnsupportedOperationException("Not supported."); } // NOI18N
187+
@Override public Iterator<Instance> getInstancesIterator() { throw new UnsupportedOperationException("Not supported."); } // NOI18N
186188
@Override public int getInstancesCount() { throw new UnsupportedOperationException("Not supported."); } // NOI18N
187189
@Override public long getRetainedSizeByClass() { throw new UnsupportedOperationException("Not supported."); } // NOI18N
188190
@Override public long getJavaClassId() { throw new UnsupportedOperationException("Not supported."); } // NOI18N
189191
@Override public String getName() { throw new UnsupportedOperationException("Not supported."); } // NOI18N
190-
@Override public List getStaticFieldValues() { throw new UnsupportedOperationException("Not supported."); } // NOI18N
191-
@Override public Collection getSubClasses() { throw new UnsupportedOperationException("Not supported."); } // NOI18N
192+
@Override public List<FieldValue> getStaticFieldValues() { throw new UnsupportedOperationException("Not supported."); } // NOI18N
193+
@Override public Collection<JavaClass> getSubClasses() { throw new UnsupportedOperationException("Not supported."); } // NOI18N
192194
@Override public JavaClass getSuperClass() { throw new UnsupportedOperationException("Not supported."); } // NOI18N
193195
@Override public Heap getHeap() { throw new UnsupportedOperationException("Not supported."); } // NOI18N
194196

‎visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaArrayItemsProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ protected HeapViewerNode createNode(Integer index) {
9494
}
9595
protected ProgressIterator<Integer> objectsIterator(int index, Progress progress) {
9696
Iterator<Integer> iterator = integerIterator(index, items.size());
97-
return new ProgressIterator(iterator, index, false, progress);
97+
return new ProgressIterator<>(iterator, index, false, progress);
9898
}
9999
protected String getMoreNodesString(String moreNodesCount) {
100100
return Bundle.JavaArrayItemsProvider_MoreNodes(moreNodesCount);
@@ -120,7 +120,7 @@ protected HeapViewerNode createNode(Integer index) {
120120
}
121121
protected ProgressIterator<Integer> objectsIterator(int index, Progress progress) {
122122
Iterator<Integer> iterator = integerIterator(index, items.size());
123-
return new ProgressIterator(iterator, index, false, progress);
123+
return new ProgressIterator<>(iterator, index, false, progress);
124124
}
125125
protected String getMoreNodesString(String moreNodesCount) {
126126
return Bundle.JavaArrayItemsProvider_MoreNodes(moreNodesCount);

‎visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaDiffClassesProvider.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
import org.graalvm.visualvm.heapviewer.ui.UIThresholds;
5252
import org.graalvm.visualvm.heapviewer.utils.NodesComputer;
5353
import org.graalvm.visualvm.heapviewer.utils.ProgressIterator;
54+
import org.graalvm.visualvm.lib.jfluid.heap.Field;
55+
import org.graalvm.visualvm.lib.jfluid.heap.FieldValue;
5456
import org.graalvm.visualvm.lib.jfluid.heap.Heap;
5557
import org.graalvm.visualvm.lib.jfluid.heap.Instance;
5658
import org.graalvm.visualvm.lib.jfluid.heap.JavaClass;
@@ -75,7 +77,7 @@ protected HeapViewerNode createNode(ClassNode javaClass) {
7577
}
7678
protected ProgressIterator<ClassNode> objectsIterator(int index, Progress progress) {
7779
Iterator<ClassNode> iterator = diffClasses.listIterator(index);
78-
return new ProgressIterator(iterator, index, false, progress);
80+
return new ProgressIterator<>(iterator, index, false, progress);
7981
}
8082
protected String getMoreNodesString(String moreNodesCount) {
8183
return JavaClassesProvider.Classes_Messages.getMoreNodesString(moreNodesCount);
@@ -93,8 +95,8 @@ protected String getNodesContainerString(String firstNodeIdx, String lastNodeIdx
9395
}
9496

9597
static HeapViewerNode[] getDiffHeapPackages(HeapViewerNode parent, Heap heap1, List<ClassNode> diffClasses, boolean retained, String viewID, HeapViewerNodeFilter viewFilter, List<DataType> dataTypes, List<SortOrder> sortOrders, Progress progress) throws InterruptedException {
96-
List<HeapViewerNode> nodes = new ArrayList();
97-
Map<String, DiffPackageNode> packages = new HashMap();
98+
List<HeapViewerNode> nodes = new ArrayList<>();
99+
Map<String, DiffPackageNode> packages = new HashMap<>();
98100

99101
Thread worker = Thread.currentThread();
100102

@@ -132,7 +134,7 @@ static List<ClassNode> createDiffClasses(Heap h1, Heap h2, final boolean retaine
132134
DataType.RETAINED_SIZE.computeValuesImmediately(h2);
133135
}
134136

135-
Map<JavaClassID, DiffClassNode> classes = new HashMap();
137+
Map<JavaClassID, DiffClassNode> classes = new HashMap<>();
136138

137139
List<JavaClass> classes1 = h1.getAllClasses();
138140
for (JavaClass jc1 : classes1) {
@@ -158,7 +160,7 @@ static List<ClassNode> createDiffClasses(Heap h1, Heap h2, final boolean retaine
158160
}
159161
}
160162

161-
return new ArrayList(classes.values());
163+
return new ArrayList<>(classes.values());
162164
}
163165

164166
private static class JavaClassID {
@@ -462,7 +464,7 @@ public Instance getProtectionDomain() {
462464
}
463465

464466
@Override
465-
public List getFields() {
467+
public List<Field> getFields() {
466468
return null;
467469
}
468470

@@ -472,12 +474,12 @@ public int getInstanceSize() {
472474
}
473475

474476
@Override
475-
public List getInstances() {
477+
public List<Instance> getInstances() {
476478
return null;
477479
}
478480

479481
@Override
480-
public Iterator getInstancesIterator() {
482+
public Iterator<Instance> getInstancesIterator() {
481483
return null;
482484
}
483485

@@ -502,12 +504,12 @@ public String getName() {
502504
}
503505

504506
@Override
505-
public List getStaticFieldValues() {
507+
public List<FieldValue> getStaticFieldValues() {
506508
return null;
507509
}
508510

509511
@Override
510-
public Collection getSubClasses() {
512+
public Collection<JavaClass> getSubClasses() {
511513
return null;
512514
}
513515

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ protected HeapViewerNode[] computeData(RootNode root, Heap heap, String viewID,
153153

154154
InstancesWrapper wrapper = HeapViewerNode.getValue(_selected, DataType.INSTANCES_WRAPPER, heap);
155155
if (wrapper != null) {
156-
List<HeapViewerNode> fieldNodes = new ArrayList();
156+
List<HeapViewerNode> fieldNodes = new ArrayList<>();
157157

158158
if (cFieldsHisto) {
159159
HeapViewerNode[] histo = getClassFieldsHistogram(wrapper, root, heap, viewID, viewFilter, dataTypes, sortOrders, progress);
@@ -185,7 +185,7 @@ else if (cFieldsHisto && !CCONF_CLASS.equals(objectsView.getCurrentColumnConfigu
185185
} else {
186186
Instance instance = HeapViewerNode.getValue(_selected, DataType.INSTANCE, heap);
187187
if (instance != null) {
188-
List<FieldValue> fields = new ArrayList();
188+
List<FieldValue> fields = new ArrayList<>();
189189

190190
if (iFields) fields.addAll(instance.getFieldValues());
191191
else filtered = true;
@@ -303,7 +303,7 @@ protected HeapViewerNode createNode(Field field) {
303303
return new FieldHistogramNode(field) {
304304
@Override
305305
InterruptibleIterator<Instance> instancesIterator() {
306-
return new InterruptibleIterator(instances.getInstancesIterator());
306+
return new InterruptibleIterator<>(instances.getInstancesIterator());
307307
}
308308
@Override
309309
int instancesCount() {
@@ -313,7 +313,7 @@ int instancesCount() {
313313
}
314314
protected ProgressIterator<Field> objectsIterator(int index, Progress progress) {
315315
Iterator<Field> iterator = fields.listIterator(index);
316-
return new ProgressIterator(iterator, index, false, progress);
316+
return new ProgressIterator<>(iterator, index, false, progress);
317317
}
318318
protected String getMoreNodesString(String moreNodesCount) {
319319
return Bundle.JavaFieldsPlugin_FieldsContainerMoreNodes(moreNodesCount);
@@ -403,7 +403,7 @@ protected HeapViewerNode createNode(InstanceCounter.Record object) {
403403
}
404404
protected ProgressIterator<InstanceCounter.Record> objectsIterator(int index, Progress progress) {
405405
Iterator<InstanceCounter.Record> iterator = values.iterator();
406-
return new ProgressIterator(iterator, index, true, progress);
406+
return new ProgressIterator<>(iterator, index, true, progress);
407407
}
408408
protected String getMoreNodesString(String moreNodesCount) {
409409
return Bundle.JavaFieldsPlugin_FieldHistogramMoreNodes(moreNodesCount);
@@ -562,7 +562,7 @@ protected boolean exclude(Instance instance) {
562562
return value == null || !fieldValue.equals(value.getValue());
563563
}
564564
};
565-
return new ProgressIterator(fieldInstanceIterator, index, true, _progress);
565+
return new ProgressIterator<>(fieldInstanceIterator, index, true, _progress);
566566
}
567567
protected String getMoreNodesString(String moreNodesCount) {
568568
return Bundle.JavaFieldsPlugin_FieldHistogramMoreNodes(moreNodesCount);
@@ -651,7 +651,7 @@ protected boolean exclude(Instance instance) {
651651
return !Objects.equals(_instance, ((ObjectFieldValue)value).getInstance());
652652
}
653653
};
654-
return new ProgressIterator(fieldInstanceIterator, index, true, _progress);
654+
return new ProgressIterator<>(fieldInstanceIterator, index, true, _progress);
655655
}
656656
protected String getMoreNodesString(String moreNodesCount) {
657657
return Bundle.JavaFieldsPlugin_FieldHistogramMoreNodes(moreNodesCount);
@@ -673,7 +673,7 @@ protected String getNodesContainerString(String firstNodeIdx, String lastNodeIdx
673673

674674
// TODO: make JavaClass.getAllInstanceFields() public?
675675
private static List<Field> getAllInstanceFields(JavaClass jclass) {
676-
List<Field> fields = new ArrayList(50);
676+
List<Field> fields = new ArrayList<>(50);
677677

678678
for (JavaClass jcls = jclass; jcls != null; jcls = jcls.getSuperClass()) {
679679
fields.addAll(jcls.getFields());

‎visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaFieldsProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ protected HeapViewerNode createNode(Integer index) {
7878
}
7979
protected ProgressIterator<Integer> objectsIterator(int index, Progress progress) {
8080
Iterator<Integer> iterator = integerIterator(index, fields.size());
81-
return new ProgressIterator(iterator, index, false, progress);
81+
return new ProgressIterator<>(iterator, index, false, progress);
8282
}
8383
protected String getMoreNodesString(String moreNodesCount) {
8484
return Bundle.JavaFieldsProvider_MoreNodes(moreNodesCount);
@@ -142,7 +142,7 @@ static List<FieldValue> getFields(HeapViewerNode parent, Heap heap, boolean inst
142142
if (instance == null) return null;
143143

144144
if (staticFields == instanceFields) {
145-
List<FieldValue> fields = new ArrayList(instance.getFieldValues());
145+
List<FieldValue> fields = new ArrayList<>(instance.getFieldValues());
146146
fields.addAll(instance.getStaticFieldValues());
147147
return fields;
148148
} else if (instanceFields) {

‎visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaHeapFragmentProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class JavaHeapFragmentProvider extends HeapFragment.Provider {
4646
public List<HeapFragment> getFragments(File heapDumpFile, Lookup.Provider heapDumpProject, Heap heap) throws IOException {
4747
if (heap.getJavaClassByName("java.lang.Object") == null) return null; // NOI18N
4848

49-
List<HeapFragment> fragments = new ArrayList();
49+
List<HeapFragment> fragments = new ArrayList<>();
5050
int segments = HeapFactory.getTotalNumberOfSegments(heap);
5151

5252
if (segments == 1) {

0 commit comments

Comments
 (0)