jdk-sandbox: comparison src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java

equal deleted inserted replaced

-:ba19a21d727d
+:ffa68af7da87
 /*
-* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 package jdk.javadoc.internal.doclets.toolkit.util.links;
 import java.util.ArrayList;
 import java.util.List;
-import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.TypeParameterElement;
 import javax.lang.model.type.ArrayType;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.type.TypeVariable;
 import javax.lang.model.type.WildcardType;
 import javax.lang.model.util.SimpleTypeVisitor9;
-import jdk.javadoc.internal.doclets.formats.html.LinkInfoImpl;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
 /**
 * A factory that constructs links from given link information.
 *  deletion without notice.</b>
 *
 * @author Jamie Ho
 */
 public abstract class LinkFactory {
+protected final Utils utils;
+protected LinkFactory(Utils utils) {
+this.utils = utils;
+}
 /**
 * Return an empty instance of a content object.
 *
 * @return an empty instance of a content object.
 *
 * @param linkInfo the information about the link.
 * @return the output of the link.
 */
 public Content getLink(LinkInfo linkInfo) {
-Utils utils = ((LinkInfoImpl) linkInfo).configuration.utils;
 if (linkInfo.type != null) {
 SimpleTypeVisitor9<Content, LinkInfo> linkVisitor =
 new SimpleTypeVisitor9<Content, LinkInfo>() {
 TypeMirror componentType = utils.getComponentType(linkInfo.type);
 linkInfo.label = null;
 linkInfo.type = bound;
 }
 /**
-* Return the link to the given class.
+* Returns a link to the given class.
 *
-* @param linkInfo the information about the link to construct.
+* @param linkInfo the information about the link to construct
 *
 * @return the link for the given class.
 */
 protected abstract Content getClassLink(LinkInfo linkInfo);
 /**
-* Return the link to the given type parameter.
+* Returns a link to the given type parameter.
 *
-* @param linkInfo     the information about the link to construct.
+* @param linkInfo     the information about the link to construct
-* @param typeParam the type parameter to link to.
+* @param typeParam the type parameter to link to
+* @return the link
 */
 protected abstract Content getTypeParameterLink(LinkInfo linkInfo, TypeMirror typeParam);
 /**
-* Return the links to the type parameters.
+* Returns links to the type parameters.
 *
-* @param linkInfo     the information about the link to construct.
+* @param linkInfo     the information about the link to construct
 * @return the links to the type parameters.
 */
 public Content getTypeParameterLinks(LinkInfo linkInfo) {
 return getTypeParameterLinks(linkInfo, true);
 }
 /**
-* Return the links to the type parameters.
+* Returns links to the type parameters.
 *
-* @param linkInfo     the information about the link to construct.
+* @param linkInfo     the information about the link to construct
-* @param isClassLabel true if this is a class label.  False if it is
+* @param isClassLabel true if this is a class label, or false if it is
-*                     the type parameters portion of the link.
+*                     the type parameters portion of the link
-* @return the links to the type parameters.
+* @return the links to the type parameters
 */
 public Content getTypeParameterLinks(LinkInfo linkInfo, boolean isClassLabel) {
-Utils utils = ((LinkInfoImpl)linkInfo).utils;
 Content links = newContent();
 List<TypeMirror> vars = new ArrayList<>();
 TypeMirror ctype = linkInfo.type != null
 ? utils.getComponentType(linkInfo.type)
 : null;

changeset 48759	ffa68af7da87
parent 47233	5ee94c2e087e
child 50810	0358dad944c7