From 30de320c01c7a271a62b431a22c3aa5ebb4d83cf Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <turbanoff@gmail.com>
Date: Wed, 9 Dec 2020 19:20:13 +0000
Subject: [PATCH] 6882207: Convert javap to use diamond operator internally

Reviewed-by: jjg
---
 .../share/classes/com/sun/tools/javap/CodeWriter.java     | 4 ++--
 .../share/classes/com/sun/tools/javap/ConstantWriter.java | 8 ++++----
 .../share/classes/com/sun/tools/javap/JavapTask.java      | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/CodeWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/CodeWriter.java
index 8167d8223ec..f3cd6daa8a6 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/CodeWriter.java
+++ b/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;
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java
index 6ef90081e45..59f8c4e935c 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java
+++ b/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;
 }
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java
index fc511a2e25c..a759bac49a9 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java
+++ b/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;
             }