1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java Fri May 10 15:15:50 2013 +0200
1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java Tue May 14 10:14:51 2013 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -103,7 +103,7 @@
1.11 writer.addAnnotationInfo(field, pre);
1.12 addModifiers(field, pre);
1.13 Content fieldlink = new RawHtml(writer.getLink(new LinkInfoImpl(
1.14 - configuration, LinkInfoImpl.CONTEXT_MEMBER, field.type())));
1.15 + configuration, LinkInfoImpl.Kind.MEMBER, field.type())));
1.16 pre.addContent(fieldlink);
1.17 pre.addContent(" ");
1.18 if (configuration.linksource) {
1.19 @@ -133,7 +133,7 @@
1.20 writer.addInlineComment(field, fieldDocTree);
1.21 } else {
1.22 Content link = new RawHtml(
1.23 - writer.getDocLink(LinkInfoImpl.CONTEXT_FIELD_DOC_COPY,
1.24 + writer.getDocLink(LinkInfoImpl.Kind.FIELD_DOC_COPY,
1.25 holder, field,
1.26 holder.isIncluded() ?
1.27 holder.typeName() : holder.qualifiedTypeName(),
1.28 @@ -240,7 +240,7 @@
1.29 */
1.30 public void addInheritedSummaryLabel(ClassDoc cd, Content inheritedTree) {
1.31 Content classLink = new RawHtml(writer.getPreQualifiedClassLink(
1.32 - LinkInfoImpl.CONTEXT_MEMBER, cd, false));
1.33 + LinkInfoImpl.Kind.MEMBER, cd, false));
1.34 Content label = new StringContent(cd.isClass() ?
1.35 configuration.getText("doclet.Fields_Inherited_From_Class") :
1.36 configuration.getText("doclet.Fields_Inherited_From_Interface"));
1.37 @@ -254,7 +254,7 @@
1.38 /**
1.39 * {@inheritDoc}
1.40 */
1.41 - protected void addSummaryLink(int context, ClassDoc cd, ProgramElementDoc member,
1.42 + protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member,
1.43 Content tdSummary) {
1.44 Content strong = HtmlTree.STRONG(new RawHtml(
1.45 writer.getDocLink(context, cd , (MemberDoc) member, member.name(), false)));
1.46 @@ -268,7 +268,7 @@
1.47 protected void addInheritedSummaryLink(ClassDoc cd,
1.48 ProgramElementDoc member, Content linksTree) {
1.49 linksTree.addContent(new RawHtml(
1.50 - writer.getDocLink(LinkInfoImpl.CONTEXT_MEMBER, cd, (MemberDoc)member,
1.51 + writer.getDocLink(LinkInfoImpl.Kind.MEMBER, cd, (MemberDoc)member,
1.52 member.name(), false)));
1.53 }
1.54
1.55 @@ -284,7 +284,7 @@
1.56 * {@inheritDoc}
1.57 */
1.58 protected Content getDeprecatedLink(ProgramElementDoc member) {
1.59 - return writer.getDocLink(LinkInfoImpl.CONTEXT_MEMBER,
1.60 + return writer.getDocLink(LinkInfoImpl.Kind.MEMBER,
1.61 (MemberDoc) member, ((FieldDoc)member).qualifiedName());
1.62 }
1.63
