Skip to content

Commit d5e23b5

Browse files
thurkathurka
committed
some generics warnings fixed
1 parent 5aaaad0 commit d5e23b5

14 files changed

+40
-39
lines changed

‎visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleObjectMergedReferences.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ private HeapViewerNode createObjectNode(O object) {
100100
protected HeapViewerNode[] getNodes(HeapViewerNode parent, String viewID, HeapViewerNodeFilter viewFilter, List<DataType> dataTypes, List<SortOrder> sortOrders, Progress progress) throws InterruptedException {
101101
boolean filtersReferences = filtersReferences();
102102

103-
final Map<Long, Integer> values = new HashMap();
103+
final Map<Long, Integer> values = new HashMap<>();
104104
FieldValue refFV = null;
105105

106106
Iterator<O> objectsI = objectsIterator();
@@ -112,7 +112,7 @@ protected HeapViewerNode[] getNodes(HeapViewerNode parent, String viewID, HeapVi
112112
O object = objectsI.next();
113113
progress.step();
114114
Collection<FieldValue> references = getReferences(object);
115-
Set<Instance> referers = new HashSet();
115+
Set<Instance> referers = new HashSet<>();
116116
if (references.isEmpty()) {
117117
referers.add(null);
118118
} else for (FieldValue reference : references) {

‎visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleObjectsProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ protected String getNodesContainerString(String firstNodeIdx, String lastNodeIdx
325325

326326
public static Set<Instance> getDominatorRoots(List<Instance> searchInstances) {
327327
Set<Instance> dominators = new HashSet(searchInstances);
328-
Set<Instance> removed = new HashSet();
328+
Set<Instance> removed = new HashSet<>();
329329

330330
for (Instance instance : searchInstances) {
331331
if (dominators.contains(instance)) {

‎visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleStackTraces.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ private Collection<StackTrace> getStackTraces() {
235235
}
236236

237237
private Collection<StackTrace> getStackTraces(Heap heap, Instance stackTraces) {
238-
Collection<StackTrace> traces = new ArrayList();
238+
Collection<StackTrace> traces = new ArrayList<>();
239239
JavaClass threadCls = heap.getJavaClassByName(THREAD_FQN);
240240
Collection<JavaClass> allThreadCls = threadCls.getSubClasses();
241241

@@ -302,7 +302,7 @@ private DefaultStackTrace(Instance t, Instance f) {
302302
public synchronized List<Frame> getFrames() {
303303
if (frames == null) {
304304
Instance frame = topFrame;
305-
frames = new ArrayList();
305+
frames = new ArrayList<>();
306306

307307
do {
308308
frames.add(new DefaultFrame(frame));
@@ -386,7 +386,7 @@ private void computeStackTrace(Heap heap, FrameVisitor visitor) {
386386
}
387387

388388
private Map<ThreadObjectGCRoot, Map<Integer, List<JavaFrameGCRoot>>> computeJavaFrameMap(Collection<GCRoot> roots) {
389-
Map<ThreadObjectGCRoot, Map<Integer, List<JavaFrameGCRoot>>> javaFrameMap = new HashMap();
389+
Map<ThreadObjectGCRoot, Map<Integer, List<JavaFrameGCRoot>>> javaFrameMap = new HashMap<>();
390390

391391
for (GCRoot root : roots) {
392392
if (GCRoot.JAVA_FRAME.equals(root.getKind())) {
@@ -397,7 +397,7 @@ private Map<ThreadObjectGCRoot, Map<Integer, List<JavaFrameGCRoot>>> computeJava
397397
List<JavaFrameGCRoot> locals;
398398

399399
if (stackMap == null) {
400-
stackMap = new HashMap();
400+
stackMap = new HashMap<>();
401401
javaFrameMap.put(threadObj, stackMap);
402402
}
403403
locals = stackMap.get(frameNo);
@@ -466,7 +466,7 @@ private synchronized Collection<StackTrace> getStackTraces() {
466466
if (isHotSpotTruffleRuntime() && truffleStackTraces == null) {
467467
FrameVisitor visitor = new FrameVisitor(this, heap, 0);
468468

469-
truffleStackTraces = new ArrayList();
469+
truffleStackTraces = new ArrayList<>();
470470

471471
computeStackTrace(heap, visitor);
472472
}
@@ -481,7 +481,7 @@ private static class HotSpotStackTrace extends StackTrace {
481481

482482
HotSpotStackTrace(Instance t) {
483483
super(t);
484-
frames = new ArrayList();
484+
frames = new ArrayList<>();
485485
}
486486

487487
@Override

‎visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleThreadsProvider.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
@NbBundle.Messages({
6565
"TruffleThreadsProvider_Unknown=<unknown>",
6666
"TruffleThreadsProvider_ThreadNotAvailable=Thread not available",
67+
"# {0} - thread name",
6768
"TruffleThreadsProvider_ThreadNamePrefix=Thread \"{0}\"",
6869
"TruffleThreadsProvider_StackFramePrefix=at",
6970
"TruffleThreadsProvider_LocalObjectPrefix=local object:",
@@ -81,7 +82,7 @@ public TruffleThreadsProvider(L language) {
8182

8283

8384
public HeapViewerNode[] getThreadsObjects(RootNode root, Heap heap, String viewID, HeapViewerNodeFilter viewFilter, List<DataType> dataTypes, List<SortOrder> sortOrders, Progress progress) throws InterruptedException {
84-
List<HeapViewerNode> threadNodes = new ArrayList();
85+
List<HeapViewerNode> threadNodes = new ArrayList<>();
8586

8687
TruffleStackTraces tst = new TruffleStackTraces(heap);
8788
Collection<TruffleStackTraces.StackTrace> threads = tst.getStackTraces();
@@ -94,7 +95,7 @@ public HeapViewerNode[] getThreadsObjects(RootNode root, Heap heap, String viewI
9495
String threadName = Bundle.TruffleThreadsProvider_ThreadNamePrefix(DetailsSupport.getDetailsString(threadInstance));
9596
if (threadName == null /*|| !threadName.startsWith(RUBY_THREAD_NAME_PREFIX)*/) continue;
9697

97-
final List<HeapViewerNode> stackFrameNodes = new ArrayList();
98+
final List<HeapViewerNode> stackFrameNodes = new ArrayList<>();
9899
ThreadNode threadNode = new ThreadNode(threadName, threadInstance) {
99100
protected HeapViewerNode[] computeChildren(RootNode root) {
100101
return stackFrameNodes.toArray(HeapViewerNode.NO_NODES);
@@ -103,7 +104,7 @@ protected HeapViewerNode[] computeChildren(RootNode root) {
103104
threadNodes.add(threadNode);
104105

105106
for (TruffleStackTraces.Frame f : st.getFrames()) {
106-
Set<HeapViewerNode> localObjects = new HashSet();
107+
Set<HeapViewerNode> localObjects = new HashSet<>();
107108
for (FieldValue fv : f.getFieldValues()) {
108109
if (worker.isInterrupted()) throw new InterruptedException();
109110

@@ -117,7 +118,7 @@ protected HeapViewerNode[] computeChildren(RootNode root) {
117118
localObjects.add((HeapViewerNode)language.createLocalObjectNode(object, object.getType()));
118119
} else if (DynamicObject.isDynamicObject(instance)) {
119120
DynamicObject dobj = new DynamicObject(instance);
120-
localObjects.add(new LocalDynamicObjectNode(dobj, dobj.getType()));
121+
localObjects.add(new LocalDynamicObjectNode<>(dobj, dobj.getType()));
121122
} else {
122123
localObjects.add(new LocalObjectNode(instance));
123124
}
@@ -147,7 +148,7 @@ public HeapViewerNode getNodeForURL(URL url, HeapContext context) {
147148
return (HeapViewerNode)language.createObjectNode(object, object.getType());
148149
} else if (DynamicObject.isDynamicObject(instance)) {
149150
DynamicObject dobj = new DynamicObject(instance);
150-
return new LocalDynamicObjectNode(dobj, dobj.getType());
151+
return new LocalDynamicObjectNode<>(dobj, dobj.getType());
151152
} else if (instance != null) {
152153
return new InstanceNode(instance);
153154
} else {
@@ -208,7 +209,7 @@ public String getThreadsHTML(HeapContext context) {
208209
private String printInstance(Instance instance, JavaClass javaClassClass) {
209210
if (language.isLanguageObject(instance)) {
210211
O object = language.createObject(instance);
211-
TruffleObjectNode<O> node = language.createObjectNode(object, object.getType());
212+
TruffleObjectNode<?> node = language.createObjectNode(object, object.getType());
212213
String instanceString = HeapUtils.instanceToHtml(instance, false, javaClassClass);
213214
String type = node.getTypeName();
214215
instanceString = instanceString.replace(">" + instance.getJavaClass().getName() + "#", ">" + HeapUtils.htmlize(type) + "#"); // NOI18N
@@ -217,7 +218,7 @@ private String printInstance(Instance instance, JavaClass javaClassClass) {
217218
return instanceString;
218219
} else if (DynamicObject.isDynamicObject(instance)) {
219220
DynamicObject dobj = new DynamicObject(instance);
220-
TruffleObjectNode<O> node = new DynamicObjectNode(dobj, dobj.getType());
221+
TruffleObjectNode<?> node = new DynamicObjectNode<>(dobj, dobj.getType());
221222
String instanceString = HeapUtils.instanceToHtml(instance, false, javaClassClass);
222223
String type = node.getTypeName();
223224
instanceString = instanceString.replace(">" + instance.getJavaClass().getName() + "#", ">" + HeapUtils.htmlize(type) + "#"); // NOI18N

‎visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/dynamicobject/DynamicObject.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,11 @@ public Instance getInstance() {
9191
}
9292

9393
public List<FieldValue> getReferences() {
94-
List<FieldValue> dynObjRefs = new ArrayList();
94+
List<FieldValue> dynObjRefs = new ArrayList<>();
9595

9696
if (getShape() != null) {
9797
List<Value> refs = instance.getReferences();
98-
Set<Instance> foundRefs = new HashSet();
98+
Set<Instance> foundRefs = new HashSet<>();
9999

100100
for (Value ref : refs) {
101101
Instance instanceRef = ref.getDefiningInstance();
@@ -219,8 +219,8 @@ private void initFields() {
219219
if (propertyMap == null) propertyMap = getValueofFields(instance, "shape", "propertyMap"); // NOI18N
220220
if (propertyMap != null) {
221221
// properties = new ArrayList();
222-
values = new ArrayList();
223-
staticValues = new ArrayList();
222+
values = new ArrayList<>();
223+
staticValues = new ArrayList<>();
224224
boolean hasExtRef = hasField(instance.getJavaClass(), "extRef"); // NOI18N
225225
boolean hasShortNames = hasField(instance.getJavaClass(), "o0"); // NOI18N
226226

@@ -328,7 +328,7 @@ private static List<Instance> getMapValues(Instance propertyMap) {
328328
}
329329

330330
private static List<Instance> getHashMapValues(Instance propertyMap) {
331-
List<Instance> mapValues = new ArrayList();
331+
List<Instance> mapValues = new ArrayList<>();
332332
Object val = propertyMap.getValueOfField("table"); // NOI18N
333333

334334
if (val != null && val instanceof ObjectArrayInstance) {
@@ -348,7 +348,7 @@ private static List<Instance> getHashMapValues(Instance propertyMap) {
348348
}
349349

350350
private static List<Instance> getConsListValues(Instance propertyMap) {
351-
List<Instance> mapValues = new ArrayList();
351+
List<Instance> mapValues = new ArrayList<>();
352352

353353
for (Instance node = propertyMap; node != null; node = (Instance) node.getValueOfField("car")) { // NOI18N
354354
Object value = node.getValueOfField("cdr"); // NOI18N
@@ -361,7 +361,7 @@ private static List<Instance> getConsListValues(Instance propertyMap) {
361361
}
362362

363363
private static List<Instance> getTrieValues(Instance propertyMap) {
364-
List<Instance> mapValues = new ArrayList();
364+
List<Instance> mapValues = new ArrayList<>();
365365
Object root = propertyMap.getValueOfField("root"); // NOI18N
366366

367367
getNodeValues(root, mapValues);

‎visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/dynamicobject/DynamicObjectLanguageHeapFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public abstract class DynamicObjectLanguageHeapFragment<D extends DynamicObject,
4848
protected DynamicObjectLanguageHeapFragment(String ID, String name, String description, TruffleLanguage<D, T, ? extends TruffleLanguageHeapFragment<D, T>> language, Heap heap) {
4949
super(ID, name, description, language, heap);
5050

51-
languageIDsCache = new HashMap();
51+
languageIDsCache = new HashMap<>();
5252
}
5353

5454

‎visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/javascript/JavaScriptHeapFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class JavaScriptHeapFragment extends DynamicObjectLanguageHeapFragment<JavaScrip
7777
JavaClass undefinedClass = heap.getJavaClassByName(JS_UNDEFIED_CLASS_FQN);
7878
undefinedInstance = (Instance)undefinedClass.getValueOfStaticField("instance"); // NOI18N
7979

80-
typesCache = new HashMap();
80+
typesCache = new HashMap<>();
8181
}
8282

8383

‎visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/javascript/JavaScriptObjectProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ protected HeapViewerNode createObjectFieldNode(JavaScriptObject object, String t
8282

8383
@Override
8484
protected Collection<FieldValue> getPropertyItems(JavaScriptObject object, Heap heap) {
85-
List<FieldValue> fields = new ArrayList();
85+
List<FieldValue> fields = new ArrayList<>();
8686

8787
fields.addAll(object.getFieldValues());
8888
fields.addAll(object.getStaticFieldValues());

‎visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/python/PythonObject.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public long getRetainedSize() {
192192

193193
List<FieldValue> getReferences() {
194194
List<Value> refs = instance.getReferences();
195-
List<FieldValue> robjRefs = new ArrayList();
195+
List<FieldValue> robjRefs = new ArrayList<>();
196196

197197
for (Value ref : refs) {
198198
Instance defInstance = ref.getDefiningInstance();
@@ -396,7 +396,7 @@ private List<FieldValue> getSetFields() {
396396
}
397397

398398
private List<FieldValue> getEntriesFromKeywords(ObjectArrayInstance keywords) {
399-
List fields = new ArrayList();
399+
List<FieldValue> fields = new ArrayList<>();
400400

401401
for (Instance keyword : keywords.getValues()) {
402402
if (keyword != null) {
@@ -408,7 +408,7 @@ private List<FieldValue> getEntriesFromKeywords(ObjectArrayInstance keywords) {
408408

409409
private List<FieldValue> getEntriesFromEconomicMapStorage(boolean isSet, Instance economicMapStorage) {
410410
Instance entries;
411-
List fields = new ArrayList();
411+
List<FieldValue> fields = new ArrayList<>();
412412
Instance economicMap = (Instance) economicMapStorage.getValueOfField("map"); // NOI18N
413413
if (economicMap instanceof Instance) {
414414
economicMapStorage = economicMap;
@@ -444,7 +444,7 @@ private List<FieldValue> getEntriesFromEconomicMapStorage(boolean isSet, Instanc
444444
}
445445

446446
private List<FieldValue> getEntriesFromTreeMap(boolean isSet, Instance treeMap) {
447-
List fields = new ArrayList();
447+
List<FieldValue> fields = new ArrayList<>();
448448
Instance rootEntry = (Instance) treeMap.getValueOfField("root"); // NOI18N
449449

450450
getEntries(isSet, rootEntry, fields);

‎visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/r/RObject.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class RObject extends TruffleObject.InstanceBased {
9797
private static Map<String,String> typeMap;
9898

9999
static {
100-
typeMap = new HashMap();
100+
typeMap = new HashMap<>();
101101
for (int i=0; i<typeMaping.length; i+=2) {
102102
typeMap.put(typeMaping[i], typeMaping[i+1]);
103103
}
@@ -336,7 +336,7 @@ TruffleFrame getFrame() {
336336

337337
List<FieldValue> getReferences() {
338338
List<Value> refs = instance.getReferences();
339-
List<FieldValue> robjRefs = new ArrayList();
339+
List<FieldValue> robjRefs = new ArrayList<>();
340340

341341
for (Value ref : refs) {
342342
Instance defInstance = ref.getDefiningInstance();
@@ -515,7 +515,7 @@ private void initData() {
515515

516516
length = 0;
517517
values = new ArrayList();
518-
List<String> nameList = new ArrayList();
518+
List<String> nameList = new ArrayList<>();
519519
for (Instance cdr = pairListInstance;
520520
cdr != null && cdr.getJavaClass().equals(pairListClass);
521521
cdr = (Instance) cdr.getValueOfField("cdr")) { // NOI18N

0 commit comments

Comments
 (0)