diff --git a/langtools/src/share/classes/com/sun/javadoc/ClassDoc.java b/langtools/src/share/classes/com/sun/javadoc/ClassDoc.java
index 092f79bf528..b6e89031270 100644
--- a/langtools/src/share/classes/com/sun/javadoc/ClassDoc.java
+++ b/langtools/src/share/classes/com/sun/javadoc/ClassDoc.java
@@ -74,15 +74,6 @@ public interface ClassDoc extends ProgramElementDoc, Type {
*/
boolean isExternalizable();
- /**
- * Return true if this class can be used as a target type of a lambda expression
- * or method reference.
- *
- * @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 --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java
index a1ac09529d7..ebcb7b64cf3 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, 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
@@ -29,6 +29,7 @@ import java.util.*;
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.*;
@@ -528,7 +529,7 @@ public class ClassWriterImpl extends SubWriterHolderWriter
* {@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);
@@ -538,6 +539,19 @@ public class ClassWriterImpl extends SubWriterHolderWriter
}
}
+ 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 --git a/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
index 7428b97e0f6..f9fcaa74864 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
@@ -288,10 +288,6 @@ public class ClassDocImpl extends ProgramElementDocImpl implements ClassDoc {
return false;
}
- public boolean isFunctionalInterface() {
- return env.types.isFunctionalInterface(tsym) && env.source.allowLambda();
- }
-
/**
* Return the package that this class is contained in.
*/
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java
index 9046bc02a6b..25ab5561dee 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, 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
@@ -381,6 +381,11 @@ public class RootDocImpl extends DocImpl implements RootDoc {
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 --git a/langtools/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java b/langtools/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java
index 0fb47c1eddc..dc0a04db0b5 100644
--- a/langtools/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java
+++ b/langtools/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, 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
@@ -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
@@ -87,6 +87,11 @@ public class TestLambdaFeature extends JavadocTester {
"default default void defaultMethod()
"},
{BUG_ID + FS + "pkg" + FS + "B.html",
"default void | "},
+ {BUG_ID + FS + "pkg1" + FS + "NotAFuncInf.html",
+ "" + NL + "- Functional Interface:
" + NL +
+ "- This is a functional interface and can therefore be used as " +
+ "the assignment target for a lambda expression or method " +
+ "reference.
" + NL + "
"},
{BUG_ID + FS + "pkg" + FS + "B.html",
"" + NL + "- Functional Interface:
"}
};
diff --git a/langtools/test/com/sun/javadoc/testLambdaFeature/pkg/A.java b/langtools/test/com/sun/javadoc/testLambdaFeature/pkg/A.java
index c52f249b491..8e5992baebf 100644
--- a/langtools/test/com/sun/javadoc/testLambdaFeature/pkg/A.java
+++ b/langtools/test/com/sun/javadoc/testLambdaFeature/pkg/A.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, 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
@@ -23,6 +23,7 @@
package pkg;
+@FunctionalInterface
public interface A {
public void method1();
diff --git a/langtools/test/com/sun/javadoc/testLambdaFeature/pkg1/FuncInf.java b/langtools/test/com/sun/javadoc/testLambdaFeature/pkg1/FuncInf.java
index 566acf596ca..bace6ea9b98 100644
--- a/langtools/test/com/sun/javadoc/testLambdaFeature/pkg1/FuncInf.java
+++ b/langtools/test/com/sun/javadoc/testLambdaFeature/pkg1/FuncInf.java
@@ -23,6 +23,7 @@
package pkg1;
+@FunctionalInterface
public interface FuncInf {
V call() throws Exception;
diff --git a/langtools/test/com/sun/javadoc/testLambdaFeature/pkg1/NotAFuncInf.java b/langtools/test/com/sun/javadoc/testLambdaFeature/pkg1/NotAFuncInf.java
new file mode 100644
index 00000000000..24ad4cd393e
--- /dev/null
+++ b/langtools/test/com/sun/javadoc/testLambdaFeature/pkg1/NotAFuncInf.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2014, 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg1;
+
+public interface NotAFuncInf {
+
+ V call() throws Exception;
+}