langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberMap.java
author ksrini
Sun, 10 Apr 2016 08:41:00 -0700
changeset 37009 476d8d615222
parent 35426 374342e56a56
child 40303 96a1226aca18
permissions -rw-r--r--
8073100: [javadoc] Provide an ability to suppress document generation for specific elements. Reviewed-by: jjg
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     1
/*
35001
d3fe97ef8534 8145722: NullPointerException in javadoc
jjg
parents: 27381
diff changeset
     2
 * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
06bc494ca11e Initial load
duke
parents:
diff changeset
     4
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
06bc494ca11e Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 1789
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 1789
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    10
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
06bc494ca11e Initial load
duke
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
06bc494ca11e Initial load
duke
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
06bc494ca11e Initial load
duke
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
06bc494ca11e Initial load
duke
parents:
diff changeset
    15
 * accompanied this code).
06bc494ca11e Initial load
duke
parents:
diff changeset
    16
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
06bc494ca11e Initial load
duke
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
06bc494ca11e Initial load
duke
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
06bc494ca11e Initial load
duke
parents:
diff changeset
    20
 *
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 1789
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 1789
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 1789
diff changeset
    23
 * questions.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    24
 */
06bc494ca11e Initial load
duke
parents:
diff changeset
    25
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    26
package jdk.javadoc.internal.doclets.toolkit.util;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    27
14258
8d2148961366 8000663: clean up langtools imports
jjg
parents: 5520
diff changeset
    28
import java.util.*;
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
    29
import java.util.regex.Pattern;
14258
8d2148961366 8000663: clean up langtools imports
jjg
parents: 5520
diff changeset
    30
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    31
import javax.lang.model.element.Element;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    32
import javax.lang.model.element.ExecutableElement;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    33
import javax.lang.model.element.TypeElement;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    34
import javax.lang.model.element.VariableElement;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    35
import javax.lang.model.type.TypeKind;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    36
import javax.lang.model.type.TypeMirror;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    37
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    38
import com.sun.source.doctree.DocCommentTree;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    39
import com.sun.source.doctree.DocTree;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    40
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    41
import jdk.javadoc.internal.doclets.toolkit.Configuration;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    42
06bc494ca11e Initial load
duke
parents:
diff changeset
    43
/**
06bc494ca11e Initial load
duke
parents:
diff changeset
    44
 * A data structure that encapsulates the visible members of a particular
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    45
 * type for a given class tree.  To use this data structure, you must specify
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    46
 * the type of member you are interested in (nested class, field, constructor
06bc494ca11e Initial load
duke
parents:
diff changeset
    47
 * or method) and the leaf of the class tree.  The data structure will map
06bc494ca11e Initial load
duke
parents:
diff changeset
    48
 * all visible members in the leaf and classes above the leaf in the tree.
06bc494ca11e Initial load
duke
parents:
diff changeset
    49
 *
14260
727a84636f12 8000665: fix "internal API" comments on javadoc files
jjg
parents: 14259
diff changeset
    50
 *  <p><b>This is NOT part of any supported API.
727a84636f12 8000665: fix "internal API" comments on javadoc files
jjg
parents: 14259
diff changeset
    51
 *  If you write code that depends on this, you do so at your own risk.
727a84636f12 8000665: fix "internal API" comments on javadoc files
jjg
parents: 14259
diff changeset
    52
 *  This code and its internal interfaces are subject to change or
727a84636f12 8000665: fix "internal API" comments on javadoc files
jjg
parents: 14259
diff changeset
    53
 *  deletion without notice.</b>
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    54
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
    55
 * @author Atul M Dambalkar
06bc494ca11e Initial load
duke
parents:
diff changeset
    56
 * @author Jamie Ho (rewrite)
06bc494ca11e Initial load
duke
parents:
diff changeset
    57
 */
06bc494ca11e Initial load
duke
parents:
diff changeset
    58
public class VisibleMemberMap {
06bc494ca11e Initial load
duke
parents:
diff changeset
    59
06bc494ca11e Initial load
duke
parents:
diff changeset
    60
    private boolean noVisibleMembers = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
    61
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    62
    public static enum Kind {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    63
        INNER_CLASSES,
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    64
        ENUM_CONSTANTS,
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    65
        FIELDS,
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    66
        CONSTRUCTORS,
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    67
        METHODS,
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    68
        ANNOTATION_TYPE_FIELDS,
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    69
        ANNOTATION_TYPE_MEMBER_OPTIONAL,
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    70
        ANNOTATION_TYPE_MEMBER_REQUIRED,
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    71
        PROPERTIES;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    72
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    73
        public static final EnumSet<Kind> summarySet = EnumSet.range(INNER_CLASSES, METHODS);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    74
        public static final EnumSet<Kind> detailSet = EnumSet.range(ENUM_CONSTANTS, METHODS);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    75
        public static String getNavLinkLabels(Kind kind) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    76
            switch (kind) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    77
                case INNER_CLASSES:
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    78
                    return "doclet.navNested";
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    79
                case ENUM_CONSTANTS:
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    80
                    return "doclet.navEnum";
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    81
                case FIELDS:
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    82
                    return "doclet.navField";
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    83
                case CONSTRUCTORS:
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    84
                    return "doclet.navConstructor";
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    85
                case METHODS:
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    86
                    return "doclet.navMethod";
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    87
                default:
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    88
                    throw new AssertionError("unknown kind:" + kind);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    89
            }
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    90
        }
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    91
    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    92
