# HG changeset patch # User briangoetz # Date 1387400718 18000 # Node ID 3651128c74ebbbbbca63bc9f90293a845f92f706 # Parent 3b3e23e673298007df5b26497dfc616bcf4a93d5 8030244: Update langtools to use Diamond Reviewed-by: darcy diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/source/doctree/AttributeTree.java --- a/langtools/src/share/classes/com/sun/source/doctree/AttributeTree.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/source/doctree/AttributeTree.java Wed Dec 18 16:05:18 2013 -0500 @@ -36,7 +36,7 @@ @jdk.Exported public interface AttributeTree extends DocTree { @jdk.Exported - enum ValueKind { EMPTY, UNQUOTED, SINGLE, DOUBLE }; + enum ValueKind { EMPTY, UNQUOTED, SINGLE, DOUBLE } Name getName(); ValueKind getValueKind(); diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/source/doctree/DocTree.java --- a/langtools/src/share/classes/com/sun/source/doctree/DocTree.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/source/doctree/DocTree.java Wed Dec 18 16:05:18 2013 -0500 @@ -236,7 +236,7 @@ Kind(String tagName) { this.tagName = tagName; } - }; + } /** * Gets the kind of this tree. diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/source/tree/LambdaExpressionTree.java --- a/langtools/src/share/classes/com/sun/source/tree/LambdaExpressionTree.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/source/tree/LambdaExpressionTree.java Wed Dec 18 16:05:18 2013 -0500 @@ -49,7 +49,7 @@ /** enum constant for expression lambdas */ EXPRESSION, /** enum constant for statement lambdas */ - STATEMENT; + STATEMENT } List getParameters(); diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/source/util/TaskEvent.java --- a/langtools/src/share/classes/com/sun/source/util/TaskEvent.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/source/util/TaskEvent.java Wed Dec 18 16:05:18 2013 -0500 @@ -69,7 +69,7 @@ * For events relating to an individual annotation processing round. **/ ANNOTATION_PROCESSING_ROUND - }; + } public TaskEvent(Kind kind) { this(kind, null, null, null); diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/source/util/Trees.java --- a/langtools/src/share/classes/com/sun/source/util/Trees.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/source/util/Trees.java Wed Dec 18 16:05:18 2013 -0500 @@ -82,8 +82,8 @@ ClassLoader cl = arg.getClass().getClassLoader(); Class c = Class.forName("com.sun.tools.javac.api.JavacTrees", false, cl); argType = Class.forName(argType.getName(), false, cl); - Method m = c.getMethod("instance", new Class[] { argType }); - return (Trees) m.invoke(null, new Object[] { arg }); + Method m = c.getMethod("instance", argType); + return (Trees) m.invoke(null, arg); } catch (Throwable e) { throw new AssertionError(e); } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/classfile/AccessFlags.java --- a/langtools/src/share/classes/com/sun/tools/classfile/AccessFlags.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/classfile/AccessFlags.java Wed Dec 18 16:05:18 2013 -0500 @@ -58,7 +58,7 @@ public static final int ACC_ENUM = 0x4000; // class, inner, field public static final int ACC_MANDATED = 0x8000; // class, inner, field, method - public static enum Kind { Class, InnerClass, Field, Method}; + public static enum Kind { Class, InnerClass, Field, Method} AccessFlags(ClassReader cr) throws IOException { this(cr.readUnsignedShort()); @@ -159,7 +159,7 @@ } private static Set getModifiers(int flags, int[] modifierFlags, Kind t) { - Set s = new LinkedHashSet(); + Set s = new LinkedHashSet<>(); for (int m: modifierFlags) { if ((flags & m) != 0) s.add(flagToModifier(m, t)); @@ -168,7 +168,7 @@ } private Set getFlags(int[] expectedFlags, Kind t) { - Set s = new LinkedHashSet(); + Set s = new LinkedHashSet<>(); int f = flags; for (int e: expectedFlags) { if ((f & e) != 0) { diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/classfile/Attribute.java --- a/langtools/src/share/classes/com/sun/tools/classfile/Attribute.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Attribute.java Wed Dec 18 16:05:18 2013 -0500 @@ -90,7 +90,7 @@ try { Class[] constrArgTypes = {ClassReader.class, int.class, int.class}; Constructor constr = attrClass.getDeclaredConstructor(constrArgTypes); - return constr.newInstance(new Object[] { cr, name_index, data.length }); + return constr.newInstance(cr, name_index, data.length); } catch (Throwable t) { reasonForDefaultAttr = t.toString(); // fall through and use DefaultAttribute @@ -107,7 +107,7 @@ } protected void init() { - standardAttributes = new HashMap>(); + standardAttributes = new HashMap<>(); standardAttributes.put(AnnotationDefault, AnnotationDefault_attribute.class); standardAttributes.put(BootstrapMethods, BootstrapMethods_attribute.class); standardAttributes.put(CharacterRangeTable, CharacterRangeTable_attribute.class); diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/classfile/Attributes.java --- a/langtools/src/share/classes/com/sun/tools/classfile/Attributes.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Attributes.java Wed Dec 18 16:05:18 2013 -0500 @@ -38,8 +38,12 @@ * deletion without notice. */ public class Attributes implements Iterable { + + public final Attribute[] attrs; + public final Map map; + Attributes(ClassReader cr) throws IOException { - map = new HashMap(); + map = new HashMap<>(); int attrs_count = cr.readUnsignedShort(); attrs = new Attribute[attrs_count]; for (int i = 0; i < attrs_count; i++) { @@ -55,7 +59,7 @@ public Attributes(ConstantPool constant_pool, Attribute[] attrs) { this.attrs = attrs; - map = new HashMap(); + map = new HashMap<>(); for (Attribute attr : attrs) { try { map.put(attr.getName(constant_pool), attr); @@ -100,7 +104,4 @@ length += a.byteLength(); return length; } - - public final Attribute[] attrs; - public final Map map; } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java --- a/langtools/src/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java Wed Dec 18 16:05:18 2013 -0500 @@ -86,5 +86,5 @@ public final int character_range_start; public final int character_range_end; public final int flags; - }; + } } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/classfile/Dependencies.java --- a/langtools/src/share/classes/com/sun/tools/classfile/Dependencies.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Dependencies.java Wed Dec 18 16:05:18 2013 -0500 @@ -245,7 +245,7 @@ ClassFileReader classFinder, Set rootClassNames, boolean transitiveClosure) throws ClassFileNotFoundException { - final Set results = new HashSet(); + final Set results = new HashSet<>(); Recorder r = new Recorder() { public void addDependency(Dependency d) { results.add(d); @@ -276,7 +276,7 @@ ClassFileReader classFinder, Set rootClassNames, boolean transitiveClosure, Recorder recorder) throws ClassFileNotFoundException { - Set doneClasses = new HashSet(); + Set doneClasses = new HashSet<>(); getFinder(); // ensure initialized getFilter(); // ensure initialized @@ -284,7 +284,7 @@ // Work queue of names of classfiles to be searched. // Entries will be unique, and for classes that do not yet have // dependencies in the results map. - Deque deque = new LinkedList(rootClassNames); + Deque deque = new LinkedList<>(rootClassNames); String className; while ((className = deque.poll()) != null) { @@ -560,7 +560,7 @@ } static abstract class BasicDependencyFinder implements Finder { - private Map locations = new HashMap(); + private Map locations = new HashMap<>(); Location getLocation(String className) { Location l = locations.get(className); @@ -578,7 +578,7 @@ try { constant_pool = classFile.constant_pool; origin = getLocation(classFile.getName()); - deps = new HashSet(); + deps = new HashSet<>(); } catch (ConstantPoolException e) { throw new ClassFileError(e); } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/classfile/Instruction.java --- a/langtools/src/share/classes/com/sun/tools/classfile/Instruction.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Instruction.java Wed Dec 18 16:05:18 2013 -0500 @@ -93,7 +93,7 @@ /** The length, in bytes, of this kind of instruction, or -1 is the * length depends on the specific instruction. */ public final int length; - }; + } /** A utility visitor to help decode the operands of an instruction. * @see Instruction#accept */ diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/classfile/Opcode.java --- a/langtools/src/share/classes/com/sun/tools/classfile/Opcode.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Opcode.java Wed Dec 18 16:05:18 2013 -0500 @@ -468,5 +468,5 @@ /** Standard opcodes. */ STANDARD, /** Legacy support for PicoJava opcodes. */ - PICOJAVA }; + PICOJAVA } } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/classfile/ReferenceFinder.java --- a/langtools/src/share/classes/com/sun/tools/classfile/ReferenceFinder.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/classfile/ReferenceFinder.java Wed Dec 18 16:05:18 2013 -0500 @@ -94,7 +94,7 @@ * @throws ConstantPoolException if an error of the constant pool */ public boolean parse(ClassFile cf) throws ConstantPoolException { - List cprefs = new ArrayList(); + List cprefs = new ArrayList<>(); int index = 1; for (ConstantPool.CPInfo cpInfo : cf.constant_pool.entries()) { if (cpInfo.accept(cpVisitor, cf.constant_pool)) { @@ -108,7 +108,7 @@ } for (Method m : cf.methods) { - Set ids = new HashSet(); + Set ids = new HashSet<>(); Code_attribute c_attr = (Code_attribute) m.attributes.get(Attribute.Code); if (c_attr != null) { for (Instruction instr : c_attr.getInstructions()) { @@ -119,7 +119,7 @@ } } if (ids.size() > 0) { - List refInfos = new ArrayList(ids.size()); + List refInfos = new ArrayList<>(ids.size()); for (int id : ids) { refInfos.add(CPRefInfo.class.cast(cf.constant_pool.get(id))); } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/classfile/Signature.java --- a/langtools/src/share/classes/com/sun/tools/classfile/Signature.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Signature.java Wed Dec 18 16:05:18 2013 -0500 @@ -96,7 +96,7 @@ while (sigp < sig.length() && sig.charAt(sigp) == '^') { sigp++; if (throwsTypes == null) - throwsTypes = new ArrayList(); + throwsTypes = new ArrayList<>(); throwsTypes.add(parseTypeSignature()); } return new MethodType(typeParamTypes, paramTypes, returnType, throwsTypes); @@ -108,7 +108,7 @@ List superinterfaces = null; while (sigp < sig.length()) { if (superinterfaces == null) - superinterfaces = new ArrayList(); + superinterfaces = new ArrayList<>(); superinterfaces.add(parseTypeSignature()); } return new ClassSigType(typeParamTypes, superclass, superinterfaces); @@ -183,7 +183,7 @@ private List parseTypeSignatures(char term) { sigp++; - List types = new ArrayList(); + List types = new ArrayList<>(); while (sig.charAt(sigp) != term) types.add(parseTypeSignature()); sigp++; @@ -229,7 +229,7 @@ private List parseTypeParamTypes() { assert sig.charAt(sigp) == '<'; sigp++; - List types = new ArrayList(); + List types = new ArrayList<>(); while (sig.charAt(sigp) != '>') types.add(parseTypeParamType()); sigp++; @@ -247,7 +247,7 @@ while (sig.charAt(sigp) == ':') { sigp++; if (interfaceBounds == null) - interfaceBounds = new ArrayList(); + interfaceBounds = new ArrayList<>(); interfaceBounds.add(parseTypeSignature()); } return new TypeParamType(name, classBound, interfaceBounds); diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/classfile/Type.java --- a/langtools/src/share/classes/com/sun/tools/classfile/Type.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Type.java Wed Dec 18 16:05:18 2013 -0500 @@ -103,7 +103,7 @@ return primitiveTypes.contains(name); } // where - private static final Set primitiveTypes = new HashSet(Arrays.asList( + private static final Set primitiveTypes = new HashSet<>(Arrays.asList( "boolean", "byte", "char", "double", "float", "int", "long", "short", "void")); @Override @@ -344,7 +344,8 @@ * {@code -} */ public static class WildcardType extends Type { - public enum Kind { UNBOUNDED, EXTENDS, SUPER }; + public enum Kind { UNBOUNDED, EXTENDS, SUPER } + public WildcardType() { this(Kind.UNBOUNDED, null); } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/classfile/TypeAnnotation.java --- a/langtools/src/share/classes/com/sun/tools/classfile/TypeAnnotation.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/classfile/TypeAnnotation.java Wed Dec 18 16:05:18 2013 -0500 @@ -165,7 +165,7 @@ { // Write type path int len = cr.readUnsignedByte(); - List loc = new ArrayList(len); + List loc = new ArrayList<>(len); for (int i = 0; i < len * TypePathEntry.bytesPerEntry; ++i) loc.add(cr.readUnsignedByte()); position.location = Position.getTypePathFromBinary(loc); @@ -342,7 +342,7 @@ // For generic/array types. // TODO: or should we use null? Noone will use this object. - public List location = new ArrayList(0); + public List location = new ArrayList<>(0); // Tree position. public int pos = -1; @@ -498,7 +498,7 @@ * @param list The bytecode representation of the type path. */ public static List getTypePathFromBinary(List list) { - List loc = new ArrayList(list.size() / TypePathEntry.bytesPerEntry); + List loc = new ArrayList<>(list.size() / TypePathEntry.bytesPerEntry); int idx = 0; while (idx < list.size()) { if (idx + 1 == list.size()) { @@ -511,7 +511,7 @@ } public static List getBinaryFromTypePath(List locs) { - List loc = new ArrayList(locs.size() * TypePathEntry.bytesPerEntry); + List loc = new ArrayList<>(locs.size() * TypePathEntry.bytesPerEntry); for (TypePathEntry tpe : locs) { loc.add(tpe.tag.tag); loc.add(tpe.arg); diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Wed Dec 18 16:05:18 2013 -0500 @@ -52,7 +52,7 @@ protected final ConfigurationImpl configuration; protected final SubWriterHolderWriter writer; protected final ClassDoc classdoc; - protected Map typeMap = new LinkedHashMap(); + protected Map typeMap = new LinkedHashMap<>(); protected Set methodTypes = EnumSet.noneOf(MethodTypes.class); private int methodTypesOr = 0; public final boolean nodepr; diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Wed Dec 18 16:05:18 2013 -0500 @@ -103,9 +103,9 @@ super(configuration, filename); this.classdoc = classdoc; if (mapper.classToPackageAnnotations.containsKey(classdoc.qualifiedName())) - pkgToPackageAnnotations = new TreeSet(mapper.classToPackageAnnotations.get(classdoc.qualifiedName())); + pkgToPackageAnnotations = new TreeSet<>(mapper.classToPackageAnnotations.get(classdoc.qualifiedName())); configuration.currentcd = classdoc; - this.pkgSet = new TreeSet(); + this.pkgSet = new TreeSet<>(); this.pkgToClassTypeParameter = pkgDivide(mapper.classToClassTypeParam); this.pkgToClassAnnotations = pkgDivide(mapper.classToClassAnnotations); this.pkgToMethodTypeParameter = pkgDivide(mapper.classToExecMemberDocTypeParam); @@ -177,7 +177,7 @@ } private Map> pkgDivide(Map> classMap) { - Map> map = new HashMap>(); + Map> map = new HashMap<>(); List list= classMap.get(classdoc.qualifiedName()); if (list != null) { Collections.sort(list); @@ -186,7 +186,7 @@ pkgSet.add(pkg); List inPkg = map.get(pkg.name()); if (inPkg == null) { - inPkg = new ArrayList(); + inPkg = new ArrayList<>(); map.put(pkg.name(), inPkg); } inPkg.add(doc); diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Wed Dec 18 16:05:18 2013 -0500 @@ -178,7 +178,7 @@ /** * Collected set of doclint options */ - public Set doclintOpts = new LinkedHashSet(); + public Set doclintOpts = new LinkedHashSet<>(); /** * Unique Resource Handler for this package. @@ -286,7 +286,7 @@ } } if (root.specifiedClasses().length > 0) { - Map map = new HashMap(); + Map map = new HashMap<>(); PackageDoc pd; ClassDoc[] classes = root.classes(); for (ClassDoc aClass : classes) { diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java Wed Dec 18 16:05:18 2013 -0500 @@ -61,7 +61,7 @@ super(writer, classDoc); VisibleMemberMap visibleMemberMap = new VisibleMemberMap(classDoc, VisibleMemberMap.CONSTRUCTORS, configuration); - List constructors = new ArrayList(visibleMemberMap.getMembersFor(classDoc)); + List constructors = new ArrayList<>(visibleMemberMap.getMembersFor(classDoc)); for (ProgramElementDoc constructor : constructors) { if (constructor.isProtected() || constructor.isPrivate()) { setFoundNonPubConstructor(true); diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Wed Dec 18 16:05:18 2013 -0500 @@ -1738,7 +1738,7 @@ return text; } - static final Set blockTags = new HashSet(); + static final Set blockTags = new HashSet<>(); static { for (HtmlTag t: HtmlTag.values()) { if (t.blockType == HtmlTag.BlockType.BLOCK) @@ -1944,7 +1944,7 @@ */ public List getAnnotations(int indent, AnnotationDesc[] descList, boolean linkBreak, boolean isJava5DeclarationLocation) { - List results = new ArrayList(); + List results = new ArrayList<>(); ContentBuilder annotation; for (AnnotationDesc aDesc : descList) { AnnotationTypeDoc annotationDoc = aDesc.annotationType(); @@ -1971,7 +1971,7 @@ if (aDesc.isSynthesized()) { for (AnnotationDesc.ElementValuePair pair : pairs) { AnnotationValue annotationValue = pair.value(); - List annotationTypeValues = new ArrayList(); + List annotationTypeValues = new ArrayList<>(); if (annotationValue.value() instanceof AnnotationValue[]) { AnnotationValue[] annotationArray = (AnnotationValue[]) annotationValue.value(); @@ -1994,7 +1994,7 @@ if (pairs.length == 1 && isAnnotationDocumented) { AnnotationValue[] annotationArray = (AnnotationValue[]) (pairs[0].value()).value(); - List annotationTypeValues = new ArrayList(); + List annotationTypeValues = new ArrayList<>(); annotationTypeValues.addAll(Arrays.asList(annotationArray)); String sep = ""; for (AnnotationValue av : annotationTypeValues) { @@ -2052,7 +2052,7 @@ pairs[j].element(), pairs[j].element().name(), false)); annotation.addContent("="); AnnotationValue annotationValue = pairs[j].value(); - List annotationTypeValues = new ArrayList(); + List annotationTypeValues = new ArrayList<>(); if (annotationValue.value() instanceof AnnotationValue[]) { AnnotationValue[] annotationArray = (AnnotationValue[]) annotationValue.value(); diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Wed Dec 18 16:05:18 2013 -0500 @@ -76,7 +76,7 @@ super(configuration, DocPath.forPackage(packageDoc).resolve(DocPaths.PACKAGE_FRAME)); this.packageDoc = packageDoc; if (configuration.root.specifiedPackages().length == 0) { - documentedClasses = new HashSet(Arrays.asList(configuration.root.classes())); + documentedClasses = new HashSet<>(Arrays.asList(configuration.root.classes())); } } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Wed Dec 18 16:05:18 2013 -0500 @@ -47,7 +47,7 @@ public class PackageUseWriter extends SubWriterHolderWriter { final PackageDoc pkgdoc; - final SortedMap> usingPackageToUsedClasses = new TreeMap>(); + final SortedMap> usingPackageToUsedClasses = new TreeMap<>(); /** * Constructor. @@ -73,7 +73,7 @@ Set usedClasses = usingPackageToUsedClasses .get(usingPackage.name()); if (usedClasses == null) { - usedClasses = new TreeSet(); + usedClasses = new TreeSet<>(); usingPackageToUsedClasses.put(Util.getPackageName(usingPackage), usedClasses); } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/ContentBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/ContentBuilder.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/ContentBuilder.java Wed Dec 18 16:05:18 2013 -0500 @@ -90,6 +90,6 @@ private void ensureMutableContents() { if (contents.isEmpty()) - contents = new ArrayList(); + contents = new ArrayList<>(); } } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java Wed Dec 18 16:05:18 2013 -0500 @@ -54,7 +54,7 @@ * @param htmlTree HTML tree of the document */ public HtmlDocument(Content docType, Content docComment, Content htmlTree) { - docContent = new ArrayList(); + docContent = new ArrayList<>(); addContent(nullCheck(docType)); addContent(nullCheck(docComment)); addContent(nullCheck(htmlTree)); @@ -67,7 +67,7 @@ * @param htmlTree HTML tree of the document */ public HtmlDocument(Content docType, Content htmlTree) { - docContent = new ArrayList(); + docContent = new ArrayList<>(); addContent(nullCheck(docType)); addContent(nullCheck(htmlTree)); } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java Wed Dec 18 16:05:18 2013 -0500 @@ -98,5 +98,5 @@ typeNameLabel, typeNameLink, typeSummary, - useSummary; + useSummary } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java Wed Dec 18 16:05:18 2013 -0500 @@ -99,7 +99,7 @@ public static enum BlockType { BLOCK, INLINE, - OTHER; + OTHER } /** @@ -107,7 +107,7 @@ */ public static enum EndTag { END, - NOEND; + NOEND } HtmlTag() { diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java Wed Dec 18 16:05:18 2013 -0500 @@ -79,7 +79,7 @@ */ public void addAttr(HtmlAttr attrName, String attrValue) { if (attrs.isEmpty()) - attrs = new LinkedHashMap(3); + attrs = new LinkedHashMap<>(3); attrs.put(nullCheck(attrName), escapeHtmlChars(attrValue)); } @@ -109,7 +109,7 @@ } else if (tagContent == HtmlTree.EMPTY || tagContent.isValid()) { if (content.isEmpty()) - content = new ArrayList(); + content = new ArrayList<>(); content.add(tagContent); } } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java Wed Dec 18 16:05:18 2013 -0500 @@ -95,7 +95,7 @@ return rawHtmlContent; } - private enum State { TEXT, ENTITY, TAG, STRING }; + private enum State { TEXT, ENTITY, TAG, STRING } @Override public int charCount() { diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Wed Dec 18 16:05:18 2013 -0500 @@ -307,8 +307,8 @@ message = new MessageRetriever(this, "com.sun.tools.doclets.internal.toolkit.resources.doclets"); - excludedDocFileDirs = new HashSet(); - excludedQualifiers = new HashSet(); + excludedDocFileDirs = new HashSet<>(); + excludedQualifiers = new HashSet<>(); setTabWidth(DocletConstants.DEFAULT_TAB_STOP_LENGTH); } @@ -392,10 +392,9 @@ // Group the packages to be documented by the lowest profile (if any) // in which each appears - Map> interimResults = - new EnumMap>(Profile.class); + Map> interimResults = new EnumMap<>(Profile.class); for (Profile p: Profile.values()) - interimResults.put(p, new ArrayList()); + interimResults.put(p, new ArrayList<>()); for (PackageDoc pkg: packages) { if (nodeprecated && Util.isDeprecated(pkg)) { @@ -412,7 +411,7 @@ } // Build the profilePackages structure used by the doclet - profilePackages = new HashMap(); + profilePackages = new HashMap<>(); List prev = Collections.emptyList(); int size; for (Map.Entry> e: interimResults.entrySet()) { @@ -434,11 +433,11 @@ } private void initPackageArray() { - Set set = new HashSet(Arrays.asList(root.specifiedPackages())); + Set set = new HashSet<>(Arrays.asList(root.specifiedPackages())); for (ClassDoc aClass : root.specifiedClasses()) { set.add(aClass.containingPackage()); } - ArrayList results = new ArrayList(set); + ArrayList results = new ArrayList<>(set); Collections.sort(results); packages = results.toArray(new PackageDoc[] {}); } @@ -449,7 +448,7 @@ * @param options the two dimensional array of options. */ public void setOptions(String[][] options) throws Fault { - LinkedHashSet customTagStrs = new LinkedHashSet(); + LinkedHashSet customTagStrs = new LinkedHashSet<>(); // Some options, specifically -link and -linkoffline, require that // the output directory has already been created: so do that first. @@ -629,7 +628,7 @@ * @return an array of tokens. */ private String[] tokenize(String s, char separator, int maxTokens) { - List tokens = new ArrayList(); + List tokens = new ArrayList<>(); StringBuilder token = new StringBuilder (); boolean prevIsEscapeChar = false; for (int i = 0; i < s.length(); i += Character.charCount(i)) { diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeFieldBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeFieldBuilder.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeFieldBuilder.java Wed Dec 18 16:05:18 2013 -0500 @@ -87,8 +87,7 @@ this.writer = writer; this.visibleMemberMap = new VisibleMemberMap(classDoc, memberType, configuration); - this.members = new ArrayList( - this.visibleMemberMap.getMembersFor(classDoc)); + this.members = new ArrayList<>(this.visibleMemberMap.getMembersFor(classDoc)); if (configuration.getMemberComparator() != null) { Collections.sort(this.members, configuration.getMemberComparator()); } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java Wed Dec 18 16:05:18 2013 -0500 @@ -87,8 +87,7 @@ this.writer = writer; this.visibleMemberMap = new VisibleMemberMap(classDoc, memberType, configuration); - this.members = new ArrayList( - this.visibleMemberMap.getMembersFor(classDoc)); + this.members = new ArrayList<>(this.visibleMemberMap.getMembersFor(classDoc)); if (configuration.getMemberComparator() != null) { Collections.sort(this.members, configuration.getMemberComparator()); } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java Wed Dec 18 16:05:18 2013 -0500 @@ -68,7 +68,7 @@ this.configuration = configuration; this.writerFactory = configuration.getWriterFactory(); - Set containingPackagesSeen = new HashSet(); + Set containingPackagesSeen = new HashSet<>(); context = new AbstractBuilder.Context(configuration, containingPackagesSeen, LayoutParser.getInstance(configuration)); } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java Wed Dec 18 16:05:18 2013 -0500 @@ -97,7 +97,7 @@ ConstantsSummaryWriter writer) { super(context); this.writer = writer; - this.classDocsWithConstFields = new HashSet(); + this.classDocsWithConstFields = new HashSet<>(); } /** @@ -151,7 +151,7 @@ */ public void buildContents(XMLNode node, Content contentTree) { Content contentListTree = writer.getContentsHeader(); - printedPackageHeaders = new HashSet(); + printedPackageHeaders = new HashSet<>(); for (PackageDoc pkg : configuration.packages) { if (hasConstantField(pkg) && !hasPrintedPackageIndex(pkg.name())) { writer.addLinkToPackageContent(pkg, @@ -169,7 +169,7 @@ * @param contentTree the tree to which the summaries will be added */ public void buildConstantSummaries(XMLNode node, Content contentTree) { - printedPackageHeaders = new HashSet(); + printedPackageHeaders = new HashSet<>(); Content summariesTree = writer.getConstantSummaries(); for (PackageDoc aPackage : configuration.packages) { if (hasConstantField(aPackage)) { @@ -331,7 +331,7 @@ * will be added */ protected void buildMembersSummary(XMLNode node, Content classConstantTree) { - List members = new ArrayList(members()); + List members = new ArrayList<>(members()); if (members.size() > 0) { Collections.sort(members); writer.addConstantMembers(classdoc, members, classConstantTree); @@ -352,7 +352,7 @@ } else { return null; } - List inclList = new LinkedList(); + List inclList = new LinkedList<>(); FieldDoc member; while(iter.hasNext()){ member = (FieldDoc)iter.next(); diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java Wed Dec 18 16:05:18 2013 -0500 @@ -94,8 +94,7 @@ classDoc, VisibleMemberMap.CONSTRUCTORS, configuration); - constructors = - new ArrayList(visibleMemberMap.getMembersFor(classDoc)); + constructors = new ArrayList<>(visibleMemberMap.getMembersFor(classDoc)); for (ProgramElementDoc constructor : constructors) { if (constructor.isProtected() || constructor.isPrivate()) { writer.setFoundNonPubConstructor(true); diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java Wed Dec 18 16:05:18 2013 -0500 @@ -88,8 +88,7 @@ classDoc, VisibleMemberMap.ENUM_CONSTANTS, configuration); - enumConstants = - new ArrayList(visibleMemberMap.getMembersFor(classDoc)); + enumConstants = new ArrayList<>(visibleMemberMap.getMembersFor(classDoc)); if (configuration.getMemberComparator() != null) { Collections.sort(enumConstants, configuration.getMemberComparator()); } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java Wed Dec 18 16:05:18 2013 -0500 @@ -89,9 +89,7 @@ classDoc, VisibleMemberMap.FIELDS, configuration); - fields = - new ArrayList(visibleMemberMap.getLeafClassMembers( - configuration)); + fields = new ArrayList<>(visibleMemberMap.getLeafClassMembers(configuration)); if (configuration.getMemberComparator() != null) { Collections.sort(fields, configuration.getMemberComparator()); } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java Wed Dec 18 16:05:18 2013 -0500 @@ -60,7 +60,7 @@ private boolean isParsing; private LayoutParser(Configuration configuration) { - xmlElementsMap = new HashMap(); + xmlElementsMap = new HashMap<>(); this.configuration = configuration; } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java Wed Dec 18 16:05:18 2013 -0500 @@ -330,11 +330,11 @@ */ private void buildSummary(MemberSummaryWriter writer, VisibleMemberMap visibleMemberMap, LinkedList summaryTreeList) { - List members = new ArrayList(visibleMemberMap.getLeafClassMembers( + List members = new ArrayList<>(visibleMemberMap.getLeafClassMembers( configuration)); if (members.size() > 0) { Collections.sort(members); - List tableContents = new LinkedList(); + List tableContents = new LinkedList<>(); for (int i = 0; i < members.size(); i++) { ProgramElementDoc member = members.get(i); final ProgramElementDoc propertyDoc = @@ -400,7 +400,7 @@ commentTextBuilder.append(propertyDoc.commentText()); // copy certain tags - List allTags = new LinkedList(); + List allTags = new LinkedList<>(); String[] tagNames = {"@defaultValue", "@since"}; for (String tagName: tagNames) { Tag[] tags = propertyDoc.tags(tagName); @@ -514,7 +514,7 @@ private void addSummary(MemberSummaryWriter writer, VisibleMemberMap visibleMemberMap, boolean showInheritedSummary, Content memberSummaryTree) { - LinkedList summaryTreeList = new LinkedList(); + LinkedList summaryTreeList = new LinkedList<>(); buildSummary(writer, visibleMemberMap, summaryTreeList); if (showInheritedSummary) buildInheritedSummary(writer, visibleMemberMap, summaryTreeList); diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java Wed Dec 18 16:05:18 2013 -0500 @@ -90,8 +90,7 @@ VisibleMemberMap.METHODS, configuration); methods = - new ArrayList(visibleMemberMap.getLeafClassMembers( - configuration)); + new ArrayList<>(visibleMemberMap.getLeafClassMembers(configuration)); if (configuration.getMemberComparator() != null) { Collections.sort(methods, configuration.getMemberComparator()); } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PropertyBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PropertyBuilder.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PropertyBuilder.java Wed Dec 18 16:05:18 2013 -0500 @@ -90,7 +90,7 @@ VisibleMemberMap.PROPERTIES, configuration); properties = - new ArrayList(visibleMemberMap.getMembersFor(classDoc)); + new ArrayList<>(visibleMemberMap.getMembersFor(classDoc)); if (configuration.getMemberComparator() != null) { Collections.sort(properties, configuration.getMemberComparator()); } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java Wed Dec 18 16:05:18 2013 -0500 @@ -42,8 +42,8 @@ XMLNode(XMLNode parent, String qname) { this.parent = parent; name = qname; - attrs = new HashMap(); - children = new ArrayList(); + attrs = new HashMap<>(); + children = new ArrayList<>(); if (parent != null) parent.children.add(this); diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java Wed Dec 18 16:05:18 2013 -0500 @@ -63,7 +63,7 @@ if (params == null) { return null; } - HashMap result = new HashMap(); + HashMap result = new HashMap<>(); for (int i = 0; i < params.length; i++) { String name = params[i] instanceof Parameter ? ((Parameter) params[i]).name() : @@ -195,7 +195,7 @@ private Content getTagletOutput(boolean isNonTypeParams, Doc holder, TagletWriter writer, Object[] formalParameters, ParamTag[] paramTags) { Content result = writer.getOutputInstance(); - Set alreadyDocumented = new HashSet(); + Set alreadyDocumented = new HashSet<>(); if (paramTags.length > 0) { result.addContent( processParamTags(isNonTypeParams, paramTags, diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java Wed Dec 18 16:05:18 2013 -0500 @@ -173,12 +173,12 @@ public TagletManager(boolean nosince, boolean showversion, boolean showauthor, boolean javafx, MessageRetriever message) { - overridenStandardTags = new HashSet(); - potentiallyConflictingTags = new HashSet(); - standardTags = new HashSet(); - standardTagsLowercase = new HashSet(); - unseenCustomTags = new HashSet(); - customTags = new LinkedHashMap(); + overridenStandardTags = new HashSet<>(); + potentiallyConflictingTags = new HashSet<>(); + standardTags = new HashSet<>(); + standardTagsLowercase = new HashSet<>(); + unseenCustomTags = new HashSet<>(); + customTags = new LinkedHashMap<>(); this.nosince = nosince; this.showversion = showversion; this.showauthor = showauthor; @@ -235,11 +235,11 @@ customTagClass = tagClassLoader.loadClass(classname); Method meth = customTagClass.getMethod("register", - new Class[] {java.util.Map.class}); + Map.class); Object[] list = customTags.values().toArray(); Taglet lastTag = (list != null && list.length > 0) ? (Taglet) list[list.length-1] : null; - meth.invoke(null, new Object[] {customTags}); + meth.invoke(null, customTags); list = customTags.values().toArray(); Object newLastTag = (list != null&& list.length > 0) ? list[list.length-1] : null; @@ -276,7 +276,7 @@ * @return the resulting array of directory and JAR file URLs */ private URL[] pathToURLs(String path) { - Set urls = new LinkedHashSet(); + Set urls = new LinkedHashSet<>(); for (String s: path.split(File.pathSeparator)) { if (s.isEmpty()) continue; try { @@ -414,7 +414,7 @@ * @param holderType the type of documentation that the misused tag was found in. */ private void printTagMisuseWarn(Taglet taglet, Tag tag, String holderType) { - Set locationsSet = new LinkedHashSet(); + Set locationsSet = new LinkedHashSet<>(); if (taglet.inOverview()) { locationsSet.add("overview"); } @@ -582,14 +582,14 @@ */ private void initCustomTagletArrays() { Iterator it = customTags.values().iterator(); - ArrayList pTags = new ArrayList(customTags.size()); - ArrayList tTags = new ArrayList(customTags.size()); - ArrayList fTags = new ArrayList(customTags.size()); - ArrayList cTags = new ArrayList(customTags.size()); - ArrayList mTags = new ArrayList(customTags.size()); - ArrayList iTags = new ArrayList(customTags.size()); - ArrayList oTags = new ArrayList(customTags.size()); - ArrayList sTags = new ArrayList(); + ArrayList pTags = new ArrayList<>(customTags.size()); + ArrayList tTags = new ArrayList<>(customTags.size()); + ArrayList fTags = new ArrayList<>(customTags.size()); + ArrayList cTags = new ArrayList<>(customTags.size()); + ArrayList mTags = new ArrayList<>(customTags.size()); + ArrayList iTags = new ArrayList<>(customTags.size()); + ArrayList oTags = new ArrayList<>(customTags.size()); + ArrayList sTags = new ArrayList<>(); Taglet current; while (it.hasNext()) { current = it.next(); diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java Wed Dec 18 16:05:18 2013 -0500 @@ -113,7 +113,7 @@ TagletWriter writer) { Content result = writer.getOutputInstance(); if (holder instanceof MethodDoc) { - Set declaredExceptionTags = new LinkedHashSet(); + Set declaredExceptionTags = new LinkedHashSet<>(); for (Type declaredExceptionType : declaredExceptionTypes) { DocFinder.Output inheritedDoc = DocFinder.search(new DocFinder.Input((MethodDoc) holder, this, @@ -139,7 +139,7 @@ ExecutableMemberDoc execHolder = (ExecutableMemberDoc) holder; ThrowsTag[] tags = execHolder.throwsTags(); Content result = writer.getOutputInstance(); - HashSet alreadyDocumented = new HashSet(); + HashSet alreadyDocumented = new HashSet<>(); if (tags.length > 0) { result.addContent(throwsTagsOutput( execHolder.throwsTags(), writer, alreadyDocumented, true)); diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java Wed Dec 18 16:05:18 2013 -0500 @@ -114,14 +114,14 @@ } private void init() { - allClasses = new HashMap>(); - ordinaryClasses = new HashMap>(); - exceptions = new HashMap>(); - enums = new HashMap>(); - annotationTypes = new HashMap>(); - errors = new HashMap>(); - interfaces = new HashMap>(); - packageSet = new HashSet(); + allClasses = new HashMap<>(); + ordinaryClasses = new HashMap<>(); + exceptions = new HashMap<>(); + enums = new HashMap<>(); + annotationTypes = new HashMap<>(); + errors = new HashMap<>(); + interfaces = new HashMap<>(); + packageSet = new HashSet<>(); } /** @@ -166,7 +166,7 @@ Set s = map.get(key); if (s == null) { packageSet.add(key); - s = new HashSet(); + s = new HashSet<>(); } s.add(classdoc); map.put(key, s); diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java Wed Dec 18 16:05:18 2013 -0500 @@ -51,35 +51,35 @@ * List of baseclasses. Contains only java.lang.Object. Can be used to get * the mapped listing of sub-classes. */ - private List baseclasses = new ArrayList(); + private List baseclasses = new ArrayList<>(); /** * Mapping for each Class with their SubClasses */ - private Map> subclasses = new HashMap>(); + private Map> subclasses = new HashMap<>(); /** * List of base-interfaces. Contains list of all the interfaces who do not * have super-interfaces. Can be used to get the mapped listing of * sub-interfaces. */ - private List baseinterfaces = new ArrayList(); + private List baseinterfaces = new ArrayList<>(); /** * Mapping for each Interface with their SubInterfaces */ - private Map> subinterfaces = new HashMap>(); + private Map> subinterfaces = new HashMap<>(); - private List baseEnums = new ArrayList(); - private Map> subEnums = new HashMap>(); + private List baseEnums = new ArrayList<>(); + private Map> subEnums = new HashMap<>(); - private List baseAnnotationTypes = new ArrayList(); - private Map> subAnnotationTypes = new HashMap>(); + private List baseAnnotationTypes = new ArrayList<>(); + private Map> subAnnotationTypes = new HashMap<>(); /** * Mapping for each Interface with classes who implement it. */ - private Map> implementingclasses = new HashMap>(); + private Map> implementingclasses = new HashMap<>(); /** * Constructor. Build the Tree using the Root of this Javadoc run. @@ -234,7 +234,7 @@ private boolean add(Map> map, ClassDoc superclass, ClassDoc cd) { List list = map.get(superclass); if (list == null) { - list = new ArrayList(); + list = new ArrayList<>(); map.put(superclass, list); } if (list.contains(cd)) { @@ -256,7 +256,7 @@ private List get(Map> map, ClassDoc cd) { List list = map.get(cd); if (list == null) { - return new ArrayList(); + return new ArrayList<>(); } return list; } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java Wed Dec 18 16:05:18 2013 -0500 @@ -48,138 +48,138 @@ * Mapping of ClassDocs to set of PackageDoc used by that class. * Entries may be null. */ - public Map> classToPackage = new HashMap>(); + public Map> classToPackage = new HashMap<>(); /** * Mapping of Annotations to set of PackageDoc that use the annotation. */ - public Map> classToPackageAnnotations = new HashMap>(); + public Map> classToPackageAnnotations = new HashMap<>(); /** * Mapping of ClassDocs to set of ClassDoc used by that class. * Entries may be null. */ - public Map> classToClass = new HashMap>(); + public Map> classToClass = new HashMap<>(); /** * Mapping of ClassDocs to list of ClassDoc which are direct or * indirect subclasses of that class. * Entries may be null. */ - public Map> classToSubclass = new HashMap>(); + public Map> classToSubclass = new HashMap<>(); /** * Mapping of ClassDocs to list of ClassDoc which are direct or * indirect subinterfaces of that interface. * Entries may be null. */ - public Map> classToSubinterface = new HashMap>(); + public Map> classToSubinterface = new HashMap<>(); /** * Mapping of ClassDocs to list of ClassDoc which implement * this interface. * Entries may be null. */ - public Map> classToImplementingClass = new HashMap>(); + public Map> classToImplementingClass = new HashMap<>(); /** * Mapping of ClassDocs to list of FieldDoc declared as that class. * Entries may be null. */ - public Map> classToField = new HashMap>(); + public Map> classToField = new HashMap<>(); /** * Mapping of ClassDocs to list of MethodDoc returning that class. * Entries may be null. */ - public Map> classToMethodReturn = new HashMap>(); + public Map> classToMethodReturn = new HashMap<>(); /** * Mapping of ClassDocs to list of MethodDoc having that class * as an arg. * Entries may be null. */ - public Map> classToMethodArgs = new HashMap>(); + public Map> classToMethodArgs = new HashMap<>(); /** * Mapping of ClassDocs to list of MethodDoc which throws that class. * Entries may be null. */ - public Map> classToMethodThrows = new HashMap>(); + public Map> classToMethodThrows = new HashMap<>(); /** * Mapping of ClassDocs to list of ConstructorDoc having that class * as an arg. * Entries may be null. */ - public Map> classToConstructorArgs = new HashMap>(); + public Map> classToConstructorArgs = new HashMap<>(); /** * Mapping of ClassDocs to list of ConstructorDoc which throws that class. * Entries may be null. */ - public Map> classToConstructorThrows = new HashMap>(); + public Map> classToConstructorThrows = new HashMap<>(); /** * The mapping of AnnotationTypeDocs to constructors that use them. */ - public Map> classToConstructorAnnotations = new HashMap>(); + public Map> classToConstructorAnnotations = new HashMap<>(); /** * The mapping of AnnotationTypeDocs to Constructor parameters that use them. */ - public Map> classToConstructorParamAnnotation = new HashMap>(); + public Map> classToConstructorParamAnnotation = new HashMap<>(); /** * The mapping of ClassDocs to Constructor arguments that use them as type parameters. */ - public Map> classToConstructorDocArgTypeParam = new HashMap>(); + public Map> classToConstructorDocArgTypeParam = new HashMap<>(); /** * The mapping of ClassDocs to ClassDocs that use them as type parameters. */ - public Map> classToClassTypeParam = new HashMap>(); + public Map> classToClassTypeParam = new HashMap<>(); /** * The mapping of AnnotationTypeDocs to ClassDocs that use them. */ - public Map> classToClassAnnotations = new HashMap>(); + public Map> classToClassAnnotations = new HashMap<>(); /** * The mapping of ClassDocs to ExecutableMemberDocs that use them as type parameters. */ - public Map> classToExecMemberDocTypeParam = new HashMap>(); + public Map> classToExecMemberDocTypeParam = new HashMap<>(); /** * The mapping of ClassDocs to ExecutableMemberDocs arguments that use them as type parameters. */ - public Map> classToExecMemberDocArgTypeParam = new HashMap>(); + public Map> classToExecMemberDocArgTypeParam = new HashMap<>(); /** * The mapping of AnnotationTypeDocs to ExecutableMemberDocs that use them. */ - public Map> classToExecMemberDocAnnotations = new HashMap>(); + public Map> classToExecMemberDocAnnotations = new HashMap<>(); /** * The mapping of ClassDocs to ExecutableMemberDocs that have return type * with type parameters of that class. */ - public Map> classToExecMemberDocReturnTypeParam = new HashMap>(); + public Map> classToExecMemberDocReturnTypeParam = new HashMap<>(); /** * The mapping of AnnotationTypeDocs to MethodDoc parameters that use them. */ - public Map> classToExecMemberDocParamAnnotation = new HashMap>(); + public Map> classToExecMemberDocParamAnnotation = new HashMap<>(); /** * The mapping of ClassDocs to FieldDocs that use them as type parameters. */ - public Map> classToFieldDocTypeParam = new HashMap>(); + public Map> classToFieldDocTypeParam = new HashMap<>(); /** * The mapping of AnnotationTypeDocs to FieldDocs that use them. */ - public Map> annotationToFieldDoc = new HashMap>(); + public Map> annotationToFieldDoc = new HashMap<>(); public ClassUseMapper(RootDoc root, ClassTree classtree) { @@ -234,7 +234,7 @@ private Collection subclasses(ClassDoc cd) { Collection ret = classToSubclass.get(cd.qualifiedName()); if (ret == null) { - ret = new TreeSet(); + ret = new TreeSet<>(); List subs = classtree.subclasses(cd); if (subs != null) { ret.addAll(subs); @@ -253,7 +253,7 @@ private Collection subinterfaces(ClassDoc cd) { Collection ret = classToSubinterface.get(cd.qualifiedName()); if (ret == null) { - ret = new TreeSet(); + ret = new TreeSet<>(); List subs = classtree.subinterfaces(cd); if (subs != null) { ret.addAll(subs); @@ -275,7 +275,7 @@ private Collection implementingClasses(ClassDoc cd) { Collection ret = classToImplementingClass.get(cd.qualifiedName()); if (ret == null) { - ret = new TreeSet(); + ret = new TreeSet<>(); List impl = classtree.implementingclasses(cd); if (impl != null) { ret.addAll(impl); @@ -297,7 +297,7 @@ */ private void mapExecutable(ExecutableMemberDoc em) { boolean isConstructor = em.isConstructor(); - List classArgs = new ArrayList(); + List classArgs = new ArrayList<>(); for (Parameter param : em.parameters()) { Type pcd = param.type(); // primitives don't get mapped, also avoid dups @@ -326,8 +326,7 @@ private List refList(Map> map, ClassDoc cd) { List list = map.get(cd.qualifiedName()); if (list == null) { - List l = new ArrayList(); - list = l; + list = new ArrayList<>(); map.put(cd.qualifiedName(), list); } return list; @@ -336,7 +335,7 @@ private Set packageSet(ClassDoc cd) { Set pkgSet = classToPackage.get(cd.qualifiedName()); if (pkgSet == null) { - pkgSet = new TreeSet(); + pkgSet = new TreeSet<>(); classToPackage.put(cd.qualifiedName(), pkgSet); } return pkgSet; @@ -345,8 +344,7 @@ private Set classSet(ClassDoc cd) { Set clsSet = classToClass.get(cd.qualifiedName()); if (clsSet == null) { - Set s = new TreeSet(); - clsSet = s; + clsSet = new TreeSet<>(); classToClass.put(cd.qualifiedName(), clsSet); } return clsSet; diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java Wed Dec 18 16:05:18 2013 -0500 @@ -69,9 +69,9 @@ * @param configuration the current configuration of the doclet */ public DeprecatedAPIListBuilder(Configuration configuration) { - deprecatedLists = new ArrayList>(); + deprecatedLists = new ArrayList<>(); for (int i = 0; i < NUM_TYPES; i++) { - deprecatedLists.add(i, new ArrayList()); + deprecatedLists.add(i, new ArrayList<>()); } buildDeprecatedAPIInfo(configuration); } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFileFactory.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFileFactory.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFileFactory.java Wed Dec 18 16:05:18 2013 -0500 @@ -46,8 +46,7 @@ * @since 1.8 */ abstract class DocFileFactory { - private static final Map factories = - new WeakHashMap(); + private static final Map factories = new WeakHashMap<>(); /** * Get the appropriate factory, based on the file manager given in the diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java Wed Dec 18 16:05:18 2013 -0500 @@ -171,7 +171,7 @@ * subclass of IOException. This subclass of DocFinder.Output allows * multiple tag inheritence. */ - public List tagList = new ArrayList(); + public List tagList = new ArrayList<>(); } /** diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java Wed Dec 18 16:05:18 2013 -0500 @@ -68,7 +68,7 @@ public static final DocPath INDEX_FILES = DocPath.create("index-files"); /** Generate the name of one of the files in the split index. */ - public static final DocPath indexN(int n) { + public static DocPath indexN(int n) { return DocPath.create("index-" + n + ".html"); } @@ -88,22 +88,22 @@ public static final DocPath PACKAGE_FRAME = DocPath.create("package-frame.html"); /** The name of the file for the profile frame. */ - public static final DocPath profileFrame(String profileName) { + public static DocPath profileFrame(String profileName) { return DocPath.create(profileName + "-frame.html"); } /** The name of the file for the profile package frame. */ - public static final DocPath profilePackageFrame(String profileName) { + public static DocPath profilePackageFrame(String profileName) { return DocPath.create(profileName + "-package-frame.html"); } /** The name of the file for the profile package summary. */ - public static final DocPath profilePackageSummary(String profileName) { + public static DocPath profilePackageSummary(String profileName) { return DocPath.create(profileName + "-package-summary.html"); } /** The name of the file for the profile summary. */ - public static final DocPath profileSummary(String profileName) { + public static DocPath profileSummary(String profileName) { return DocPath.create(profileName + "-summary.html"); } diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java Wed Dec 18 16:05:18 2013 -0500 @@ -104,7 +104,7 @@ this.path = path; this.relative = relative; if (packageToItemMap == null) { - packageToItemMap = new HashMap(); + packageToItemMap = new HashMap<>(); } if (!packageToItemMap.containsKey(packageName)) { // save the previous packageToItemMap.put(packageName, this); // mapped location diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java Wed Dec 18 16:05:18 2013 -0500 @@ -61,24 +61,24 @@ /** * Map of regular expressions with the corresponding group name. */ - private Map regExpGroupMap = new HashMap(); + private Map regExpGroupMap = new HashMap<>(); /** * List of regular expressions sorted according to the length. Regular * expression with longest length will be first in the sorted order. */ - private List sortedRegExpList = new ArrayList(); + private List sortedRegExpList = new ArrayList<>(); /** * List of group names in the same order as given on the command line. */ - private List groupList = new ArrayList(); + private List groupList = new ArrayList<>(); /** * Map of non-regular expressions(possible package names) with the * corresponding group name. */ - private Map pkgNameGroupMap = new HashMap(); + private Map pkgNameGroupMap = new HashMap<>(); /** * The global configuration information for this run. @@ -176,7 +176,7 @@ * @param packages Packages specified on the command line. */ public Map> groupPackages(PackageDoc[] packages) { - Map> groupPackageMap = new HashMap>(); + Map> groupPackageMap = new HashMap<>(); String defaultGroupName = (pkgNameGroupMap.isEmpty() && regExpGroupMap.isEmpty())? configuration.message.getText("doclet.Packages") : @@ -229,7 +229,7 @@ List getPkgList(Map> map, String groupname) { List list = map.get(groupname); if (list == null) { - list = new ArrayList(); + list = new ArrayList<>(); map.put(groupname, list); } return list; diff -r 3b3e23e67329 -r 3651128c74eb langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java Wed Dec 18 19:22:58 2013 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java Wed Dec 18 16:05:18 2013 -0500 @@ -43,8 +43,8 @@ */ public class ImplementedMethods { - private Map interfaces = new HashMap(); - private List methlist = new ArrayList