archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 11:04:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8022738: doclet should only generate functional interface text if source >= 8

Browse source 
Reviewed-by: jjg
This commit is contained in:
Bhavesh Patel 2013-08-30 16:38:54 -07:00
parent 4cf2250826
commit b8f8cab5f4
4 changed files with 54 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
View file

@ -289,7 +289,7 @@ public class ClassDocImpl extends ProgramElementDocImpl implements ClassDoc {
}
public boolean isFunctionalInterface() {
return env.types.isFunctionalInterface(tsym);
return env.types.isFunctionalInterface(tsym) && env.source.allowLambda();
}
/**

6
langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
View file

@ -123,6 +123,11 @@ public class DocEnv {
*/
private boolean silent = false;
/**
* The source language version.
*/
protected Source source;
/**
* Constructor
*
@ -144,6 +149,7 @@ public class DocEnv {
// Default. Should normally be reset with setLocale.
this.doclocale = new DocLocale(this, "", breakiterator);
source = Source.instance(context);
}
public void setSilent(boolean silent) {

22
langtools/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 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
@ -23,7 +23,7 @@
/*
* @test
* @bug 8004893
* @bug 8004893 8022738
* @summary Make sure that the lambda feature changes work fine in
* javadoc.
* @author bpatel
@ -35,11 +35,15 @@
public class TestLambdaFeature extends JavadocTester {
//Test information.
private static final String BUG_ID = "8004893";
private static final String BUG_ID = "8004893-8022738";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", "pkg1"
};
private static final String[] ARGS_1 = new String[] {
"-d", BUG_ID + "-2", "-sourcepath", SRC_DIR, "-source", "1.5", "pkg1"
};
//Input for string search tests.
@ -60,6 +64,11 @@ public class TestLambdaFeature extends JavadocTester {
"<a href=\"javascript:show(16);\">Default Methods</a></span>" +
"<span class=\"tabEnd\">&nbsp;</span></span></caption>"},
{BUG_ID + FS + "pkg" + FS + "A.html",
"<dl>" + NL + "<dt>Functional Interface:</dt>" + NL +
"<dd>This is a functional interface and can therefore be used as " +
"the assignment target for a lambda expression or method " +
"reference.</dd>" + NL + "</dl>"},
{BUG_ID + FS + "pkg1" + FS + "FuncInf.html",
"<dl>" + NL + "<dt>Functional Interface:</dt>" + NL +
"<dd>This is a functional interface and can therefore be used as " +
"the assignment target for a lambda expression or method " +
@ -75,6 +84,10 @@ public class TestLambdaFeature extends JavadocTester {
{BUG_ID + FS + "pkg" + FS + "B.html",
"<dl>" + NL + "<dt>Functional Interface:</dt>"}
};
private static final String[][] NEGATED_TEST_1 = {
{BUG_ID + "-2" + FS + "pkg1" + FS + "FuncInf.html",
"<dl>" + NL + "<dt>Functional Interface:</dt>"}
};
/**
* The entry point of the test.
@ -83,6 +96,7 @@ public class TestLambdaFeature extends JavadocTester {
public static void main(String[] args) {
TestLambdaFeature tester = new TestLambdaFeature();
run(tester, ARGS, TEST, NEGATED_TEST);
run(tester, ARGS_1, NO_TEST, NEGATED_TEST_1);
tester.printSummary();
}

29
langtools/test/com/sun/javadoc/testLambdaFeature/pkg1/FuncInf.java Normal file
View file

@ -0,0 +1,29 @@
/*
* Copyright (c) 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
* 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 FuncInf<V> {
V call() throws Exception;
}