06bc494ca11e Initial load
duke
parents:
diff changeset
    93
    public static final String STARTLEVEL = "start";
06bc494ca11e Initial load
duke
parents:
diff changeset
    94
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    95
    // properties aren't named setA* or getA*
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    96
    private static final Pattern GETTERSETTERPATTERN = Pattern.compile("[sg]et\\p{Upper}.*");
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    97
    /**
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
    98
     * List of TypeElement objects for which ClassMembers objects are built.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    99
     */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   100
    private final Set<TypeElement> visibleClasses;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   101
06bc494ca11e Initial load
duke
parents:
diff changeset
   102
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
   103
     * Map for each member name on to a map which contains members with same
06bc494ca11e Initial load
duke
parents:
diff changeset
   104
     * name-signature. The mapped map will contain mapping for each MemberDoc
06bc494ca11e Initial load
duke
parents:
diff changeset
   105
     * onto it's respecive level string.
06bc494ca11e Initial load
duke
parents:
diff changeset
   106
     */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   107
    private final Map<Object, Map<Element, String>> memberNameMap = new HashMap<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   108
06bc494ca11e Initial load
duke
parents:
diff changeset
   109
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
   110
     * Map of class and it's ClassMembers object.
06bc494ca11e Initial load
duke
parents:
diff changeset
   111
     */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   112
    private final Map<TypeElement, ClassMembers> classMap = new HashMap<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   113
06bc494ca11e Initial load
duke
parents:
diff changeset
   114
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
   115
     * Type whose visible members are requested.  This is the leaf of
06bc494ca11e Initial load
duke
parents:
diff changeset
   116
     * the class tree being mapped.
06bc494ca11e Initial load
duke
parents:
diff changeset
   117
     */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   118
    private final TypeElement typeElement;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   119
06bc494ca11e Initial load
duke
parents:
diff changeset
   120
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
   121
     * Member kind: InnerClasses/Fields/Methods?
06bc494ca11e Initial load
duke
parents:
diff changeset
   122
     */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   123
    private final Kind kind;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   124
06bc494ca11e Initial load
duke
parents:
diff changeset
   125
    /**
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   126
     * The configuration this VisibleMemberMap was created with.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   127
     */
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   128
    private final Configuration configuration;
25454
376a52c9540c 8039028: [javadoc] refactor the usage of Util.java
ksrini
parents: 22163
diff changeset
   129
    private final Utils utils;
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   130
    private final Comparator<Element> comparator;
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   131
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   132
    private final Map<TypeElement, List<Element>> propertiesCache;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   133
    private final Map<Element, Element> classPropertiesMap;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   134
    private final Map<Element, GetterSetter> getterSetterMap;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   135
