@@ -763,7 +763,7 @@ public Content getLink(LinkInfoImpl linkInfo) {
763763 */
764764 public Content getTypeParameterLinks (LinkInfoImpl linkInfo ) {
765765 LinkFactoryImpl factory = new LinkFactoryImpl (this );
766- return factory .getTypeParameterLinks (linkInfo , false );
766+ return factory .getTypeParameterLinks (linkInfo );
767767 }
768768
769769 /*************************************************************
@@ -853,18 +853,16 @@ public void addPreQualifiedClassLink(LinkInfoImpl.Kind context, TypeElement type
853853 * link label.
854854 *
855855 * @param typeElement the class to link to.
856- * @param isStrong true if the link should be strong.
857856 * @return the link with the package portion of the label in plain text.
858857 */
859- public Content getPreQualifiedClassLink (LinkInfoImpl .Kind context ,
860- TypeElement typeElement , boolean isStrong ) {
858+ public Content getPreQualifiedClassLink (LinkInfoImpl .Kind context , TypeElement typeElement ) {
861859 ContentBuilder classlink = new ContentBuilder ();
862860 PackageElement pkg = utils .containingPackage (typeElement );
863861 if (pkg != null && ! configuration .shouldExcludeQualifier (pkg .getSimpleName ().toString ())) {
864862 classlink .add (getEnclosingPackageName (typeElement ));
865863 }
866864 classlink .add (getLink (new LinkInfoImpl (configuration ,
867- context , typeElement ).label (utils .getSimpleName (typeElement )). strong ( isStrong ) ));
865+ context , typeElement ).label (utils .getSimpleName (typeElement ))));
868866 return classlink ;
869867 }
870868
@@ -934,65 +932,55 @@ public void addPreQualifiedStrongClassLink(LinkInfoImpl.Kind context, TypeElemen
934932 */
935933 public Content getDocLink (LinkInfoImpl .Kind context , Element element , CharSequence label ) {
936934 return getDocLink (context , utils .getEnclosingTypeElement (element ), element ,
937- new StringContent (label ));
935+ new StringContent (label ), false );
938936 }
939937
940938 /**
941939 * Return the link for the given member.
942940 *
943941 * @param context the id of the context where the link will be printed.
942+ * @param typeElement the typeElement that we should link to. This is not
943+ * not necessarily the type containing element since we may be
944+ * inheriting comments.
944945 * @param element the member being linked to.
945946 * @param label the label for the link.
946- * @param strong true if the link should be strong.
947947 * @return the link for the given member.
948948 */
949- public Content getDocLink (LinkInfoImpl .Kind context , Element element , CharSequence label ,
950- boolean strong ) {
951- return getDocLink (context , utils . getEnclosingTypeElement ( element ) , element , label , strong );
949+ public Content getDocLink (LinkInfoImpl .Kind context , TypeElement typeElement , Element element ,
950+ CharSequence label ) {
951+ return getDocLink (context , typeElement , element , label , false );
952952 }
953953
954954 /**
955955 * Return the link for the given member.
956956 *
957957 * @param context the id of the context where the link will be printed.
958- * @param typeElement the typeElement that we should link to. This is not
959- necessarily equal to element.containingClass(). We may be
960- inheriting comments.
958+ * @param typeElement the typeElement that we should link to. This is not
959+ * not necessarily the type containing element since we may be
960+ * inheriting comments.
961961 * @param element the member being linked to.
962962 * @param label the label for the link.
963- * @param strong true if the link should be strong.
964963 * @return the link for the given member.
965964 */
966965 public Content getDocLink (LinkInfoImpl .Kind context , TypeElement typeElement , Element element ,
967- CharSequence label , boolean strong ) {
968- return getDocLink (context , typeElement , element , label , strong , false );
969- }
970-
971- public Content getDocLink (LinkInfoImpl .Kind context , TypeElement typeElement , Element element ,
972- Content label , boolean strong ) {
973- return getDocLink (context , typeElement , element , label , strong , false );
966+ CharSequence label , boolean isProperty ) {
967+ return getDocLink (context , typeElement , element , new StringContent (label ), isProperty );
974968 }
975969
976970 /**
977971 * Return the link for the given member.
978972 *
979973 * @param context the id of the context where the link will be printed.
980- * @param typeElement the typeElement that we should link to. This is not
981- necessarily equal to element.containingClass(). We may be
982- inheriting comments.
974+ * @param typeElement the typeElement that we should link to. This is not
975+ * not necessarily the type containing element since we may be
976+ * inheriting comments.
983977 * @param element the member being linked to.
984978 * @param label the label for the link.
985- * @param strong true if the link should be strong.
986979 * @param isProperty true if the element parameter is a JavaFX property.
987980 * @return the link for the given member.
988981 */
989982 public Content getDocLink (LinkInfoImpl .Kind context , TypeElement typeElement , Element element ,
990- CharSequence label , boolean strong , boolean isProperty ) {
991- return getDocLink (context , typeElement , element , new StringContent (label ), strong , isProperty );
992- }
993-
994- public Content getDocLink (LinkInfoImpl .Kind context , TypeElement typeElement , Element element ,
995- Content label , boolean strong , boolean isProperty ) {
983+ Content label , boolean isProperty ) {
996984 if (!utils .isLinkable (typeElement , element )) {
997985 return label ;
998986 }
@@ -1003,52 +991,19 @@ public Content getDocLink(LinkInfoImpl.Kind context, TypeElement typeElement, El
1003991 return getLink (new LinkInfoImpl (configuration , context , typeElement )
1004992 .label (label )
1005993 .where (id .name ())
1006- .targetMember (element )
1007- .strong (strong ));
994+ .targetMember (element ));
1008995 }
1009996
1010997 if (utils .isVariableElement (element ) || utils .isTypeElement (element )) {
1011998 return getLink (new LinkInfoImpl (configuration , context , typeElement )
1012999 .label (label )
10131000 .where (element .getSimpleName ().toString ())
1014- .targetMember (element )
1015- .strong (strong ));
1001+ .targetMember (element ));
10161002 }
10171003
10181004 return label ;
10191005 }
10201006
1021- /**
1022- * Return the link for the given member.
1023- *
1024- * @param context the id of the context where the link will be added
1025- * @param typeElement the typeElement that we should link to. This is not
1026- necessarily equal to element.containingClass(). We may be
1027- inheriting comments
1028- * @param element the member being linked to
1029- * @param label the label for the link
1030- * @return the link for the given member
1031- */
1032- public Content getDocLink (LinkInfoImpl .Kind context , TypeElement typeElement , Element element ,
1033- Content label ) {
1034- if (!(utils .isIncluded (element ) || utils .isLinkable (typeElement ))) {
1035- return label ;
1036- } else if (utils .isExecutableElement (element )) {
1037- ExecutableElement emd = (ExecutableElement ) element ;
1038- return getLink (new LinkInfoImpl (configuration , context , typeElement )
1039- .label (label )
1040- .where (htmlIds .forMember (emd ).name ())
1041- .targetMember (element ));
1042- } else if (utils .isVariableElement (element ) || utils .isTypeElement (element )) {
1043- return getLink (new LinkInfoImpl (configuration , context , typeElement )
1044- .label (label )
1045- .where (element .getSimpleName ().toString ())
1046- .targetMember (element ));
1047- } else {
1048- return label ;
1049- }
1050- }
1051-
10521007 public Content seeTagToContent (Element element , DocTree see ) {
10531008 Kind kind = see .getKind ();
10541009 if (!(kind == LINK || kind == SEE || kind == LINK_PLAIN )) {
@@ -1900,8 +1855,7 @@ private void addAnnotations(TypeElement annotationDoc, LinkInfoImpl linkInfo,
19001855 }
19011856 String simpleName = element .getSimpleName ().toString ();
19021857 if (multipleValues || !"value" .equals (simpleName )) { // Omit "value=" where unnecessary
1903- annotation .add (getDocLink (LinkInfoImpl .Kind .ANNOTATION ,
1904- element , simpleName , false ));
1858+ annotation .add (getDocLink (LinkInfoImpl .Kind .ANNOTATION , element , simpleName ));
19051859 annotation .add ("=" );
19061860 }
19071861 AnnotationValue annotationValue = map .get (element );
@@ -2015,8 +1969,7 @@ public Content visitAnnotation(AnnotationMirror a, Void p) {
20151969 }
20161970 @ Override
20171971 public Content visitEnumConstant (VariableElement c , Void p ) {
2018- return getDocLink (LinkInfoImpl .Kind .ANNOTATION ,
2019- c , c .getSimpleName (), false );
1972+ return getDocLink (LinkInfoImpl .Kind .ANNOTATION , c , c .getSimpleName ());
20201973 }
20211974 @ Override
20221975 public Content visitArray (List <? extends AnnotationValue > vals , Void p ) {
0 commit comments