1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Fri May 10 15:15:50 2013 +0200
1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Tue May 14 10:14:51 2013 -0700
1.3 @@ -125,7 +125,7 @@
1.4 Content li;
1.5 if (prev != null) {
1.6 Content prevLink = new RawHtml(getLink(new LinkInfoImpl(configuration,
1.7 - LinkInfoImpl.CONTEXT_CLASS, prev, "",
1.8 + LinkInfoImpl.Kind.CLASS, prev, "",
1.9 configuration.getText("doclet.Prev_Class"), true)));
1.10 li = HtmlTree.LI(prevLink);
1.11 }
1.12 @@ -143,7 +143,7 @@
1.13 Content li;
1.14 if (next != null) {
1.15 Content nextLink = new RawHtml(getLink(new LinkInfoImpl(configuration,
1.16 - LinkInfoImpl.CONTEXT_CLASS, next, "",
1.17 + LinkInfoImpl.Kind.CLASS, next, "",
1.18 configuration.getText("doclet.Next_Class"), true)));
1.19 li = HtmlTree.LI(nextLink);
1.20 }
1.21 @@ -185,7 +185,7 @@
1.22 div.addContent(pkgNameDiv);
1.23 }
1.24 LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
1.25 - LinkInfoImpl.CONTEXT_CLASS_HEADER, classDoc, false);
1.26 + LinkInfoImpl.Kind.CLASS_HEADER, classDoc, false);
1.27 //Let's not link to ourselves in the header.
1.28 linkInfo.linkToSelf = false;
1.29 Content headerContent = new StringContent(header);
1.30 @@ -245,7 +245,7 @@
1.31 addAnnotationInfo(classDoc, pre);
1.32 pre.addContent(modifiers);
1.33 LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
1.34 - LinkInfoImpl.CONTEXT_CLASS_SIGNATURE, classDoc, false);
1.35 + LinkInfoImpl.Kind.CLASS_SIGNATURE, classDoc, false);
1.36 //Let's not link to ourselves in the signature.
1.37 linkInfo.linkToSelf = false;
1.38 Content className = new StringContent(classDoc.name());
1.39 @@ -265,7 +265,7 @@
1.40 pre.addContent(DocletConstants.NL);
1.41 pre.addContent("extends ");
1.42 Content link = new RawHtml(getLink(new LinkInfoImpl(configuration,
1.43 - LinkInfoImpl.CONTEXT_CLASS_SIGNATURE_PARENT_NAME,
1.44 + LinkInfoImpl.Kind.CLASS_SIGNATURE_PARENT_NAME,
1.45 superclass)));
1.46 pre.addContent(link);
1.47 }
1.48 @@ -286,7 +286,7 @@
1.49 pre.addContent(", ");
1.50 }
1.51 Content link = new RawHtml(getLink(new LinkInfoImpl(configuration,
1.52 - LinkInfoImpl.CONTEXT_CLASS_SIGNATURE_PARENT_NAME,
1.53 + LinkInfoImpl.Kind.CLASS_SIGNATURE_PARENT_NAME,
1.54 implIntfacs[i])));
1.55 pre.addContent(link);
1.56 counter++;
1.57 @@ -361,7 +361,7 @@
1.58 Content li = new HtmlTree(HtmlTag.LI);
1.59 if (type.equals(classDoc)) {
1.60 String typeParameters = getTypeParameterLinks(
1.61 - new LinkInfoImpl(configuration, LinkInfoImpl.CONTEXT_TREE,
1.62 + new LinkInfoImpl(configuration, LinkInfoImpl.Kind.TREE,
1.63 classDoc, false));
1.64 if (configuration.shouldExcludeQualifier(
1.65 classDoc.containingPackage().name())) {
1.66 @@ -373,7 +373,7 @@
1.67 }
1.68 } else {
1.69 Content link = new RawHtml(getLink(new LinkInfoImpl(configuration,
1.70 - LinkInfoImpl.CONTEXT_CLASS_TREE_PARENT,
1.71 + LinkInfoImpl.Kind.CLASS_TREE_PARENT,
1.72 type instanceof ClassDoc ? (ClassDoc) type : type,
1.73 configuration.getClassName(type.asClassDoc()), false)));
1.74 li.addContent(link);
1.75 @@ -419,7 +419,7 @@
1.76 "doclet.Subclasses");
1.77 Content dt = HtmlTree.DT(label);
1.78 Content dl = HtmlTree.DL(dt);
1.79 - dl.addContent(getClassLinks(LinkInfoImpl.CONTEXT_SUBCLASSES,
1.80 + dl.addContent(getClassLinks(LinkInfoImpl.Kind.SUBCLASSES,
1.81 subclasses));
1.82 classInfoTree.addContent(dl);
1.83 }
1.84 @@ -437,7 +437,7 @@
1.85 "doclet.Subinterfaces");
1.86 Content dt = HtmlTree.DT(label);
1.87 Content dl = HtmlTree.DL(dt);
1.88 - dl.addContent(getClassLinks(LinkInfoImpl.CONTEXT_SUBINTERFACES,
1.89 + dl.addContent(getClassLinks(LinkInfoImpl.Kind.SUBINTERFACES,
1.90 subInterfaces));
1.91 classInfoTree.addContent(dl);
1.92 }
1.93 @@ -461,7 +461,7 @@
1.94 "doclet.Implementing_Classes");
1.95 Content dt = HtmlTree.DT(label);
1.96 Content dl = HtmlTree.DL(dt);
1.97 - dl.addContent(getClassLinks(LinkInfoImpl.CONTEXT_IMPLEMENTED_CLASSES,
1.98 + dl.addContent(getClassLinks(LinkInfoImpl.Kind.IMPLEMENTED_CLASSES,
1.99 implcl));
1.100 classInfoTree.addContent(dl);
1.101 }
1.102 @@ -479,7 +479,7 @@
1.103 "doclet.All_Implemented_Interfaces");
1.104 Content dt = HtmlTree.DT(label);
1.105 Content dl = HtmlTree.DL(dt);
1.106 - dl.addContent(getClassLinks(LinkInfoImpl.CONTEXT_IMPLEMENTED_INTERFACES,
1.107 + dl.addContent(getClassLinks(LinkInfoImpl.Kind.IMPLEMENTED_INTERFACES,
1.108 interfaceArray));
1.109 classInfoTree.addContent(dl);
1.110 }
1.111 @@ -497,7 +497,7 @@
1.112 "doclet.All_Superinterfaces");
1.113 Content dt = HtmlTree.DT(label);
1.114 Content dl = HtmlTree.DL(dt);
1.115 - dl.addContent(getClassLinks(LinkInfoImpl.CONTEXT_SUPER_INTERFACES,
1.116 + dl.addContent(getClassLinks(LinkInfoImpl.Kind.SUPER_INTERFACES,
1.117 interfaceArray));
1.118 classInfoTree.addContent(dl);
1.119 }
1.120 @@ -521,7 +521,7 @@
1.121 Content dl = HtmlTree.DL(dt);
1.122 Content dd = new HtmlTree(HtmlTag.DD);
1.123 dd.addContent(new RawHtml(getLink(new LinkInfoImpl(configuration,
1.124 - LinkInfoImpl.CONTEXT_CLASS, outerClass, false))));
1.125 + LinkInfoImpl.Kind.CLASS, outerClass, false))));
1.126 dl.addContent(dd);
1.127 classInfoTree.addContent(dl);
1.128 }
1.129 @@ -569,7 +569,7 @@
1.130 * @param list the list of classes
1.131 * @return a content tree for the class list
1.132 */
1.133 - private Content getClassLinks(int context, List<?> list) {
1.134 + private Content getClassLinks(LinkInfoImpl.Kind context, List<?> list) {
1.135 Object[] typeList = list.toArray();
1.136 Content dd = new HtmlTree(HtmlTag.DD);
1.137 for (int i = 0; i < list.size(); i++) {