06bc494ca11e Initial load
duke
parents:
diff changeset
   136
    /**
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   137
     * Construct a VisibleMemberMap of the given type for the given class.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   138
     *
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   139
     * @param typeElement whose members are being mapped.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   140
     * @param kind the kind of member that is being mapped.
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   141
     * @param configuration the configuration to use to construct this
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   142
     * VisibleMemberMap. If the field configuration.nodeprecated is true the
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   143
     * deprecated members are excluded from the map. If the field
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   144
     * configuration.javafx is true the JavaFX features are used.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   145
     */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   146
    public VisibleMemberMap(TypeElement typeElement,
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   147
                            Kind kind,
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   148
                            Configuration configuration) {
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   149
        this.typeElement = typeElement;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   150
        this.kind = kind;
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   151
        this.configuration = configuration;
25454
376a52c9540c 8039028: [javadoc] refactor the usage of Util.java
ksrini
parents: 22163
diff changeset
   152
        this.utils = configuration.utils;
35419
6adb831721fe 8148413: Memory leak in javadoc VisibleMemberMap
jjg
parents: 35001
diff changeset
   153
        propertiesCache = configuration.propertiesCache;
6adb831721fe 8148413: Memory leak in javadoc VisibleMemberMap
jjg
parents: 35001
diff changeset
   154
        classPropertiesMap = configuration.classPropertiesMap;
6adb831721fe 8148413: Memory leak in javadoc VisibleMemberMap
jjg
parents: 35001
diff changeset
   155
        getterSetterMap = configuration.getterSetterMap;
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   156
        comparator  = utils.makeGeneralPurposeComparator();
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   157
        visibleClasses = new LinkedHashSet<>();
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   158
        new ClassMembers(typeElement, STARTLEVEL).build();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   159
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   160
06bc494ca11e Initial load
duke
parents:
diff changeset
   161
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
   162
     * Return the list of visible classes in this map.
06bc494ca11e Initial load
duke
parents:
diff changeset
   163
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
   164
     * @return the list of visible classes in this map.
06bc494ca11e Initial load
duke
parents:
diff changeset
   165
     */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   166
    public SortedSet<TypeElement> getVisibleClasses() {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   167
        SortedSet<TypeElement> vClasses = new TreeSet<>(comparator);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   168
        vClasses.addAll(visibleClasses);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   169
        return vClasses;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   170
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   171
06bc494ca11e Initial load
duke
parents:
diff changeset
   172
    /**
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   173
     * Returns the property field documentation belonging to the given member.
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   174
     * @param element the member for which the property documentation is needed.
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   175
     * @return the property field documentation, null if there is none.
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   176
     */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   177
    public Element getPropertyMemberDoc(Element element) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   178
        return classPropertiesMap.get(element);
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   179
    }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   180
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   181
    /**
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   182
     * Returns the getter documentation belonging to the given property method.
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   183
     * @param propertyMethod the method for which the getter is needed.
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   184
     * @return the getter documentation, null if there is none.
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   185
     */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   186
    public Element getGetterForProperty(Element propertyMethod) {
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   187
        return getterSetterMap.get(propertyMethod).getGetter();
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   188
    }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   189
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   190
    /**
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   191
     * Returns the setter documentation belonging to the given property method.
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   192
     * @param propertyMethod the method for which the setter is needed.
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   193
     * @return the setter documentation, null if there is none.
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   194
     */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   195
    public Element getSetterForProperty(Element propertyMethod) {
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   196
        return getterSetterMap.get(propertyMethod).getSetter();
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   197
    }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   198
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   199
    /**
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   200
     * Return the package private members inherited by the class.  Only return
06bc494ca11e Initial load
duke
parents:
diff changeset
   201
     * if parent is package private and not documented.
06bc494ca11e Initial load
duke
parents:
diff changeset
   202
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
   203
     * @return the package private members inherited by the class.
06bc494ca11e Initial load
duke
parents:
diff changeset
   204
     */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   205
    private List<Element> getInheritedPackagePrivateMethods() {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   206
        List<Element> results = new ArrayList<>();
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   207
        for (TypeElement currentClass : visibleClasses) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   208
            if (currentClass != typeElement &&
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   209
                utils.isPackagePrivate(currentClass) &&
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   210
                !utils.isLinkable(currentClass)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   211
                // Document these members in the child class because
06bc494ca11e Initial load
duke
parents:
diff changeset
   212
                // the parent is inaccessible.
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   213
                results.addAll(classMap.get(currentClass).members);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   214
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   215
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   216
        return results;
06bc494ca11e Initial load
duke
parents:
diff changeset
   217
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   218
06bc494ca11e Initial load
duke
parents:
diff changeset
   219
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
   220
     * Return the visible members of the class being mapped.  Also append at the
06bc494ca11e Initial load
duke
parents:
diff changeset
   221
     * end of the list members that are inherited by inaccessible parents. We
06bc494ca11e Initial load
duke
parents:
diff changeset
   222
     * document these members in the child because the parent is not documented.
06bc494ca11e Initial load
duke
parents:
diff changeset
   223
     *
14259
fb94a1df0d53 8000208: fix langtools javadoc comment issues
jjg
parents: 14258
diff changeset
   224
     * @param configuration the current configuration of the doclet.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   225
     */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   226
    public SortedSet<Element> getLeafClassMembers() {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   227
        SortedSet<Element> result = getMembersFor(typeElement);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   228
        result.addAll(getInheritedPackagePrivateMethods());
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   229
        return result;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   230
    }
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   231
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   232
    public Set<Element> getLeafClassMembersSourceOrder() {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   233
        Set<Element> result = new LinkedHashSet<>(classMap.get(typeElement).members);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   234
        result.addAll(getInheritedPackagePrivateMethods());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   235
        return result;
06bc494ca11e Initial load
duke
parents:
diff changeset
   236
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   237
06bc494ca11e Initial load
duke
parents:
diff changeset
   238
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
   239
     * Retrn the list of members for the given class.
06bc494ca11e Initial load
duke
parents:
diff changeset
   240
     *
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   241
     * @param typeElement the class to retrieve the list of visible members for.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   242
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
   243
     * @return the list of members for the given class.
06bc494ca11e Initial load
duke
parents:
diff changeset
   244
     */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   245
    public SortedSet<Element> getMembersFor(TypeElement typeElement) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   246
        return asSortedSet(classMap.get(typeElement).members);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   247
    }
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   248
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   249
    public boolean hasMembersFor(TypeElement typeElement) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   250
        return !classMap.get(typeElement).members.isEmpty();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   251
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   252
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   253
    private SortedSet<Element> asSortedSet(Collection<Element> in) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   254
        if (in == null) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   255
            return Collections.emptySortedSet();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   256
        }
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   257
        TreeSet<Element> out = new TreeSet<>(comparator);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   258
        out.addAll(in);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   259
        return out;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   260
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   261
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   262
    private void fillMemberLevelMap(List<? extends Element> list, String level) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   263
        for (Element element : list) {
22159
682da512ec17 8030253: Update langtools to use strings-in-switch
briangoetz
parents: 22153
diff changeset
   264
            Object key = getMemberKey(element);
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   265
            Map<Element, String> memberLevelMap = memberNameMap.get(key);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   266
            if (memberLevelMap == null) {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22159
diff changeset
   267
                memberLevelMap = new HashMap<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   268
                memberNameMap.put(key, memberLevelMap);
06bc494ca11e Initial load
duke
parents:
diff changeset
   269
            }
22159
682da512ec17 8030253: Update langtools to use strings-in-switch
briangoetz
parents: 22153
diff changeset
   270
            memberLevelMap.put(element, level);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   271
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   272
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   273
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   274
    private void purgeMemberLevelMap(Iterable<? extends Element> list, String level) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   275
        for (Element element : list) {
22159
682da512ec17 8030253: Update langtools to use strings-in-switch
briangoetz
parents: 22153
diff changeset
   276
            Object key = getMemberKey(element);
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   277
            Map<Element, String> memberLevelMap = memberNameMap.get(key);
35001
d3fe97ef8534 8145722: NullPointerException in javadoc
jjg
parents: 27381
diff changeset
   278
            if (memberLevelMap != null && level.equals(memberLevelMap.get(element)))
22159
682da512ec17 8030253: Update langtools to use strings-in-switch
briangoetz
parents: 22153
diff changeset
   279
                memberLevelMap.remove(element);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   280
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   281
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   282
06bc494ca11e Initial load
duke
parents:
diff changeset
   283
    /**
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   284
     * Represents a class member.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   285
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   286
    private class ClassMember {
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   287
        private Set<Element> members;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   288
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   289
        public ClassMember(Element element) {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22159
diff changeset
   290
            members = new HashSet<>();
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   291
            members.add(element);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   292
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   293
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   294
        public boolean isEqual(ExecutableElement member) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   295
            for (Element element : members) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   296
                if (utils.executableMembersEqual(member, (ExecutableElement) element)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   297
                    members.add(member);
22159
682da512ec17 8030253: Update langtools to use strings-in-switch
briangoetz
parents: 22153
diff changeset
   298
                    return true;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   299
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
   300
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   301
            return false;
06bc494ca11e Initial load
duke
parents:
diff changeset
   302
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   303
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   304
06bc494ca11e Initial load
duke
parents:
diff changeset
   305
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
   306
     * A data structure that represents the class members for
06bc494ca11e Initial load
duke
parents:
diff changeset
   307
     * a visible class.
06bc494ca11e Initial load
duke
parents:
diff changeset
   308
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   309
    private class ClassMembers {
06bc494ca11e Initial load
duke
parents:
diff changeset
   310
06bc494ca11e Initial load
duke
parents:
diff changeset
   311
        /**
06bc494ca11e Initial load
duke
parents:
diff changeset
   312
         * The mapping class, whose inherited members are put in the
06bc494ca11e Initial load
duke
parents:
diff changeset
   313
         * {@link #members} list.
06bc494ca11e Initial load
duke
parents:
diff changeset
   314
         */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   315
        private final TypeElement typeElement;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   316
06bc494ca11e Initial load
duke
parents:
diff changeset
   317
        /**
06bc494ca11e Initial load
duke
parents:
diff changeset
   318
         * List of inherited members from the mapping class.
06bc494ca11e Initial load
duke
parents:
diff changeset
   319
         */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   320
        private Set<Element> members = new LinkedHashSet<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   321
06bc494ca11e Initial load
duke
parents:
diff changeset
   322
        /**
06bc494ca11e Initial load
duke
parents:
diff changeset
   323
         * Level/Depth of inheritance.
06bc494ca11e Initial load
duke
parents:
diff changeset
   324
         */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   325
        private final String level;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   326
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   327
        private ClassMembers(TypeElement mappingClass, String level) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   328
            this.typeElement = mappingClass;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   329
            this.level = level;
06bc494ca11e Initial load
duke
parents:
diff changeset
   330
            if (classMap.containsKey(mappingClass) &&
868
d0f233085cbb 6657907: javadoc has unchecked warnings
jjg
parents: 10
diff changeset
   331
                        level.startsWith(classMap.get(mappingClass).level)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   332
                //Remove lower level class so that it can be replaced with
06bc494ca11e Initial load
duke
parents:
diff changeset
   333
                //same class found at higher level.
06bc494ca11e Initial load
duke
parents:
diff changeset
   334
                purgeMemberLevelMap(getClassMembers(mappingClass, false),
868
d0f233085cbb 6657907: javadoc has unchecked warnings
jjg
parents: 10
diff changeset
   335
                    classMap.get(mappingClass).level);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   336
                classMap.remove(mappingClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
   337
                visibleClasses.remove(mappingClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
   338
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   339
            if (!classMap.containsKey(mappingClass)) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   340
                classMap.put(mappingClass, this);
06bc494ca11e Initial load
duke
parents:
diff changeset
   341
                visibleClasses.add(mappingClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
   342
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   343
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   344
06bc494ca11e Initial load
duke
parents:
diff changeset
   345
        private void build() {
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   346
            if (kind == Kind.CONSTRUCTORS) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   347
                addMembers(typeElement);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   348
            } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   349
                mapClass();
06bc494ca11e Initial load
duke
parents:
diff changeset
   350
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   351
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   352
06bc494ca11e Initial load
duke
parents:
diff changeset
   353
        private void mapClass() {
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   354
            addMembers(typeElement);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   355
            List<? extends TypeMirror> interfaces = typeElement.getInterfaces();
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   356
            for (TypeMirror anInterface : interfaces) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   357
                String locallevel = level + 1;
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   358
                ClassMembers cm = new ClassMembers(utils.asTypeElement(anInterface), locallevel);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   359
                cm.mapClass();
06bc494ca11e Initial load
duke
parents:
diff changeset
   360
            }
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   361
            if (utils.isClass(typeElement)) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   362
                TypeElement superclass = utils.getSuperClass(typeElement);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   363
                if (!(superclass == null || typeElement.equals(superclass))) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   364
                    ClassMembers cm = new ClassMembers(superclass, level + "c");
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   365
                    cm.mapClass();
06bc494ca11e Initial load
duke
parents:
diff changeset
   366
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
   367
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   368
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   369
06bc494ca11e Initial load
duke
parents:
diff changeset
   370
        /**
06bc494ca11e Initial load
duke
parents:
diff changeset
   371
         * Get all the valid members from the mapping class. Get the list of
06bc494ca11e Initial load
duke
parents:
diff changeset
   372
         * members for the class to be included into(ctii), also get the level
06bc494ca11e Initial load
duke
parents:
diff changeset
   373
         * string for ctii. If mapping class member is not already in the
06bc494ca11e Initial load
duke
parents:
diff changeset
   374
         * inherited member list and if it is visible in the ctii and not
06bc494ca11e Initial load
duke
parents:
diff changeset
   375
         * overridden, put such a member in the inherited member list.
06bc494ca11e Initial load
duke
parents:
diff changeset
   376
         * Adjust member-level-map, class-map.
06bc494ca11e Initial load
duke
parents:
diff changeset
   377
         */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   378
        private void addMembers(TypeElement fromClass) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   379
            List<? extends Element> classMembers = getClassMembers(fromClass, true);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   380
            List<Element> incllist = new ArrayList<>();
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   381
            for (Element element : classMembers) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   382
                if (!found(members, element)) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   383
                    if (memberIsVisible(element)) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   384
                        if (!isOverridden(element, level)) {
37009
476d8d615222 8073100: [javadoc] Provide an ability to suppress document generation for specific elements.
ksrini
parents: 35426
diff changeset
   385
                            if (!utils.isHidden(element)) {
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   386
                                incllist.add(element);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   387
                            }
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   388
                        }
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   389
                    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   390
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
   391
            }
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   392
            if (!incllist.isEmpty()) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   393
                noVisibleMembers = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
   394
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   395
            members.addAll(incllist);
06bc494ca11e Initial load
duke
parents:
diff changeset
   396
            fillMemberLevelMap(getClassMembers(fromClass, false), level);
06bc494ca11e Initial load
duke
parents:
diff changeset
   397
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   398
06bc494ca11e Initial load
duke
parents:
diff changeset
   399
        /**
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   400
         * Is given element visible in given typeElement in terms of inheritance? The given element
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   401
         * is visible in the given typeElement if it is public or protected and if it is
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   402
         * package-private if it's containing class is in the same package as the given typeElement.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   403
         */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   404
        private boolean memberIsVisible(Element element) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   405
            if (utils.getEnclosingTypeElement(element).equals(VisibleMemberMap.this.typeElement)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   406
                //Member is in class that we are finding visible members for.
06bc494ca11e Initial load
duke
parents:
diff changeset
   407
                //Of course it is visible.
06bc494ca11e Initial load
duke
parents:
diff changeset
   408
                return true;
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   409
            } else if (utils.isPrivate(element)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   410
                //Member is in super class or implemented interface.
06bc494ca11e Initial load
duke
parents:
diff changeset
   411
                //Private, so not inherited.
06bc494ca11e Initial load
duke
parents:
diff changeset
   412
                return false;
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   413
            } else if (utils.isPackagePrivate(element)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   414
                //Member is package private.  Only return true if its class is in
06bc494ca11e Initial load
duke
parents:
diff changeset
   415
                //same package.
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   416
                return utils.containingPackage(element).equals(utils.containingPackage(VisibleMemberMap.this.typeElement));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   417
            } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   418
                //Public members are always inherited.
06bc494ca11e Initial load
duke
parents:
diff changeset
   419
                return true;
06bc494ca11e Initial load
duke
parents:
diff changeset
   420
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   421
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   422
06bc494ca11e Initial load
duke
parents:
diff changeset
   423
        /**
06bc494ca11e Initial load
duke
parents:
diff changeset
   424
         * Return all available class members.
06bc494ca11e Initial load
duke
parents:
diff changeset
   425
         */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   426
        private List<? extends Element> getClassMembers(TypeElement te, boolean filter) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   427
            if (utils.isEnum(te) && kind == Kind.CONSTRUCTORS) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   428
                //If any of these rules are hit, return empty array because
06bc494ca11e Initial load
duke
parents:
diff changeset
   429
                //we don't document these members ever.
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   430
                return Collections.emptyList();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   431
            }
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   432
            List<? extends Element> list;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   433
            switch (kind) {
20237
b6d89903c867 8015249: javadoc fails to document static final fields in annotation types
bpatel
parents: 16319
diff changeset
   434
                case ANNOTATION_TYPE_FIELDS:
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   435
                    list = (filter)
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   436
                            ? utils.getAnnotationFields(te)
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   437
                            : utils.getAnnotationFieldsUnfiltered(te);
20237
b6d89903c867 8015249: javadoc fails to document static final fields in annotation types
bpatel
parents: 16319
diff changeset
   438
                    break;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   439
                case ANNOTATION_TYPE_MEMBER_OPTIONAL:
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   440
                    list = utils.isAnnotationType(te)
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   441
                            ? filterAnnotations(te, false)
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   442
                            : Collections.emptyList();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   443
                    break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   444
                case ANNOTATION_TYPE_MEMBER_REQUIRED:
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   445
                    list = utils.isAnnotationType(te)
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   446
                            ? filterAnnotations(te, true)
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   447
                            : Collections.emptyList();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   448
                    break;
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   449
                case INNER_CLASSES:
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   450
                    List<TypeElement> xlist = filter
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   451
                            ? utils.getInnerClasses(te)
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   452
                            : utils.getInnerClassesUnfiltered(te);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   453
                    list = new ArrayList<>(xlist);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   454
                    break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   455
                case ENUM_CONSTANTS:
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   456
                    list = utils.getEnumConstants(te);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   457
                    break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   458
                case FIELDS:
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   459
                    if (filter) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   460
                        list = utils.isAnnotationType(te)
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   461
                                ? utils.getAnnotationFields(te)
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   462
                                : utils.getFields(te);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   463
                    } else {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   464
                        list = utils.isAnnotationType(te)
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   465
                                ? utils.getAnnotationFieldsUnfiltered(te)
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   466
                                : utils.getFieldsUnfiltered(te);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   467
                    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   468
                    break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   469
                case CONSTRUCTORS:
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   470
                    list = utils.getConstructors(te);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   471
                    break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   472
                case METHODS:
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   473
                    list = filter ? utils.getMethods(te) : utils.getMethodsUnfiltered(te);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   474
                    checkOnPropertiesTags(list);
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   475
                    break;
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   476
                case PROPERTIES:
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   477
                    list = properties(te, filter);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   478
                    break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   479
                default:
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   480
                    list = Collections.emptyList();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   481
            }
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   482
            // Deprected members should be excluded or not?
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   483
            if (configuration.nodeprecated) {
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   484
                return utils.excludeDeprecatedMembers(list);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   485
            }
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   486
            return list;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   487
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   488
06bc494ca11e Initial load
duke
parents:
diff changeset
   489
        /**
06bc494ca11e Initial load
duke
parents:
diff changeset
   490
         * Filter the annotation type members and return either the required
06bc494ca11e Initial load
duke
parents:
diff changeset
   491
         * members or the optional members, depending on the value of the
06bc494ca11e Initial load
duke
parents:
diff changeset
   492
         * required parameter.
06bc494ca11e Initial load
duke
parents:
diff changeset
   493
         *
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   494
         * @param typeElement The annotation type to process.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   495
         * @param required
06bc494ca11e Initial load
duke
parents:
diff changeset
   496
         * @return the annotation type members and return either the required
06bc494ca11e Initial load
duke
parents:
diff changeset
   497
         * members or the optional members, depending on the value of the
06bc494ca11e Initial load
duke
parents:
diff changeset
   498
         * required parameter.
06bc494ca11e Initial load
duke
parents:
diff changeset
   499
         */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   500
        private List<Element> filterAnnotations(TypeElement typeElement, boolean required) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   501
            List<Element> members = utils.getAnnotationMethods(typeElement);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   502
            List<Element> targetMembers = new ArrayList<>();
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   503
            for (Element member : members) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   504
                ExecutableElement ee = (ExecutableElement)member;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   505
                if ((required && ee.getDefaultValue() == null)
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   506
                        || ((!required) && ee.getDefaultValue() != null)) {
22159
682da512ec17 8030253: Update langtools to use strings-in-switch
briangoetz
parents: 22153
diff changeset
   507
                    targetMembers.add(member);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   508
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
   509
            }
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   510
            return targetMembers;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   511
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   512
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   513
        private boolean found(Iterable<Element> list, Element elem) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   514
            for (Element pgmelem : list) {
25454
376a52c9540c 8039028: [javadoc] refactor the usage of Util.java
ksrini
parents: 22163
diff changeset
   515
                if (utils.matches(pgmelem, elem)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   516
                    return true;
06bc494ca11e Initial load
duke
parents:
diff changeset
   517
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
   518
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   519
            return false;
06bc494ca11e Initial load
duke
parents:
diff changeset
   520
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   521
06bc494ca11e Initial load
duke
parents:
diff changeset
   522
06bc494ca11e Initial load
duke
parents:
diff changeset
   523
        /**
06bc494ca11e Initial load
duke
parents:
diff changeset
   524
         * Is member overridden? The member is overridden if it is found in the
06bc494ca11e Initial load
duke
parents:
diff changeset
   525
         * same level hierarchy e.g. member at level "11" overrides member at
06bc494ca11e Initial load
duke
parents:
diff changeset
   526
         * level "111".
06bc494ca11e Initial load
duke
parents:
diff changeset
   527
         */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   528
        private boolean isOverridden(Element element, String level) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   529
            Object key = getMemberKey(element);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   530
            Map<?, String> memberLevelMap = (Map<?, String>) memberNameMap.get(key);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   531
            if (memberLevelMap == null)
06bc494ca11e Initial load
duke
parents:
diff changeset
   532
                return false;
22159
682da512ec17 8030253: Update langtools to use strings-in-switch
briangoetz
parents: 22153
diff changeset
   533
            for (String mappedlevel : memberLevelMap.values()) {
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   534
                if (mappedlevel.equals(STARTLEVEL)
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   535
                        || (level.startsWith(mappedlevel)
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   536
                        && !level.equals(mappedlevel))) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   537
                    return true;
06bc494ca11e Initial load
duke
parents:
diff changeset
   538
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
   539
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   540
            return false;
06bc494ca11e Initial load
duke
parents:
diff changeset
   541
        }
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   542
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   543
        private List<Element> properties(final TypeElement typeElement, final boolean filter) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   544
            final List<ExecutableElement> allMethods = filter
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   545
                    ? utils.getMethods(typeElement)
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   546
                    : utils.getMethodsUnfiltered(typeElement);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   547
            final List<VariableElement> allFields = utils.getFieldsUnfiltered(typeElement);
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   548
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   549
            if (propertiesCache.containsKey(typeElement)) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   550
                return propertiesCache.get(typeElement);
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   551
            }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   552
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   553
            final List<Element> result = new ArrayList<>();
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   554
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   555
            for (final Element propertyMethod : allMethods) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   556
                ExecutableElement ee = (ExecutableElement)propertyMethod;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   557
                if (!isPropertyMethod(ee)) {
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   558
                    continue;
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   559
                }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   560
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   561
                final ExecutableElement getter = getterForField(allMethods, ee);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   562
                final ExecutableElement setter = setterForField(allMethods, ee);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   563
                final VariableElement field = fieldForProperty(allFields, ee);
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   564
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   565
                addToPropertiesMap(setter, getter, ee, field);
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   566
                getterSetterMap.put(propertyMethod, new GetterSetter(getter, setter));
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   567
                result.add(ee);
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   568
            }
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   569
            propertiesCache.put(typeElement, result);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   570
            return result;
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   571
        }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   572
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   573
        private void addToPropertiesMap(ExecutableElement setter,
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   574
                                        ExecutableElement getter,
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   575
                                        ExecutableElement propertyMethod,
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   576
                                        VariableElement field) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   577
            if (field == null || utils.getDocCommentTree(field) == null) {
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   578
                addToPropertiesMap(setter, propertyMethod);
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   579
                addToPropertiesMap(getter, propertyMethod);
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   580
                addToPropertiesMap(propertyMethod, propertyMethod);
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   581
            } else {
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   582
                addToPropertiesMap(getter, field);
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   583
                addToPropertiesMap(setter, field);
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   584
                addToPropertiesMap(propertyMethod, field);
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   585
            }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   586
        }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   587
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   588
        private void addToPropertiesMap(Element propertyMethod,
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   589
                                        Element commentSource) {
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   590
            if (null == propertyMethod || null == commentSource) {
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   591
                return;
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   592
            }
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   593
            DocCommentTree docTree = utils.getDocCommentTree(propertyMethod);
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   594
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   595
            /* The second condition is required for the property buckets. In
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   596
             * this case the comment is at the property method (not at the field)
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   597
             * and it needs to be listed in the map.
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   598
             */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   599
            if ((docTree == null) || propertyMethod.equals(commentSource)) {
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   600
                classPropertiesMap.put(propertyMethod, commentSource);
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   601
            }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   602
        }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   603
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   604
        private ExecutableElement getterForField(List<ExecutableElement> methods,
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   605
                                         ExecutableElement propertyMethod) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   606
            final String propertyMethodName = utils.getSimpleName(propertyMethod);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   607
            final String fieldName = propertyMethodName.substring(0,
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   608
                            propertyMethodName.lastIndexOf("Property"));
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   609
            final String fieldNameUppercased =
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   610
                    "" + Character.toUpperCase(fieldName.charAt(0))
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   611
                                            + fieldName.substring(1);
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   612
            final String getterNamePattern;
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   613
            final String fieldTypeName = propertyMethod.getReturnType().toString();
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   614
            if ("boolean".equals(fieldTypeName)
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   615
                    || fieldTypeName.endsWith("BooleanProperty")) {
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   616
                getterNamePattern = "(is|get)" + fieldNameUppercased;
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   617
            } else {
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   618
                getterNamePattern = "get" + fieldNameUppercased;
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   619
            }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   620
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   621
            for (ExecutableElement method : methods) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   622
                if (Pattern.matches(getterNamePattern, utils.getSimpleName(method))) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   623
                    if (method.getParameters().isEmpty() &&
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   624
                            utils.isPublic(method) || utils.isProtected(method)) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   625
                        return method;
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   626
                    }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   627
                }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   628
            }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   629
            return null;
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   630
        }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   631
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   632
        private ExecutableElement setterForField(List<ExecutableElement> methods,
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   633
                                         ExecutableElement propertyMethod) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   634
            final String propertyMethodName = utils.getSimpleName(propertyMethod);
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   635
            final String fieldName =
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   636
                    propertyMethodName.substring(0,
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   637
                            propertyMethodName.lastIndexOf("Property"));
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   638
            final String fieldNameUppercased =
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   639
                    "" + Character.toUpperCase(fieldName.charAt(0))
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   640
                                             + fieldName.substring(1);
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   641
            final String setter = "set" + fieldNameUppercased;
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   642
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   643
            for (ExecutableElement method : methods) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   644
                if (setter.equals(utils.getSimpleName(method))) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   645
                    if (method.getParameters().size() == 1
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   646
                            && method.getReturnType().getKind() == TypeKind.VOID
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   647
                            && (utils.isPublic(method) || utils.isProtected(method))) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   648
                        return method;
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   649
                    }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   650
                }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   651
            }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   652
            return null;
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   653
        }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   654
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   655
        private VariableElement fieldForProperty(List<VariableElement> fields, ExecutableElement property) {
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   656
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   657
            for (VariableElement field : fields) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   658
                final String fieldName = utils.getSimpleName(field);
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   659
                final String propertyName = fieldName + "Property";
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   660
                if (propertyName.equals(utils.getSimpleName(property))) {
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   661
                    return field;
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   662
                }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   663
            }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   664
            return null;
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   665
        }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   666
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   667
        private boolean isPropertyMethod(ExecutableElement method) {
27381
46ea7c75828e 8061305: Javadoc crashes when method name ends with "Property"
ksrini
parents: 25874
diff changeset
   668
            if (!configuration.javafx) {
46ea7c75828e 8061305: Javadoc crashes when method name ends with "Property"
ksrini
parents: 25874
diff changeset
   669
               return false;
46ea7c75828e 8061305: Javadoc crashes when method name ends with "Property"
ksrini
parents: 25874
diff changeset
   670
            }
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   671
            if (!utils.getSimpleName(method).endsWith("Property")) {
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   672
                return false;
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   673
            }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   674
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   675
            if (!memberIsVisible(method)) {
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   676
                return false;
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   677
            }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   678
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   679
            if (GETTERSETTERPATTERN.matcher(utils.getSimpleName(method)).matches()) {
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   680
                return false;
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   681
            }
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   682
            if (!method.getTypeParameters().isEmpty()) {
27381
46ea7c75828e 8061305: Javadoc crashes when method name ends with "Property"
ksrini
parents: 25874
diff changeset
   683
                return false;
46ea7c75828e 8061305: Javadoc crashes when method name ends with "Property"
ksrini
parents: 25874
diff changeset
   684
            }
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   685
            return method.getParameters().isEmpty()
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   686
                    && method.getReturnType().getKind() != TypeKind.VOID;
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   687
        }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   688
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   689
        private void checkOnPropertiesTags(List<? extends Element> members) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   690
            for (Element e: members) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   691
                ExecutableElement ee = (ExecutableElement)e;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   692
                if (utils.isIncluded(ee)) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   693
                    CommentHelper ch = utils.getCommentHelper(ee);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   694
                    for (DocTree tree: utils.getBlockTags(ee)) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   695
                        String tagName = ch.getTagName(tree);
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   696
                        if (tagName.equals("@propertySetter")
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   697
                                || tagName.equals("@propertyGetter")
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   698
                                || tagName.equals("@propertyDescription")) {
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   699
                            if (!isPropertyGetterOrSetter(members, ee)) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   700
                                configuration.message.warning(ch.getDocTreePath(tree),
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   701
                                        "doclet.javafx_tag_misuse");
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   702
                            }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   703
                            break;
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   704
                        }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   705
                    }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   706
                }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   707
            }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   708
        }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   709
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   710
        private boolean isPropertyGetterOrSetter(List<? extends Element> members,
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   711
                                                 ExecutableElement method) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   712
            String propertyName = utils.propertyName(method);
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   713
            if (!propertyName.isEmpty()) {
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   714
                String propertyMethodName = propertyName + "Property";
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   715
                for (Element member: members) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   716
                    if (utils.getSimpleName(member).equals(propertyMethodName)) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   717
                        return true;
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   718
                    }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   719
                }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   720
            }
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   721
            return false;
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   722
        }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   723
    }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   724
