stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6882207: Convert javap to use diamond operator internally

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Andrey Turbanov 2020-12-09 19:20:13 +00:00 committed by Jonathan Gibbons
parent d33a689b96
commit 30de320c01
3 changed files with 7 additions and 7 deletions
src/jdk.jdeps/share/classes/com/sun/tools/javap
CodeWriter.javaConstantWriter.javaJavapTask.java

4
src/jdk.jdeps/share/classes/com/sun/tools/javap/CodeWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -128,7 +128,7 @@ public class CodeWriter extends BasicWriter {
}
// where
Instruction.KindVisitor<Void,Integer> instructionPrinter =
new Instruction.KindVisitor<Void,Integer>() {
new Instruction.KindVisitor<>() {
public Void visitNoOperands(Instruction instr, Integer indent) {
return null;

8
src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -60,7 +60,7 @@ public class ConstantWriter extends BasicWriter {
}
protected void writeConstantPool(ConstantPool constant_pool) {
ConstantPool.Visitor<Integer, Void> v = new ConstantPool.Visitor<Integer,Void>() {
ConstantPool.Visitor<Integer, Void> v = new ConstantPool.Visitor<>() {
public Integer visitClass(CONSTANT_Class_info info, Void p) {
print("#" + info.name_index);
tab();
@ -545,6 +545,6 @@ public class ConstantWriter extends BasicWriter {
return buf.toString();
}
private ClassWriter classWriter;
private Options options;
private final ClassWriter classWriter;
private final Options options;
}

2
src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java

@ -1024,7 +1024,7 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
private Diagnostic<JavaFileObject> createDiagnostic(
final Diagnostic.Kind kind, final String key, final Object... args) {
return new Diagnostic<JavaFileObject>() {
return new Diagnostic<>() {
public Kind getKind() {
return kind;
}