langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberMap.java
equal
deleted
inserted
replaced
37 |
37 |
38 import com.sun.source.doctree.DocCommentTree; |
38 import com.sun.source.doctree.DocCommentTree; |
39 import com.sun.source.doctree.DocTree; |
39 import com.sun.source.doctree.DocTree; |
40 |
40 |
41 import jdk.javadoc.internal.doclets.toolkit.Configuration; |
41 import jdk.javadoc.internal.doclets.toolkit.Configuration; |
|
42 import jdk.javadoc.internal.doclets.toolkit.Messages; |
42 |
43 |
43 /** |
44 /** |
44 * A data structure that encapsulates the visible members of a particular |
45 * A data structure that encapsulates the visible members of a particular |
45 * type for a given class tree. To use this data structure, you must specify |
46 * type for a given class tree. To use this data structure, you must specify |
46 * the type of member you are interested in (nested class, field, constructor |
47 * the type of member you are interested in (nested class, field, constructor |
124 |
125 |
125 /** |
126 /** |
126 * The configuration this VisibleMemberMap was created with. |
127 * The configuration this VisibleMemberMap was created with. |
127 */ |
128 */ |
128 private final Configuration configuration; |
129 private final Configuration configuration; |
|
130 private final Messages messages; |
129 private final Utils utils; |
131 private final Utils utils; |
130 private final Comparator<Element> comparator; |
132 private final Comparator<Element> comparator; |
131 |
133 |
132 private final Map<TypeElement, List<Element>> propertiesCache; |
134 private final Map<TypeElement, List<Element>> propertiesCache; |
133 private final Map<Element, Element> classPropertiesMap; |
135 private final Map<Element, Element> classPropertiesMap; |
147 Kind kind, |
149 Kind kind, |
148 Configuration configuration) { |
150 Configuration configuration) { |
149 this.typeElement = typeElement; |
151 this.typeElement = typeElement; |
150 this.kind = kind; |
152 this.kind = kind; |
151 this.configuration = configuration; |
153 this.configuration = configuration; |
|
154 this.messages = configuration.getMessages(); |
152 this.utils = configuration.utils; |
155 this.utils = configuration.utils; |
153 propertiesCache = configuration.propertiesCache; |
156 propertiesCache = configuration.propertiesCache; |
154 classPropertiesMap = configuration.classPropertiesMap; |
157 classPropertiesMap = configuration.classPropertiesMap; |
155 getterSetterMap = configuration.getterSetterMap; |
158 getterSetterMap = configuration.getterSetterMap; |
156 comparator = utils.makeGeneralPurposeComparator(); |
159 comparator = utils.makeGeneralPurposeComparator(); |
695 String tagName = ch.getTagName(tree); |
698 String tagName = ch.getTagName(tree); |
696 if (tagName.equals("@propertySetter") |
699 if (tagName.equals("@propertySetter") |
697 || tagName.equals("@propertyGetter") |
700 || tagName.equals("@propertyGetter") |
698 || tagName.equals("@propertyDescription")) { |
701 || tagName.equals("@propertyDescription")) { |
699 if (!isPropertyGetterOrSetter(members, ee)) { |
702 if (!isPropertyGetterOrSetter(members, ee)) { |
700 configuration.message.warning(ch.getDocTreePath(tree), |
703 messages.warning(ch.getDocTreePath(tree), |
701 "doclet.javafx_tag_misuse"); |
704 "doclet.javafx_tag_misuse"); |
702 } |
705 } |
703 break; |
706 break; |
704 } |
707 } |
705 } |
708 } |