35419
6adb831721fe 8148413: Memory leak in javadoc VisibleMemberMap
jjg
parents: 35001
diff changeset
   725
    public class GetterSetter {
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   726
        private final Element getter;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   727
        private final Element setter;
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   728
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   729
        public GetterSetter(Element getter, Element setter) {
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   730
            this.getter = getter;
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   731
            this.setter = setter;
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   732
        }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   733
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   734
        public Element getGetter() {
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   735
            return getter;
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   736
        }
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   737
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   738
        public Element getSetter() {
16319
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   739
            return setter;
e586bfeb39c5 7112427: The doclet needs to be able to generate JavaFX documentation.
jjg
parents: 14260
diff changeset
   740
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   741
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   742
06bc494ca11e Initial load
duke
parents:
diff changeset
   743
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
   744
     * Return true if this map has no visible members.
06bc494ca11e Initial load
duke
parents:
diff changeset
   745
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
   746
     * @return true if this map has no visible members.
06bc494ca11e Initial load
duke
parents:
diff changeset
   747
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   748
    public boolean noVisibleMembers() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   749
        return noVisibleMembers;
06bc494ca11e Initial load
duke
parents:
diff changeset
   750
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   751
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   752
    private ClassMember getClassMember(ExecutableElement member) {
22159
682da512ec17 8030253: Update langtools to use strings-in-switch
briangoetz
parents: 22153
diff changeset
   753
        for (Object key : memberNameMap.keySet()) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   754
            if (key instanceof String) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   755
                continue;
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   756
            }
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   757
            if (((ClassMember) key).isEqual(member)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   758
                return (ClassMember) key;
06bc494ca11e Initial load
duke
parents:
diff changeset
   759
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   760
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   761
        return new ClassMember(member);
06bc494ca11e Initial load
duke
parents:
diff changeset
   762
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   763
06bc494ca11e Initial load
duke
parents:
diff changeset
   764
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
   765
     * Return the key to the member map for the given member.
06bc494ca11e Initial load
duke
parents:
diff changeset
   766
     */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   767
    private Object getMemberKey(Element element) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   768
        if (utils.isConstructor(element)) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   769
            return utils.getSimpleName(element) + utils.flatSignature((ExecutableElement)element);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   770
        } else if (utils.isMethod(element)) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   771
            return getClassMember((ExecutableElement) element);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   772
        } else if (utils.isField(element) || utils.isEnumConstant(element) || utils.isAnnotationType(element)) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   773
            return utils.getSimpleName(element);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   774
        } else { // it's a class or interface
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   775
            String classOrIntName = utils.getSimpleName(element);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   776
            //Strip off the containing class name because we only want the member name.
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   777
            classOrIntName = classOrIntName.indexOf('.') != 0
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   778
                    ? classOrIntName.substring(classOrIntName.lastIndexOf('.'))
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 35419
diff changeset
   779
                    : classOrIntName;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   780
            return "clint" + classOrIntName;
06bc494ca11e Initial load
duke
parents:
diff changeset
   781
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   782
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   783
}