jdk-sandbox: comparison langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java

equal deleted inserted replaced

-:3b3e23e67329
+:3651128c74eb
 public static final String STARTLEVEL = "start";
 /**
 * List of ClassDoc objects for which ClassMembers objects are built.
 */
-private final List<ClassDoc> visibleClasses = new ArrayList<ClassDoc>();
+private final List<ClassDoc> visibleClasses = new ArrayList<>();
 /**
 * Map for each member name on to a map which contains members with same
 * name-signature. The mapped map will contain mapping for each MemberDoc
 * onto it's respecive level string.
 */
-private final Map<Object,Map<ProgramElementDoc,String>> memberNameMap = new HashMap<Object,Map<ProgramElementDoc,String>>();
+private final Map<Object,Map<ProgramElementDoc,String>> memberNameMap = new HashMap<>();
 /**
 * Map of class and it's ClassMembers object.
 */
-private final Map<ClassDoc,ClassMembers> classMap = new HashMap<ClassDoc,ClassMembers>();
+private final Map<ClassDoc,ClassMembers> classMap = new HashMap<>();
 /**
 * Type whose visible members are requested.  This is the leaf of
 * the class tree being mapped.
 */
 /**
 * The configuration this VisibleMemberMap was created with.
 */
 private final Configuration configuration;
-private static final Map<ClassDoc, ProgramElementDoc[]> propertiesCache =
+private static final Map<ClassDoc, ProgramElementDoc[]> propertiesCache = new HashMap<>();
-new HashMap<ClassDoc, ProgramElementDoc[]>();
+private static final Map<ProgramElementDoc, ProgramElementDoc> classPropertiesMap = new HashMap<>();
-private static final Map<ProgramElementDoc, ProgramElementDoc> classPropertiesMap =
+private static final Map<ProgramElementDoc, GetterSetter> getterSetterMap = new HashMap<>();
-new HashMap<ProgramElementDoc, ProgramElementDoc>();
-private static final Map<ProgramElementDoc, GetterSetter> getterSetterMap =
-new HashMap<ProgramElementDoc, GetterSetter>();
 /**
 * Construct a VisibleMemberMap of the given type for the given
 * class.
 *
 *
 * @param configuration the current configuration of the doclet.
 * @return the package private members inherited by the class.
 */
 private List<ProgramElementDoc> getInheritedPackagePrivateMethods(Configuration configuration) {
-List<ProgramElementDoc> results = new ArrayList<ProgramElementDoc>();
+List<ProgramElementDoc> results = new ArrayList<>();
 for (ClassDoc currentClass : visibleClasses) {
 if (currentClass != classdoc &&
 currentClass.isPackagePrivate() &&
 !Util.isLinkable(currentClass, configuration)) {
 // Document these members in the child class because
 * @return the list of members for the given class.
 */
 public List<ProgramElementDoc> getMembersFor(ClassDoc cd) {
 ClassMembers clmembers = classMap.get(cd);
 if (clmembers == null) {
-return new ArrayList<ProgramElementDoc>();
+return new ArrayList<>();
 }
 return clmembers.getMembers();
 }
 /**
 * Sort the given mixed list of classes and interfaces to a list of
 * classes followed by interfaces traversed. Don't sort alphabetically.
 */
 private void sort(List<ClassDoc> list) {
-List<ClassDoc> classes = new ArrayList<ClassDoc>();
+List<ClassDoc> classes = new ArrayList<>();
-List<ClassDoc> interfaces = new ArrayList<ClassDoc>();
+List<ClassDoc> interfaces = new ArrayList<>();
 for (ClassDoc cd : list) {
 if (cd.isClass()) {
 classes.add(cd);
 }
 else {
 private void fillMemberLevelMap(List<ProgramElementDoc> list, String level) {
 for (ProgramElementDoc element : list) {
 Object key = getMemberKey(element);
 Map<ProgramElementDoc, String> memberLevelMap = memberNameMap.get(key);
 if (memberLevelMap == null) {
-memberLevelMap = new HashMap<ProgramElementDoc, String>();
+memberLevelMap = new HashMap<>();
 memberNameMap.put(key, memberLevelMap);
 }
 memberLevelMap.put(element, level);
 }
 }
 */
 private class ClassMember {
 private Set<ProgramElementDoc> members;
 public ClassMember(ProgramElementDoc programElementDoc) {
-members = new HashSet<ProgramElementDoc>();
+members = new HashSet<>();
 members.add(programElementDoc);
 }
 public void addMember(ProgramElementDoc programElementDoc) {
 members.add(programElementDoc);
 private ClassDoc mappingClass;
 /**
 * List of inherited members from the mapping class.
 */
-private List<ProgramElementDoc> members = new ArrayList<ProgramElementDoc>();
+private List<ProgramElementDoc> members = new ArrayList<>();
 /**
 * Level/Depth of inheritance.
 */
 private String level;
 * overridden, put such a member in the inherited member list.
 * Adjust member-level-map, class-map.
 */
 private void addMembers(ClassDoc fromClass) {
 List<ProgramElementDoc> cdmembers = getClassMembers(fromClass, true);
-List<ProgramElementDoc> incllist = new ArrayList<ProgramElementDoc>();
+List<ProgramElementDoc> incllist = new ArrayList<>();
 for (ProgramElementDoc pgmelem : cdmembers) {
 if (!found(members, pgmelem) &&
 memberIsVisible(pgmelem) &&
 !isOverridden(pgmelem, level) &&
 !isTreatedAsPrivate(pgmelem)) {
 * required parameter.
 */
 private AnnotationTypeElementDoc[] filter(AnnotationTypeDoc doc,
 boolean required) {
 AnnotationTypeElementDoc[] members = doc.elements();
-List<AnnotationTypeElementDoc> targetMembers = new ArrayList<AnnotationTypeElementDoc>();
+List<AnnotationTypeElementDoc> targetMembers = new ArrayList<>();
 for (AnnotationTypeElementDoc member : members) {
 if ((required && member.defaultValue() == null) ||
 ((!required) && member.defaultValue() != null)) {
 targetMembers.add(member);
 }
 if (propertiesCache.containsKey(cd)) {
 return propertiesCache.get(cd);
 }
-final List<MethodDoc> result = new ArrayList<MethodDoc>();
+final List<MethodDoc> result = new ArrayList<>();
 for (final MethodDoc propertyMethod : allMethods) {
 if (!isPropertyMethod(propertyMethod)) {
 continue;

changeset 22163	3651128c74eb
parent 22159	682da512ec17
child 25454	376a52c9540c