1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Wed Dec 25 10:36:05 2013 -0800 1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Thu Jan 02 02:15:21 2014 -0800 1.3 @@ -29,6 +29,7 @@ 1.4 1.5 import com.sun.javadoc.*; 1.6 import com.sun.tools.javac.jvm.Profile; 1.7 +import com.sun.tools.javadoc.RootDocImpl; 1.8 import com.sun.tools.doclets.formats.html.markup.*; 1.9 import com.sun.tools.doclets.internal.toolkit.*; 1.10 import com.sun.tools.doclets.internal.toolkit.builders.*; 1.11 @@ -529,7 +530,7 @@ 1.12 * {@inheritDoc} 1.13 */ 1.14 public void addFunctionalInterfaceInfo (Content classInfoTree) { 1.15 - if (classDoc.isFunctionalInterface()) { 1.16 + if (isFunctionalInterface()) { 1.17 Content dt = HtmlTree.DT(getResource("doclet.Functional_Interface")); 1.18 Content dl = HtmlTree.DL(dt); 1.19 Content dd = new HtmlTree(HtmlTag.DD); 1.20 @@ -539,6 +540,19 @@ 1.21 } 1.22 } 1.23 1.24 + public boolean isFunctionalInterface() { 1.25 + if (configuration.root instanceof RootDocImpl) { 1.26 + RootDocImpl root = (RootDocImpl) configuration.root; 1.27 + AnnotationDesc[] annotationDescList = classDoc.annotations(); 1.28 + for (AnnotationDesc annoDesc : annotationDescList) { 1.29 + if (root.isFunctionalInterface(annoDesc)) { 1.30 + return true; 1.31 + } 1.32 + } 1.33 + } 1.34 + return false; 1.35 + } 1.36 + 1.37 /** 1.38 * {@inheritDoc} 1.39 */