# HG changeset patch # User kizune # Date 1389726638 -14400 # Node ID 1f135528db7c12a450620265a3473125240040c7 # Parent 8712cc6441db431dc9e8822bd36ae07a18bfaa9b# Parent 4a6f853f8721992467c7963757e70dbefd811488 Merge diff -r 8712cc6441db -r 1f135528db7c src/share/classes/com/sun/javadoc/ClassDoc.java --- a/src/share/classes/com/sun/javadoc/ClassDoc.java Fri Jan 03 16:01:05 2014 -0800 +++ b/src/share/classes/com/sun/javadoc/ClassDoc.java Tue Jan 14 23:10:38 2014 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2013, 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 @@ -66,12 +66,6 @@ boolean isExternalizable(); /** - * Return true if this class can be used as a target type of a lambda expression - * or method reference. - */ - boolean isFunctionalInterface(); - - /** * Return the serialization methods for this class or * interface. * diff -r 8712cc6441db -r 1f135528db7c src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java --- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Fri Jan 03 16:01:05 2014 -0800 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Tue Jan 14 23:10:38 2014 +0400 @@ -29,6 +29,7 @@ import com.sun.javadoc.*; import com.sun.tools.javac.jvm.Profile; +import com.sun.tools.javadoc.RootDocImpl; import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; import com.sun.tools.doclets.internal.toolkit.builders.*; @@ -529,7 +530,7 @@ * {@inheritDoc} */ public void addFunctionalInterfaceInfo (Content classInfoTree) { - if (classDoc.isFunctionalInterface()) { + if (isFunctionalInterface()) { Content dt = HtmlTree.DT(getResource("doclet.Functional_Interface")); Content dl = HtmlTree.DL(dt); Content dd = new HtmlTree(HtmlTag.DD); @@ -539,6 +540,19 @@ } } + public boolean isFunctionalInterface() { + if (configuration.root instanceof RootDocImpl) { + RootDocImpl root = (RootDocImpl) configuration.root; + AnnotationDesc[] annotationDescList = classDoc.annotations(); + for (AnnotationDesc annoDesc : annotationDescList) { + if (root.isFunctionalInterface(annoDesc)) { + return true; + } + } + } + return false; + } + /** * {@inheritDoc} */ diff -r 8712cc6441db -r 1f135528db7c src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java --- a/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java Fri Jan 03 16:01:05 2014 -0800 +++ b/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java Tue Jan 14 23:10:38 2014 +0400 @@ -288,10 +288,6 @@ return false; } - public boolean isFunctionalInterface() { - return env.types.isFunctionalInterface(tsym) && env.source.allowLambda(); - } - /** * Return the package that this class is contained in. */ diff -r 8712cc6441db -r 1f135528db7c src/share/classes/com/sun/tools/javadoc/RootDocImpl.java --- a/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java Fri Jan 03 16:01:05 2014 -0800 +++ b/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java Tue Jan 14 23:10:38 2014 +0400 @@ -381,6 +381,11 @@ env.initDoclint(opts, customTagNames); } + public boolean isFunctionalInterface(AnnotationDesc annotationDesc) { + return annotationDesc.annotationType().qualifiedName().equals( + env.syms.functionalInterfaceType.toString()) && env.source.allowLambda(); + } + public boolean showTagMessages() { return env.showTagMessages(); } diff -r 8712cc6441db -r 1f135528db7c test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java --- a/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java Fri Jan 03 16:01:05 2014 -0800 +++ b/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java Tue Jan 14 23:10:38 2014 +0400 @@ -23,7 +23,7 @@ /* * @test - * @bug 8004893 8022738 + * @bug 8004893 8022738 8029143 * @summary Make sure that the lambda feature changes work fine in * javadoc. * @author bpatel @@ -81,6 +81,11 @@ "
default default void defaultMethod()"}, {BUG_ID + FS + "pkg" + FS + "B.html", "
default void