Mercurial > hg > openjdk > jigsaw > langtools
changeset 1842:f9e6d666883e default tip
Merge
line wrap: on
line diff
--- a/.hgtags Wed Feb 13 15:38:52 2013 +0000 +++ b/.hgtags Tue May 07 17:14:17 2013 -0700 @@ -202,3 +202,16 @@ 6f0986ed9b7e11d6eb06618f27e20b18f19fb797 jdk8-b72 8d0baee36c7184d55c80354b45704c37d6b7ac79 jdk8-b73 56c97aff46bb577b8668874154c24115a7e8a3e8 jdk8-b74 +c2e11e2ec4a3682513e566849e5562f31ded8c65 jdk8-b75 +e81839b3233792415daaab051698edc6067f1a16 jdk8-b76 +89c66415168925dffe492356ff893ff248bb5603 jdk8-b77 +af8417e590f4e76e0dfed09e71239fb102ef0d43 jdk8-b78 +56dfafbb9e1ad7548a4415316dc003296fb498cb jdk8-b79 +a8227c61768499dac847ea718af6719027c949f2 jdk8-b80 +ed69d087fdfd394491657a28ba9bc58e7849b7db jdk8-b81 +825da6847791994a8f405ee397df9e7fa638a458 jdk8-b82 +22ba3f92d4ae43bbc19793e854171cae2586f644 jdk8-b83 +cfb65ca92082b2412aed66c8422c2466bde544ef jdk8-b84 +4a48f31735349782ad13980267358c97076adc66 jdk8-b85 +6ab578e141dfd17c4dc03869bb204aafa490c9f4 jdk8-b86 +1329f9c38d93c8caf339d7687df8371d06fe9e56 jdk8-b87
--- a/make/Makefile-classic Wed Feb 13 15:38:52 2013 +0000 +++ b/make/Makefile-classic Tue May 07 17:14:17 2013 -0700 @@ -241,6 +241,7 @@ javax/annotation/processing \ javax/lang/model \ javax/tools \ + jdk/ \ com/sun/source \ com/sun/tools/javac
--- a/make/build.properties Wed Feb 13 15:38:52 2013 +0000 +++ b/make/build.properties Tue May 07 17:14:17 2013 -0700 @@ -124,6 +124,7 @@ javax/annotation/processing/ \ javax/lang/model/ \ javax/tools/ \ + jdk/ \ com/sun/source/ \ com/sun/tools/javac/ \ com/sun/tools/doclint/ @@ -190,7 +191,8 @@ javap.includes = \ com/sun/tools/classfile/ \ com/sun/tools/javap/ \ - com/sun/tools/jdeps/ + com/sun/tools/jdeps/ \ + sun/tools/javap/ javap.tests = \ tools/javap/
--- a/make/build.xml Wed Feb 13 15:38:52 2013 +0000 +++ b/make/build.xml Tue May 07 17:14:17 2013 -0700 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2007, 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 @@ -484,6 +484,31 @@ </zip> </target> + <target name="doclint-api" depends="build-all-classes"> + <delete dir="${build.dir}/doclint/classes"/> + <mkdir dir="${build.dir}/doclint/classes"/> + <javac fork="true" + executable="${boot.javac}" + srcdir="${src.classes.dir}:${build.gensrc.dir}" + destdir="${build.dir}/doclint/classes" + includes="javax/lang/model/** com/sun/javadoc/** com/sun/source/**" + excludes="" + sourcepath="${javac.sourcepath}" + classpath="${javac.classpath}" + includeAntRuntime="no" + source="${javac.source}" + target="${javac.target}" + debug="${javac.debug}" + debuglevel="${javac.debuglevel}"> + <compilerarg value="-implicit:none"/> + <compilerarg value="-Xprefer:source"/> + <compilerarg value="-J-Xbootclasspath/p:${build.bootstrap.dir}/classes"/> + <compilerarg line="${javac.no.jdk.warnings}"/> + <compilerarg line="${javac.version.opt}"/> + <compilerarg line="-Xdoclint:all/protected,-missing"/> + </javac> + </target> + <!-- **** Debugging/diagnostic targets. --> @@ -776,7 +801,7 @@ jarclasspath="sjavac.jar"/> <build-tool name="sjavac"/> </target> - + <!-- (no javadoc for javap) --> <target name="jtreg-sjavac" depends="build-sjavac,-def-jtreg">
--- a/make/netbeans/langtools/nbproject/project.xml Wed Feb 13 15:38:52 2013 +0000 +++ b/make/netbeans/langtools/nbproject/project.xml Tue May 07 17:14:17 2013 -0700 @@ -29,15 +29,13 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> - -<!DOCTYPE project [ - <!ENTITY standard-ide-actions SYSTEM "standard-ide-actions.ent"> - <!ENTITY standard-context-menu-items SYSTEM "standard-context-menu-items.ent"> -]> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.ant.freeform</type> <configuration> <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1"> + <name>langtools</name> + </general-data> + <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2"> <!-- Do not use Project Properties customizer when editing this file manually. --> <name>langtools</name> <properties> @@ -49,11 +47,6 @@ <location>${root}</location> </source-folder> <source-folder> - <label>Source files</label> - <type>java</type> - <location>${root}/src/share/classes</location> - </source-folder> - <source-folder> <label>Test files</label> <type>tests</type> <location>${root}/test</location> @@ -63,9 +56,169 @@ <type>build</type> <location>${root}/make</location> </source-folder> + <source-folder> + <label>Source files</label> + <type>java</type> + <location>${root}/src/share/classes</location> + </source-folder> + <build-file> + <location>${root}/build/classes</location> + </build-file> </folders> <ide-actions> - &standard-ide-actions; + <!-- + Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + - Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + - Neither the name of Oracle nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + <!-- + This file defines the standard actions accepted by langtools projects. + It is normally included as an entity into a project's project.xml file. + + For information on these actions, see + - NetBeans: Setting Up Projects + at http://www.netbeans.org/kb/55/using-netbeans/project_setup.html + - NetBeans: Advanced Freeform Project Configuration + at http://www.netbeans.org/kb/41/freeform-config.html +--> + <action name="build"> + <target>build</target> + </action> + <action name="clean"> + <target>clean</target> + </action> + <action name="rebuild"> + <target>clean</target> + <target>build</target> + </action> + <action name="compile.single"> + <target>compile-single</target> + <property name="srcdir">${root}/src/share/classes</property> + <context> + <property>includes</property> + <folder>${root}/src/share/classes</folder> + <pattern>\.java$</pattern> + <format>relative-path</format> + <arity> + <separated-files>,</separated-files> + </arity> + </context> + </action> + <action name="run"> + <target>run</target> + </action> + <action name="run.single"> + <target>run-single</target> + <context> + <property>run.classname</property> + <folder>${root}/src/share/classes</folder> + <pattern>\.java$</pattern> + <format>java-name</format> + <arity> + <one-file-only/> + </arity> + </context> + </action> + <!-- + Note: NetBeans does not appear to support context menu items + on shell scripts :-( +--> + <action name="run.single"> + <target>jtreg</target> + <context> + <property>jtreg.tests</property> + <folder>${root}/test</folder> + <pattern>\.(java|sh)$</pattern> + <format>relative-path</format> + <arity> + <separated-files>,</separated-files> + </arity> + </context> + </action> + <action name="test"> + <target>jtreg</target> + </action> + <action name="debug"> + <target>debug</target> + </action> + <action name="debug.single"> + <target>debug-single</target> + <context> + <property>debug.classname</property> + <folder>${root}/src/share/classes</folder> + <pattern>\.java$</pattern> + <format>java-name</format> + <arity> + <one-file-only/> + </arity> + </context> + </action> + <!-- + Note: NetBeans does not appear to support context menu items + on shell scripts :-( +--> + <action name="debug.single"> + <target>debug-jtreg</target> + <context> + <property>jtreg.tests</property> + <folder>${root}/test</folder> + <pattern>\.(java|sh)$</pattern> + <format>relative-path</format> + <arity> + <one-file-only/> + </arity> + </context> + </action> + <action name="debug.fix"> + <target>debug-fix</target> + <property name="srcdir">${root}/src/share/classes</property> + <context> + <property>class</property> + <folder>${root}/src/share/classes</folder> + <pattern>\.java$</pattern> + <format>relative-path-noext</format> + <arity> + <one-file-only/> + </arity> + </context> + </action> + <action name="javadoc"> + <target>javadoc</target> + </action> + <action name="select-tool"> + <target>select-tool</target> + </action> + <action name="test-select-tool-1"> + <target>test-select-tool-1</target> + </action> + <action name="test-select-tool-2"> + <target>test-select-tool-2</target> + </action> </ide-actions> <export> <type>folder</type> @@ -86,13 +239,68 @@ <label>Build files</label> <location>${root}/make</location> </source-folder> + <source-folder style="packages"> + <label>Source files</label> + <location>${root}/src/share/classes</location> + </source-folder> <source-file> <label>README</label> <location>README</location> </source-file> </items> <context-menu> - &standard-context-menu-items; + <!-- + Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + - Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + - Neither the name of Oracle nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + <!-- + This file defines the actions that will appear on the project's context + menu, in the Projects viewer. + It is normally included as an entity into a project's project.xml file. + + For information on these actions, see + - NetBeans: Setting Up Projects + at http://www.netbeans.org/kb/55/using-netbeans/project_setup.html + - NetBeans: Advanced Freeform Project Configuration + at http://www.netbeans.org/kb/41/freeform-config.html +--> + <ide-action name="select-tool"/> + <separator/> + <ide-action name="build"/> + <ide-action name="rebuild"/> + <ide-action name="clean"/> + <ide-action name="javadoc"/> + <separator/> + <ide-action name="run"/> + <ide-action name="debug"/> + <separator/> + <ide-action name="test"/> </context-menu> </view> <subprojects/> @@ -101,7 +309,7 @@ <compilation-unit> <package-root>${root}/src/share/classes</package-root> <built-to>${root}/build/classes</built-to> - <source-level>1.5</source-level> <!-- FIXME --> + <source-level>1.5</source-level> </compilation-unit> </java-data> </configuration>
--- a/makefiles/BuildLangtools.gmk Wed Feb 13 15:38:52 2013 +0000 +++ b/makefiles/BuildLangtools.gmk Tue May 07 17:14:17 2013 -0700 @@ -113,23 +113,7 @@ $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC,$(BUILD_BOOTSTRAP_LANGTOOLS),\ SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\ JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\ - JARMAIN:=com.sun.tools.javac.Main)) - - $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAH,$(BUILD_BOOTSTRAP_LANGTOOLS),\ - SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\ - JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar,\ - JARMAIN:=com.sun.tools.javah.Main)) - - $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAP,$(BUILD_BOOTSTRAP_LANGTOOLS),\ - SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\ - JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javap.jar,\ - JARMAIN:=com.sun.tools.javap.Main)) - - $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVADOC,$(BUILD_BOOTSTRAP_LANGTOOLS),\ - SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\ - JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar,\ - SUFFIXES:=.class $(RESOURCE_SUFFIXES),\ - JARMAIN:=com.sun.tools.javadoc.Main)) + SUFFIXES:=.class $(RESOURCE_SUFFIXES))) # GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not # yet built. It is currently not needed but might be again in the future. The following @@ -178,7 +162,8 @@ $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\ JVM:=$(JAVA),\ JAVAC:="-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ - -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\ + -cp $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ + com.sun.tools.javac.Main,\ FLAGS:=-XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror,\ SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) @@ -203,11 +188,7 @@ all: $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar \ $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip \ - $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ - $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar \ - $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javap.jar \ - $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar - + $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar endif endif
--- a/src/share/classes/com/sun/javadoc/ExecutableMemberDoc.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/javadoc/ExecutableMemberDoc.java Tue May 07 17:14:17 2013 -0700 @@ -88,13 +88,12 @@ Parameter[] parameters(); /** - * Get the receiver annotations of this executable element. - * Return an empty array if there are none. + * Get the receiver type of this executable element. * - * @return the receiver annotations of this executable element. + * @return the receiver type of this executable element. * @since 1.8 */ - AnnotationDesc[] receiverAnnotations(); + Type receiverType(); /** * Return the throws tags in this method.
--- a/src/share/classes/com/sun/javadoc/Type.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/javadoc/Type.java Tue May 07 17:14:17 2013 -0700 @@ -160,4 +160,13 @@ * @since 1.5 */ AnnotationTypeDoc asAnnotationTypeDoc(); + + /** + * If this type is an array type, return the element type of the + * array. Otherwise, return null. + * + * @return a <code>Type</code> representing the element type or null. + * @since 1.8 + */ + Type getElementType(); }
--- a/src/share/classes/com/sun/source/doctree/AttributeTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/AttributeTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -33,7 +33,9 @@ * * @since 1.8 */ +@jdk.Supported public interface AttributeTree extends DocTree { + @jdk.Supported enum ValueKind { EMPTY, UNQUOTED, SINGLE, DOUBLE }; Name getName();
--- a/src/share/classes/com/sun/source/doctree/AuthorTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/AuthorTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -35,6 +35,7 @@ * * @since 1.8 */ +@jdk.Supported public interface AuthorTree extends BlockTagTree { List<? extends DocTree> getName(); }
--- a/src/share/classes/com/sun/source/doctree/BlockTagTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/BlockTagTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -31,6 +31,7 @@ * * @since 1.8 */ +@jdk.Supported public interface BlockTagTree extends DocTree { String getTagName(); }
--- a/src/share/classes/com/sun/source/doctree/CommentTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/CommentTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -33,6 +33,7 @@ * * @since 1.8 */ +@jdk.Supported public interface CommentTree extends DocTree { String getBody(); }
--- a/src/share/classes/com/sun/source/doctree/DeprecatedTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/DeprecatedTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -35,6 +35,7 @@ * * @since 1.8 */ +@jdk.Supported public interface DeprecatedTree extends BlockTagTree { List<? extends DocTree> getBody(); }
--- a/src/share/classes/com/sun/source/doctree/DocCommentTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/DocCommentTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -35,6 +35,7 @@ * * @since 1.8 */ +@jdk.Supported public interface DocCommentTree extends DocTree { List<? extends DocTree> getFirstSentence(); List<? extends DocTree> getBody();
--- a/src/share/classes/com/sun/source/doctree/DocRootTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/DocRootTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -33,4 +33,5 @@ * * @since 1.8 */ +@jdk.Supported public interface DocRootTree extends InlineTagTree { }
--- a/src/share/classes/com/sun/source/doctree/DocTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/DocTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -30,7 +30,9 @@ * * @since 1.8 */ +@jdk.Supported public interface DocTree { + @jdk.Supported enum Kind { /** * Used for instances of {@link AttributeTree}
--- a/src/share/classes/com/sun/source/doctree/DocTreeVisitor.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/DocTreeVisitor.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -54,6 +54,7 @@ * * @since 1.8 */ +@jdk.Supported public interface DocTreeVisitor<R,P> { R visitAttribute(AttributeTree node, P p); R visitAuthor(AuthorTree node, P p);
--- a/src/share/classes/com/sun/source/doctree/EndElementTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/EndElementTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -35,6 +35,7 @@ * * @since 1.8 */ +@jdk.Supported public interface EndElementTree extends DocTree { Name getName(); }
--- a/src/share/classes/com/sun/source/doctree/EntityTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/EntityTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -36,6 +36,7 @@ * * @since 1.8 */ +@jdk.Supported public interface EntityTree extends DocTree { Name getName(); }
--- a/src/share/classes/com/sun/source/doctree/ErroneousTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/ErroneousTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -32,6 +32,7 @@ * * @since 1.8 */ +@jdk.Supported public interface ErroneousTree extends TextTree { /** * Gets a diagnostic object giving details about
--- a/src/share/classes/com/sun/source/doctree/IdentifierTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/IdentifierTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -35,6 +35,7 @@ * * @since 1.8 */ +@jdk.Supported public interface IdentifierTree extends DocTree { Name getName(); }
--- a/src/share/classes/com/sun/source/doctree/InheritDocTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/InheritDocTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -34,4 +34,5 @@ * * @since 1.8 */ +@jdk.Supported public interface InheritDocTree extends InlineTagTree { }
--- a/src/share/classes/com/sun/source/doctree/InlineTagTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/InlineTagTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -31,6 +31,7 @@ * * @since 1.8 */ +@jdk.Supported public interface InlineTagTree extends DocTree { String getTagName(); }
--- a/src/share/classes/com/sun/source/doctree/LinkTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/LinkTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -36,6 +36,7 @@ * * @since 1.8 */ +@jdk.Supported public interface LinkTree extends InlineTagTree { ReferenceTree getReference(); List<? extends DocTree> getLabel();
--- a/src/share/classes/com/sun/source/doctree/LiteralTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/LiteralTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -34,6 +34,7 @@ * * @since 1.8 */ +@jdk.Supported public interface LiteralTree extends InlineTagTree { TextTree getBody(); }
--- a/src/share/classes/com/sun/source/doctree/ParamTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/ParamTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -35,6 +35,7 @@ * * @since 1.8 */ +@jdk.Supported public interface ParamTree extends BlockTagTree { boolean isTypeParameter(); IdentifierTree getName();
--- a/src/share/classes/com/sun/source/doctree/ReferenceTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/ReferenceTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -33,6 +33,7 @@ * * @since 1.8 */ +@jdk.Supported public interface ReferenceTree extends DocTree { String getSignature(); }
--- a/src/share/classes/com/sun/source/doctree/ReturnTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/ReturnTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -35,6 +35,7 @@ * * @since 1.8 */ +@jdk.Supported public interface ReturnTree extends BlockTagTree { List<? extends DocTree> getDescription(); }
--- a/src/share/classes/com/sun/source/doctree/SeeTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/SeeTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -38,6 +38,7 @@ * * @since 1.8 */ +@jdk.Supported public interface SeeTree extends BlockTagTree { List<? extends DocTree> getReference(); }
--- a/src/share/classes/com/sun/source/doctree/SerialDataTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/SerialDataTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -35,6 +35,7 @@ * * @since 1.8 */ +@jdk.Supported public interface SerialDataTree extends BlockTagTree { List<? extends DocTree> getDescription(); }
--- a/src/share/classes/com/sun/source/doctree/SerialFieldTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/SerialFieldTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -35,6 +35,7 @@ * * @since 1.8 */ +@jdk.Supported public interface SerialFieldTree extends BlockTagTree { IdentifierTree getName(); ReferenceTree getType();
--- a/src/share/classes/com/sun/source/doctree/SerialTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/SerialTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -35,6 +35,7 @@ * * @since 1.8 */ +@jdk.Supported public interface SerialTree extends BlockTagTree { List<? extends DocTree> getDescription(); }
--- a/src/share/classes/com/sun/source/doctree/SinceTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/SinceTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -35,6 +35,7 @@ * * @since 1.8 */ +@jdk.Supported public interface SinceTree extends BlockTagTree { List<? extends DocTree> getBody(); }
--- a/src/share/classes/com/sun/source/doctree/StartElementTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/StartElementTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -36,6 +36,7 @@ * * @since 1.8 */ +@jdk.Supported public interface StartElementTree extends DocTree { Name getName(); List<? extends DocTree> getAttributes();
--- a/src/share/classes/com/sun/source/doctree/TextTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/TextTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -30,6 +30,7 @@ * * @since 1.8 */ +@jdk.Supported public interface TextTree extends DocTree { String getBody(); }
--- a/src/share/classes/com/sun/source/doctree/ThrowsTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/ThrowsTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -38,6 +38,7 @@ * * @since 1.8 */ +@jdk.Supported public interface ThrowsTree extends BlockTagTree { ReferenceTree getExceptionName(); List<? extends DocTree> getDescription();
--- a/src/share/classes/com/sun/source/doctree/UnknownBlockTagTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/UnknownBlockTagTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -35,6 +35,7 @@ * @since 1.8 * */ +@jdk.Supported public interface UnknownBlockTagTree extends BlockTagTree { List<? extends DocTree> getContent(); }
--- a/src/share/classes/com/sun/source/doctree/UnknownInlineTagTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/UnknownInlineTagTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -35,6 +35,7 @@ * @since 1.8 * */ +@jdk.Supported public interface UnknownInlineTagTree extends InlineTagTree { List<? extends DocTree> getContent(); }
--- a/src/share/classes/com/sun/source/doctree/ValueTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/ValueTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -33,6 +33,7 @@ * * @since 1.8 */ +@jdk.Supported public interface ValueTree extends InlineTagTree { ReferenceTree getReference(); }
--- a/src/share/classes/com/sun/source/doctree/VersionTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/VersionTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -36,6 +36,7 @@ * * @since 1.8 */ +@jdk.Supported public interface VersionTree extends BlockTagTree { List<? extends DocTree> getBody(); }
--- a/src/share/classes/com/sun/source/doctree/package-info.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/doctree/package-info.java Tue May 07 17:14:17 2013 -0700 @@ -31,4 +31,5 @@ * @since 1.8 * @see <a href="http://download.oracle.com/javase/6/docs/technotes/tools/solaris/javadoc.html#javadoctags">http://download.oracle.com/javase/6/docs/technotes/tools/solaris/javadoc.html#javadoctags</a> */ +@jdk.Supported package com.sun.source.doctree;
--- a/src/share/classes/com/sun/source/tree/AnnotatedTypeTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/AnnotatedTypeTree.java Tue May 07 17:14:17 2013 -0700 @@ -41,6 +41,7 @@ * @author Mahmood Ali * @since 1.8 */ +@jdk.Supported public interface AnnotatedTypeTree extends ExpressionTree { List<? extends AnnotationTree> getAnnotations(); ExpressionTree getUnderlyingType();
--- a/src/share/classes/com/sun/source/tree/AnnotationTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/AnnotationTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -42,6 +42,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface AnnotationTree extends ExpressionTree { Tree getAnnotationType(); List<? extends ExpressionTree> getArguments();
--- a/src/share/classes/com/sun/source/tree/ArrayAccessTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/ArrayAccessTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -39,6 +39,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface ArrayAccessTree extends ExpressionTree { ExpressionTree getExpression(); ExpressionTree getIndex();
--- a/src/share/classes/com/sun/source/tree/ArrayTypeTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/ArrayTypeTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -39,6 +39,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface ArrayTypeTree extends Tree { Tree getType(); }
--- a/src/share/classes/com/sun/source/tree/AssertTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/AssertTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -41,6 +41,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface AssertTree extends StatementTree { ExpressionTree getCondition(); ExpressionTree getDetail();
--- a/src/share/classes/com/sun/source/tree/AssignmentTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/AssignmentTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -39,6 +39,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface AssignmentTree extends ExpressionTree { ExpressionTree getVariable(); ExpressionTree getExpression();
--- a/src/share/classes/com/sun/source/tree/BinaryTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/BinaryTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -40,6 +40,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface BinaryTree extends ExpressionTree { ExpressionTree getLeftOperand(); ExpressionTree getRightOperand();
--- a/src/share/classes/com/sun/source/tree/BlockTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/BlockTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -45,6 +45,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface BlockTree extends StatementTree { boolean isStatic(); List<? extends StatementTree> getStatements();
--- a/src/share/classes/com/sun/source/tree/BreakTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/BreakTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -43,6 +43,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface BreakTree extends StatementTree { Name getLabel(); }
--- a/src/share/classes/com/sun/source/tree/CaseTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/CaseTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -45,6 +45,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface CaseTree extends Tree { /** * @return null if and only if this Case is {@code default:}
--- a/src/share/classes/com/sun/source/tree/CatchTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/CatchTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -40,6 +40,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface CatchTree extends Tree { VariableTree getParameter(); BlockTree getBlock();
--- a/src/share/classes/com/sun/source/tree/ClassTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/ClassTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -48,6 +48,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface ClassTree extends StatementTree { ModifiersTree getModifiers(); Name getSimpleName();
--- a/src/share/classes/com/sun/source/tree/CompilationUnitTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/CompilationUnitTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -37,6 +37,7 @@ * @author Peter von der Ahé * @since 1.6 */ +@jdk.Supported public interface CompilationUnitTree extends Tree { List<? extends AnnotationTree> getPackageAnnotations(); ExpressionTree getPackageName();
--- a/src/share/classes/com/sun/source/tree/CompoundAssignmentTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/CompoundAssignmentTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -40,6 +40,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface CompoundAssignmentTree extends ExpressionTree { ExpressionTree getVariable(); ExpressionTree getExpression();
--- a/src/share/classes/com/sun/source/tree/ConditionalExpressionTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/ConditionalExpressionTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -39,6 +39,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface ConditionalExpressionTree extends ExpressionTree { ExpressionTree getCondition(); ExpressionTree getTrueExpression();
--- a/src/share/classes/com/sun/source/tree/ContinueTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/ContinueTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -42,6 +42,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface ContinueTree extends StatementTree { Name getLabel(); }
--- a/src/share/classes/com/sun/source/tree/DoWhileLoopTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/DoWhileLoopTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -41,6 +41,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface DoWhileLoopTree extends StatementTree { ExpressionTree getCondition(); StatementTree getStatement();
--- a/src/share/classes/com/sun/source/tree/EmptyStatementTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/EmptyStatementTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -39,4 +39,5 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface EmptyStatementTree extends StatementTree {}
--- a/src/share/classes/com/sun/source/tree/EnhancedForLoopTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/EnhancedForLoopTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -40,6 +40,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface EnhancedForLoopTree extends StatementTree { VariableTree getVariable(); ExpressionTree getExpression();
--- a/src/share/classes/com/sun/source/tree/ErroneousTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/ErroneousTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -34,6 +34,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface ErroneousTree extends ExpressionTree { List<? extends Tree> getErrorTrees(); }
--- a/src/share/classes/com/sun/source/tree/ExpressionStatementTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/ExpressionStatementTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -39,6 +39,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface ExpressionStatementTree extends StatementTree { ExpressionTree getExpression(); }
--- a/src/share/classes/com/sun/source/tree/ExpressionTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/ExpressionTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -35,4 +35,5 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface ExpressionTree extends Tree {}
--- a/src/share/classes/com/sun/source/tree/ForLoopTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/ForLoopTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -42,6 +42,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface ForLoopTree extends StatementTree { List<? extends StatementTree> getInitializer(); ExpressionTree getCondition();
--- a/src/share/classes/com/sun/source/tree/IdentifierTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/IdentifierTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -41,6 +41,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface IdentifierTree extends ExpressionTree { Name getName(); }
--- a/src/share/classes/com/sun/source/tree/IfTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/IfTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -45,6 +45,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface IfTree extends StatementTree { ExpressionTree getCondition(); StatementTree getThenStatement();
--- a/src/share/classes/com/sun/source/tree/ImportTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/ImportTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -41,6 +41,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface ImportTree extends Tree { boolean isStatic(); /**
--- a/src/share/classes/com/sun/source/tree/InstanceOfTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/InstanceOfTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -39,6 +39,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface InstanceOfTree extends ExpressionTree { ExpressionTree getExpression(); Tree getType();
--- a/src/share/classes/com/sun/source/tree/IntersectionTypeTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/IntersectionTypeTree.java Tue May 07 17:14:17 2013 -0700 @@ -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 @@ -34,6 +34,7 @@ * * @since 1.8 */ +@jdk.Supported public interface IntersectionTypeTree extends Tree { List<? extends Tree> getBounds(); }
--- a/src/share/classes/com/sun/source/tree/LabeledStatementTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/LabeledStatementTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -41,6 +41,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface LabeledStatementTree extends StatementTree { Name getLabel(); StatementTree getStatement();
--- a/src/share/classes/com/sun/source/tree/LambdaExpressionTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/LambdaExpressionTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -37,12 +37,14 @@ * (x,y)-> { return x + y; } * }</pre> */ +@jdk.Supported public interface LambdaExpressionTree extends ExpressionTree { /** * Lambda expressions come in two forms: (i) expression lambdas, whose body * is an expression, and (ii) statement lambdas, whose body is a block */ + @jdk.Supported public enum BodyKind { /** enum constant for expression lambdas */ EXPRESSION,
--- a/src/share/classes/com/sun/source/tree/LineMap.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/LineMap.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 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 @@ -31,6 +31,7 @@ * * @since 1.6 */ +@jdk.Supported public interface LineMap { /** * Find the start position of a line.
--- a/src/share/classes/com/sun/source/tree/LiteralTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/LiteralTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -40,6 +40,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface LiteralTree extends ExpressionTree { Object getValue(); }
--- a/src/share/classes/com/sun/source/tree/MemberReferenceTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/MemberReferenceTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -39,12 +39,14 @@ * * @since 1.8 */ +@jdk.Supported public interface MemberReferenceTree extends ExpressionTree { /** * There are two kinds of member references: (i) method references and * (ii) constructor references */ + @jdk.Supported public enum ReferenceMode { /** enum constant for method references */ INVOKE,
--- a/src/share/classes/com/sun/source/tree/MemberSelectTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/MemberSelectTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -41,6 +41,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface MemberSelectTree extends ExpressionTree { ExpressionTree getExpression(); Name getIdentifier();
--- a/src/share/classes/com/sun/source/tree/MethodInvocationTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/MethodInvocationTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -43,6 +43,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface MethodInvocationTree extends ExpressionTree { List<? extends Tree> getTypeArguments(); ExpressionTree getMethodSelect();
--- a/src/share/classes/com/sun/source/tree/MethodTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/MethodTree.java Tue May 07 17:14:17 2013 -0700 @@ -46,6 +46,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface MethodTree extends Tree { ModifiersTree getModifiers(); Name getName();
--- a/src/share/classes/com/sun/source/tree/ModifiersTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/ModifiersTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -45,6 +45,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface ModifiersTree extends Tree { Set<Modifier> getFlags(); List<? extends AnnotationTree> getAnnotations();
--- a/src/share/classes/com/sun/source/tree/NewArrayTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/NewArrayTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -43,6 +43,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface NewArrayTree extends ExpressionTree { Tree getType(); List<? extends ExpressionTree> getDimensions();
--- a/src/share/classes/com/sun/source/tree/NewClassTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/NewClassTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -48,6 +48,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface NewClassTree extends ExpressionTree { ExpressionTree getEnclosingExpression(); List<? extends Tree> getTypeArguments();
--- a/src/share/classes/com/sun/source/tree/ParameterizedTypeTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/ParameterizedTypeTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -41,6 +41,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface ParameterizedTypeTree extends Tree { Tree getType(); List<? extends Tree> getTypeArguments();
--- a/src/share/classes/com/sun/source/tree/ParenthesizedTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/ParenthesizedTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -40,6 +40,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface ParenthesizedTree extends ExpressionTree { ExpressionTree getExpression(); }
--- a/src/share/classes/com/sun/source/tree/PrimitiveTypeTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/PrimitiveTypeTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -41,6 +41,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface PrimitiveTypeTree extends Tree { TypeKind getPrimitiveTypeKind(); }
--- a/src/share/classes/com/sun/source/tree/ReturnTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/ReturnTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -40,6 +40,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface ReturnTree extends StatementTree { ExpressionTree getExpression(); }
--- a/src/share/classes/com/sun/source/tree/Scope.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/Scope.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 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 @@ -48,6 +48,7 @@ * * @since 1.6 */ +@jdk.Supported public interface Scope { /** * Returns the enclosing scope.
--- a/src/share/classes/com/sun/source/tree/StatementTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/StatementTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -35,4 +35,5 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface StatementTree extends Tree {}
--- a/src/share/classes/com/sun/source/tree/SwitchTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/SwitchTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -43,6 +43,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface SwitchTree extends StatementTree { ExpressionTree getExpression(); List<? extends CaseTree> getCases();
--- a/src/share/classes/com/sun/source/tree/SynchronizedTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/SynchronizedTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -40,6 +40,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface SynchronizedTree extends StatementTree { ExpressionTree getExpression(); BlockTree getBlock();
--- a/src/share/classes/com/sun/source/tree/ThrowTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/ThrowTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -39,6 +39,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface ThrowTree extends StatementTree { ExpressionTree getExpression(); }
--- a/src/share/classes/com/sun/source/tree/Tree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/Tree.java Tue May 07 17:14:17 2013 -0700 @@ -39,11 +39,13 @@ * * @since 1.6 */ +@jdk.Supported public interface Tree { /** * Enumerates all kinds of trees. */ + @jdk.Supported public enum Kind { ANNOTATED_TYPE(AnnotatedTypeTree.class),
--- a/src/share/classes/com/sun/source/tree/TreeVisitor.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/TreeVisitor.java Tue May 07 17:14:17 2013 -0700 @@ -56,6 +56,7 @@ * * @since 1.6 */ +@jdk.Supported public interface TreeVisitor<R,P> { R visitAnnotatedType(AnnotatedTypeTree node, P p); R visitAnnotation(AnnotationTree node, P p);
--- a/src/share/classes/com/sun/source/tree/TryTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/TryTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -45,6 +45,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface TryTree extends StatementTree { BlockTree getBlock(); List<? extends CatchTree> getCatches();
--- a/src/share/classes/com/sun/source/tree/TypeCastTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/TypeCastTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -39,6 +39,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface TypeCastTree extends ExpressionTree { Tree getType(); ExpressionTree getExpression();
--- a/src/share/classes/com/sun/source/tree/TypeParameterTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/TypeParameterTree.java Tue May 07 17:14:17 2013 -0700 @@ -44,6 +44,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface TypeParameterTree extends Tree { Name getName(); List<? extends Tree> getBounds();
--- a/src/share/classes/com/sun/source/tree/UnaryTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/UnaryTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -42,6 +42,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface UnaryTree extends ExpressionTree { ExpressionTree getExpression(); }
--- a/src/share/classes/com/sun/source/tree/UnionTypeTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/UnionTypeTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 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 @@ -34,6 +34,7 @@ * * @since 1.7 */ +@jdk.Supported public interface UnionTypeTree extends Tree { List<? extends Tree> getTypeAlternatives(); }
--- a/src/share/classes/com/sun/source/tree/VariableTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/VariableTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -41,6 +41,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface VariableTree extends StatementTree { ModifiersTree getModifiers(); Name getName();
--- a/src/share/classes/com/sun/source/tree/WhileLoopTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/WhileLoopTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -41,6 +41,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface WhileLoopTree extends StatementTree { ExpressionTree getCondition(); StatementTree getStatement();
--- a/src/share/classes/com/sun/source/tree/WildcardTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/WildcardTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -44,6 +44,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface WildcardTree extends Tree { Tree getBound(); }
--- a/src/share/classes/com/sun/source/tree/package-info.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/tree/package-info.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -31,4 +31,5 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported package com.sun.source.tree;
--- a/src/share/classes/com/sun/source/util/DocTreeScanner.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/util/DocTreeScanner.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -53,7 +53,7 @@ * * <p>Here is an example to count the number of erroneous nodes in a tree: * <pre> - * class CountErrors extends DocTreeScanner<Integer,Void> { + * class CountErrors extends DocTreeScanner<Integer,Void> { * {@literal @}Override * public Integer visitErroneous(ErroneousTree node, Void p) { * return 1; @@ -67,6 +67,7 @@ * * @since 1.8 */ +@jdk.Supported public class DocTreeScanner<R,P> implements DocTreeVisitor<R,P> { /**
--- a/src/share/classes/com/sun/source/util/DocTrees.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/util/DocTrees.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -38,6 +38,7 @@ * * @since 1.8 */ +@jdk.Supported public abstract class DocTrees extends Trees { /** * Gets a DocTrees object for a given CompilationTask.
--- a/src/share/classes/com/sun/source/util/JavacTask.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/util/JavacTask.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -48,6 +48,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public abstract class JavacTask implements CompilationTask { /** @@ -55,7 +56,7 @@ * If the compiler is being invoked using a * {@link javax.tools.JavaCompiler.CompilationTask CompilationTask}, * then that task will be returned. - * @param processingEnvironment + * @param processingEnvironment the processing environment * @return the {@code JavacTask} for a {@code ProcessingEnvironment} * @since 1.8 */
--- a/src/share/classes/com/sun/source/util/Plugin.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/util/Plugin.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -38,7 +38,7 @@ * * <p>Plug-ins are located via a {@link ServiceLoader}, * using the same class path as annotation processors (i.e. - * {@link StandardLocation#PROCESSOR_PATH PROCESSOR_PATH} or + * {@link StandardLocation#ANNOTATION_PROCESSOR_PATH ANNOTATION_PROCESSOR_PATH} or * {@code -processorpath}). * * <p>It is expected that a typical plug-in will simply register a @@ -48,6 +48,7 @@ * * @since 1.8 */ +@jdk.Supported public interface Plugin { /** * Get the user-friendly name of this plug-in.
--- a/src/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -32,6 +32,7 @@ * * @since 1.8 */ +@jdk.Supported public class SimpleDocTreeVisitor<R,P> implements DocTreeVisitor<R, P> { protected final R DEFAULT_VALUE;
--- a/src/share/classes/com/sun/source/util/SimpleTreeVisitor.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/util/SimpleTreeVisitor.java Tue May 07 17:14:17 2013 -0700 @@ -33,6 +33,7 @@ * @author Peter von der Ahé * @since 1.6 */ +@jdk.Supported public class SimpleTreeVisitor<R,P> implements TreeVisitor<R,P> { protected final R DEFAULT_VALUE;
--- a/src/share/classes/com/sun/source/util/SourcePositions.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/util/SourcePositions.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -35,6 +35,7 @@ * @author Peter von der Ahé * @since 1.6 */ +@jdk.Supported public interface SourcePositions { /**
--- a/src/share/classes/com/sun/source/util/TaskEvent.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/util/TaskEvent.java Tue May 07 17:14:17 2013 -0700 @@ -36,12 +36,14 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public final class TaskEvent { /** * Kind of task event. * @since 1.6 */ + @jdk.Supported public enum Kind { /** * For events related to the parsing of a file.
--- a/src/share/classes/com/sun/source/util/TaskListener.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/util/TaskListener.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -32,6 +32,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public interface TaskListener { public void started(TaskEvent e);
--- a/src/share/classes/com/sun/source/util/TreePath.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/util/TreePath.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 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 @@ -36,6 +36,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public class TreePath implements Iterable<Tree> { /** * Gets a tree path for a tree node within a compilation unit.
--- a/src/share/classes/com/sun/source/util/TreePathScanner.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/util/TreePathScanner.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 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 @@ -38,6 +38,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public class TreePathScanner<R, P> extends TreeScanner<R, P> { /**
--- a/src/share/classes/com/sun/source/util/TreeScanner.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/util/TreeScanner.java Tue May 07 17:14:17 2013 -0700 @@ -68,6 +68,7 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported public class TreeScanner<R,P> implements TreeVisitor<R,P> { /** Scan a single node.
--- a/src/share/classes/com/sun/source/util/Trees.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/util/Trees.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -51,6 +51,7 @@ * * @author Peter von der Ahé */ +@jdk.Supported public abstract class Trees { /** * Gets a Trees object for a given CompilationTask.
--- a/src/share/classes/com/sun/source/util/package-info.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/source/util/package-info.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -30,4 +30,5 @@ * @author Jonathan Gibbons * @since 1.6 */ +@jdk.Supported package com.sun.source.util;
--- a/src/share/classes/com/sun/tools/classfile/AccessFlags.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/classfile/AccessFlags.java Tue May 07 17:14:17 2013 -0700 @@ -56,7 +56,8 @@ public static final int ACC_SYNTHETIC = 0x1000; // class, inner, field, method public static final int ACC_ANNOTATION = 0x2000; // class, inner public static final int ACC_ENUM = 0x4000; // class, inner, field - public static final int ACC_MODULE = 0x8000; // class, inner, field, method + public static final int ACC_MANDATED = 0x8000; // class, inner, field, method + public static final int ACC_MODULE = 0x10000; // class, inner, field, method public static enum Kind { Class, InnerClass, Field, Method}; @@ -208,6 +209,8 @@ return "abstract"; case ACC_STRICT: return "strictfp"; + case ACC_MANDATED: + return "mandated"; case ACC_MODULE: return "module"; default: @@ -247,6 +250,8 @@ return "ACC_ANNOTATION"; case ACC_ENUM: return "ACC_ENUM"; + case ACC_MANDATED: + return "ACC_MANDATED"; case ACC_MODULE: return "ACC_MODULE"; default:
--- a/src/share/classes/com/sun/tools/classfile/ClassWriter.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/classfile/ClassWriter.java Tue May 07 17:14:17 2013 -0700 @@ -546,7 +546,7 @@ out.writeByte(attr.method_parameter_table.length); for (MethodParameters_attribute.Entry e : attr.method_parameter_table) { out.writeShort(e.name_index); - out.writeInt(e.flags); + out.writeShort(e.flags); } return null; } @@ -790,12 +790,13 @@ private void write(TypeAnnotation.Position p, ClassOutputStream out) { out.writeByte(p.type.targetTypeValue()); switch (p.type) { - // type cast - case CAST: // instanceof case INSTANCEOF: // new expression case NEW: + // constructor/method reference receiver + case CONSTRUCTOR_REFERENCE: + case METHOD_REFERENCE: out.writeShort(p.offset); break; // local variable @@ -842,9 +843,12 @@ case METHOD_FORMAL_PARAMETER: out.writeByte(p.parameter_index); break; + // type cast + case CAST: // method/constructor/reference type argument case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT: case METHOD_INVOCATION_TYPE_ARGUMENT: + case CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT: case METHOD_REFERENCE_TYPE_ARGUMENT: out.writeShort(p.offset); out.writeByte(p.type_index); @@ -853,10 +857,6 @@ case METHOD_RETURN: case FIELD: break; - // lambda formal parameter - case LAMBDA_FORMAL_PARAMETER: - out.writeByte(p.parameter_index); - break; case UNKNOWN: throw new AssertionError("ClassWriter: UNKNOWN target type should never occur!"); default:
--- a/src/share/classes/com/sun/tools/classfile/Code_attribute.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/classfile/Code_attribute.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 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 @@ -38,7 +38,7 @@ * deletion without notice.</b> */ public class Code_attribute extends Attribute { - public class InvalidIndex extends AttributeException { + public static class InvalidIndex extends AttributeException { private static final long serialVersionUID = -8904527774589382802L; InvalidIndex(int index) { this.index = index; @@ -143,7 +143,7 @@ public final Exception_data[] exception_table; public final Attributes attributes; - public class Exception_data { + public static class Exception_data { Exception_data(ClassReader cr) throws IOException { start_pc = cr.readUnsignedShort(); end_pc = cr.readUnsignedShort();
--- a/src/share/classes/com/sun/tools/classfile/Descriptor.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/classfile/Descriptor.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 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 @@ -37,7 +37,7 @@ * deletion without notice.</b> */ public class Descriptor { - public class InvalidDescriptor extends DescriptorException { + public static class InvalidDescriptor extends DescriptorException { private static final long serialVersionUID = 1L; InvalidDescriptor(String desc) { this.desc = desc;
--- a/src/share/classes/com/sun/tools/classfile/MethodParameters_attribute.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/classfile/MethodParameters_attribute.java Tue May 07 17:14:17 2013 -0700 @@ -73,7 +73,7 @@ public static class Entry { Entry(ClassReader cr) throws IOException { name_index = cr.readUnsignedShort(); - flags = cr.readInt(); + flags = cr.readUnsignedShort(); } public static int length() {
--- a/src/share/classes/com/sun/tools/classfile/TypeAnnotation.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/classfile/TypeAnnotation.java Tue May 07 17:14:17 2013 -0700 @@ -86,12 +86,13 @@ position.type = type; switch (type) { - // type cast - case CAST: // instanceof case INSTANCEOF: // new expression case NEW: + // constructor/method reference receiver + case CONSTRUCTOR_REFERENCE: + case METHOD_REFERENCE: position.offset = cr.readUnsignedShort(); break; // local variable @@ -142,9 +143,12 @@ case METHOD_FORMAL_PARAMETER: position.parameter_index = cr.readUnsignedByte(); break; + // type cast + case CAST: // method/constructor/reference type argument case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT: case METHOD_INVOCATION_TYPE_ARGUMENT: + case CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT: case METHOD_REFERENCE_TYPE_ARGUMENT: position.offset = cr.readUnsignedShort(); position.type_index = cr.readUnsignedByte(); @@ -153,10 +157,6 @@ case METHOD_RETURN: case FIELD: break; - // lambda formal parameter - case LAMBDA_FORMAL_PARAMETER: - position.parameter_index = cr.readUnsignedByte(); - break; case UNKNOWN: throw new AssertionError("TypeAnnotation: UNKNOWN target type should never occur!"); default: @@ -177,13 +177,14 @@ int n = 0; n += 1; // TargetType tag is a byte switch (pos.type) { - // type cast - case CAST: // instanceof case INSTANCEOF: // new expression case NEW: - n += 2; + // constructor/method reference receiver + case CONSTRUCTOR_REFERENCE: + case METHOD_REFERENCE: + n += 2; // offset break; // local variable case LOCAL_VARIABLE: @@ -192,7 +193,7 @@ n += 2; // table_length; int table_length = pos.lvarOffset.length; n += 2 * table_length; // offset - n += 2 * table_length; // length; + n += 2 * table_length; // length n += 2 * table_length; // index break; // exception parameter @@ -206,7 +207,7 @@ // type parameter case CLASS_TYPE_PARAMETER: case METHOD_TYPE_PARAMETER: - n += 1; // parameter_index; + n += 1; // parameter_index break; // type parameter bound case CLASS_TYPE_PARAMETER_BOUND: @@ -226,9 +227,12 @@ case METHOD_FORMAL_PARAMETER: n += 1; // parameter_index break; + // type cast + case CAST: // method/constructor/reference type argument case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT: case METHOD_INVOCATION_TYPE_ARGUMENT: + case CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT: case METHOD_REFERENCE_TYPE_ARGUMENT: n += 2; // offset n += 1; // type index @@ -237,10 +241,6 @@ case METHOD_RETURN: case FIELD: break; - // lambda formal parameter - case LAMBDA_FORMAL_PARAMETER: - n += 1; // parameter_index - break; case UNKNOWN: throw new AssertionError("TypeAnnotation: UNKNOWN target type should never occur!"); default: @@ -377,12 +377,13 @@ sb.append(type); switch (type) { - // type cast - case CAST: // instanceof case INSTANCEOF: // new expression case NEW: + // constructor/method reference receiver + case CONSTRUCTOR_REFERENCE: + case METHOD_REFERENCE: sb.append(", offset = "); sb.append(offset); break; @@ -444,9 +445,12 @@ sb.append(", param_index = "); sb.append(parameter_index); break; + // type cast + case CAST: // method/constructor/reference type argument case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT: case METHOD_INVOCATION_TYPE_ARGUMENT: + case CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT: case METHOD_REFERENCE_TYPE_ARGUMENT: sb.append(", offset = "); sb.append(offset); @@ -457,12 +461,6 @@ case METHOD_RETURN: case FIELD: break; - // lambda formal parameter - case LAMBDA_FORMAL_PARAMETER: - // TODO: also needs an offset? - sb.append(", param_index = "); - sb.append(parameter_index); - break; case UNKNOWN: sb.append(", position UNKNOWN!"); break; @@ -564,34 +562,37 @@ /** For annotations on an exception parameter. */ EXCEPTION_PARAMETER(0x42, true), - /** For annotations on a typecast. */ - CAST(0x43, true), - /** For annotations on a type test. */ - INSTANCEOF(0x44, true), + INSTANCEOF(0x43, true), /** For annotations on an object creation expression. */ - NEW(0x45, true), + NEW(0x44, true), + + /** For annotations on a constructor reference receiver. */ + CONSTRUCTOR_REFERENCE(0x45, true), + + /** For annotations on a method reference receiver. */ + METHOD_REFERENCE(0x46, true), + + /** For annotations on a typecast. */ + CAST(0x47, true), /** For annotations on a type argument of an object creation expression. */ - CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT(0x46, true), + CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT(0x48, true), /** For annotations on a type argument of a method call. */ - METHOD_INVOCATION_TYPE_ARGUMENT(0x47, true), + METHOD_INVOCATION_TYPE_ARGUMENT(0x49, true), - /** For annotations on a lambda parameter type. */ - LAMBDA_FORMAL_PARAMETER(0x48, true), - - /** For annotations on a method reference. */ - METHOD_REFERENCE(0x49, true), + /** For annotations on a type argument of a constructor reference. */ + CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT(0x4A, true), /** For annotations on a type argument of a method reference. */ - METHOD_REFERENCE_TYPE_ARGUMENT(0x50, true), + METHOD_REFERENCE_TYPE_ARGUMENT(0x4B, true), /** For annotations with an unknown target. */ UNKNOWN(0xFF); - private static final int MAXIMUM_TARGET_TYPE_VALUE = 0x50; + private static final int MAXIMUM_TARGET_TYPE_VALUE = 0x4B; private final int targetTypeValue; private final boolean isLocal;
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java Tue May 07 17:14:17 2013 -0700 @@ -139,12 +139,24 @@ } } - protected void addReceiverAnnotations(ExecutableMemberDoc member, - Content tree) { - if (member.receiverAnnotations().length > 0) { - tree.addContent(writer.getSpace()); - writer.addReceiverAnnotationInfo(member, tree); - } + /** + * Add the receiver annotations information. + * + * @param member the member to write receiver annotations for. + * @param rcvrType the receiver type. + * @param descList list of annotation description. + * @param tree the content tree to which the information will be added. + */ + protected void addReceiverAnnotations(ExecutableMemberDoc member, Type rcvrType, + AnnotationDesc[] descList, Content tree) { + writer.addReceiverAnnotationInfo(member, descList, tree); + tree.addContent(writer.getSpace()); + tree.addContent(rcvrType.typeName()); + LinkInfoImpl linkInfo = new LinkInfoImpl(configuration, + LinkInfoImpl.CONTEXT_CLASS_SIGNATURE, rcvrType); + tree.addContent(new RawHtml(writer.getTypeParameterLinks(linkInfo))); + tree.addContent(writer.getSpace()); + tree.addContent("this"); } @@ -168,14 +180,24 @@ protected void addParameters(ExecutableMemberDoc member, boolean includeAnnotations, Content htmltree) { htmltree.addContent("("); + String sep = ""; Parameter[] params = member.parameters(); String indent = makeSpace(writer.displayLength); if (configuration.linksource) { //add spaces to offset indentation changes caused by link. indent+= makeSpace(member.name().length()); } + Type rcvrType = member.receiverType(); + if (includeAnnotations && rcvrType instanceof AnnotatedType) { + AnnotationDesc[] descList = rcvrType.asAnnotatedType().annotations(); + if (descList.length > 0) { + addReceiverAnnotations(member, rcvrType, descList, htmltree); + sep = "," + DocletConstants.NL + indent; + } + } int paramstart; for (paramstart = 0; paramstart < params.length; paramstart++) { + htmltree.addContent(sep); Parameter param = params[paramstart]; if (!param.name().startsWith("this$")) { if (includeAnnotations) {
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java Tue May 07 17:14:17 2013 -0700 @@ -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 @@ -150,7 +150,20 @@ String tableSummary, Content body) { if (packages.length > 0) { Arrays.sort(packages); - addAllClassesLink(body); + HtmlTree div = new HtmlTree(HtmlTag.DIV); + div.addStyle(HtmlStyle.indexHeader); + addAllClassesLink(div); + if (configuration.showProfiles) { + addAllProfilesLink(div); + } + body.addContent(div); + if (configuration.showProfiles) { + String profileSummary = configuration.getText("doclet.Profiles"); + String profilesTableSummary = configuration.getText("doclet.Member_Table_Summary", + configuration.getText("doclet.Profile_Summary"), + configuration.getText("doclet.profiles")); + addProfilesList(profileSummary, profilesTableSummary, body); + } addPackagesList(packages, text, tableSummary, body); } } @@ -182,10 +195,29 @@ } /** - * Do nothing. This will be overridden in PackageIndexFrameWriter. + * Do nothing. This will be overridden. + * + * @param div the document tree to which the all classes link will be added + */ + protected void addAllClassesLink(Content div) { + } + + /** + * Do nothing. This will be overridden. * - * @param body the document tree to which the all classes link will be added + * @param div the document tree to which the all profiles link will be added */ - protected void addAllClassesLink(Content body) { + protected void addAllProfilesLink(Content div) { + } + + /** + * Do nothing. This will be overridden. + * + * @param profileSummary the profile summary heading + * @param profilesTableSummary the profiles table summary information + * @param body the content tree to which the profiles list will be added + */ + protected void addProfilesList(String profileSummary, String profilesTableSummary, + Content body) { } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractProfileIndexWriter.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,276 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.doclets.formats.html; + +import java.io.*; + +import com.sun.tools.javac.sym.Profiles; +import com.sun.tools.doclets.formats.html.markup.*; +import com.sun.tools.doclets.internal.toolkit.*; +import com.sun.tools.doclets.internal.toolkit.util.DocPath; + +/** + * Abstract class to generate the profile overview files in + * Frame and Non-Frame format. This will be sub-classed to + * generate profile-overview-frame.html as well as profile-overview-summary.html. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice.</b> + * + * @author Bhavesh Patel + */ +public abstract class AbstractProfileIndexWriter extends HtmlDocletWriter { + + /** + * Profiles to be documented. + */ + protected Profiles profiles; + + /** + * Constructor. Also initializes the profiles variable. + * + * @param configuration The current configuration + * @param filename Name of the profile index file to be generated. + */ + public AbstractProfileIndexWriter(ConfigurationImpl configuration, + DocPath filename) throws IOException { + super(configuration, filename); + profiles = configuration.profiles; + } + + /** + * Adds the navigation bar header to the documentation tree. + * + * @param body the document tree to which the navigation bar header will be added + */ + protected abstract void addNavigationBarHeader(Content body); + + /** + * Adds the navigation bar footer to the documentation tree. + * + * @param body the document tree to which the navigation bar footer will be added + */ + protected abstract void addNavigationBarFooter(Content body); + + /** + * Adds the overview header to the documentation tree. + * + * @param body the document tree to which the overview header will be added + */ + protected abstract void addOverviewHeader(Content body); + + /** + * Adds the profiles list to the documentation tree. + * + * @param profiles profiles object + * @param text caption for the table + * @param tableSummary summary for the table + * @param body the document tree to which the profiles list will be added + */ + protected abstract void addProfilesList(Profiles profiles, String text, + String tableSummary, Content body); + + /** + * Adds the profile packages list to the documentation tree. + * + * @param profiles profiles object + * @param text caption for the table + * @param tableSummary summary for the table + * @param body the document tree to which the profiles list will be added + * @param profileName the name for the profile being documented + */ + protected abstract void addProfilePackagesList(Profiles profiles, String text, + String tableSummary, Content body, String profileName); + + /** + * Generate and prints the contents in the profile index file. Call appropriate + * methods from the sub-class in order to generate Frame or Non + * Frame format. + * + * @param title the title of the window. + * @param includeScript boolean set true if windowtitle script is to be included + */ + protected void buildProfileIndexFile(String title, boolean includeScript) throws IOException { + String windowOverview = configuration.getText(title); + Content body = getBody(includeScript, getWindowTitle(windowOverview)); + addNavigationBarHeader(body); + addOverviewHeader(body); + addIndex(body); + addOverview(body); + addNavigationBarFooter(body); + printHtmlDocument(configuration.metakeywords.getOverviewMetaKeywords(title, + configuration.doctitle), includeScript, body); + } + + /** + * Generate and prints the contents in the profile packages index file. Call appropriate + * methods from the sub-class in order to generate Frame or Non + * Frame format. + * + * @param title the title of the window. + * @param includeScript boolean set true if windowtitle script is to be included + * @param profileName the name of the profile being documented + */ + protected void buildProfilePackagesIndexFile(String title, + boolean includeScript, String profileName) throws IOException { + String windowOverview = configuration.getText(title); + Content body = getBody(includeScript, getWindowTitle(windowOverview)); + addNavigationBarHeader(body); + addOverviewHeader(body); + addProfilePackagesIndex(body, profileName); + addOverview(body); + addNavigationBarFooter(body); + printHtmlDocument(configuration.metakeywords.getOverviewMetaKeywords(title, + configuration.doctitle), includeScript, body); + } + + /** + * Default to no overview, override to add overview. + * + * @param body the document tree to which the overview will be added + */ + protected void addOverview(Content body) throws IOException { + } + + /** + * Adds the frame or non-frame profile index to the documentation tree. + * + * @param body the document tree to which the index will be added + */ + protected void addIndex(Content body) { + addIndexContents(profiles, "doclet.Profile_Summary", + configuration.getText("doclet.Member_Table_Summary", + configuration.getText("doclet.Profile_Summary"), + configuration.getText("doclet.profiles")), body); + } + + /** + * Adds the frame or non-frame profile packages index to the documentation tree. + * + * @param body the document tree to which the index will be added + * @param profileName the name of the profile being documented + */ + protected void addProfilePackagesIndex(Content body, String profileName) { + addProfilePackagesIndexContents(profiles, "doclet.Profile_Summary", + configuration.getText("doclet.Member_Table_Summary", + configuration.getText("doclet.Profile_Summary"), + configuration.getText("doclet.profiles")), body, profileName); + } + + /** + * Adds profile index contents. Call appropriate methods from + * the sub-classes. Adds it to the body HtmlTree + * + * @param profiles profiles to be documented + * @param text string which will be used as the heading + * @param tableSummary summary for the table + * @param body the document tree to which the index contents will be added + */ + protected void addIndexContents(Profiles profiles, String text, + String tableSummary, Content body) { + if (profiles.getProfileCount() > 0) { + HtmlTree div = new HtmlTree(HtmlTag.DIV); + div.addStyle(HtmlStyle.indexHeader); + addAllClassesLink(div); + addAllPackagesLink(div); + body.addContent(div); + addProfilesList(profiles, text, tableSummary, body); + } + } + + /** + * Adds profile packages index contents. Call appropriate methods from + * the sub-classes. Adds it to the body HtmlTree + * + * @param profiles profiles to be documented + * @param text string which will be used as the heading + * @param tableSummary summary for the table + * @param body the document tree to which the index contents will be added + * @param profileName the name of the profile being documented + */ + protected void addProfilePackagesIndexContents(Profiles profiles, String text, + String tableSummary, Content body, String profileName) { + HtmlTree div = new HtmlTree(HtmlTag.DIV); + div.addStyle(HtmlStyle.indexHeader); + addAllClassesLink(div); + addAllPackagesLink(div); + addAllProfilesLink(div); + body.addContent(div); + addProfilePackagesList(profiles, text, tableSummary, body, profileName); + } + + /** + * Adds the doctitle to the documentation tree, if it is specified on the command line. + * + * @param body the document tree to which the title will be added + */ + protected void addConfigurationTitle(Content body) { + if (configuration.doctitle.length() > 0) { + Content title = new RawHtml(configuration.doctitle); + Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, + HtmlStyle.title, title); + Content div = HtmlTree.DIV(HtmlStyle.header, heading); + body.addContent(div); + } + } + + /** + * Returns highlighted "Overview", in the navigation bar as this is the + * overview page. + * + * @return a Content object to be added to the documentation tree + */ + protected Content getNavLinkContents() { + Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, overviewLabel); + return li; + } + + /** + * Do nothing. This will be overridden in ProfileIndexFrameWriter. + * + * @param div the document tree to which the all classes link will be added + */ + protected void addAllClassesLink(Content div) { + } + + /** + * Do nothing. This will be overridden in ProfileIndexFrameWriter. + * + * @param div the document tree to which the all packages link will be added + */ + protected void addAllPackagesLink(Content div) { + } + + /** + * Do nothing. This will be overridden in ProfilePackageIndexFrameWriter. + * + * @param div the document tree to which the all profiles link will be added + */ + protected void addAllProfilesLink(Content div) { + } +}
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -25,10 +25,10 @@ package com.sun.tools.doclets.formats.html; -import java.io.IOException; import java.util.*; import com.sun.javadoc.*; +import com.sun.tools.javac.jvm.Profile; import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; import com.sun.tools.doclets.internal.toolkit.builders.*; @@ -165,6 +165,20 @@ bodyTree.addContent(HtmlConstants.START_OF_CLASS_DATA); HtmlTree div = new HtmlTree(HtmlTag.DIV); div.addStyle(HtmlStyle.header); + if (configuration.showProfiles) { + String sep = ""; + int profile = configuration.profiles.getProfile(getTypeNameForProfile(classDoc)); + if (profile > 0) { + Content profNameContent = new StringContent(); + for (int i = profile; i < configuration.profiles.getProfileCount(); i++) { + profNameContent.addContent(sep); + profNameContent.addContent(Profile.lookup(i).name); + sep = ", "; + } + Content profileNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, profNameContent); + div.addContent(profileNameDiv); + } + } if (pkgname.length() > 0) { Content pkgNameContent = new StringContent(pkgname); Content pkgNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, pkgNameContent);
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java Tue May 07 17:14:17 2013 -0700 @@ -60,7 +60,7 @@ ClassDoc classDoc) { super(writer, classDoc); VisibleMemberMap visibleMemberMap = new VisibleMemberMap(classDoc, - VisibleMemberMap.CONSTRUCTORS, configuration.nodeprecated); + VisibleMemberMap.CONSTRUCTORS, configuration); List<ProgramElementDoc> constructors = new ArrayList<ProgramElementDoc>(visibleMemberMap.getMembersFor(classDoc)); for (int i = 0; i < constructors.size(); i++) { if ((constructors.get(i)).isProtected() || @@ -137,7 +137,6 @@ addName(constructor.name(), pre); } addParameters(constructor, pre); - writer.addReceiverAnnotationInfo(constructor, pre); addExceptions(constructor, pre); return pre; }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -65,7 +65,7 @@ public FrameOutputWriter(ConfigurationImpl configuration, DocPath filename) throws IOException { super(configuration, filename); - noOfPackages = configuration.packages.length; + noOfPackages = configuration.packages.length; } /**
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -28,6 +28,8 @@ import java.util.*; import com.sun.javadoc.*; +import com.sun.tools.javac.sym.Profiles; +import com.sun.tools.javac.jvm.Profile; import com.sun.tools.doclets.internal.toolkit.*; import com.sun.tools.doclets.internal.toolkit.builders.*; import com.sun.tools.doclets.internal.toolkit.util.*; @@ -202,6 +204,44 @@ /** * {@inheritDoc} */ + protected void generateProfileFiles() throws Exception { + if (configuration.showProfiles) { + ProfileIndexFrameWriter.generate(configuration); + Profile prevProfile = null, nextProfile; + for (int i = 1; i < configuration.profiles.getProfileCount(); i++) { + ProfilePackageIndexFrameWriter.generate(configuration, Profile.lookup(i).name); + PackageDoc[] packages = configuration.profilePackages.get( + Profile.lookup(i).name); + PackageDoc prev = null, next; + for (int j = 0; j < packages.length; j++) { + // if -nodeprecated option is set and the package is marked as + // deprecated, do not generate the profilename-package-summary.html + // and profilename-package-frame.html pages for that package. + if (!(configuration.nodeprecated && Util.isDeprecated(packages[j]))) { + ProfilePackageFrameWriter.generate(configuration, packages[j], i); + next = (j + 1 < packages.length + && packages[j + 1].name().length() > 0) ? packages[j + 1] : null; + AbstractBuilder profilePackageSummaryBuilder = + configuration.getBuilderFactory().getProfilePackageSummaryBuilder( + packages[j], prev, next, Profile.lookup(i)); + profilePackageSummaryBuilder.build(); + prev = packages[j]; + } + } + nextProfile = (i + 1 < configuration.profiles.getProfileCount()) ? + Profile.lookup(i + 1) : null; + AbstractBuilder profileSummaryBuilder = + configuration.getBuilderFactory().getProfileSummaryBuilder( + Profile.lookup(i), prevProfile, nextProfile); + profileSummaryBuilder.build(); + prevProfile = Profile.lookup(i); + } + } + } + + /** + * {@inheritDoc} + */ protected void generatePackageFiles(ClassTree classtree) throws Exception { PackageDoc[] packages = configuration.packages; if (packages.length > 1) {
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Tue May 07 17:14:17 2013 -0700 @@ -301,6 +301,107 @@ } /** + * Get Profile Package link, with target frame. + * + * @param pd the packageDoc object + * @param target name of the target frame + * @param label tag for the link + * @param profileName the name of the profile being documented + * @return a content for the target profile packages link + */ + public Content getTargetProfilePackageLink(PackageDoc pd, String target, + Content label, String profileName) { + return getHyperLink(pathString(pd, DocPaths.profilePackageSummary(profileName)), + label, "", target); + } + + /** + * Get Profile link, with target frame. + * + * @param target name of the target frame + * @param label tag for the link + * @param profileName the name of the profile being documented + * @return a content for the target profile link + */ + public Content getTargetProfileLink(String target, Content label, + String profileName) { + return getHyperLink(pathToRoot.resolve( + DocPaths.profileSummary(profileName)), label, "", target); + } + + /** + * Get the type name for profile search. + * + * @param cd the classDoc object for which the type name conversion is needed + * @return a type name string for the type + */ + public String getTypeNameForProfile(ClassDoc cd) { + StringBuilder typeName = + new StringBuilder((cd.containingPackage()).name().replace(".", "/")); + typeName.append("/") + .append(cd.name().replace(".", "$")); + return typeName.toString(); + } + + /** + * Check if a type belongs to a profile. + * + * @param cd the classDoc object that needs to be checked + * @param profileValue the profile in which the type needs to be checked + * @return true if the type is in the profile + */ + public boolean isTypeInProfile(ClassDoc cd, int profileValue) { + return (configuration.profiles.getProfile(getTypeNameForProfile(cd)) <= profileValue); + } + + public void addClassesSummary(ClassDoc[] classes, String label, + String tableSummary, String[] tableHeader, Content summaryContentTree, + int profileValue) { + if(classes.length > 0) { + Arrays.sort(classes); + Content caption = getTableCaption(label); + Content table = HtmlTree.TABLE(HtmlStyle.packageSummary, 0, 3, 0, + tableSummary, caption); + table.addContent(getSummaryTableHeader(tableHeader, "col")); + Content tbody = new HtmlTree(HtmlTag.TBODY); + for (int i = 0; i < classes.length; i++) { + if (!isTypeInProfile(classes[i], profileValue)) { + continue; + } + if (!Util.isCoreClass(classes[i]) || + !configuration.isGeneratedDoc(classes[i])) { + continue; + } + Content classContent = new RawHtml(getLink(new LinkInfoImpl( + configuration, LinkInfoImpl.CONTEXT_PACKAGE, classes[i], + false))); + Content tdClass = HtmlTree.TD(HtmlStyle.colFirst, classContent); + HtmlTree tr = HtmlTree.TR(tdClass); + if (i%2 == 0) + tr.addStyle(HtmlStyle.altColor); + else + tr.addStyle(HtmlStyle.rowColor); + HtmlTree tdClassDescription = new HtmlTree(HtmlTag.TD); + tdClassDescription.addStyle(HtmlStyle.colLast); + if (Util.isDeprecated(classes[i])) { + tdClassDescription.addContent(deprecatedLabel); + if (classes[i].tags("deprecated").length > 0) { + addSummaryDeprecatedComment(classes[i], + classes[i].tags("deprecated")[0], tdClassDescription); + } + } + else + addSummaryComment(classes[i], tdClassDescription); + tr.addContent(tdClassDescription); + tbody.addContent(tr); + } + table.addContent(tbody); + Content li = HtmlTree.LI(HtmlStyle.blockList, table); + summaryContentTree.addContent(li); + } + } + + /** * Generates the HTML document tree and prints it out. * * @param metakeywords Array of String keywords for META tag. Each element @@ -442,7 +543,8 @@ } HtmlTree navList = new HtmlTree(HtmlTag.UL); navList.addStyle(HtmlStyle.navList); - navList.addAttr(HtmlAttr.TITLE, "Navigation"); + navList.addAttr(HtmlAttr.TITLE, + configuration.getText("doclet.Navigation")); if (configuration.createoverview) { navList.addContent(getNavLinkContents()); } @@ -1198,13 +1300,31 @@ */ public String getDocLink(int context, ClassDoc classDoc, MemberDoc doc, String label, boolean strong) { + return getDocLink(context, classDoc, doc, label, strong, false); + } + + /** + * Return the link for the given member. + * + * @param context the id of the context where the link will be printed. + * @param classDoc the classDoc that we should link to. This is not + * necessarily equal to doc.containingClass(). We may be + * inheriting comments. + * @param doc the member being linked to. + * @param label the label for the link. + * @param strong true if the link should be strong. + * @param isProperty true if the doc parameter is a JavaFX property. + * @return the link for the given member. + */ + public String getDocLink(int context, ClassDoc classDoc, MemberDoc doc, + String label, boolean strong, boolean isProperty) { if (! (doc.isIncluded() || Util.isLinkable(classDoc, configuration))) { return label; } else if (doc instanceof ExecutableMemberDoc) { ExecutableMemberDoc emd = (ExecutableMemberDoc)doc; return getLink(new LinkInfoImpl(configuration, context, classDoc, - getAnchor(emd), label, strong)); + getAnchor(emd, isProperty), label, strong)); } else if (doc instanceof MemberDoc) { return getLink(new LinkInfoImpl(configuration, context, classDoc, doc.name(), label, strong)); @@ -1242,6 +1362,13 @@ } public String getAnchor(ExecutableMemberDoc emd) { + return getAnchor(emd, false); + } + + public String getAnchor(ExecutableMemberDoc emd, boolean isProperty) { + if (isProperty) { + return emd.name(); + } StringBuilder signature = new StringBuilder(emd.signature()); StringBuilder signatureParsed = new StringBuilder(); int counter = 0; @@ -1733,11 +1860,13 @@ * Add the annotation types of the executable receiver. * * @param method the executable to write the receiver annotations for. + * @param descList list of annotation description. * @param htmltree the documentation tree to which the annotation info will be * added */ - public void addReceiverAnnotationInfo(ExecutableMemberDoc method, Content htmltree) { - addAnnotationInfo(method, method.receiverAnnotations(), htmltree); + public void addReceiverAnnotationInfo(ExecutableMemberDoc method, AnnotationDesc[] descList, + Content htmltree) { + addAnnotationInfo(0, method, descList, false, htmltree); } /** @@ -1788,13 +1917,16 @@ private boolean addAnnotationInfo(int indent, Doc doc, AnnotationDesc[] descList, boolean lineBreak, Content htmltree) { List<String> annotations = getAnnotations(indent, descList, lineBreak); + String sep =""; if (annotations.size() == 0) { return false; } Content annotationContent; for (Iterator<String> iter = annotations.iterator(); iter.hasNext();) { + htmltree.addContent(sep); annotationContent = new RawHtml(iter.next()); htmltree.addContent(annotationContent); + sep = " "; } return true; }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java Tue May 07 17:14:17 2013 -0700 @@ -157,9 +157,9 @@ if (!isFirst) { linkInfo.displayLength += 1; output.append(" "); - isFirst = false; } output.append(anno); + isFirst = false; } if (!annos.isEmpty()) { linkInfo.displayLength += 1;
--- a/src/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java Tue May 07 17:14:17 2013 -0700 @@ -198,6 +198,11 @@ */ public static final int CONTEXT_CLASS_USE_HEADER = 33; + /** + * The header for property documentation copied from parent. + */ + public static final int CONTEXT_PROPERTY_DOC_COPY = 34; + public final ConfigurationImpl configuration; /** @@ -422,6 +427,7 @@ case CONTEXT_SUBCLASSES: case CONTEXT_METHOD_DOC_COPY: case CONTEXT_FIELD_DOC_COPY: + case CONTEXT_PROPERTY_DOC_COPY: case CONTEXT_CLASS_USE_HEADER: includeTypeInClassLinkLabel = false; break;
--- a/src/share/classes/com/sun/tools/doclets/formats/html/LinkOutputImpl.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/LinkOutputImpl.java Tue May 07 17:14:17 2013 -0700 @@ -63,6 +63,13 @@ /** * {@inheritDoc} */ + public void insert(int offset, Object o) { + output.insert(offset, o.toString()); + } + + /** + * {@inheritDoc} + */ public String toString() { return output.toString(); }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Tue May 07 17:14:17 2013 -0700 @@ -130,7 +130,6 @@ addName(method.name(), pre); } addParameters(method, pre); - addReceiverAnnotations(method, pre); addExceptions(method, pre); return pre; }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Tue May 07 17:14:17 2013 -0700 @@ -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 @@ -161,6 +161,7 @@ */ protected void addClassKindListing(ClassDoc[] arr, Content labelContent, Content contentTree) { + arr = Util.filterOutPrivateClasses(arr, configuration.javafx); if(arr.length > 0) { Arrays.sort(arr); boolean printedHeader = false;
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Tue May 07 17:14:17 2013 -0700 @@ -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 @@ -145,13 +145,26 @@ * Adds "All Classes" link for the top of the left-hand frame page to the * documentation tree. * - * @param body the Content object to which the all classes link should be added + * @param div the Content object to which the all classes link should be added */ - protected void addAllClassesLink(Content body) { + protected void addAllClassesLink(Content div) { Content linkContent = getHyperLink(DocPaths.ALLCLASSES_FRAME, allclassesLabel, "", "packageFrame"); - Content div = HtmlTree.DIV(HtmlStyle.indexHeader, linkContent); - body.addContent(div); + Content span = HtmlTree.SPAN(linkContent); + div.addContent(span); + } + + /** + * Adds "All Profiles" link for the top of the left-hand frame page to the + * documentation tree. + * + * @param div the Content object to which the all profiles link should be added + */ + protected void addAllProfilesLink(Content div) { + Content linkContent = getHyperLink(DocPaths.PROFILE_OVERVIEW_FRAME, + allprofilesLabel, "", "packageListFrame"); + Content span = HtmlTree.SPAN(linkContent); + div.addContent(span); } /**
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -29,6 +29,7 @@ import java.util.*; import com.sun.javadoc.*; +import com.sun.tools.javac.jvm.Profile; import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; import com.sun.tools.doclets.internal.toolkit.util.*; @@ -122,6 +123,21 @@ /** * {@inheritDoc} */ + protected void addProfilesList(String profileSummary, String profilesTableSummary, + Content body) { + Content table = HtmlTree.TABLE(HtmlStyle.overviewSummary, 0, 3, 0, profilesTableSummary, + getTableCaption(profileSummary)); + table.addContent(getSummaryTableHeader(profileTableHeader, "col")); + Content tbody = new HtmlTree(HtmlTag.TBODY); + addProfilesList(tbody); + table.addContent(tbody); + Content div = HtmlTree.DIV(HtmlStyle.contentContainer, table); + body.addContent(div); + } + + /** + * {@inheritDoc} + */ protected void addPackagesList(PackageDoc[] packages, String text, String tableSummary, Content body) { Content table = HtmlTree.TABLE(HtmlStyle.overviewSummary, 0, 3, 0, tableSummary, @@ -135,6 +151,31 @@ } /** + * Adds list of profiles in the index table. Generate link to each profile. + * + * @param tbody the documentation tree to which the list will be added + */ + protected void addProfilesList(Content tbody) { + for (int i = 1; i < configuration.profiles.getProfileCount(); i++) { + String profileName = Profile.lookup(i).name; + Content profileLinkContent = getTargetProfileLink("classFrame", + new StringContent(profileName), profileName); + Content tdProfile = HtmlTree.TD(HtmlStyle.colFirst, profileLinkContent); + HtmlTree tdSummary = new HtmlTree(HtmlTag.TD); + tdSummary.addStyle(HtmlStyle.colLast); + tdSummary.addContent(getSpace()); + HtmlTree tr = HtmlTree.TR(tdProfile); + tr.addContent(tdSummary); + if (i % 2 == 0) { + tr.addStyle(HtmlStyle.altColor); + } else { + tr.addStyle(HtmlStyle.rowColor); + } + tbody.addContent(tr); + } + } + + /** * Adds list of packages in the index table. Generate link to each package. * * @param packages Packages to which link is to be generated @@ -196,10 +237,7 @@ protected void addOverviewComment(Content htmltree) { if (root.inlineTags().length > 0) { htmltree.addContent(getMarkerAnchor("overview_description")); - HtmlTree div = new HtmlTree(HtmlTag.DIV); - div.addStyle(HtmlStyle.subTitle); - addInlineComment(root, div); - htmltree.addContent(div); + addInlineComment(root, htmltree); } } @@ -211,7 +249,7 @@ */ protected void addOverview(Content body) throws IOException { HtmlTree div = new HtmlTree(HtmlTag.DIV); - div.addStyle(HtmlStyle.footer); + div.addStyle(HtmlStyle.contentContainer); addOverviewComment(div); addTagsInfo(root, div); body.addContent(div);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ProfileIndexFrameWriter.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,173 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.doclets.formats.html; + +import java.io.*; + +import com.sun.tools.javac.sym.Profiles; +import com.sun.tools.doclets.formats.html.markup.*; +import com.sun.tools.doclets.internal.toolkit.*; +import com.sun.tools.doclets.internal.toolkit.util.*; +import com.sun.tools.javac.jvm.Profile; + +/** + * Generate the profile index for the left-hand frame in the generated output. + * A click on the profile name in this frame will update the page in the top + * left hand frame with the listing of packages of the clicked profile. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice.</b> + * + * @author Bhavesh Patel + */ +public class ProfileIndexFrameWriter extends AbstractProfileIndexWriter { + + /** + * Construct the ProfileIndexFrameWriter object. + * + * @param configuration the configuration object + * @param filename Name of the profile index file to be generated. + */ + public ProfileIndexFrameWriter(ConfigurationImpl configuration, + DocPath filename) throws IOException { + super(configuration, filename); + } + + /** + * Generate the profile index file named "profile-overview-frame.html". + * @throws DocletAbortException + * @param configuration the configuration object + */ + public static void generate(ConfigurationImpl configuration) { + ProfileIndexFrameWriter profilegen; + DocPath filename = DocPaths.PROFILE_OVERVIEW_FRAME; + try { + profilegen = new ProfileIndexFrameWriter(configuration, filename); + profilegen.buildProfileIndexFile("doclet.Window_Overview", false); + profilegen.close(); + } catch (IOException exc) { + configuration.standardmessage.error( + "doclet.exception_encountered", + exc.toString(), filename); + throw new DocletAbortException(); + } + } + + /** + * {@inheritDoc} + */ + protected void addProfilesList(Profiles profiles, String text, + String tableSummary, Content body) { + Content heading = HtmlTree.HEADING(HtmlConstants.PROFILE_HEADING, true, + profilesLabel); + Content div = HtmlTree.DIV(HtmlStyle.indexContainer, heading); + HtmlTree ul = new HtmlTree(HtmlTag.UL); + ul.addAttr(HtmlAttr.TITLE, profilesLabel.toString()); + for (int i = 1; i < profiles.getProfileCount(); i++) { + ul.addContent(getProfile(i)); + } + div.addContent(ul); + body.addContent(div); + } + + /** + * Gets each profile name as a separate link. + * + * @param profile the profile being documented + * @return content for the profile link + */ + protected Content getProfile(int profile) { + Content profileLinkContent; + Content profileLabel; + String profileName = (Profile.lookup(profile)).name; + profileLabel = new StringContent(profileName); + profileLinkContent = getHyperLink(DocPaths.profileFrame(profileName), profileLabel, "", + "packageListFrame"); + Content li = HtmlTree.LI(profileLinkContent); + return li; + } + + /** + * {@inheritDoc} + */ + protected void addNavigationBarHeader(Content body) { + Content headerContent; + if (configuration.packagesheader.length() > 0) { + headerContent = new RawHtml(replaceDocRootDir(configuration.packagesheader)); + } else { + headerContent = new RawHtml(replaceDocRootDir(configuration.header)); + } + Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, true, + HtmlStyle.bar, headerContent); + body.addContent(heading); + } + + /** + * Do nothing as there is no overview information in this page. + */ + protected void addOverviewHeader(Content body) { + } + + /** + * Adds "All Classes" link for the top of the left-hand frame page to the + * documentation tree. + * + * @param div the Content object to which the all classes link should be added + */ + protected void addAllClassesLink(Content div) { + Content linkContent = getHyperLink(DocPaths.ALLCLASSES_FRAME, + allclassesLabel, "", "packageFrame"); + Content span = HtmlTree.SPAN(linkContent); + div.addContent(span); + } + + /** + * Adds "All Packages" link for the top of the left-hand frame page to the + * documentation tree. + * + * @param div the Content object to which the all packages link should be added + */ + protected void addAllPackagesLink(Content div) { + Content linkContent = getHyperLink(DocPaths.OVERVIEW_FRAME, + allpackagesLabel, "", "packageListFrame"); + Content span = HtmlTree.SPAN(linkContent); + div.addContent(span); + } + + /** + * {@inheritDoc} + */ + protected void addNavigationBarFooter(Content body) { + Content p = HtmlTree.P(getSpace()); + body.addContent(p); + } + + protected void addProfilePackagesList(Profiles profiles, String text, + String tableSummary, Content body, String profileName) { + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,186 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.doclets.formats.html; + +import java.io.*; +import java.util.*; + +import com.sun.javadoc.*; +import com.sun.tools.javac.jvm.Profile; +import com.sun.tools.doclets.formats.html.markup.*; +import com.sun.tools.doclets.internal.toolkit.*; +import com.sun.tools.doclets.internal.toolkit.util.*; + +/** + * Class to generate file for each package contents of a profile in the left-hand bottom + * frame. This will list all the Class Kinds in the package for a profile. A click on any + * class-kind will update the right-hand frame with the clicked class-kind page. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice.</b> + * + * @author Bhavesh Patel + */ +public class ProfilePackageFrameWriter extends HtmlDocletWriter { + + /** + * The package being documented. + */ + private PackageDoc packageDoc; + + /** + * Constructor to construct ProfilePackageFrameWriter object and to generate + * "profilename-package-frame.html" file in the respective package directory. + * For example for profile compact1 and package "java.lang" this will generate file + * "compact1-package-frame.html" file in the "java/lang" directory. It will also + * create "java/lang" directory in the current or the destination directory + * if it doesn't exist. + * + * @param configuration the configuration of the doclet. + * @param packageDoc PackageDoc under consideration. + * @param profileName the name of the profile being documented + */ + public ProfilePackageFrameWriter(ConfigurationImpl configuration, + PackageDoc packageDoc, String profileName) + throws IOException { + super(configuration, DocPath.forPackage(packageDoc).resolve( + DocPaths.profilePackageFrame(profileName))); + this.packageDoc = packageDoc; + } + + /** + * Generate a profile package summary page for the left-hand bottom frame. Construct + * the ProfilePackageFrameWriter object and then uses it generate the file. + * + * @param configuration the current configuration of the doclet. + * @param packageDoc The package for which "profilename-package-frame.html" is to be generated. + * @param profileValue the value of the profile being documented + */ + public static void generate(ConfigurationImpl configuration, + PackageDoc packageDoc, int profileValue) { + ProfilePackageFrameWriter profpackgen; + try { + String profileName = Profile.lookup(profileValue).name; + profpackgen = new ProfilePackageFrameWriter(configuration, packageDoc, + profileName); + StringBuilder winTitle = new StringBuilder(profileName); + String sep = " - "; + winTitle.append(sep); + String pkgName = Util.getPackageName(packageDoc); + winTitle.append(pkgName); + Content body = profpackgen.getBody(false, + profpackgen.getWindowTitle(winTitle.toString())); + Content profName = new StringContent(profileName); + Content sepContent = new StringContent(sep); + Content pkgNameContent = new RawHtml(pkgName); + Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, HtmlStyle.bar, + profpackgen.getTargetProfileLink("classFrame", profName, profileName)); + heading.addContent(sepContent); + heading.addContent(profpackgen.getTargetProfilePackageLink(packageDoc, + "classFrame", pkgNameContent, profileName)); + body.addContent(heading); + HtmlTree div = new HtmlTree(HtmlTag.DIV); + div.addStyle(HtmlStyle.indexContainer); + profpackgen.addClassListing(div, profileValue); + body.addContent(div); + profpackgen.printHtmlDocument( + configuration.metakeywords.getMetaKeywords(packageDoc), false, body); + profpackgen.close(); + } catch (IOException exc) { + configuration.standardmessage.error( + "doclet.exception_encountered", + exc.toString(), DocPaths.PACKAGE_FRAME.getPath()); + throw new DocletAbortException(); + } + } + + /** + * Add class listing for all the classes in this package. Divide class + * listing as per the class kind and generate separate listing for + * Classes, Interfaces, Exceptions and Errors. + * + * @param contentTree the content tree to which the listing will be added + * @param profileValue the value of the profile being documented + */ + protected void addClassListing(Content contentTree, int profileValue) { + if (packageDoc.isIncluded()) { + addClassKindListing(packageDoc.interfaces(), + getResource("doclet.Interfaces"), contentTree, profileValue); + addClassKindListing(packageDoc.ordinaryClasses(), + getResource("doclet.Classes"), contentTree, profileValue); + addClassKindListing(packageDoc.enums(), + getResource("doclet.Enums"), contentTree, profileValue); + addClassKindListing(packageDoc.exceptions(), + getResource("doclet.Exceptions"), contentTree, profileValue); + addClassKindListing(packageDoc.errors(), + getResource("doclet.Errors"), contentTree, profileValue); + addClassKindListing(packageDoc.annotationTypes(), + getResource("doclet.AnnotationTypes"), contentTree, profileValue); + } + } + + /** + * Add specific class kind listing. Also add label to the listing. + * + * @param arr Array of specific class kinds, namely Class or Interface or Exception or Error + * @param labelContent content tree of the label to be added + * @param contentTree the content tree to which the class kind listing will be added + * @param profileValue the value of the profile being documented + */ + protected void addClassKindListing(ClassDoc[] arr, Content labelContent, + Content contentTree, int profileValue) { + if(arr.length > 0) { + Arrays.sort(arr); + boolean printedHeader = false; + HtmlTree ul = new HtmlTree(HtmlTag.UL); + ul.addAttr(HtmlAttr.TITLE, labelContent.toString()); + for (int i = 0; i < arr.length; i++) { + if (!isTypeInProfile(arr[i], profileValue)) { + continue; + } + if (!Util.isCoreClass(arr[i]) || ! + configuration.isGeneratedDoc(arr[i])) { + continue; + } + if (!printedHeader) { + Content heading = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING, + true, labelContent); + contentTree.addContent(heading); + printedHeader = true; + } + Content link = new RawHtml (getLink(new LinkInfoImpl(configuration, + LinkInfoImpl.PACKAGE_FRAME, arr[i], + (arr[i].isInterface() ? italicsText(arr[i].name()) : + arr[i].name()),"classFrame"))); + Content li = HtmlTree.LI(link); + ul.addContent(li); + } + contentTree.addContent(ul); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageIndexFrameWriter.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,200 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.doclets.formats.html; + +import java.io.*; + +import com.sun.javadoc.*; +import com.sun.tools.javac.sym.Profiles; +import com.sun.tools.doclets.formats.html.markup.*; +import com.sun.tools.doclets.internal.toolkit.*; +import com.sun.tools.doclets.internal.toolkit.util.*; + +/** + * Generate the profile package index for the left-hand frame in the generated output. + * A click on the package name in this frame will update the page in the bottom + * left hand frame with the listing of contents of the clicked profile package. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice.</b> + * + * @author Bhavesh Patel + */ +public class ProfilePackageIndexFrameWriter extends AbstractProfileIndexWriter { + + /** + * Construct the ProfilePackageIndexFrameWriter object. + * + * @param configuration the configuration object + * @param filename Name of the package index file to be generated. + */ + public ProfilePackageIndexFrameWriter(ConfigurationImpl configuration, + DocPath filename) throws IOException { + super(configuration, filename); + } + + /** + * Generate the profile package index file. + * @throws DocletAbortException + * @param configuration the configuration object + * @param profileName the name of the profile being documented + */ + public static void generate(ConfigurationImpl configuration, String profileName) { + ProfilePackageIndexFrameWriter profpackgen; + DocPath filename = DocPaths.profileFrame(profileName); + try { + profpackgen = new ProfilePackageIndexFrameWriter(configuration, filename); + profpackgen.buildProfilePackagesIndexFile("doclet.Window_Overview", false, profileName); + profpackgen.close(); + } catch (IOException exc) { + configuration.standardmessage.error( + "doclet.exception_encountered", + exc.toString(), filename); + throw new DocletAbortException(); + } + } + + /** + * {@inheritDoc} + */ + protected void addProfilePackagesList(Profiles profiles, String text, + String tableSummary, Content body, String profileName) { + Content profNameContent = new StringContent(profileName); + Content heading = HtmlTree.HEADING(HtmlConstants.PACKAGE_HEADING, true, + getTargetProfileLink("classFrame", profNameContent, profileName)); + heading.addContent(getSpace()); + heading.addContent(packagesLabel); + Content div = HtmlTree.DIV(HtmlStyle.indexContainer, heading); + HtmlTree ul = new HtmlTree(HtmlTag.UL); + ul.addAttr(HtmlAttr.TITLE, packagesLabel.toString()); + PackageDoc[] packages = configuration.profilePackages.get(profileName); + for (int i = 0; i < packages.length; i++) { + if ((!(configuration.nodeprecated && Util.isDeprecated(packages[i])))) { + ul.addContent(getPackage(packages[i], profileName)); + } + } + div.addContent(ul); + body.addContent(div); + } + + /** + * Gets each package name as a separate link. + * + * @param pd PackageDoc + * @param profileName the name of the profile being documented + * @return content for the package link + */ + protected Content getPackage(PackageDoc pd, String profileName) { + Content packageLinkContent; + Content pkgLabel; + if (pd.name().length() > 0) { + pkgLabel = getPackageLabel(pd.name()); + packageLinkContent = getHyperLink(pathString(pd, + DocPaths.profilePackageFrame(profileName)), pkgLabel, "", + "packageFrame"); + } else { + pkgLabel = new RawHtml("<unnamed package>"); + packageLinkContent = getHyperLink(DocPaths.PACKAGE_FRAME, + pkgLabel, "", "packageFrame"); + } + Content li = HtmlTree.LI(packageLinkContent); + return li; + } + + /** + * {@inheritDoc} + */ + protected void addNavigationBarHeader(Content body) { + Content headerContent; + if (configuration.packagesheader.length() > 0) { + headerContent = new RawHtml(replaceDocRootDir(configuration.packagesheader)); + } else { + headerContent = new RawHtml(replaceDocRootDir(configuration.header)); + } + Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, true, + HtmlStyle.bar, headerContent); + body.addContent(heading); + } + + /** + * Do nothing as there is no overview information in this page. + */ + protected void addOverviewHeader(Content body) { + } + + protected void addProfilesList(Profiles profiles, String text, + String tableSummary, Content body) { + } + + /** + * Adds "All Classes" link for the top of the left-hand frame page to the + * documentation tree. + * + * @param div the Content object to which the all classes link should be added + */ + protected void addAllClassesLink(Content div) { + Content linkContent = getHyperLink(DocPaths.ALLCLASSES_FRAME, + allclassesLabel, "", "packageFrame"); + Content span = HtmlTree.SPAN(linkContent); + div.addContent(span); + } + + /** + * Adds "All Packages" link for the top of the left-hand frame page to the + * documentation tree. + * + * @param div the Content object to which the all packages link should be added + */ + protected void addAllPackagesLink(Content div) { + Content linkContent = getHyperLink(DocPaths.OVERVIEW_FRAME, + allpackagesLabel, "", "packageListFrame"); + Content span = HtmlTree.SPAN(linkContent); + div.addContent(span); + } + + /** + * Adds "All Profiles" link for the top of the left-hand frame page to the + * documentation tree. + * + * @param div the Content object to which the all profiles link should be added + */ + protected void addAllProfilesLink(Content div) { + Content linkContent = getHyperLink(DocPaths.PROFILE_OVERVIEW_FRAME, + allprofilesLabel, "", "packageListFrame"); + Content span = HtmlTree.SPAN(linkContent); + div.addContent(span); + } + + /** + * {@inheritDoc} + */ + protected void addNavigationBarFooter(Content body) { + Content p = HtmlTree.P(getSpace()); + body.addContent(p); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageWriterImpl.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,296 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.doclets.formats.html; + +import java.io.*; +import java.util.*; + +import com.sun.javadoc.*; +import com.sun.tools.javac.jvm.Profile; +import com.sun.tools.doclets.formats.html.markup.*; +import com.sun.tools.doclets.internal.toolkit.*; +import com.sun.tools.doclets.internal.toolkit.util.*; + +/** + * Class to generate file for each profile package contents in the right-hand + * frame. This will list all the Class Kinds in the package. A click on any + * class-kind will update the frame with the clicked class-kind page. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice.</b> + * + * @author Bhavesh Patel + */ +public class ProfilePackageWriterImpl extends HtmlDocletWriter + implements ProfilePackageSummaryWriter { + + /** + * The prev package name in the alpha-order list. + */ + protected PackageDoc prev; + + /** + * The next package name in the alpha-order list. + */ + protected PackageDoc next; + + /** + * The profile package being documented. + */ + protected PackageDoc packageDoc; + + /** + * The name of the profile being documented. + */ + protected String profileName; + + /** + * The value of the profile being documented. + */ + protected int profileValue; + + /** + * Constructor to construct ProfilePackageWriter object and to generate + * "profilename-package-summary.html" file in the respective package directory. + * For example for profile compact1 and package "java.lang" this will generate file + * "compact1-package-summary.html" file in the "java/lang" directory. It will also + * create "java/lang" directory in the current or the destination directory + * if it doesn't exist. + * + * @param configuration the configuration of the doclet. + * @param packageDoc PackageDoc under consideration. + * @param prev Previous package in the sorted array. + * @param next Next package in the sorted array. + * @param profile The profile being documented. + */ + public ProfilePackageWriterImpl(ConfigurationImpl configuration, + PackageDoc packageDoc, PackageDoc prev, PackageDoc next, + Profile profile) throws IOException { + super(configuration, DocPath.forPackage(packageDoc).resolve( + DocPaths.profilePackageSummary(profile.name))); + this.prev = prev; + this.next = next; + this.packageDoc = packageDoc; + this.profileName = profile.name; + this.profileValue = profile.value; + } + + /** + * {@inheritDoc} + */ + public Content getPackageHeader(String heading) { + String pkgName = packageDoc.name(); + Content bodyTree = getBody(true, getWindowTitle(pkgName)); + addTop(bodyTree); + addNavLinks(true, bodyTree); + HtmlTree div = new HtmlTree(HtmlTag.DIV); + div.addStyle(HtmlStyle.header); + Content profileContent = new StringContent(profileName); + Content profileNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, profileContent); + div.addContent(profileNameDiv); + Content annotationContent = new HtmlTree(HtmlTag.P); + addAnnotationInfo(packageDoc, annotationContent); + div.addContent(annotationContent); + Content tHeading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, true, + HtmlStyle.title, packageLabel); + tHeading.addContent(getSpace()); + Content packageHead = new RawHtml(heading); + tHeading.addContent(packageHead); + div.addContent(tHeading); + addDeprecationInfo(div); + if (packageDoc.inlineTags().length > 0 && ! configuration.nocomment) { + HtmlTree docSummaryDiv = new HtmlTree(HtmlTag.DIV); + docSummaryDiv.addStyle(HtmlStyle.docSummary); + addSummaryComment(packageDoc, docSummaryDiv); + div.addContent(docSummaryDiv); + Content space = getSpace(); + Content descLink = getHyperLink(DocLink.fragment("package_description"), + descriptionLabel, "", ""); + Content descPara = new HtmlTree(HtmlTag.P, seeLabel, space, descLink); + div.addContent(descPara); + } + bodyTree.addContent(div); + return bodyTree; + } + + /** + * {@inheritDoc} + */ + public Content getContentHeader() { + HtmlTree div = new HtmlTree(HtmlTag.DIV); + div.addStyle(HtmlStyle.contentContainer); + return div; + } + + /** + * Add the package deprecation information to the documentation tree. + * + * @param div the content tree to which the deprecation information will be added + */ + public void addDeprecationInfo(Content div) { + Tag[] deprs = packageDoc.tags("deprecated"); + if (Util.isDeprecated(packageDoc)) { + HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV); + deprDiv.addStyle(HtmlStyle.deprecatedContent); + Content deprPhrase = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); + deprDiv.addContent(deprPhrase); + if (deprs.length > 0) { + Tag[] commentTags = deprs[0].inlineTags(); + if (commentTags.length > 0) { + addInlineDeprecatedComment(packageDoc, deprs[0], deprDiv); + } + } + div.addContent(deprDiv); + } + } + + /** + * {@inheritDoc} + */ + public void addClassesSummary(ClassDoc[] classes, String label, + String tableSummary, String[] tableHeader, Content packageSummaryContentTree) { + addClassesSummary(classes, label, tableSummary, tableHeader, + packageSummaryContentTree, profileValue); + } + + /** + * {@inheritDoc} + */ + public Content getSummaryHeader() { + HtmlTree ul = new HtmlTree(HtmlTag.UL); + ul.addStyle(HtmlStyle.blockList); + return ul; + } + + /** + * {@inheritDoc} + */ + public void addPackageDescription(Content packageContentTree) { + if (packageDoc.inlineTags().length > 0) { + packageContentTree.addContent(getMarkerAnchor("package_description")); + Content h2Content = new StringContent( + configuration.getText("doclet.Package_Description", + packageDoc.name())); + packageContentTree.addContent(HtmlTree.HEADING(HtmlConstants.PACKAGE_HEADING, + true, h2Content)); + addInlineComment(packageDoc, packageContentTree); + } + } + + /** + * {@inheritDoc} + */ + public void addPackageTags(Content packageContentTree) { + addTagsInfo(packageDoc, packageContentTree); + } + + /** + * {@inheritDoc} + */ + public void addPackageFooter(Content contentTree) { + addNavLinks(false, contentTree); + addBottom(contentTree); + } + + /** + * {@inheritDoc} + */ + public void printDocument(Content contentTree) throws IOException { + printHtmlDocument(configuration.metakeywords.getMetaKeywords(packageDoc), + true, contentTree); + } + + /** + * Get "Use" link for this package in the navigation bar. + * + * @return a content tree for the class use link + */ + protected Content getNavLinkClassUse() { + Content useLink = getHyperLink(DocPaths.PACKAGE_USE, + useLabel, "", ""); + Content li = HtmlTree.LI(useLink); + return li; + } + + /** + * Get "PREV PACKAGE" link in the navigation bar. + * + * @return a content tree for the previous link + */ + public Content getNavLinkPrevious() { + Content li; + if (prev == null) { + li = HtmlTree.LI(prevpackageLabel); + } else { + DocPath path = DocPath.relativePath(packageDoc, prev); + li = HtmlTree.LI(getHyperLink(path.resolve(DocPaths.profilePackageSummary(profileName)), + prevpackageLabel, "", "")); + } + return li; + } + + /** + * Get "NEXT PACKAGE" link in the navigation bar. + * + * @return a content tree for the next link + */ + public Content getNavLinkNext() { + Content li; + if (next == null) { + li = HtmlTree.LI(nextpackageLabel); + } else { + DocPath path = DocPath.relativePath(packageDoc, next); + li = HtmlTree.LI(getHyperLink(path.resolve(DocPaths.profilePackageSummary(profileName)), + nextpackageLabel, "", "")); + } + return li; + } + + /** + * Get "Tree" link in the navigation bar. This will be link to the package + * tree file. + * + * @return a content tree for the tree link + */ + protected Content getNavLinkTree() { + Content useLink = getHyperLink(DocPaths.PACKAGE_TREE, + treeLabel, "", ""); + Content li = HtmlTree.LI(useLink); + return li; + } + + /** + * Highlight "Package" in the navigation bar, as this is the package page. + * + * @return a content tree for the package link + */ + protected Content getNavLinkPackage() { + Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, packageLabel); + return li; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ProfileWriterImpl.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,208 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.doclets.formats.html; + +import java.io.*; +import java.util.*; + +import com.sun.javadoc.*; +import com.sun.tools.javac.jvm.Profile; +import com.sun.tools.doclets.formats.html.markup.*; +import com.sun.tools.doclets.internal.toolkit.*; +import com.sun.tools.doclets.internal.toolkit.util.*; + +/** + * Class to generate file for each profile contents in the right-hand + * frame. This will list all the packages and Class Kinds in the profile. A click on any + * class-kind will update the frame with the clicked class-kind page. A click on any + * package will update the frame with the clicked profile package page. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice.</b> + * + * @author Bhavesh Patel + */ +public class ProfileWriterImpl extends HtmlDocletWriter + implements ProfileSummaryWriter { + + /** + * The prev profile name in the alpha-order list. + */ + protected Profile prevProfile; + + /** + * The next profile name in the alpha-order list. + */ + protected Profile nextProfile; + + /** + * The profile being documented. + */ + protected Profile profile; + + /** + * Constructor to construct ProfileWriter object and to generate + * "profileName-summary.html" file. + * + * @param configuration the configuration of the doclet. + * @param profile Profile under consideration. + * @param prevProfile Previous profile in the sorted array. + * @param nextProfile Next profile in the sorted array. + */ + public ProfileWriterImpl(ConfigurationImpl configuration, + Profile profile, Profile prevProfile, Profile nextProfile) + throws IOException { + super(configuration, DocPaths.profileSummary(profile.name)); + this.prevProfile = prevProfile; + this.nextProfile = nextProfile; + this.profile = profile; + } + + /** + * {@inheritDoc} + */ + public Content getProfileHeader(String heading) { + String profileName = profile.name; + Content bodyTree = getBody(true, getWindowTitle(profileName)); + addTop(bodyTree); + addNavLinks(true, bodyTree); + HtmlTree div = new HtmlTree(HtmlTag.DIV); + div.addStyle(HtmlStyle.header); + Content tHeading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, true, + HtmlStyle.title, profileLabel); + tHeading.addContent(getSpace()); + Content profileHead = new RawHtml(heading); + tHeading.addContent(profileHead); + div.addContent(tHeading); + bodyTree.addContent(div); + return bodyTree; + } + + /** + * {@inheritDoc} + */ + public Content getContentHeader() { + HtmlTree div = new HtmlTree(HtmlTag.DIV); + div.addStyle(HtmlStyle.contentContainer); + return div; + } + + /** + * {@inheritDoc} + */ + public Content getSummaryHeader() { + HtmlTree li = new HtmlTree(HtmlTag.LI); + li.addStyle(HtmlStyle.blockList); + return li; + } + + /** + * {@inheritDoc} + */ + public Content getSummaryTree(Content summaryContentTree) { + HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList, summaryContentTree); + HtmlTree div = HtmlTree.DIV(HtmlStyle.summary, ul); + return div; + } + + /** + * {@inheritDoc} + */ + public Content getPackageSummaryHeader(PackageDoc pkg) { + Content pkgName = getTargetProfilePackageLink(pkg, + "classFrame", new StringContent(pkg.name()), profile.name); + Content heading = HtmlTree.HEADING(HtmlTag.H3, pkgName); + HtmlTree li = HtmlTree.LI(HtmlStyle.blockList, heading); + return li; + } + + /** + * {@inheritDoc} + */ + public Content getPackageSummaryTree(Content packageSummaryContentTree) { + HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList, packageSummaryContentTree); + return ul; + } + + /** + * {@inheritDoc} + */ + public void addClassesSummary(ClassDoc[] classes, String label, + String tableSummary, String[] tableHeader, Content packageSummaryContentTree) { + addClassesSummary(classes, label, tableSummary, tableHeader, + packageSummaryContentTree, profile.value); + } + + /** + * {@inheritDoc} + */ + public void addProfileFooter(Content contentTree) { + addNavLinks(false, contentTree); + addBottom(contentTree); + } + + /** + * {@inheritDoc} + */ + public void printDocument(Content contentTree) throws IOException { + printHtmlDocument(configuration.metakeywords.getMetaKeywords(profile), + true, contentTree); + } + + /** + * Get "PREV PROFILE" link in the navigation bar. + * + * @return a content tree for the previous link + */ + public Content getNavLinkPrevious() { + Content li; + if (prevProfile == null) { + li = HtmlTree.LI(prevprofileLabel); + } else { + li = HtmlTree.LI(getHyperLink(pathToRoot.resolve(DocPaths.profileSummary( + prevProfile.name)), prevprofileLabel, "", "")); + } + return li; + } + + /** + * Get "NEXT PROFILE" link in the navigation bar. + * + * @return a content tree for the next link + */ + public Content getNavLinkNext() { + Content li; + if (nextProfile == null) { + li = HtmlTree.LI(nextprofileLabel); + } else { + li = HtmlTree.LI(getHyperLink(pathToRoot.resolve(DocPaths.profileSummary( + nextProfile.name)), nextprofileLabel, "", "")); + } + return li; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,322 @@ +/* + * Copyright (c) 1997, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.doclets.formats.html; + +import java.io.*; + +import com.sun.javadoc.*; +import com.sun.tools.doclets.formats.html.markup.*; +import com.sun.tools.doclets.internal.toolkit.*; +import com.sun.tools.doclets.internal.toolkit.util.*; + +/** + * Writes property documentation in HTML format. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice.</b> + * + * @author Robert Field + * @author Atul M Dambalkar + * @author Jamie Ho (rewrite) + * @author Bhavesh Patel (Modified) + */ +public class PropertyWriterImpl extends AbstractMemberWriter + implements PropertyWriter, MemberSummaryWriter { + + public PropertyWriterImpl(SubWriterHolderWriter writer, ClassDoc classdoc) { + super(writer, classdoc); + } + + /** + * {@inheritDoc} + */ + public Content getMemberSummaryHeader(ClassDoc classDoc, + Content memberSummaryTree) { + memberSummaryTree.addContent(HtmlConstants.START_OF_PROPERTY_SUMMARY); + Content memberTree = writer.getMemberTreeHeader(); + writer.addSummaryHeader(this, classDoc, memberTree); + return memberTree; + } + + /** + * {@inheritDoc} + */ + public Content getPropertyDetailsTreeHeader(ClassDoc classDoc, + Content memberDetailsTree) { + memberDetailsTree.addContent(HtmlConstants.START_OF_PROPERTY_DETAILS); + Content propertyDetailsTree = writer.getMemberTreeHeader(); + propertyDetailsTree.addContent(writer.getMarkerAnchor("property_detail")); + Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING, + writer.propertyDetailsLabel); + propertyDetailsTree.addContent(heading); + return propertyDetailsTree; + } + + /** + * {@inheritDoc} + */ + public Content getPropertyDocTreeHeader(MethodDoc property, + Content propertyDetailsTree) { + propertyDetailsTree.addContent( + writer.getMarkerAnchor(property.name())); + Content propertyDocTree = writer.getMemberTreeHeader(); + Content heading = new HtmlTree(HtmlConstants.MEMBER_HEADING); + heading.addContent(property.name().substring(0, property.name().lastIndexOf("Property"))); + propertyDocTree.addContent(heading); + return propertyDocTree; + } + + /** + * {@inheritDoc} + */ + public Content getSignature(MethodDoc property) { + Content pre = new HtmlTree(HtmlTag.PRE); + writer.addAnnotationInfo(property, pre); + addModifiers(property, pre); + Content propertylink = new RawHtml(writer.getLink(new LinkInfoImpl( + configuration, LinkInfoImpl.CONTEXT_MEMBER, + property.returnType()))); + pre.addContent(propertylink); + pre.addContent(" "); + if (configuration.linksource) { + Content propertyName = new StringContent(property.name()); + writer.addSrcLink(property, propertyName, pre); + } else { + addName(property.name(), pre); + } + return pre; + } + + /** + * {@inheritDoc} + */ + public void addDeprecated(MethodDoc property, Content propertyDocTree) { + } + + /** + * {@inheritDoc} + */ + public void addComments(MethodDoc property, Content propertyDocTree) { + ClassDoc holder = property.containingClass(); + if (property.inlineTags().length > 0) { + if (holder.equals(classdoc) || + (! (holder.isPublic() || Util.isLinkable(holder, configuration)))) { + writer.addInlineComment(property, propertyDocTree); + } else { + Content link = new RawHtml( + writer.getDocLink(LinkInfoImpl.CONTEXT_PROPERTY_DOC_COPY, + holder, property, + holder.isIncluded() ? + holder.typeName() : holder.qualifiedTypeName(), + false)); + Content codeLink = HtmlTree.CODE(link); + Content strong = HtmlTree.STRONG(holder.isClass()? + writer.descfrmClassLabel : writer.descfrmInterfaceLabel); + strong.addContent(writer.getSpace()); + strong.addContent(codeLink); + propertyDocTree.addContent(HtmlTree.DIV(HtmlStyle.block, strong)); + writer.addInlineComment(property, propertyDocTree); + } + } + } + + /** + * {@inheritDoc} + */ + public void addTags(MethodDoc property, Content propertyDocTree) { + writer.addTagsInfo(property, propertyDocTree); + } + + /** + * {@inheritDoc} + */ + public Content getPropertyDetails(Content propertyDetailsTree) { + return getMemberTree(propertyDetailsTree); + } + + /** + * {@inheritDoc} + */ + public Content getPropertyDoc(Content propertyDocTree, + boolean isLastContent) { + return getMemberTree(propertyDocTree, isLastContent); + } + + /** + * Close the writer. + */ + public void close() throws IOException { + writer.close(); + } + + public int getMemberKind() { + return VisibleMemberMap.PROPERTIES; + } + + /** + * {@inheritDoc} + */ + public void addSummaryLabel(Content memberTree) { + Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING, + writer.getResource("doclet.Property_Summary")); + memberTree.addContent(label); + } + + /** + * {@inheritDoc} + */ + public String getTableSummary() { + return configuration.getText("doclet.Member_Table_Summary", + configuration.getText("doclet.Property_Summary"), + configuration.getText("doclet.properties")); + } + + /** + * {@inheritDoc} + */ + public String getCaption() { + return configuration.getText("doclet.Properties"); + } + + /** + * {@inheritDoc} + */ + public String[] getSummaryTableHeader(ProgramElementDoc member) { + String[] header = new String[] { + configuration.getText("doclet.Type"), + configuration.getText("doclet.0_and_1", + configuration.getText("doclet.Property"), + configuration.getText("doclet.Description")) + }; + return header; + } + + /** + * {@inheritDoc} + */ + public void addSummaryAnchor(ClassDoc cd, Content memberTree) { + memberTree.addContent(writer.getMarkerAnchor("property_summary")); + } + + /** + * {@inheritDoc} + */ + public void addInheritedSummaryAnchor(ClassDoc cd, Content inheritedTree) { + inheritedTree.addContent(writer.getMarkerAnchor( + "properties_inherited_from_class_" + configuration.getClassName(cd))); + } + + /** + * {@inheritDoc} + */ + public void addInheritedSummaryLabel(ClassDoc cd, Content inheritedTree) { + Content classLink = new RawHtml(writer.getPreQualifiedClassLink( + LinkInfoImpl.CONTEXT_MEMBER, cd, false)); + Content label = new StringContent(cd.isClass() ? + configuration.getText("doclet.Properties_Inherited_From_Class") : + configuration.getText("doclet.Properties_Inherited_From_Interface")); + Content labelHeading = HtmlTree.HEADING(HtmlConstants.INHERITED_SUMMARY_HEADING, + label); + labelHeading.addContent(writer.getSpace()); + labelHeading.addContent(classLink); + inheritedTree.addContent(labelHeading); + } + + /** + * {@inheritDoc} + */ + protected void addSummaryLink(int context, ClassDoc cd, ProgramElementDoc member, + Content tdSummary) { + Content strong = HtmlTree.STRONG(new RawHtml( + writer.getDocLink(context, + cd, + (MemberDoc) member, + member.name().substring(0, member.name().lastIndexOf("Property")), + false, + true))); + + Content code = HtmlTree.CODE(strong); + tdSummary.addContent(code); + } + + /** + * {@inheritDoc} + */ + protected void addInheritedSummaryLink(ClassDoc cd, + ProgramElementDoc member, Content linksTree) { + linksTree.addContent(new RawHtml( + writer.getDocLink(LinkInfoImpl.CONTEXT_MEMBER, cd, (MemberDoc)member, + ((member.name().lastIndexOf("Property") != -1) && configuration.javafx) + ? member.name().substring(0, member.name().length() - "Property".length()) + : member.name(), + false, true))); + } + + /** + * {@inheritDoc} + */ + protected void addSummaryType(ProgramElementDoc member, Content tdSummaryType) { + MethodDoc property = (MethodDoc)member; + addModifierAndType(property, property.returnType(), tdSummaryType); + } + + /** + * {@inheritDoc} + */ + protected Content getDeprecatedLink(ProgramElementDoc member) { + return writer.getDocLink(LinkInfoImpl.CONTEXT_MEMBER, + (MemberDoc) member, ((MethodDoc)member).qualifiedName()); + } + + /** + * {@inheritDoc} + */ + protected Content getNavSummaryLink(ClassDoc cd, boolean link) { + if (link) { + return writer.getHyperLink((cd == null)? + "property_summary": + "properties_inherited_from_class_" + + configuration.getClassName(cd), + writer.getResource("doclet.navProperty")); + } else { + return writer.getResource("doclet.navProperty"); + } + } + + /** + * {@inheritDoc} + */ + protected void addNavDetailLink(boolean link, Content liNav) { + if (link) { + liNav.addContent(writer.getHyperLink("property_detail", + writer.getResource("doclet.navProperty"))); + } else { + liNav.addContent(writer.getResource("doclet.navProperty")); + } + } +}
--- a/src/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -28,6 +28,7 @@ import java.io.IOException; import com.sun.javadoc.*; +import com.sun.tools.javac.jvm.Profile; import com.sun.tools.doclets.internal.toolkit.*; import com.sun.tools.doclets.internal.toolkit.util.*; @@ -69,6 +70,24 @@ /** * {@inheritDoc} */ + public ProfileSummaryWriter getProfileSummaryWriter(Profile profile, + Profile prevProfile, Profile nextProfile) throws Exception { + return new ProfileWriterImpl(configuration, profile, + prevProfile, nextProfile); + } + + /** + * {@inheritDoc} + */ + public ProfilePackageSummaryWriter getProfilePackageSummaryWriter(PackageDoc packageDoc, + PackageDoc prevPkg, PackageDoc nextPkg, Profile profile) throws Exception { + return new ProfilePackageWriterImpl(configuration, packageDoc, + prevPkg, nextPkg, profile); + } + + /** + * {@inheritDoc} + */ public ClassWriter getClassWriter(ClassDoc classDoc, ClassDoc prevClass, ClassDoc nextClass, ClassTree classTree) throws IOException { return new ClassWriterImpl(configuration, classDoc, @@ -127,6 +146,15 @@ /** * {@inheritDoc} */ + public PropertyWriterImpl getPropertyWriter(ClassWriter classWriter) + throws Exception { + return new PropertyWriterImpl((SubWriterHolderWriter) classWriter, + classWriter.getClassDoc()); + } + + /** + * {@inheritDoc} + */ public MethodWriterImpl getMethodWriter(ClassWriter classWriter) throws Exception { return new MethodWriterImpl((SubWriterHolderWriter) classWriter, @@ -155,6 +183,8 @@ return getEnumConstantWriter(classWriter); case VisibleMemberMap.FIELDS: return getFieldWriter(classWriter); + case VisibleMemberMap.PROPERTIES: + return getPropertyWriter(classWriter); case VisibleMemberMap.INNERCLASSES: return new NestedClassWriterImpl((SubWriterHolderWriter) classWriter, classWriter.getClassDoc());
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlConstants.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlConstants.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 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 @@ -112,6 +112,12 @@ new Comment("=========== FIELD SUMMARY ==========="); /** + * Marker to identify start of properties summary. + */ + public static final Content START_OF_PROPERTY_SUMMARY = + new Comment("=========== PROPERTY SUMMARY ==========="); + + /** * Marker to identify start of method summary. */ public static final Content START_OF_METHOD_SUMMARY = @@ -136,6 +142,12 @@ new Comment("============ FIELD DETAIL ==========="); /** + * Marker to identify start of property details. + */ + public static final Content START_OF_PROPERTY_DETAILS = + new Comment("============ PROPERTY DETAIL ==========="); + + /** * Marker to identify start of constructor details. */ public static final Content START_OF_CONSTRUCTOR_DETAILS = @@ -168,6 +180,11 @@ public static final HtmlTag PACKAGE_HEADING = HtmlTag.H2; /** + * Html tag for the profile name heading. + */ + public static final HtmlTag PROFILE_HEADING = HtmlTag.H2; + + /** * Html tag for the member summary heading. */ public static final HtmlTag SUMMARY_HEADING = HtmlTag.H3;
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -63,6 +63,11 @@ protected boolean memberDetailsListPrinted; /** + * Header for table displaying profiles and description.. + */ + protected final String[] profileTableHeader; + + /** * Header for tables displaying packages and description.. */ protected final String[] packageTableHeader; @@ -83,6 +88,8 @@ public final Content packageLabel; + public final Content profileLabel; + public final Content useLabel; public final Content prevLabel; @@ -111,6 +118,10 @@ public final Content allclassesLabel; + public final Content allpackagesLabel; + + public final Content allprofilesLabel; + public final Content indexLabel; public final Content helpLabel; @@ -123,14 +134,22 @@ public final Content nextpackageLabel; + public final Content prevprofileLabel; + + public final Content nextprofileLabel; + public final Content packagesLabel; + public final Content profilesLabel; + public final Content methodDetailsLabel; public final Content annotationTypeDetailsLabel; public final Content fieldDetailsLabel; + public final Content propertyDetailsLabel; + public final Content constructorDetailsLabel; public final Content enumConstantsDetailsLabel; @@ -162,6 +181,10 @@ writer = DocFile.createFileForOutput(configuration, path).openWriter(); this.configuration = configuration; this.memberDetailsListPrinted = false; + profileTableHeader = new String[] { + configuration.getText("doclet.Profile"), + configuration.getText("doclet.Description") + }; packageTableHeader = new String[] { configuration.getText("doclet.Package"), configuration.getText("doclet.Description") @@ -175,6 +198,7 @@ defaultPackageLabel = new RawHtml( DocletConstants.DEFAULT_PACKAGE_NAME); packageLabel = getResource("doclet.Package"); + profileLabel = getResource("doclet.Profile"); useLabel = getResource("doclet.navClassUse"); prevLabel = getResource("doclet.Prev"); nextLabel = getResource("doclet.Next"); @@ -189,16 +213,22 @@ deprecatedLabel = getResource("doclet.navDeprecated"); deprecatedPhrase = getResource("doclet.Deprecated"); allclassesLabel = getResource("doclet.All_Classes"); + allpackagesLabel = getResource("doclet.All_Packages"); + allprofilesLabel = getResource("doclet.All_Profiles"); indexLabel = getResource("doclet.Index"); helpLabel = getResource("doclet.Help"); seeLabel = getResource("doclet.See"); descriptionLabel = getResource("doclet.Description"); prevpackageLabel = getResource("doclet.Prev_Package"); nextpackageLabel = getResource("doclet.Next_Package"); + prevprofileLabel = getResource("doclet.Prev_Profile"); + nextprofileLabel = getResource("doclet.Next_Profile"); packagesLabel = getResource("doclet.Packages"); + profilesLabel = getResource("doclet.Profiles"); methodDetailsLabel = getResource("doclet.Method_Detail"); annotationTypeDetailsLabel = getResource("doclet.Annotation_Type_Member_Detail"); fieldDetailsLabel = getResource("doclet.Field_Detail"); + propertyDetailsLabel = getResource("doclet.Property_Detail"); constructorDetailsLabel = getResource("doclet.Constructor_Detail"); enumConstantsDetailsLabel = getResource("doclet.Enum_Constant_Detail"); specifiedByLabel = getResource("doclet.Specified_By");
--- a/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties Tue May 07 17:14:17 2013 -0700 @@ -4,7 +4,9 @@ doclet.Window_Overview=Overview List doclet.Window_Overview_Summary=Overview doclet.Package=Package +doclet.Profile=Profile doclet.All_Packages=All Packages +doclet.All_Profiles=All Profiles doclet.Tree=Tree doclet.Class_Hierarchy=Class Hierarchy doclet.Window_Class_Hierarchy=Class Hierarchy @@ -17,6 +19,8 @@ doclet.Next_Class=Next Class doclet.Prev_Package=Prev Package doclet.Next_Package=Next Package +doclet.Prev_Profile=Prev Profile +doclet.Next_Profile=Next Profile doclet.Prev_Letter=Prev Letter doclet.Next_Letter=Next Letter doclet.Href_Class_Title=class in {0} @@ -32,6 +36,7 @@ doclet.navAnnotationTypeRequiredMember=Required doclet.navAnnotationTypeMember=Element doclet.navField=Field +doclet.navProperty=Property doclet.navEnum=Enum Constants doclet.navConstructor=Constr doclet.navMethod=Method @@ -40,6 +45,7 @@ doclet.Window_Split_Index={0}-Index doclet.Help=Help doclet.Skip_navigation_links=Skip navigation links +doclet.Navigation=Navigation doclet.New_Page=NewPage doclet.navDeprecated=Deprecated doclet.Window_Deprecated_List=Deprecated List @@ -91,7 +97,7 @@ doclet.Subinterfaces=All Known Subinterfaces: doclet.Implementing_Classes=All Known Implementing Classes: doclet.Functional_Interface=Functional Interface: -doclet.Functional_Interface_Message=This is a functional interface and can therefore be used as the assignment target for a lambda expression or method reference. +doclet.Functional_Interface_Message=This is a functional interface and can therefore be used as the assignment target for a lambda expression or method reference. doclet.also=also doclet.Frames=Frames doclet.No_Frames=No Frames
--- a/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties Tue May 07 17:14:17 2013 -0700 @@ -32,7 +32,7 @@ doclet.navAnnotationTypeRequiredMember=\u5FC5\u9808 doclet.navAnnotationTypeMember=\u8981\u7D20 doclet.navField=\u30D5\u30A3\u30FC\u30EB\u30C9 -doclet.navEnum=\u5217\u6319\u5B9A\u6570 +doclet.navEnum=\u5217\u6319\u578B\u5B9A\u6570 doclet.navConstructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF doclet.navMethod=\u30E1\u30BD\u30C3\u30C9 doclet.Index=\u7D22\u5F15 @@ -41,59 +41,47 @@ doclet.Help=\u30D8\u30EB\u30D7 doclet.Skip_navigation_links=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30EA\u30F3\u30AF\u3092\u30B9\u30AD\u30C3\u30D7 doclet.New_Page=NewPage -doclet.None=\u306A\u3057 -doclet.Factory_Method_Detail=static\u30D5\u30A1\u30AF\u30C8\u30EA\u30FB\u30E1\u30BD\u30C3\u30C9\u306E\u8A73\u7D30 doclet.navDeprecated=\u975E\u63A8\u5968 -doclet.Deprecated_List=\u975E\u63A8\u5968API\u306E\u30EA\u30B9\u30C8 -doclet.Window_Deprecated_List=\u975E\u63A8\u5968API\u306E\u30EA\u30B9\u30C8 -doclet.Note_0_is_deprecated=\u6CE8\u610F: {0}\u306F\u63A8\u5968\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 +doclet.Window_Deprecated_List=\u975E\u63A8\u5968\u306E\u30EA\u30B9\u30C8 doclet.Overrides=\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9: doclet.in_class=\u30AF\u30E9\u30B9\u5185 -doclet.0_Fields_and_Methods="{0}"\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u30E1\u30BD\u30C3\u30C9 -doclet.Index_of_Fields_and_Methods=\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u30E1\u30BD\u30C3\u30C9\u306E\u7D22\u5F15 doclet.Static_variable_in={0}\u306Estatic\u5909\u6570 doclet.Variable_in={0}\u306E\u5909\u6570 doclet.Constructor_for={0}\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF doclet.Static_method_in={0}\u306Estatic\u30E1\u30BD\u30C3\u30C9 doclet.Method_in={0}\u306E\u30E1\u30BD\u30C3\u30C9 -doclet.throws=\u30B9\u30ED\u30FC doclet.package=\u30D1\u30C3\u30B1\u30FC\u30B8 doclet.MalformedURL=\u4E0D\u6B63\u306AURL: {0} doclet.File_error=\u30D5\u30A1\u30A4\u30EB\u8AAD\u8FBC\u307F\u30A8\u30E9\u30FC: {0} doclet.URL_error=URL\u53D6\u51FA\u3057\u30A8\u30E9\u30FC: {0} -doclet.No_Package_Comment_File=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306EPackage.Comment\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093 -doclet.No_Source_For_Class=\u30AF\u30E9\u30B9{0}\u306E\u30BD\u30FC\u30B9\u60C5\u5831\u304C\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002 doclet.see.class_or_package_not_found=\u30BF\u30B0{0}: \u53C2\u7167\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {1} doclet.see.class_or_package_not_accessible=\u30BF\u30B0{0}: \u53C2\u7167\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093: {1} -doclet.see.malformed_tag={0}\u30BF\u30B0: \u4E0D\u6B63\u306A{1}\u30BF\u30B0 -doclet.Inherited_API_Summary=\u7D99\u627F\u3055\u308C\u305FAPI\u306E\u6982\u8981 -doclet.Deprecated_API=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044API -doclet.Deprecated_Classes=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30AF\u30E9\u30B9 -doclet.Deprecated_Enums=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u5217\u6319\u578B -doclet.Deprecated_Interfaces=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 -doclet.Deprecated_Exceptions=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u4F8B\u5916 -doclet.Deprecated_Annotation_Types=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u6CE8\u91C8\u578B -doclet.Deprecated_Errors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A8\u30E9\u30FC -doclet.Deprecated_Fields=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30D5\u30A3\u30FC\u30EB\u30C9 -doclet.Deprecated_Constructors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF -doclet.Deprecated_Methods=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30E1\u30BD\u30C3\u30C9 -doclet.Deprecated_Enum_Constants=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u5217\u6319\u578B\u5B9A\u6570 -doclet.Deprecated_Annotation_Type_Members=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u6CE8\u91C8\u578B\u306E\u8981\u7D20 -doclet.deprecated_classes=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30AF\u30E9\u30B9 -doclet.deprecated_enums=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u5217\u6319\u578B -doclet.deprecated_interfaces=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 -doclet.deprecated_exceptions=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u4F8B\u5916 -doclet.deprecated_annotation_types=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u6CE8\u91C8\u578B -doclet.deprecated_errors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A8\u30E9\u30FC -doclet.deprecated_fields=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30D5\u30A3\u30FC\u30EB\u30C9 -doclet.deprecated_constructors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF -doclet.deprecated_methods=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30E1\u30BD\u30C3\u30C9 -doclet.deprecated_enum_constants=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u5217\u6319\u578B\u5B9A\u6570 -doclet.deprecated_annotation_type_members=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u6CE8\u91C8\u578B\u306E\u8981\u7D20 -doclet.Frame_Output=\u30D5\u30EC\u30FC\u30E0\u51FA\u529B -doclet.Docs_generated_by_Javadoc=\u3053\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306Fjavadoc\u3067\u751F\u6210\u3055\u308C\u3066\u3044\u307E\u3059\u3002 +doclet.Deprecated_API=\u975E\u63A8\u5968\u306EAPI +doclet.Deprecated_Packages=\u975E\u63A8\u5968\u306E\u30D1\u30C3\u30B1\u30FC\u30B8 +doclet.Deprecated_Classes=\u975E\u63A8\u5968\u306E\u30AF\u30E9\u30B9 +doclet.Deprecated_Enums=\u975E\u63A8\u5968\u306E\u5217\u6319\u578B +doclet.Deprecated_Interfaces=\u975E\u63A8\u5968\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 +doclet.Deprecated_Exceptions=\u975E\u63A8\u5968\u306E\u4F8B\u5916 +doclet.Deprecated_Annotation_Types=\u975E\u63A8\u5968\u306E\u6CE8\u91C8\u578B +doclet.Deprecated_Errors=\u975E\u63A8\u5968\u306E\u30A8\u30E9\u30FC +doclet.Deprecated_Fields=\u975E\u63A8\u5968\u306E\u30D5\u30A3\u30FC\u30EB\u30C9 +doclet.Deprecated_Constructors=\u975E\u63A8\u5968\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF +doclet.Deprecated_Methods=\u975E\u63A8\u5968\u306E\u30E1\u30BD\u30C3\u30C9 +doclet.Deprecated_Enum_Constants=\u975E\u63A8\u5968\u306E\u5217\u6319\u578B\u5B9A\u6570 +doclet.Deprecated_Annotation_Type_Members=\u975E\u63A8\u5968\u306E\u6CE8\u91C8\u578B\u306E\u8981\u7D20 +doclet.deprecated_packages=\u975E\u63A8\u5968\u306E\u30D1\u30C3\u30B1\u30FC\u30B8 +doclet.deprecated_classes=\u975E\u63A8\u5968\u306E\u30AF\u30E9\u30B9 +doclet.deprecated_enums=\u975E\u63A8\u5968\u306E\u5217\u6319\u578B +doclet.deprecated_interfaces=\u975E\u63A8\u5968\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 +doclet.deprecated_exceptions=\u975E\u63A8\u5968\u306E\u4F8B\u5916 +doclet.deprecated_annotation_types=\u975E\u63A8\u5968\u306E\u6CE8\u91C8\u578B +doclet.deprecated_errors=\u975E\u63A8\u5968\u306E\u30A8\u30E9\u30FC +doclet.deprecated_fields=\u975E\u63A8\u5968\u306E\u30D5\u30A3\u30FC\u30EB\u30C9 +doclet.deprecated_constructors=\u975E\u63A8\u5968\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF +doclet.deprecated_methods=\u975E\u63A8\u5968\u306E\u30E1\u30BD\u30C3\u30C9 +doclet.deprecated_enum_constants=\u975E\u63A8\u5968\u306E\u5217\u6319\u578B\u5B9A\u6570 +doclet.deprecated_annotation_type_members=\u975E\u63A8\u5968\u306E\u6CE8\u91C8\u578B\u306E\u8981\u7D20 doclet.Generated_Docs_Untitled=\u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8(\u30BF\u30A4\u30C8\u30EB\u306A\u3057) -doclet.Blank=\u30D6\u30E9\u30F3\u30AF doclet.Other_Packages=\u305D\u306E\u4ED6\u306E\u30D1\u30C3\u30B1\u30FC\u30B8 doclet.Package_Description=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306E\u8AAC\u660E doclet.Description=\u8AAC\u660E @@ -102,33 +90,25 @@ doclet.Subclasses=\u76F4\u7CFB\u306E\u65E2\u77E5\u306E\u30B5\u30D6\u30AF\u30E9\u30B9: doclet.Subinterfaces=\u65E2\u77E5\u306E\u30B5\u30D6\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8: doclet.Implementing_Classes=\u65E2\u77E5\u306E\u5B9F\u88C5\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8: +doclet.Functional_Interface=\u6A5F\u80FD\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 +doclet.Functional_Interface_Message=\u3053\u308C\u306F\u6A5F\u80FD\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306A\u306E\u3067\u3001\u30E9\u30E0\u30C0\u5F0F\u307E\u305F\u306F\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306E\u5272\u5F53\u3066\u30BF\u30FC\u30B2\u30C3\u30C8\u3068\u3057\u3066\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002 doclet.also=\u540C\u69D8\u306B -doclet.Option=\u30AA\u30D7\u30B7\u30E7\u30F3 -doclet.Or=\u307E\u305F\u306F doclet.Frames=\u30D5\u30EC\u30FC\u30E0 doclet.No_Frames=\u30D5\u30EC\u30FC\u30E0\u306A\u3057 doclet.Package_Hierarchies=\u30D1\u30C3\u30B1\u30FC\u30B8\u968E\u5C64: doclet.Hierarchy_For_Package=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306E\u968E\u5C64 -doclet.Source_Code=\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9: doclet.Hierarchy_For_All_Packages=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64 -doclet.Cannot_handle_no_packages=\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u51E6\u7406\u3067\u304D\u307E\u305B\u3093\u3002 doclet.Frame_Alert=\u30D5\u30EC\u30FC\u30E0\u95A2\u9023\u306E\u30A2\u30E9\u30FC\u30C8 -doclet.Overview-Member-Frame=\u6982\u8981\u30E1\u30F3\u30D0\u30FC\u30FB\u30D5\u30EC\u30FC\u30E0 doclet.Frame_Warning_Message=\u3053\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306F\u30D5\u30EC\u30FC\u30E0\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u3066\u8868\u793A\u3059\u308B\u3088\u3046\u306B\u4F5C\u6210\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D5\u30EC\u30FC\u30E0\u3092\u8868\u793A\u3067\u304D\u306A\u3044Web\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u306E\u5834\u5408\u306B\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002{0}\u306B\u30EA\u30F3\u30AF\u3057\u307E\u3059\u3002 doclet.No_Script_Message=\u30D6\u30E9\u30A6\u30B6\u306EJavaScript\u304C\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002 doclet.Non_Frame_Version=\u30D5\u30EC\u30FC\u30E0\u306B\u5BFE\u5FDC\u3057\u3066\u3044\u306A\u3044\u30D0\u30FC\u30B8\u30E7\u30F3 -doclet.Frame_Version=\u30D5\u30EC\u30FC\u30E0\u3042\u308A\u306E\u30D0\u30FC\u30B8\u30E7\u30F3 -doclet.Following_From_Class=\u30AF\u30E9\u30B9{0}\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u30BF\u30B0: -doclet.Following_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9{0}\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u30BF\u30B0: doclet.Description_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u8AAC\u660E: doclet.Description_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u8AAC\u660E: -doclet.Standard_doclet_invoked=\u6A19\u6E96\u306Edoclet\u304C\u8D77\u52D5\u3055\u308C\u307E\u3057\u305F... -doclet.No_Non_Deprecated_Classes_To_Document=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3059\u308B\u975E\u63A8\u5968\u4EE5\u5916\u306E\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002 +doclet.No_Non_Deprecated_Classes_To_Document=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3059\u308B\u975E\u63A8\u5968\u3067\u306A\u3044\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002 doclet.Interfaces_Italic=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9(\u30A4\u30BF\u30EA\u30C3\u30AF) doclet.Enclosing_Class=\u542B\u307E\u308C\u3066\u3044\u308B\u30AF\u30E9\u30B9: doclet.Enclosing_Interface=\u542B\u307E\u308C\u3066\u3044\u308B\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9: doclet.Window_Source_title=\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9 -doclet.Help_title=API\u30D8\u30EB\u30D7 doclet.Window_Help_title=API\u30D8\u30EB\u30D7 doclet.Help_line_1=API\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u69CB\u6210 doclet.Help_line_2=\u3053\u306EAPI(Application Programming Interface)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u3001\u6B21\u306B\u8AAC\u660E\u3059\u308B\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u3042\u308B\u9805\u76EE\u306B\u5BFE\u5FDC\u3059\u308B\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059\u3002 @@ -149,7 +129,7 @@ doclet.Help_line_17_with_tree_link=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F{0}\u30DA\u30FC\u30B8\u304C\u3042\u308A\u3001\u3055\u3089\u306B\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u968E\u5C64\u30DA\u30FC\u30B8\u306F\u3001\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3092\u542B\u307F\u307E\u3059\u3002\u30AF\u30E9\u30B9\u306F <code>java.lang.Object</code> \u3092\u958B\u59CB\u70B9\u3068\u3059\u308B\u7D99\u627F\u69CB\u9020\u3067\u7DE8\u6210\u3055\u308C\u307E\u3059\u3002\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306F\u3001<code>java.lang.Object</code> \u304B\u3089\u306F\u7D99\u627F\u3057\u307E\u305B\u3093\u3002 doclet.Help_line_18=\u6982\u8981\u30DA\u30FC\u30B8\u3092\u8868\u793A\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u300C\u968E\u5C64\u30C4\u30EA\u30FC\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u3001\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002 doclet.Help_line_19=\u7279\u5B9A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u8868\u793A\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u300C\u968E\u5C64\u30C4\u30EA\u30FC\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u3001\u8A72\u5F53\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u307F\u306E\u968E\u5C64\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002 -doclet.Help_line_20_with_deprecated_api_link={0}\u30DA\u30FC\u30B8\u306F\u3001\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u3059\u3079\u3066\u306EAPI\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\u3002\u975E\u63A8\u5968API\u3068\u306F\u3001\u6A5F\u80FD\u6539\u826F\u306A\u3069\u306E\u7406\u7531\u304B\u3089\u4F7F\u7528\u3092\u304A\u85A6\u3081\u3067\u304D\u306A\u304F\u306A\u3063\u305FAPI\u306E\u3053\u3068\u3067\u3001\u901A\u5E38\u306F\u305D\u308C\u306B\u4EE3\u308F\u308BAPI\u304C\u63D0\u4F9B\u3055\u308C\u307E\u3059\u3002\u975E\u63A8\u5968API\u306F\u4ECA\u5F8C\u306E\u5B9F\u88C5\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002 +doclet.Help_line_20_with_deprecated_api_link={0}\u30DA\u30FC\u30B8\u306F\u3001\u975E\u63A8\u5968\u306EAPI\u3092\u3059\u3079\u3066\u30EA\u30B9\u30C8\u3057\u307E\u3059\u3002\u975E\u63A8\u5968\u306EAPI\u3068\u306F\u3001\u6A5F\u80FD\u6539\u826F\u306A\u3069\u306E\u7406\u7531\u304B\u3089\u4F7F\u7528\u3092\u304A\u85A6\u3081\u3067\u304D\u306A\u304F\u306A\u3063\u305FAPI\u306E\u3053\u3068\u3067\u3001\u901A\u5E38\u306F\u305D\u308C\u306B\u4EE3\u308F\u308BAPI\u304C\u63D0\u4F9B\u3055\u308C\u307E\u3059\u3002\u975E\u63A8\u5968\u306EAPI\u306F\u4ECA\u5F8C\u306E\u5B9F\u88C5\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002 doclet.Help_line_21=\u7D22\u5F15 doclet.Help_line_22={0}\u306B\u306F\u3001\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3001\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306E\u30EA\u30B9\u30C8\u304C\u542B\u307E\u308C\u307E\u3059\u3002 doclet.Help_line_23=\u524D/\u6B21 @@ -158,7 +138,7 @@ doclet.Help_line_26=\u3053\u308C\u3089\u306E\u30EA\u30F3\u30AF\u306FHTML\u30D5\u30EC\u30FC\u30E0\u306E\u8868\u793A\u3068\u975E\u8868\u793A\u3092\u5207\u308A\u66FF\u3048\u307E\u3059\u3002\u3059\u3079\u3066\u306E\u30DA\u30FC\u30B8\u306F\u30D5\u30EC\u30FC\u30E0\u3042\u308A\u3067\u3082\u3001\u30D5\u30EC\u30FC\u30E0\u306A\u3057\u3067\u3082\u8868\u793A\u3067\u304D\u307E\u3059\u3002 doclet.Help_line_27={0}\u30EA\u30F3\u30AF\u306B\u306F\u3001\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9(\u975Estatic\u306E\u30CD\u30B9\u30C8\u3055\u308C\u305F\u578B\u3092\u9664\u304F)\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002 doclet.Help_line_28=\u76F4\u5217\u5316\u53EF\u80FD\u307E\u305F\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u5404\u30AF\u30E9\u30B9\u306F\u3001\u76F4\u5217\u5316\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u30E1\u30BD\u30C3\u30C9\u306E\u8AAC\u660E\u3092\u542B\u307F\u307E\u3059\u3002\u3053\u306E\u60C5\u5831\u306F\u3001API\u3092\u4F7F\u7528\u3059\u308B\u958B\u767A\u8005\u3067\u306F\u306A\u304F\u3001\u518D\u5B9F\u88C5\u3092\u884C\u3046\u62C5\u5F53\u8005\u306B\u5F79\u7ACB\u3061\u307E\u3059\u3002\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u30EA\u30F3\u30AF\u304C\u306A\u3044\u5834\u5408\u3001\u76F4\u5217\u5316\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306B\u79FB\u52D5\u3057\u3066\u3001\u30AF\u30E9\u30B9\u8A18\u8FF0\u306E\u300C\u95A2\u9023\u9805\u76EE\u300D\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u3042\u308B\u300C\u76F4\u5217\u5316\u3055\u308C\u305F\u5F62\u5F0F\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3053\u3068\u306B\u3088\u308A\u3001\u3053\u306E\u60C5\u5831\u3092\u8868\u793A\u3067\u304D\u307E\u3059\u3002 -doclet.Help_line_29=<a href="constant-values.html">\u300C\u5B9A\u6570\u30D5\u30A3\u30FC\u30EB\u30C9\u5024\u300D</a> \u30DA\u30FC\u30B8\u306B\u306F\u3001static final\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u305D\u306E\u5024\u306E\u30EA\u30B9\u30C8\u304C\u3042\u308A\u307E\u3059\u3002 +doclet.Help_line_29={0}\u30DA\u30FC\u30B8\u306B\u306F\u3001static final\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u305D\u306E\u5024\u306E\u30EA\u30B9\u30C8\u304C\u3042\u308A\u307E\u3059\u3002 doclet.Help_line_30=\u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u6A19\u6E96doclet\u3092\u4F7F\u7528\u3057\u3066\u751F\u6210\u3055\u308C\u305FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059\u3002 doclet.Help_enum_line_1=\u5404\u5217\u6319\u578B\u306B\u306F\u3001\u305D\u308C\u81EA\u8EAB\u306E\u500B\u5225\u306E\u30DA\u30FC\u30B8\u3068\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059: doclet.Help_enum_line_2=\u5217\u6319\u578B\u306E\u5BA3\u8A00 @@ -166,19 +146,6 @@ doclet.Help_annotation_type_line_1=\u5404\u6CE8\u91C8\u578B\u306B\u306F\u3001\u305D\u308C\u81EA\u8EAB\u306E\u500B\u5225\u306E\u30DA\u30FC\u30B8\u3068\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059: doclet.Help_annotation_type_line_2=\u6CE8\u91C8\u578B\u306E\u5BA3\u8A00 doclet.Help_annotation_type_line_3=\u6CE8\u91C8\u578B\u306E\u8AAC\u660E -doclet.Style_line_1=javadoc\u30B9\u30BF\u30A4\u30EB\u30FB\u30B7\u30FC\u30C8 -doclet.Style_line_2=\u8272\u3084\u30D5\u30A9\u30F3\u30C8\u306A\u3069\u306E\u30B9\u30BF\u30A4\u30EB\u5C5E\u6027\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u306B\u306F\u3001\u3053\u3053\u3067\u5B9A\u7FA9\u3057\u307E\u3059 -doclet.Style_line_3=\u30DA\u30FC\u30B8\u306E\u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u306E\u8272 -doclet.Style_Headings=\u898B\u51FA\u3057 -doclet.Style_line_4=\u8868\u306E\u8272 -doclet.Style_line_5=\u6FC3\u3044\u85E4\u8272 -doclet.Style_line_6=\u8584\u3044\u85E4\u8272 -doclet.Style_line_7=\u767D -doclet.Style_line_8=\u5DE6\u5074\u306E\u30D5\u30EC\u30FC\u30E0\u306E\u30EA\u30B9\u30C8\u306B\u4F7F\u7528\u3059\u308B\u30D5\u30A9\u30F3\u30C8 -doclet.Style_line_9=\u30D5\u30EC\u30FC\u30E0\u306B\u304A\u3051\u308B\u3001\u3088\u308A\u5C0F\u3055\u3044sans-serif\u30D5\u30A9\u30F3\u30C8\u306E\u4F8B -doclet.Style_line_10=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306E\u30D5\u30A9\u30F3\u30C8\u3068\u8272 -doclet.Style_line_11=\u6FC3\u3044\u9752 -doclet.Style_line_12=\u8868\u306E\u30AD\u30E3\u30D7\u30B7\u30E7\u30F3\u30FB\u30B9\u30BF\u30A4\u30EB doclet.ClassUse_Packages.that.use.0={0}\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u30D1\u30C3\u30B1\u30FC\u30B8 doclet.ClassUse_Uses.of.0.in.1={1}\u3067\u306E{0}\u306E\u4F7F\u7528 doclet.ClassUse_Classes.in.0.used.by.1={1}\u306B\u3088\u308A\u4F7F\u7528\u3055\u308C\u308B{0}\u306E\u30AF\u30E9\u30B9 @@ -208,13 +175,11 @@ doclet.Window_ClassUse_Header={0} {1}\u306E\u4F7F\u7528 doclet.ClassUse_Title={0}<br>{1}\u306E\u4F7F\u7528 doclet.navClassUse=\u4F7F\u7528 -doclet.link_option_twice=\u5916\u90E8URL\u30EA\u30F3\u30AF\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3(link\u307E\u305F\u306Flinkoffline)\u304C2\u56DE\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u3002 doclet.Error_in_packagelist=-group\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u4F7F\u7528\u65B9\u6CD5\u306E\u30A8\u30E9\u30FC: {0} {1} doclet.Groupname_already_used=-group\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u304A\u3044\u3066\u3001\u3059\u3067\u306B\u30B0\u30EB\u30FC\u30D7\u540D\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0} doclet.Same_package_name_used=\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u5F62\u5F0F\u304C2\u56DE\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0} -doclet.Serialization.Excluded_Class=\u5E38\u99D0\u30D5\u30A3\u30FC\u30EB\u30C9{1}\u306F\u3001\u9664\u5916\u3055\u308C\u305F\u30AF\u30E9\u30B9{0}\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002 -doclet.Serialization.Nonexcluded_Class=\u5E38\u99D0\u30D5\u30A3\u30FC\u30EB\u30C9{1}\u306F\u3001\u975E\u8868\u793A\u306E\u3001\u542B\u307E\u308C\u306A\u3044\u30AF\u30E9\u30B9{0}\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002 -doclet.usage=\u6A19\u6E96\u306Edoclet\u306B\u3088\u308A\u63D0\u4F9B\u3055\u308C\u308B\u3082\u306E:\n-d <directory> \u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n-use \u30AF\u30E9\u30B9\u3068\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4F7F\u7528\u30DA\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\n-version @version\u30D1\u30E9\u30B0\u30E9\u30D5\u3092\u542B\u3081\u308B\n-author @author\u30D1\u30E9\u30B0\u30E9\u30D5\u3092\u542B\u3081\u308B\n-docfilessubdirs doc-file\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u518D\u5E30\u7684\u306B\u30B3\u30D4\u30FC\u3059\u308B\n-splitindex 1\u5B57\u3054\u3068\u306B1\u30D5\u30A1\u30A4\u30EB\u306B\u7D22\u5F15\u3092\u5206\u5272\u3059\u308B\n-windowtitle <text> \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u7528\u306E\u30D6\u30E9\u30A6\u30B6\u30FB\u30A6\u30A3\u30F3\u30C9\u30A6\u30FB\u30BF\u30A4\u30C8\u30EB\n-doctitle <html-code> \u6982\u8981\u30DA\u30FC\u30B8\u306B\u30BF\u30A4\u30C8\u30EB\u3092\u542B\u3081\u308B\n-header <html-code> \u5404\u30DA\u30FC\u30B8\u306B\u30D8\u30C3\u30C0\u30FC\u3092\u542B\u3081\u308B\n-footer <html-code> \u5404\u30DA\u30FC\u30B8\u306B\u30D5\u30C3\u30BF\u30FC\u3092\u542B\u3081\u308B\n-top <html-code> \u5404\u30DA\u30FC\u30B8\u306B\u4E0A\u90E8\u30C6\u30AD\u30B9\u30C8\u3092\u542B\u3081\u308B\n-bottom <html-code> \u5404\u30DA\u30FC\u30B8\u306B\u4E0B\u90E8\u30C6\u30AD\u30B9\u30C8\u3092\u542B\u3081\u308B\n-link <url> <url>\u306Bjavadoc\u51FA\u529B\u3078\u306E\u30EA\u30F3\u30AF\u3092\u4F5C\u6210\u3059\u308B\n-linkoffline <url> <url2> <url2>\u306B\u3042\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30B9\u30C8\u3092\u4F7F\u7528\u3057\u3066<url>\u306Edocs\u306B\u30EA\u30F3\u30AF\u3059\u308B\n-excludedocfilessubdir <name1>:.. \u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u306Edoc-files\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u3059\u3079\u3066\u9664\u5916\u3059\u308B\n-group <name> <p1>:<p2>.. \u6307\u5B9A\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u6982\u8981\u30DA\u30FC\u30B8\u306B\u304A\u3044\u3066\u30B0\u30EB\u30FC\u30D7\u5316\u3059\u308B\n-nocomment \u8A18\u8FF0\u304A\u3088\u3073\u30BF\u30B0\u3092\u6291\u5236\u3057\u3066\u5BA3\u8A00\u306E\u307F\u3092\u751F\u6210\u3059\u308B\n-nodeprecated @deprecated\u60C5\u5831\u3092\u9664\u5916\u3059\u308B\n-noqualifier <name1>:<name2>:... \u51FA\u529B\u304B\u3089\u4FEE\u98FE\u5B50\u306E\u30EA\u30B9\u30C8\u3092\u9664\u5916\u3059\u308B\n-nosince @since\u60C5\u5831\u3092\u9664\u5916\u3059\u308B\n-notimestamp \u975E\u8868\u793A\u306E\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u3092\u9664\u5916\u3059\u308B\n-nodeprecatedlist \u975E\u63A8\u5968\u306E\u30EA\u30B9\u30C8\u3092\u751F\u6210\u3057\u306A\u3044\n-notree \u30AF\u30E9\u30B9\u968E\u5C64\u3092\u751F\u6210\u3057\u306A\u3044\n-noindex \u7D22\u5F15\u3092\u751F\u6210\u3057\u306A\u3044\n-nohelp \u30D8\u30EB\u30D7\u30FB\u30EA\u30F3\u30AF\u3092\u751F\u6210\u3057\u306A\u3044\n-nonavbar \u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u3092\u751F\u6210\u3057\u306A\u3044\n-serialwarn @serial\u30BF\u30B0\u306B\u95A2\u3059\u308B\u8B66\u544A\u3092\u751F\u6210\u3059\u308B\n-tag <name>:<locations>:<header> \u5358\u4E00\u306E\u5F15\u6570\u3092\u6301\u3064\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0\u3092\u6307\u5B9A\u3059\u308B\n-taglet \u30BF\u30B0\u30EC\u30C3\u30C8\u306E\u5B8C\u5168\u4FEE\u98FE\u540D\u3092\u767B\u9332\u3059\u308B\n-tagletpath \u30BF\u30B0\u30EC\u30C3\u30C8\u306E\u30D1\u30B9\n-charset <charset> \u751F\u6210\u3055\u308C\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30AF\u30ED\u30B9\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u306E\u6587\u5B57\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\n-helpfile <file> \u30D8\u30EB\u30D7\u30FB\u30EA\u30F3\u30AF\u306E\u30EA\u30F3\u30AF\u5148\u30D5\u30A1\u30A4\u30EB\u3092\u542B\u3081\u308B\n-linksource HTML\u5F62\u5F0F\u3067\u30BD\u30FC\u30B9\u3092\u751F\u6210\u3059\u308B\n-sourcetab <tab length> \u30BD\u30FC\u30B9\u5185\u306E\u30BF\u30D6\u306E\u7A7A\u767D\u6587\u5B57\u306E\u6570\u3092\u6307\u5B9A\u3059\u308B\n-keywords HTML\u306Emeta\u30BF\u30B0\u306B\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u60C5\u5831\u3092\u542B\u3081\u308B\n-stylesheetfile <path> \u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30B9\u30BF\u30A4\u30EB\u5909\u66F4\u7528\u30D5\u30A1\u30A4\u30EB\n-docencoding <name> \u51FA\u529B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u540D +doclet.exception_encountered={1}\u306E\u51E6\u7406\u4E2D\u306B\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\n{0} +doclet.usage=\u6A19\u6E96\u306Edoclet\u306B\u3088\u308A\u63D0\u4F9B\u3055\u308C\u308B\u3082\u306E:\n-d <directory> \u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n-use \u30AF\u30E9\u30B9\u3068\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4F7F\u7528\u30DA\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\n-version @version\u30D1\u30E9\u30B0\u30E9\u30D5\u3092\u542B\u3081\u308B\n-author @author\u30D1\u30E9\u30B0\u30E9\u30D5\u3092\u542B\u3081\u308B\n-docfilessubdirs doc-file\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u518D\u5E30\u7684\u306B\u30B3\u30D4\u30FC\u3059\u308B\n-splitindex 1\u5B57\u3054\u3068\u306B1\u30D5\u30A1\u30A4\u30EB\u306B\u7D22\u5F15\u3092\u5206\u5272\u3059\u308B\n-windowtitle <text> \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u7528\u306E\u30D6\u30E9\u30A6\u30B6\u30FB\u30A6\u30A3\u30F3\u30C9\u30A6\u30FB\u30BF\u30A4\u30C8\u30EB\n-doctitle <html-code> \u6982\u8981\u30DA\u30FC\u30B8\u306B\u30BF\u30A4\u30C8\u30EB\u3092\u542B\u3081\u308B\n-header <html-code> \u5404\u30DA\u30FC\u30B8\u306B\u30D8\u30C3\u30C0\u30FC\u3092\u542B\u3081\u308B\n-footer <html-code> \u5404\u30DA\u30FC\u30B8\u306B\u30D5\u30C3\u30BF\u30FC\u3092\u542B\u3081\u308B\n-top <html-code> \u5404\u30DA\u30FC\u30B8\u306B\u4E0A\u90E8\u30C6\u30AD\u30B9\u30C8\u3092\u542B\u3081\u308B\n-bottom <html-code> \u5404\u30DA\u30FC\u30B8\u306B\u4E0B\u90E8\u30C6\u30AD\u30B9\u30C8\u3092\u542B\u3081\u308B\n-link <url> <url>\u306Bjavadoc\u51FA\u529B\u3078\u306E\u30EA\u30F3\u30AF\u3092\u4F5C\u6210\u3059\u308B\n-linkoffline <url> <url2> <url2>\u306B\u3042\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30B9\u30C8\u3092\u4F7F\u7528\u3057\u3066<url>\u306Edocs\u306B\u30EA\u30F3\u30AF\u3059\u308B\n-excludedocfilessubdir <name1>:.. \u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u306Edoc-files\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u3059\u3079\u3066\u9664\u5916\u3059\u308B\n-group <name> <p1>:<p2>.. \u6307\u5B9A\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u6982\u8981\u30DA\u30FC\u30B8\u306B\u304A\u3044\u3066\u30B0\u30EB\u30FC\u30D7\u5316\u3059\u308B\n-nocomment \u8A18\u8FF0\u304A\u3088\u3073\u30BF\u30B0\u3092\u6291\u5236\u3057\u3066\u5BA3\u8A00\u306E\u307F\u3092\u751F\u6210\u3059\u308B\n-nodeprecated @deprecated\u60C5\u5831\u3092\u9664\u5916\u3059\u308B\n-noqualifier <name1>:<name2>:... \u51FA\u529B\u304B\u3089\u4FEE\u98FE\u5B50\u306E\u30EA\u30B9\u30C8\u3092\u9664\u5916\u3059\u308B\n-nosince @since\u60C5\u5831\u3092\u9664\u5916\u3059\u308B\n-notimestamp \u975E\u8868\u793A\u306E\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u3092\u9664\u5916\u3059\u308B\n-nodeprecatedlist \u975E\u63A8\u5968\u306E\u30EA\u30B9\u30C8\u3092\u751F\u6210\u3057\u306A\u3044\n-notree \u30AF\u30E9\u30B9\u968E\u5C64\u3092\u751F\u6210\u3057\u306A\u3044\n-noindex \u7D22\u5F15\u3092\u751F\u6210\u3057\u306A\u3044\n-nohelp \u30D8\u30EB\u30D7\u30FB\u30EA\u30F3\u30AF\u3092\u751F\u6210\u3057\u306A\u3044\n-nonavbar \u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u3092\u751F\u6210\u3057\u306A\u3044\n-serialwarn @serial\u30BF\u30B0\u306B\u95A2\u3059\u308B\u8B66\u544A\u3092\u751F\u6210\u3059\u308B\n-tag <name>:<locations>:<header> \u5358\u4E00\u306E\u5F15\u6570\u3092\u6301\u3064\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0\u3092\u6307\u5B9A\u3059\u308B\n-taglet \u30BF\u30B0\u30EC\u30C3\u30C8\u306E\u5B8C\u5168\u4FEE\u98FE\u540D\u3092\u767B\u9332\u3059\u308B\n-tagletpath \u30BF\u30B0\u30EC\u30C3\u30C8\u306E\u30D1\u30B9\n-Xdocrootparent <url> \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30B3\u30E1\u30F3\u30C8\u5185\u306E@docRoot(\u3053\u306E\u5F8C\u306B\u306F/..\u304C\u7D9A\u304F)\u306E\u3059\u3079\u3066\u306E\u51FA\u73FE\u7B87\u6240\u3092<url>\u3067\u7F6E\u63DB\u3059\u308B\n-charset <charset> \u751F\u6210\u3055\u308C\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30AF\u30ED\u30B9\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u306E\u6587\u5B57\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\n-helpfile <file> \u30D8\u30EB\u30D7\u30FB\u30EA\u30F3\u30AF\u306E\u30EA\u30F3\u30AF\u5148\u30D5\u30A1\u30A4\u30EB\u3092\u542B\u3081\u308B\n-linksource HTML\u5F62\u5F0F\u3067\u30BD\u30FC\u30B9\u3092\u751F\u6210\u3059\u308B\n-sourcetab <tab length> \u30BD\u30FC\u30B9\u5185\u306E\u30BF\u30D6\u306E\u7A7A\u767D\u6587\u5B57\u306E\u6570\u3092\u6307\u5B9A\u3059\u308B\n-keywords HTML\u306Emeta\u30BF\u30B0\u306B\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u60C5\u5831\u3092\u542B\u3081\u308B\n-stylesheetfile <path> \u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30B9\u30BF\u30A4\u30EB\u5909\u66F4\u7528\u30D5\u30A1\u30A4\u30EB\n-docencoding <name> \u51FA\u529B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u540D
--- a/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties Tue May 07 17:14:17 2013 -0700 @@ -41,33 +41,23 @@ doclet.Help=\u5E2E\u52A9 doclet.Skip_navigation_links=\u8DF3\u8FC7\u5BFC\u822A\u94FE\u63A5 doclet.New_Page=NewPage -doclet.None=\u65E0 -doclet.Factory_Method_Detail=\u9759\u6001\u5DE5\u5382\u65B9\u6CD5\u8BE6\u7EC6\u8D44\u6599 doclet.navDeprecated=\u5DF2\u8FC7\u65F6 -doclet.Deprecated_List=\u5DF2\u8FC7\u65F6\u7684\u5217\u8868 doclet.Window_Deprecated_List=\u5DF2\u8FC7\u65F6\u7684\u5217\u8868 -doclet.Note_0_is_deprecated=\u6CE8: {0}\u5DF2\u8FC7\u65F6\u3002 doclet.Overrides=\u8986\u76D6: doclet.in_class=\u5728\u7C7B\u4E2D -doclet.0_Fields_and_Methods="{0}" \u5B57\u6BB5\u548C\u65B9\u6CD5 -doclet.Index_of_Fields_and_Methods=\u5B57\u6BB5\u548C\u65B9\u6CD5\u7684\u7D22\u5F15 doclet.Static_variable_in={0}\u4E2D\u7684\u9759\u6001\u53D8\u91CF doclet.Variable_in={0}\u4E2D\u7684\u53D8\u91CF doclet.Constructor_for={0}\u7684\u6784\u9020\u5668 doclet.Static_method_in={0}\u4E2D\u7684\u9759\u6001\u65B9\u6CD5 doclet.Method_in={0}\u4E2D\u7684\u65B9\u6CD5 -doclet.throws=\u629B\u51FA doclet.package=\u7A0B\u5E8F\u5305 doclet.MalformedURL=\u683C\u5F0F\u9519\u8BEF\u7684 URL: {0} doclet.File_error=\u8BFB\u53D6\u6587\u4EF6\u65F6\u51FA\u9519: {0} doclet.URL_error=\u83B7\u53D6 URL \u65F6\u51FA\u9519: {0} -doclet.No_Package_Comment_File=\u5BF9\u4E8E\u7A0B\u5E8F\u5305{0}, \u627E\u4E0D\u5230 Package.Comment \u6587\u4EF6 -doclet.No_Source_For_Class=\u7C7B{0}\u7684\u6E90\u4FE1\u606F\u4E0D\u53EF\u7528\u3002 doclet.see.class_or_package_not_found=\u6807\u8BB0{0}: \u627E\u4E0D\u5230\u5F15\u7528: {1} doclet.see.class_or_package_not_accessible=\u6807\u8BB0{0}: \u65E0\u6CD5\u8BBF\u95EE\u5F15\u7528: {1} -doclet.see.malformed_tag=\u6807\u8BB0{0}: \u683C\u5F0F\u9519\u8BEF: {1} -doclet.Inherited_API_Summary=\u7EE7\u627F\u7684 API \u6982\u8981 doclet.Deprecated_API=\u5DF2\u8FC7\u65F6\u7684 API +doclet.Deprecated_Packages=\u5DF2\u8FC7\u65F6\u7A0B\u5E8F\u5305 doclet.Deprecated_Classes=\u5DF2\u8FC7\u65F6\u7684\u7C7B doclet.Deprecated_Enums=\u5DF2\u8FC7\u65F6\u7684\u679A\u4E3E doclet.Deprecated_Interfaces=\u5DF2\u8FC7\u65F6\u7684\u63A5\u53E3 @@ -79,6 +69,7 @@ doclet.Deprecated_Methods=\u5DF2\u8FC7\u65F6\u7684\u65B9\u6CD5 doclet.Deprecated_Enum_Constants=\u5DF2\u8FC7\u65F6\u7684\u679A\u4E3E\u5E38\u91CF doclet.Deprecated_Annotation_Type_Members=\u5DF2\u8FC7\u65F6\u7684\u6CE8\u91CA\u7C7B\u578B\u5143\u7D20 +doclet.deprecated_packages=\u5DF2\u8FC7\u65F6\u7A0B\u5E8F\u5305 doclet.deprecated_classes=\u5DF2\u8FC7\u65F6\u7684\u7C7B doclet.deprecated_enums=\u5DF2\u8FC7\u65F6\u7684\u679A\u4E3E doclet.deprecated_interfaces=\u5DF2\u8FC7\u65F6\u7684\u63A5\u53E3 @@ -90,10 +81,7 @@ doclet.deprecated_methods=\u5DF2\u8FC7\u65F6\u7684\u65B9\u6CD5 doclet.deprecated_enum_constants=\u5DF2\u8FC7\u65F6\u7684\u679A\u4E3E\u5E38\u91CF doclet.deprecated_annotation_type_members=\u5DF2\u8FC7\u65F6\u7684\u6CE8\u91CA\u7C7B\u578B\u5143\u7D20 -doclet.Frame_Output=\u6846\u67B6\u8F93\u51FA -doclet.Docs_generated_by_Javadoc=\u7531 Javadoc \u751F\u6210\u7684\u6587\u6863\u3002 doclet.Generated_Docs_Untitled=\u751F\u6210\u7684\u6587\u6863 (\u65E0\u6807\u9898) -doclet.Blank=\u7A7A\u767D doclet.Other_Packages=\u5176\u4ED6\u7A0B\u5E8F\u5305 doclet.Package_Description=\u7A0B\u5E8F\u5305{0}\u7684\u8BF4\u660E doclet.Description=\u8BF4\u660E @@ -102,33 +90,25 @@ doclet.Subclasses=\u76F4\u63A5\u5DF2\u77E5\u5B50\u7C7B: doclet.Subinterfaces=\u6240\u6709\u5DF2\u77E5\u5B50\u63A5\u53E3: doclet.Implementing_Classes=\u6240\u6709\u5DF2\u77E5\u5B9E\u73B0\u7C7B: +doclet.Functional_Interface=\u51FD\u6570\u63A5\u53E3: +doclet.Functional_Interface_Message=\u8FD9\u662F\u4E00\u4E2A\u51FD\u6570\u63A5\u53E3, \u56E0\u6B64\u53EF\u7528\u4F5C lambda \u8868\u8FBE\u5F0F\u6216\u65B9\u6CD5\u5F15\u7528\u7684\u8D4B\u503C\u76EE\u6807\u3002 doclet.also=\u5E76 -doclet.Option=\u9009\u9879 -doclet.Or=\u6216 doclet.Frames=\u6846\u67B6 doclet.No_Frames=\u65E0\u6846\u67B6 doclet.Package_Hierarchies=\u7A0B\u5E8F\u5305\u5206\u5C42\u7ED3\u6784: doclet.Hierarchy_For_Package=\u7A0B\u5E8F\u5305{0}\u7684\u5206\u5C42\u7ED3\u6784 -doclet.Source_Code=\u6E90\u4EE3\u7801: doclet.Hierarchy_For_All_Packages=\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784 -doclet.Cannot_handle_no_packages=\u65E0\u6CD5\u5904\u7406\u6CA1\u6709\u7A0B\u5E8F\u5305\u7684\u60C5\u51B5\u3002 doclet.Frame_Alert=\u6846\u67B6\u9884\u8B66 -doclet.Overview-Member-Frame=\u6210\u5458\u6846\u67B6\u6982\u89C8 doclet.Frame_Warning_Message=\u8BF7\u4F7F\u7528\u6846\u67B6\u529F\u80FD\u67E5\u770B\u6B64\u6587\u6863\u3002\u5982\u679C\u770B\u5230\u6B64\u6D88\u606F, \u5219\u8868\u660E\u60A8\u4F7F\u7528\u7684\u662F\u4E0D\u652F\u6301\u6846\u67B6\u7684 Web \u5BA2\u6237\u673A\u3002\u94FE\u63A5\u5230{0}\u3002 doclet.No_Script_Message=\u60A8\u7684\u6D4F\u89C8\u5668\u5DF2\u7981\u7528 JavaScript\u3002 doclet.Non_Frame_Version=\u975E\u6846\u67B6\u7248\u672C -doclet.Frame_Version=\u6846\u67B6\u7248\u672C -doclet.Following_From_Class=\u4EE5\u4E0B\u5185\u5BB9\u662F\u4ECE\u7C7B{0}\u590D\u5236\u7684 -doclet.Following_From_Interface=\u4EE5\u4E0B\u5185\u5BB9\u662F\u4ECE\u63A5\u53E3{0}\u590D\u5236\u7684 doclet.Description_From_Interface=\u4ECE\u63A5\u53E3\u590D\u5236\u7684\u8BF4\u660E: doclet.Description_From_Class=\u4ECE\u7C7B\u590D\u5236\u7684\u8BF4\u660E: -doclet.Standard_doclet_invoked=\u5DF2\u8C03\u7528\u7684\u6807\u51C6 doclet... doclet.No_Non_Deprecated_Classes_To_Document=\u627E\u4E0D\u5230\u53EF\u4EE5\u6587\u6863\u5316\u7684\u672A\u8FC7\u65F6\u7684\u7C7B\u3002 doclet.Interfaces_Italic=\u63A5\u53E3 (\u659C\u4F53) doclet.Enclosing_Class=\u5C01\u95ED\u7C7B: doclet.Enclosing_Interface=\u5C01\u95ED\u63A5\u53E3: doclet.Window_Source_title=\u6E90\u4EE3\u7801 -doclet.Help_title=API \u5E2E\u52A9 doclet.Window_Help_title=API \u5E2E\u52A9 doclet.Help_line_1=\u6B64 API \u6587\u6863\u7684\u7EC4\u7EC7\u65B9\u5F0F doclet.Help_line_2=\u6B64 API (\u5E94\u7528\u7A0B\u5E8F\u7F16\u7A0B\u63A5\u53E3) \u6587\u6863\u5305\u542B\u5BF9\u5E94\u4E8E\u5BFC\u822A\u680F\u4E2D\u7684\u9879\u76EE\u7684\u9875\u9762, \u5982\u4E0B\u6240\u8FF0\u3002 @@ -158,7 +138,7 @@ doclet.Help_line_26=\u8FD9\u4E9B\u94FE\u63A5\u7528\u4E8E\u663E\u793A\u548C\u9690\u85CF HTML \u6846\u67B6\u3002\u6240\u6709\u9875\u9762\u5747\u5177\u6709\u6709\u6846\u67B6\u548C\u65E0\u6846\u67B6\u4E24\u79CD\u663E\u793A\u65B9\u5F0F\u3002 doclet.Help_line_27={0}\u94FE\u63A5\u663E\u793A\u6240\u6709\u7C7B\u548C\u63A5\u53E3 (\u9664\u4E86\u975E\u9759\u6001\u5D4C\u5957\u7C7B\u578B)\u3002 doclet.Help_line_28=\u6BCF\u4E2A\u53EF\u5E8F\u5217\u5316\u6216\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u90FD\u6709\u5176\u5E8F\u5217\u5316\u5B57\u6BB5\u548C\u65B9\u6CD5\u7684\u8BF4\u660E\u3002\u6B64\u4FE1\u606F\u5BF9\u91CD\u65B0\u5B9E\u73B0\u8005\u6709\u7528, \u800C\u5BF9\u4F7F\u7528 API \u7684\u5F00\u53D1\u8005\u5219\u6CA1\u6709\u4EC0\u4E48\u7528\u5904\u3002\u5C3D\u7BA1\u5BFC\u822A\u680F\u4E2D\u6CA1\u6709\u94FE\u63A5, \u4F46\u60A8\u53EF\u4EE5\u901A\u8FC7\u4E0B\u5217\u65B9\u5F0F\u83B7\u53D6\u6B64\u4FE1\u606F: \u8F6C\u81F3\u4EFB\u4F55\u5E8F\u5217\u5316\u7C7B, \u7136\u540E\u5355\u51FB\u7C7B\u8BF4\u660E\u7684 "\u53E6\u8BF7\u53C2\u9605" \u90E8\u5206\u4E2D\u7684 "\u5E8F\u5217\u5316\u8868\u683C"\u3002 -doclet.Help_line_29=<a href="constant-values.html">\u5E38\u91CF\u5B57\u6BB5\u503C</a>\u9875\u9762\u5217\u51FA\u4E86\u9759\u6001\u6700\u7EC8\u5B57\u6BB5\u53CA\u5176\u503C\u3002 +doclet.Help_line_29={0}\u9875\u9762\u5217\u51FA\u4E86\u9759\u6001\u6700\u7EC8\u5B57\u6BB5\u53CA\u5176\u503C\u3002 doclet.Help_line_30=\u6B64\u5E2E\u52A9\u6587\u4EF6\u9002\u7528\u4E8E\u4F7F\u7528\u6807\u51C6 doclet \u751F\u6210\u7684 API \u6587\u6863\u3002 doclet.Help_enum_line_1=\u6BCF\u4E2A\u679A\u4E3E\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762, \u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206: doclet.Help_enum_line_2=\u679A\u4E3E\u58F0\u660E @@ -166,19 +146,6 @@ doclet.Help_annotation_type_line_1=\u6BCF\u4E2A\u6CE8\u91CA\u7C7B\u578B\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762, \u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206: doclet.Help_annotation_type_line_2=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E doclet.Help_annotation_type_line_3=\u6CE8\u91CA\u7C7B\u578B\u8BF4\u660E -doclet.Style_line_1=Javadoc \u6837\u5F0F\u8868 -doclet.Style_line_2=\u5728\u6B64\u5904\u5B9A\u4E49\u989C\u8272, \u5B57\u4F53\u548C\u5176\u4ED6\u6837\u5F0F\u5C5E\u6027\u4EE5\u8986\u76D6\u9ED8\u8BA4\u503C -doclet.Style_line_3=\u9875\u9762\u80CC\u666F\u989C\u8272 -doclet.Style_Headings=\u6807\u9898 -doclet.Style_line_4=\u8868\u683C\u989C\u8272 -doclet.Style_line_5=\u6DF1\u7D2B\u8272 -doclet.Style_line_6=\u6DE1\u7D2B\u8272 -doclet.Style_line_7=\u767D\u8272 -doclet.Style_line_8=\u5DE6\u4FA7\u7684\u6846\u67B6\u5217\u8868\u4E2D\u4F7F\u7528\u7684\u5B57\u4F53 -doclet.Style_line_9=\u6846\u67B6\u4E2D\u5C0F\u53F7 sans-serif \u5B57\u4F53\u7684\u793A\u4F8B -doclet.Style_line_10=\u5BFC\u822A\u680F\u5B57\u4F53\u548C\u989C\u8272 -doclet.Style_line_11=\u6DF1\u84DD\u8272 -doclet.Style_line_12=\u8868\u6807\u9898\u6837\u5F0F doclet.ClassUse_Packages.that.use.0=\u4F7F\u7528{0}\u7684\u7A0B\u5E8F\u5305 doclet.ClassUse_Uses.of.0.in.1={1}\u4E2D{0}\u7684\u4F7F\u7528 doclet.ClassUse_Classes.in.0.used.by.1={1}\u4F7F\u7528\u7684{0}\u4E2D\u7684\u7C7B @@ -208,13 +175,11 @@ doclet.Window_ClassUse_Header={0} {1}\u7684\u4F7F\u7528 doclet.ClassUse_Title={0} {1}<br>\u7684\u4F7F\u7528 doclet.navClassUse=\u4F7F\u7528 -doclet.link_option_twice=\u5916\u90E8 URL \u94FE\u63A5\u9009\u9879 (link \u6216 linkoffline) \u4F7F\u7528\u4E86\u4E24\u6B21\u3002 doclet.Error_in_packagelist=\u4F7F\u7528 -group \u9009\u9879\u65F6\u51FA\u9519: {0} {1} doclet.Groupname_already_used=\u5728 -group \u9009\u9879\u4E2D, groupname \u5DF2\u4F7F\u7528: {0} doclet.Same_package_name_used=\u7A0B\u5E8F\u5305\u540D\u79F0\u5F62\u5F0F\u4F7F\u7528\u4E86\u4E24\u6B21: {0} -doclet.Serialization.Excluded_Class=\u975E\u77AC\u6001\u5B57\u6BB5{1}\u4F7F\u7528\u4E86\u6392\u9664\u7684\u7C7B{0}\u3002 -doclet.Serialization.Nonexcluded_Class=\u975E\u77AC\u6001\u5B57\u6BB5{1}\u4F7F\u7528\u4E86\u9690\u85CF\u7684, \u672A\u5305\u542B\u7684\u7C7B{0}\u3002 -doclet.usage=\u901A\u8FC7\u6807\u51C6 doclet \u63D0\u4F9B:\n-d <directory> \u8F93\u51FA\u6587\u4EF6\u7684\u76EE\u6807\u76EE\u5F55\n-use \u521B\u5EFA\u7C7B\u548C\u7A0B\u5E8F\u5305\u7528\u6CD5\u9875\u9762\n-version \u5305\u542B @version \u6BB5\n-author \u5305\u542B @author \u6BB5\n-docfilessubdirs \u9012\u5F52\u590D\u5236\u6587\u6863\u6587\u4EF6\u5B50\u76EE\u5F55\n-splitindex \u5C06\u7D22\u5F15\u5206\u4E3A\u6BCF\u4E2A\u5B57\u6BCD\u5BF9\u5E94\u4E00\u4E2A\u6587\u4EF6\n-windowtitle <text> \u6587\u6863\u7684\u6D4F\u89C8\u5668\u7A97\u53E3\u6807\u9898\n-doctitle <html-code> \u5305\u542B\u6982\u89C8\u9875\u9762\u7684\u6807\u9898\n-header <html-code> \u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u9875\u7709\u6587\u672C\n-footer <html-code> \u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u9875\u811A\u6587\u672C\n-top <html-code> \u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u9876\u90E8\u6587\u672C\n-bottom <html-code> \u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u5E95\u90E8\u6587\u672C\n-link <url> \u521B\u5EFA\u6307\u5411\u4F4D\u4E8E <url> \u7684 javadoc \u8F93\u51FA\u7684\u94FE\u63A5\n-linkoffline <url> <url2> \u5229\u7528\u4F4D\u4E8E <url2> \u7684\u7A0B\u5E8F\u5305\u5217\u8868\u94FE\u63A5\u81F3\u4F4D\u4E8E <url> \u7684\u6587\u6863\n-excludedocfilessubdir <name1>:..\u6392\u9664\u5177\u6709\u7ED9\u5B9A\u540D\u79F0\u7684\u6240\u6709\u6587\u6863\u6587\u4EF6\u5B50\u76EE\u5F55\u3002\n-group <name> <p1>:<p2>..\u5728\u6982\u89C8\u9875\u9762\u4E2D, \u5C06\u6307\u5B9A\u7684\u7A0B\u5E8F\u5305\u5206\u7EC4\n-nocomment \u4E0D\u751F\u6210\u8BF4\u660E\u548C\u6807\u8BB0, \u53EA\u751F\u6210\u58F0\u660E\u3002\n-nodeprecated \u4E0D\u5305\u542B @deprecated \u4FE1\u606F\n-noqualifier <name1>:<name2>:...\u8F93\u51FA\u4E2D\u4E0D\u5305\u62EC\u6307\u5B9A\u9650\u5B9A\u7B26\u7684\u5217\u8868\u3002\n-nosince \u4E0D\u5305\u542B @since \u4FE1\u606F\n-notimestamp \u4E0D\u5305\u542B\u9690\u85CF\u65F6\u95F4\u6233\n-nodeprecatedlist \u4E0D\u751F\u6210\u5DF2\u8FC7\u65F6\u7684\u5217\u8868\n-notree \u4E0D\u751F\u6210\u7C7B\u5206\u5C42\u7ED3\u6784\n-noindex \u4E0D\u751F\u6210\u7D22\u5F15\n-nohelp \u4E0D\u751F\u6210\u5E2E\u52A9\u94FE\u63A5\n-nonavbar \u4E0D\u751F\u6210\u5BFC\u822A\u680F\n-serialwarn \u751F\u6210\u6709\u5173 @serial \u6807\u8BB0\u7684\u8B66\u544A\n-tag <name>:<locations>:<header> \u6307\u5B9A\u5355\u4E2A\u53C2\u6570\u5B9A\u5236\u6807\u8BB0\n-taglet \u8981\u6CE8\u518C\u7684 Taglet \u7684\u5168\u9650\u5B9A\u540D\u79F0\n-tagletpath Taglet \u7684\u8DEF\u5F84\n-charset <charset> \u7528\u4E8E\u8DE8\u5E73\u53F0\u67E5\u770B\u751F\u6210\u7684\u6587\u6863\u7684\u5B57\u7B26\u96C6\u3002\n-helpfile <file> \u5305\u542B\u5E2E\u52A9\u94FE\u63A5\u6240\u94FE\u63A5\u5230\u7684\u6587\u4EF6\n-linksource \u4EE5 HTML \u683C\u5F0F\u751F\u6210\u6E90\u6587\u4EF6\n-sourcetab <tab length> \u6307\u5B9A\u6E90\u4E2D\u6BCF\u4E2A\u5236\u8868\u7B26\u5360\u636E\u7684\u7A7A\u683C\u6570\n-keywords \u4F7F\u7A0B\u5E8F\u5305, \u7C7B\u548C\u6210\u5458\u4FE1\u606F\u9644\u5E26 HTML \u5143\u6807\u8BB0\n-stylesheetfile <path> \u7528\u4E8E\u66F4\u6539\u751F\u6210\u6587\u6863\u7684\u6837\u5F0F\u7684\u6587\u4EF6\n-docencoding <name> \u8F93\u51FA\u7F16\u7801\u540D\u79F0 +doclet.exception_encountered=\u5904\u7406{1}\u65F6\u51FA\u73B0\u5F02\u5E38\u9519\u8BEF\n{0} +doclet.usage=\u901A\u8FC7\u6807\u51C6 doclet \u63D0\u4F9B:\n-d <directory> \u8F93\u51FA\u6587\u4EF6\u7684\u76EE\u6807\u76EE\u5F55\n-use \u521B\u5EFA\u7C7B\u548C\u7A0B\u5E8F\u5305\u7528\u6CD5\u9875\u9762\n-version \u5305\u542B @version \u6BB5\n-author \u5305\u542B @author \u6BB5\n-docfilessubdirs \u9012\u5F52\u590D\u5236\u6587\u6863\u6587\u4EF6\u5B50\u76EE\u5F55\n-splitindex \u5C06\u7D22\u5F15\u5206\u4E3A\u6BCF\u4E2A\u5B57\u6BCD\u5BF9\u5E94\u4E00\u4E2A\u6587\u4EF6\n-windowtitle <text> \u6587\u6863\u7684\u6D4F\u89C8\u5668\u7A97\u53E3\u6807\u9898\n-doctitle <html-code> \u5305\u542B\u6982\u89C8\u9875\u9762\u7684\u6807\u9898\n-header <html-code> \u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u9875\u7709\u6587\u672C\n-footer <html-code> \u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u9875\u811A\u6587\u672C\n-top <html-code> \u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u9876\u90E8\u6587\u672C\n-bottom <html-code> \u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u5E95\u90E8\u6587\u672C\n-link <url> \u521B\u5EFA\u6307\u5411\u4F4D\u4E8E <url> \u7684 javadoc \u8F93\u51FA\u7684\u94FE\u63A5\n-linkoffline <url> <url2> \u5229\u7528\u4F4D\u4E8E <url2> \u7684\u7A0B\u5E8F\u5305\u5217\u8868\u94FE\u63A5\u81F3\u4F4D\u4E8E <url> \u7684\u6587\u6863\n-excludedocfilessubdir <name1>:.. \u6392\u9664\u5177\u6709\u7ED9\u5B9A\u540D\u79F0\u7684\u6240\u6709\u6587\u6863\u6587\u4EF6\u5B50\u76EE\u5F55\u3002\n-group <name> <p1>:<p2>.. \u5728\u6982\u89C8\u9875\u9762\u4E2D, \u5C06\u6307\u5B9A\u7684\u7A0B\u5E8F\u5305\u5206\u7EC4\n-nocomment \u4E0D\u751F\u6210\u8BF4\u660E\u548C\u6807\u8BB0, \u53EA\u751F\u6210\u58F0\u660E\u3002\n-nodeprecated \u4E0D\u5305\u542B @deprecated \u4FE1\u606F\n-noqualifier <name1>:<name2>:... \u8F93\u51FA\u4E2D\u4E0D\u5305\u62EC\u9650\u5B9A\u7B26\u7684\u5217\u8868\u3002\n-nosince \u4E0D\u5305\u542B @since \u4FE1\u606F\n-notimestamp \u4E0D\u5305\u542B\u9690\u85CF\u65F6\u95F4\u6233\n-nodeprecatedlist \u4E0D\u751F\u6210\u5DF2\u8FC7\u65F6\u7684\u5217\u8868\n-notree \u4E0D\u751F\u6210\u7C7B\u5206\u5C42\u7ED3\u6784\n-noindex \u4E0D\u751F\u6210\u7D22\u5F15\n-nohelp \u4E0D\u751F\u6210\u5E2E\u52A9\u94FE\u63A5\n-nonavbar \u4E0D\u751F\u6210\u5BFC\u822A\u680F\n-serialwarn \u751F\u6210\u6709\u5173 @serial \u6807\u8BB0\u7684\u8B66\u544A\n-tag <name>:<locations>:<header> \u6307\u5B9A\u5355\u4E2A\u53C2\u6570\u5B9A\u5236\u6807\u8BB0\n-taglet \u8981\u6CE8\u518C\u7684 Taglet \u7684\u5168\u9650\u5B9A\u540D\u79F0\n-tagletpath Taglet \u7684\u8DEF\u5F84\n-Xdocrootparent <url> \u5C06\u6587\u6863\u6CE8\u91CA\u4E2D\u51FA\u73B0\u7684\u6240\u6709\u540E\u8DDF /.. \u7684 @docRoot \u66FF\u6362\u4E3A <url>\n-charset <charset> \u7528\u4E8E\u8DE8\u5E73\u53F0\u67E5\u770B\u751F\u6210\u7684\u6587\u6863\u7684\u5B57\u7B26\u96C6\u3002\n-helpfile <file> \u5305\u542B\u5E2E\u52A9\u94FE\u63A5\u6240\u94FE\u63A5\u5230\u7684\u6587\u4EF6\n-linksource \u4EE5 HTML \u683C\u5F0F\u751F\u6210\u6E90\u6587\u4EF6\n-sourcetab <tab length> \u6307\u5B9A\u6E90\u4E2D\u6BCF\u4E2A\u5236\u8868\u7B26\u5360\u636E\u7684\u7A7A\u683C\u6570\n-keywords \u4F7F\u7A0B\u5E8F\u5305, \u7C7B\u548C\u6210\u5458\u4FE1\u606F\u9644\u5E26 HTML \u5143\u6807\u8BB0\n-stylesheetfile <path> \u7528\u4E8E\u66F4\u6539\u751F\u6210\u6587\u6863\u7684\u6837\u5F0F\u7684\u6587\u4EF6\n-docencoding <name> \u8F93\u51FA\u7F16\u7801\u540D\u79F0
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -28,8 +28,6 @@ import com.sun.javadoc.*; import com.sun.tools.doclets.internal.toolkit.builders.*; import com.sun.tools.doclets.internal.toolkit.util.*; -import java.io.File; -import java.util.StringTokenizer; /** * An abstract implementation of a Doclet. @@ -82,6 +80,9 @@ } try { doclet.startGeneration(root); + } catch (Configuration.Fault f) { + root.printError(f.getMessage()); + return false; } catch (Exception exc) { exc.printStackTrace(); return false; @@ -112,7 +113,7 @@ * * @see com.sun.javadoc.RootDoc */ - private void startGeneration(RootDoc root) throws Exception { + private void startGeneration(RootDoc root) throws Configuration.Fault, Exception { if (root.classes().length == 0) { configuration.message. error("doclet.No_Public_Classes_To_Document"); @@ -128,6 +129,7 @@ PackageListWriter.generate(configuration); generatePackageFiles(classtree); + generateProfileFiles(); generateOtherFiles(root, classtree); configuration.tagletManager.printReport(); @@ -148,6 +150,12 @@ } /** + * Generate the profile documentation. + * + */ + protected abstract void generateProfileFiles() throws Exception; + + /** * Generate the package documentation. * * @param classtree the data structure representing the class tree.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Tue May 07 17:14:17 2013 -0700 @@ -29,6 +29,8 @@ import java.util.*; import com.sun.javadoc.*; +import com.sun.tools.javac.sym.Profiles; +import com.sun.tools.javac.jvm.Profile; import com.sun.tools.doclets.internal.toolkit.builders.BuilderFactory; import com.sun.tools.doclets.internal.toolkit.taglets.*; import com.sun.tools.doclets.internal.toolkit.util.*; @@ -52,6 +54,21 @@ public abstract class Configuration { /** + * Exception used to report a problem during setOptions. + */ + public static class Fault extends Exception { + private static final long serialVersionUID = 0; + + Fault(String msg) { + super(msg); + } + + Fault(String msg, Exception cause) { + super(msg, cause); + } + } + + /** * The factory for builders. */ protected BuilderFactory builderFactory; @@ -174,6 +191,12 @@ public boolean showauthor = false; /** + * Generate documentation for JavaFX getters and setters automatically + * by copying it from the appropriate property definition. + */ + public boolean javafx = false; + + /** * Generate version specific information for the all the classes * if @version tag is used in the doc comment and if -version option is * used. <code>showversion</code> is set to true if -version option is @@ -188,6 +211,17 @@ public String sourcepath = ""; /** + * Argument for command line option "-Xprofilespath". + */ + public String profilespath = ""; + + /** + * Generate profiles documentation if profilespath is set and valid profiles + * are present. + */ + public boolean showProfiles = false; + + /** * Don't generate deprecated API information at all, if -nodeprecated * option is used. <code>nodepracted</code> is set to true if * -nodeprecated option is used. Default is generate deprected API @@ -238,7 +272,7 @@ * @param options The array of option names and values. * @throws DocletAbortException */ - public abstract void setSpecificDocletOptions(String[][] options); + public abstract void setSpecificDocletOptions(String[][] options) throws Fault; /** * Return the doclet specific {@link MessageRetriever} @@ -247,6 +281,16 @@ public abstract MessageRetriever getDocletSpecificMsg(); /** + * A profiles object used to access profiles across various pages. + */ + public Profiles profiles; + + /** + * An map of the profiles to packages. + */ + public Map<String,PackageDoc[]> profilePackages; + + /** * An array of the packages specified on the command-line merged * with the array of packages that contain the classes specified on the * command-line. The array is sorted. @@ -294,6 +338,7 @@ option = option.toLowerCase(); if (option.equals("-author") || option.equals("-docfilessubdirs") || + option.equals("-javafx") || option.equals("-keywords") || option.equals("-linksource") || option.equals("-nocomment") || @@ -315,7 +360,8 @@ option.equals("-sourcepath") || option.equals("-tag") || option.equals("-taglet") || - option.equals("-tagletpath")) { + option.equals("-tagletpath") || + option.equals("-xprofilespath")) { return 2; } else if (option.equals("-group") || option.equals("-linkoffline")) { @@ -334,6 +380,38 @@ public abstract boolean validOptions(String options[][], DocErrorReporter reporter); + private void initProfiles() throws IOException { + profiles = Profiles.read(new File(profilespath)); + // Generate profiles documentation only is profilespath is set and if + // profiles is not null and profiles count is 1 or more. + showProfiles = (!profilespath.isEmpty() && profiles != null && + profiles.getProfileCount() > 0); + } + + private void initProfilePackages() throws IOException { + profilePackages = new HashMap<String,PackageDoc[]>(); + ArrayList<PackageDoc> results; + Map<String,PackageDoc> packageIndex = new HashMap<String,PackageDoc>(); + for (int i = 0; i < packages.length; i++) { + PackageDoc pkg = packages[i]; + packageIndex.put(pkg.name(), pkg); + } + for (int i = 1; i < profiles.getProfileCount(); i++) { + Set<String> profPkgs = profiles.getPackages(i); + results = new ArrayList<PackageDoc>(); + for (String packageName : profPkgs) { + packageName = packageName.replace("/", "."); + PackageDoc profPkg = packageIndex.get(packageName); + if (profPkg != null) { + results.add(profPkg); + } + } + Collections.sort(results); + PackageDoc[] profilePkgs = results.toArray(new PackageDoc[]{}); + profilePackages.put(Profile.lookup(i).name, profilePkgs); + } + } + private void initPackageArray() { Set<PackageDoc> set = new HashSet<PackageDoc>(Arrays.asList(root.specifiedPackages())); ClassDoc[] classes = root.specifiedClasses(); @@ -350,15 +428,26 @@ * * @param options the two dimensional array of options. */ - public void setOptions(String[][] options) { + public void setOptions(String[][] options) throws Fault { LinkedHashSet<String[]> customTagStrs = new LinkedHashSet<String[]>(); + + // Some options, specifically -link and -linkoffline, require that + // the output directory has already been created: so do that first. for (int oi = 0; oi < options.length; ++oi) { String[] os = options[oi]; String opt = os[0].toLowerCase(); if (opt.equals("-d")) { destDirName = addTrailingFileSep(os[1]); docFileDestDirName = destDirName; - } else if (opt.equals("-docfilessubdirs")) { + ensureOutputDirExists(); + break; + } + } + + for (int oi = 0; oi < options.length; ++oi) { + String[] os = options[oi]; + String opt = os[0].toLowerCase(); + if (opt.equals("-docfilessubdirs")) { copydocfilesubdirs = true; } else if (opt.equals("-docencoding")) { docencoding = os[1]; @@ -366,6 +455,8 @@ encoding = os[1]; } else if (opt.equals("-author")) { showauthor = true; + } else if (opt.equals("-javafx")) { + javafx = true; } else if (opt.equals("-nosince")) { nosince = true; } else if (opt.equals("-version")) { @@ -404,6 +495,8 @@ customTagStrs.add(os); } else if (opt.equals("-tagletpath")) { tagletpath = os[1]; + } else if (opt.equals("-xprofilespath")) { + profilespath = os[1]; } else if (opt.equals("-keywords")) { keywords = true; } else if (opt.equals("-serialwarn")) { @@ -436,12 +529,37 @@ * * @throws DocletAbortException */ - public void setOptions() { + public void setOptions() throws Fault { initPackageArray(); setOptions(root.options()); + if (!profilespath.isEmpty()) { + try { + initProfiles(); + initProfilePackages(); + } catch (Exception e) { + throw new DocletAbortException(); + } + } setSpecificDocletOptions(root.options()); } + private void ensureOutputDirExists() throws Fault { + DocFile destDir = DocFile.createFileForDirectory(this, destDirName); + if (!destDir.exists()) { + //Create the output directory (in case it doesn't exist yet) + root.printNotice(getText("doclet.dest_dir_create", destDirName)); + destDir.mkdirs(); + } else if (!destDir.isDirectory()) { + throw new Fault(getText( + "doclet.destination_directory_not_directory_0", + destDir.getPath())); + } else if (!destDir.canWrite()) { + throw new Fault(getText( + "doclet.destination_directory_not_writable_0", + destDir.getPath())); + } + } + /** * Initialize the taglet manager. The strings to initialize the simple custom tags should @@ -451,7 +569,7 @@ */ private void initTagletManager(Set<String[]> customTagStrs) { tagletManager = tagletManager == null ? - new TagletManager(nosince, showversion, showauthor, message) : + new TagletManager(nosince, showversion, showauthor, javafx, message) : tagletManager; String[] args; for (Iterator<String[]> it = customTagStrs.iterator(); it.hasNext(); ) { @@ -575,26 +693,7 @@ for (int oi = 0; oi < options.length; oi++) { String[] os = options[oi]; String opt = os[0].toLowerCase(); - if (opt.equals("-d")) { - String destdirname = addTrailingFileSep(os[1]); - DocFile destDir = DocFile.createFileForDirectory(this, destdirname); - if (!destDir.exists()) { - //Create the output directory (in case it doesn't exist yet) - reporter.printNotice(getText("doclet.dest_dir_create", - destdirname)); - destDir.mkdirs(); - } else if (!destDir.isDirectory()) { - reporter.printError(getText( - "doclet.destination_directory_not_directory_0", - destDir.getPath())); - return false; - } else if (!destDir.canWrite()) { - reporter.printError(getText( - "doclet.destination_directory_not_writable_0", - destDir.getPath())); - return false; - } - } else if (opt.equals("-docencoding")) { + if (opt.equals("-docencoding")) { docencodingfound = true; if (!checkOutputFileEncoding(os[1], reporter)) { return false;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/ProfilePackageSummaryWriter.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,116 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.doclets.internal.toolkit; + +import java.io.*; + +import com.sun.javadoc.*; + +/** + * The interface for writing profile package summary output. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice.</b> + * + * @author Bhavesh Patel + */ + +public interface ProfilePackageSummaryWriter { + + /** + * Get the header for the summary. + * + * @param heading Package name. + * @return the header to be added to the content tree + */ + public abstract Content getPackageHeader(String heading); + + /** + * Get the header for the content. + * + * @return a content tree for the content header + */ + public abstract Content getContentHeader(); + + /** + * Get the header for the package summary. + * + * @return a content tree with the package summary header + */ + public abstract Content getSummaryHeader(); + + /** + * Adds the table of classes to the documentation tree. + * + * @param classes the array of classes to document. + * @param label the label for this table. + * @param tableSummary the summary string for the table + * @param tableHeader array of table headers + * @param summaryContentTree the content tree to which the summaries will be added + */ + public abstract void addClassesSummary(ClassDoc[] classes, String label, + String tableSummary, String[] tableHeader, Content summaryContentTree); + + /** + * Adds the package description from the "packages.html" file to the documentation + * tree. + * + * @param packageContentTree the content tree to which the package description + * will be added + */ + public abstract void addPackageDescription(Content packageContentTree); + + /** + * Adds the tag information from the "packages.html" file to the documentation + * tree. + * + * @param packageContentTree the content tree to which the package tags will + * be added + */ + public abstract void addPackageTags(Content packageContentTree); + + /** + * Adds the footer to the documentation tree. + * + * @param contentTree the tree to which the footer will be added + */ + public abstract void addPackageFooter(Content contentTree); + + /** + * Print the package summary document. + * + * @param contentTree the content tree that will be printed + */ + public abstract void printDocument(Content contentTree) throws IOException; + + /** + * Close the writer. + */ + public abstract void close() throws IOException; + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/ProfileSummaryWriter.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,120 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.doclets.internal.toolkit; + +import java.io.*; + +import com.sun.javadoc.*; + +/** + * The interface for writing profile summary output. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice.</b> + * + * @author Bhavesh Patel + */ + +public interface ProfileSummaryWriter { + + /** + * Get the header for the summary. + * + * @param heading profile name. + * @return the header to be added to the content tree + */ + public abstract Content getProfileHeader(String heading); + + /** + * Get the header for the profile content. + * + * @return a content tree for the profile content header + */ + public abstract Content getContentHeader(); + + /** + * Get the header for the summary header. + * + * @return a content tree with the summary header + */ + public abstract Content getSummaryHeader(); + + /** + * Get the header for the summary tree. + * + * @param summaryContentTree the content tree. + * @return a content tree with the summary tree + */ + public abstract Content getSummaryTree(Content summaryContentTree); + + /** + * Get the header for the package summary header. + * + * @return a content tree with the package summary header + */ + public abstract Content getPackageSummaryHeader(PackageDoc pkg); + + /** + * Get the header for the package summary tree. + * + * @return a content tree with the package summary + */ + public abstract Content getPackageSummaryTree(Content packageSummaryContentTree); + + /** + * Adds the table of classes to the documentation tree. + * + * @param classes the array of classes to document. + * @param label the label for this table. + * @param tableSummary the summary string for the table + * @param tableHeader array of table headers + * @param packageSummaryContentTree the content tree to which the summaries will be added + */ + public abstract void addClassesSummary(ClassDoc[] classes, String label, + String tableSummary, String[] tableHeader, Content packageSummaryContentTree); + + /** + * Adds the footer to the documentation tree. + * + * @param contentTree the tree to which the footer will be added + */ + public abstract void addProfileFooter(Content contentTree); + + /** + * Print the profile summary document. + * + * @param contentTree the content tree that will be printed + */ + public abstract void printDocument(Content contentTree) throws IOException; + + /** + * Close the writer. + */ + public abstract void close() throws IOException; + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/PropertyWriter.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,119 @@ +/* + * Copyright (c) 2003, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.doclets.internal.toolkit; + +import java.io.*; +import com.sun.javadoc.*; + +/** + * The interface for writing property output. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice.</b> + * + * @author Jamie Ho + * @author Bhavesh Patel (Modified) + * @since 1.7 + */ + +public interface PropertyWriter { + + /** + * Get the property details tree header. + * + * @param classDoc the class being documented + * @param memberDetailsTree the content tree representing member details + * @return content tree for the property details header + */ + public Content getPropertyDetailsTreeHeader(ClassDoc classDoc, + Content memberDetailsTree); + + /** + * Get the property documentation tree header. + * + * @param property the property being documented + * @param propertyDetailsTree the content tree representing property details + * @return content tree for the property documentation header + */ + public Content getPropertyDocTreeHeader(MethodDoc property, + Content propertyDetailsTree); + + /** + * Get the signature for the given property. + * + * @param property the property being documented + * @return content tree for the property signature + */ + public Content getSignature(MethodDoc property); + + /** + * Add the deprecated output for the given property. + * + * @param property the property being documented + * @param propertyDocTree content tree to which the deprecated information will be added + */ + public void addDeprecated(MethodDoc property, Content propertyDocTree); + + /** + * Add the comments for the given property. + * + * @param property the property being documented + * @param propertyDocTree the content tree to which the comments will be added + */ + public void addComments(MethodDoc property, Content propertyDocTree); + + /** + * Add the tags for the given property. + * + * @param property the property being documented + * @param propertyDocTree the content tree to which the tags will be added + */ + public void addTags(MethodDoc property, Content propertyDocTree); + + /** + * Get the property details tree. + * + * @param memberDetailsTree the content tree representing member details + * @return content tree for the property details + */ + public Content getPropertyDetails(Content memberDetailsTree); + + /** + * Get the property documentation. + * + * @param propertyDocTree the content tree representing property documentation + * @param isLastContent true if the content to be added is the last content + * @return content tree for the property documentation + */ + public Content getPropertyDoc(Content propertyDocTree, boolean isLastContent); + + /** + * Close the writer. + */ + public void close() throws IOException; +}
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -26,6 +26,7 @@ package com.sun.tools.doclets.internal.toolkit; import com.sun.javadoc.*; +import com.sun.tools.javac.jvm.Profile; import com.sun.tools.doclets.internal.toolkit.util.*; /** @@ -65,6 +66,33 @@ throws Exception; /** + * Return the writer for the profile summary. + * + * @param profile the profile being documented. + * @param prevProfile the previous profile that was documented. + * @param nextProfile the next profile being documented. + * @return the writer for the profile summary. Return null if this + * writer is not supported by the doclet. + */ + public abstract ProfileSummaryWriter getProfileSummaryWriter(Profile + profile, Profile prevProfile, Profile nextProfile) + throws Exception; + + /** + * Return the writer for the profile package summary. + * + * @param packageDoc the profile package being documented. + * @param prevPkg the previous profile package that was documented. + * @param nextPkg the next profile package being documented. + * @param profile the profile being documented. + * @return the writer for the profile package summary. Return null if this + * writer is not supported by the doclet. + */ + public abstract ProfilePackageSummaryWriter getProfilePackageSummaryWriter( + PackageDoc packageDoc, PackageDoc prevPkg, PackageDoc nextPkg, + Profile profile) throws Exception; + + /** * Return the writer for a class. * * @param classDoc the class being documented. @@ -147,6 +175,16 @@ throws Exception; /** + * Return the property writer for a given class. + * + * @param classWriter the writer for the class being documented. + * @return the property writer for the give class. Return null if this + * writer is not supported by the doclet. + */ + public abstract PropertyWriter getPropertyWriter(ClassWriter classWriter) + throws Exception; + + /** * Return the constructor writer for a given class. * * @param classWriter the writer for the class being documented.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -116,9 +116,9 @@ * @param contentTree the content tree to which the documentation will be added */ public void buildAnnotationTypeDoc(XMLNode node, Content contentTree) throws Exception { - contentTree = writer.getHeader(configuration.getText("doclet.AnnotationType") + + contentTree = writer.getHeader(configuration.getText("doclet.AnnotationType") + " " + annotationTypeDoc.name()); - Content annotationContentTree = writer.getAnnotationContentHeader(); + Content annotationContentTree = writer.getAnnotationContentHeader(); buildChildren(node, annotationContentTree); contentTree.addContent(annotationContentTree); writer.addFooter(contentTree);
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -86,7 +86,7 @@ this.classDoc = classDoc; this.writer = writer; this.visibleMemberMap = new VisibleMemberMap(classDoc, memberType, - configuration.nodeprecated); + configuration); this.members = new ArrayList<ProgramElementDoc>( this.visibleMemberMap.getMembersFor(classDoc)); if (configuration.getMemberComparator() != null) {
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -29,6 +29,7 @@ import java.util.Set; import com.sun.javadoc.*; +import com.sun.tools.javac.jvm.Profile; import com.sun.tools.doclets.internal.toolkit.*; import com.sun.tools.doclets.internal.toolkit.util.*; @@ -96,6 +97,36 @@ } /** + * Return the builder that builds the profile summary. + * + * @param profile the profile being documented. + * @param prevProfile the previous profile being documented. + * @param nextProfile the next profile being documented. + * @return the builder that builds the profile summary. + */ + public AbstractBuilder getProfileSummaryBuilder(Profile profile, Profile prevProfile, + Profile nextProfile) throws Exception { + return ProfileSummaryBuilder.getInstance(context, profile, + writerFactory.getProfileSummaryWriter(profile, prevProfile, nextProfile)); + } + + /** + * Return the builder that builds the profile package summary. + * + * @param pkg the profile package being documented. + * @param prevPkg the previous profile package being documented. + * @param nextPkg the next profile package being documented. + * @param profile the profile being documented. + * @return the builder that builds the profile package summary. + */ + public AbstractBuilder getProfilePackageSummaryBuilder(PackageDoc pkg, PackageDoc prevPkg, + PackageDoc nextPkg, Profile profile) throws Exception { + return ProfilePackageSummaryBuilder.getInstance(context, pkg, + writerFactory.getProfilePackageSummaryWriter(pkg, prevPkg, nextPkg, + profile), profile); + } + + /** * Return the builder for the class. * * @param classDoc the class being documented. @@ -197,6 +228,19 @@ } /** + * Return an instance of the property builder for the given class. + * + * @return an instance of the field builder for the given class. + */ + public AbstractBuilder getPropertyBuilder(ClassWriter classWriter) throws Exception { + final PropertyWriter propertyWriter = + writerFactory.getPropertyWriter(classWriter); + return PropertyBuilder.getInstance(context, + classWriter.getClassDoc(), + propertyWriter); + } + + /** * Return an instance of the constructor builder for the given class. * * @return an instance of the constructor builder for the given class.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -381,6 +381,17 @@ } /** + * Build the property documentation. + * + * @param elements the XML elements that specify how a field is documented. + */ + public void buildPropertyDetails(XMLNode node, + Content memberDetailsTree) throws Exception { + configuration.getBuilderFactory(). + getPropertyBuilder(writer).buildChildren(node, memberDetailsTree); + } + + /** * Build the constructor documentation. * * @param node the XML element that specifies which components to document
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -265,7 +265,7 @@ */ private boolean hasConstantField (ClassDoc classDoc) { VisibleMemberMap visibleMemberMapFields = new VisibleMemberMap(classDoc, - VisibleMemberMap.FIELDS, configuration.nodeprecated); + VisibleMemberMap.FIELDS, configuration); List<?> fields = visibleMemberMapFields.getLeafClassMembers(configuration); for (Iterator<?> iter = fields.iterator(); iter.hasNext(); ) { FieldDoc field = (FieldDoc) iter.next(); @@ -323,9 +323,9 @@ public ConstantFieldBuilder(ClassDoc classdoc) { this.classdoc = classdoc; visibleMemberMapFields = new VisibleMemberMap(classdoc, - VisibleMemberMap.FIELDS, configuration.nodeprecated); + VisibleMemberMap.FIELDS, configuration); visibleMemberMapEnumConst = new VisibleMemberMap(classdoc, - VisibleMemberMap.ENUM_CONSTANTS, configuration.nodeprecated); + VisibleMemberMap.ENUM_CONSTANTS, configuration); } /**
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -93,7 +93,7 @@ new VisibleMemberMap( classDoc, VisibleMemberMap.CONSTRUCTORS, - configuration.nodeprecated); + configuration); constructors = new ArrayList<ProgramElementDoc>(visibleMemberMap.getMembersFor(classDoc)); for (int i = 0; i < constructors.size(); i++) {
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -87,7 +87,7 @@ new VisibleMemberMap( classDoc, VisibleMemberMap.ENUM_CONSTANTS, - configuration.nodeprecated); + configuration); enumConstants = new ArrayList<ProgramElementDoc>(visibleMemberMap.getMembersFor(classDoc)); if (configuration.getMemberComparator() != null) {
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -88,7 +88,7 @@ new VisibleMemberMap( classDoc, VisibleMemberMap.FIELDS, - configuration.nodeprecated); + configuration); fields = new ArrayList<ProgramElementDoc>(visibleMemberMap.getLeafClassMembers( configuration));
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -26,6 +26,7 @@ package com.sun.tools.doclets.internal.toolkit.builders; import java.util.*; +import java.text.MessageFormat; import com.sun.javadoc.*; import com.sun.tools.doclets.internal.toolkit.*; @@ -82,7 +83,7 @@ new VisibleMemberMap( classDoc, i, - configuration.nodeprecated); + configuration); } } @@ -254,6 +255,17 @@ } /** + * Build the summary for the fields. + */ + public void buildPropertiesSummary(XMLNode node, Content memberSummaryTree) { + MemberSummaryWriter writer = + memberSummaryWriters[VisibleMemberMap.PROPERTIES]; + VisibleMemberMap visibleMemberMap = + visibleMemberMaps[VisibleMemberMap.PROPERTIES]; + addSummary(writer, visibleMemberMap, true, memberSummaryTree); + } + + /** * Build the summary for the nested classes. * * @param node the XML element that specifies which components to document @@ -311,6 +323,11 @@ List<Content> tableContents = new LinkedList<Content>(); for (int i = 0; i < members.size(); i++) { ProgramElementDoc member = members.get(i); + final ProgramElementDoc propertyDoc = + visibleMemberMap.getPropertyMemberDoc(member); + if (propertyDoc != null) { + processProperty(visibleMemberMap, member, propertyDoc); + } Tag[] firstSentenceTags = member.firstSentenceTags(); if (member instanceof MethodDoc && firstSentenceTags.length == 0) { //Inherit comments from overriden or implemented method if @@ -330,6 +347,106 @@ } /** + * Process the property method, property setter and/or property getter + * comment text so that it contains the documentation from + * the property field. The method adds the leading sentence, + * copied documentation including the defaultValue tag and + * the see tags if the appropriate property getter and setter are + * available. + * + * @param visibleMemberMap the members information. + * @param member the member which is to be augmented. + * @param propertyDoc the original property documentation. + */ + private void processProperty(VisibleMemberMap visibleMemberMap, + ProgramElementDoc member, + ProgramElementDoc propertyDoc) { + StringBuilder commentTextBuilder = new StringBuilder(); + final boolean isSetter = isSetter(member); + final boolean isGetter = isGetter(member); + if (isGetter || isSetter) { + //add "[GS]ets the value of the property PROPERTY_NAME." + if (isSetter) { + commentTextBuilder.append( + MessageFormat.format( + configuration.getText("doclet.PropertySetterWithName"), + Util.propertyNameFromMethodName(member.name()))); + } + if (isGetter) { + commentTextBuilder.append( + MessageFormat.format( + configuration.getText("doclet.PropertyGetterWithName"), + Util.propertyNameFromMethodName(member.name()))); + } + if (propertyDoc.commentText() != null + && !propertyDoc.commentText().isEmpty()) { + commentTextBuilder.append(" \n @propertyDescription "); + } + } + commentTextBuilder.append(propertyDoc.commentText()); + + Tag[] tags = propertyDoc.tags("@defaultValue"); + if (tags != null) { + for (Tag tag: tags) { + commentTextBuilder.append("\n") + .append(tag.name()) + .append(" ") + .append(tag.text()); + } + } + + //add @see tags + if (!isGetter && !isSetter) { + MethodDoc getter = (MethodDoc) visibleMemberMap.getGetterForProperty(member); + MethodDoc setter = (MethodDoc) visibleMemberMap.getSetterForProperty(member); + + if ((null != getter) + && (commentTextBuilder.indexOf("@see #" + getter.name()) == -1)) { + commentTextBuilder.append("\n @see #") + .append(getter.name()) + .append("() "); + } + + if ((null != setter) + && (commentTextBuilder.indexOf("@see #" + setter.name()) == -1)) { + String typeName = setter.parameters()[0].typeName(); + // Removal of type parameters and package information. + typeName = typeName.split("<")[0]; + if (typeName.contains(".")) { + typeName = typeName.substring(typeName.lastIndexOf(".") + 1); + } + commentTextBuilder.append("\n @see #").append(setter.name()); + + if (setter.parameters()[0].type().asTypeVariable() == null) { + commentTextBuilder.append("(").append(typeName).append(")"); + } + commentTextBuilder.append(" \n"); + } + } + member.setRawCommentText(commentTextBuilder.toString()); + } + /** + * Test whether the method is a getter. + * @param ped property method documentation. Needs to be either property + * method, property getter, or property setter. + * @return true if the given documentation belongs to a getter. + */ + private boolean isGetter(ProgramElementDoc ped) { + final String pedName = ped.name(); + return pedName.startsWith("get") || pedName.startsWith("is"); + } + + /** + * Test whether the method is a setter. + * @param ped property method documentation. Needs to be either property + * method, property getter, or property setter. + * @return true if the given documentation belongs to a setter. + */ + private boolean isSetter(ProgramElementDoc ped) { + return ped.name().startsWith("set"); + } + + /** * Build the inherited member summary for the given methods. * * @param writer the writer for this member summary.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -88,7 +88,7 @@ visibleMemberMap = new VisibleMemberMap( classDoc, VisibleMemberMap.METHODS, - configuration.nodeprecated); + configuration); methods = new ArrayList<ProgramElementDoc>(visibleMemberMap.getLeafClassMembers( configuration));
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -176,6 +176,7 @@ ? packageDoc.interfaces() : configuration.classDocCatalog.interfaces( Util.getPackageName(packageDoc)); + interfaces = Util.filterOutPrivateClasses(interfaces, configuration.javafx); if (interfaces.length > 0) { packageWriter.addClassesSummary( interfaces, @@ -205,6 +206,7 @@ ? packageDoc.ordinaryClasses() : configuration.classDocCatalog.ordinaryClasses( Util.getPackageName(packageDoc)); + classes = Util.filterOutPrivateClasses(classes, configuration.javafx); if (classes.length > 0) { packageWriter.addClassesSummary( classes, @@ -234,6 +236,7 @@ ? packageDoc.enums() : configuration.classDocCatalog.enums( Util.getPackageName(packageDoc)); + enums = Util.filterOutPrivateClasses(enums, configuration.javafx); if (enums.length > 0) { packageWriter.addClassesSummary( enums, @@ -263,6 +266,7 @@ ? packageDoc.exceptions() : configuration.classDocCatalog.exceptions( Util.getPackageName(packageDoc)); + exceptions = Util.filterOutPrivateClasses(exceptions, configuration.javafx); if (exceptions.length > 0) { packageWriter.addClassesSummary( exceptions, @@ -292,6 +296,7 @@ ? packageDoc.errors() : configuration.classDocCatalog.errors( Util.getPackageName(packageDoc)); + errors = Util.filterOutPrivateClasses(errors, configuration.javafx); if (errors.length > 0) { packageWriter.addClassesSummary( errors, @@ -321,6 +326,7 @@ ? packageDoc.annotationTypes() : configuration.classDocCatalog.annotationTypes( Util.getPackageName(packageDoc)); + annotationTypes = Util.filterOutPrivateClasses(annotationTypes, configuration.javafx); if (annotationTypes.length > 0) { packageWriter.addClassesSummary( annotationTypes,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ProfilePackageSummaryBuilder.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,374 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.doclets.internal.toolkit.builders; + +import java.io.*; + +import com.sun.javadoc.*; +import com.sun.tools.javac.jvm.Profile; +import com.sun.tools.doclets.internal.toolkit.*; +import com.sun.tools.doclets.internal.toolkit.util.*; + +/** + * Builds the summary for a given profile package. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice.</b> + * + * @author Bhavesh Patel + */ +public class ProfilePackageSummaryBuilder extends AbstractBuilder { + /** + * The root element of the profile package summary XML is {@value}. + */ + public static final String ROOT = "PackageDoc"; + + /** + * The profile package being documented. + */ + private final PackageDoc packageDoc; + + /** + * The name of the profile being documented. + */ + private final String profileName; + + /** + * The value of the profile being documented. + */ + private final int profileValue; + + /** + * The doclet specific writer that will output the result. + */ + private final ProfilePackageSummaryWriter profilePackageWriter; + + /** + * The content that will be added to the profile package summary documentation tree. + */ + private Content contentTree; + + /** + * Construct a new ProfilePackageSummaryBuilder. + * + * @param context the build context. + * @param pkg the profile package being documented. + * @param profilePackageWriter the doclet specific writer that will output the + * result. + * @param profile the profile being documented. + */ + private ProfilePackageSummaryBuilder(Context context, + PackageDoc pkg, ProfilePackageSummaryWriter profilePackageWriter, + Profile profile) { + super(context); + this.packageDoc = pkg; + this.profilePackageWriter = profilePackageWriter; + this.profileName = profile.name; + this.profileValue = profile.value; + } + + /** + * Construct a new ProfilePackageSummaryBuilder. + * + * @param context the build context. + * @param pkg the profile package being documented. + * @param profilePackageWriter the doclet specific writer that will output the + * result. + * @param profile the profile being documented. + * + * @return an instance of a ProfilePackageSummaryBuilder. + */ + public static ProfilePackageSummaryBuilder getInstance(Context context, + PackageDoc pkg, ProfilePackageSummaryWriter profilePackageWriter, + Profile profile) { + return new ProfilePackageSummaryBuilder(context, pkg, profilePackageWriter, + profile); + } + + /** + * Build the profile package summary. + */ + public void build() throws IOException { + if (profilePackageWriter == null) { + //Doclet does not support this output. + return; + } + build(layoutParser.parseXML(ROOT), contentTree); + } + + /** + * {@inheritDoc} + */ + public String getName() { + return ROOT; + } + + /** + * Build the profile package documentation. + * + * @param node the XML element that specifies which components to document + * @param contentTree the content tree to which the documentation will be added + */ + public void buildPackageDoc(XMLNode node, Content contentTree) throws Exception { + contentTree = profilePackageWriter.getPackageHeader( + Util.getPackageName(packageDoc)); + buildChildren(node, contentTree); + profilePackageWriter.addPackageFooter(contentTree); + profilePackageWriter.printDocument(contentTree); + profilePackageWriter.close(); + Util.copyDocFiles(configuration, packageDoc); + } + + /** + * Build the content for the profile package doc. + * + * @param node the XML element that specifies which components to document + * @param contentTree the content tree to which the package contents + * will be added + */ + public void buildContent(XMLNode node, Content contentTree) { + Content packageContentTree = profilePackageWriter.getContentHeader(); + buildChildren(node, packageContentTree); + contentTree.addContent(packageContentTree); + } + + /** + * Build the profile package summary. + * + * @param node the XML element that specifies which components to document + * @param packageContentTree the package content tree to which the summaries will + * be added + */ + public void buildSummary(XMLNode node, Content packageContentTree) { + Content summaryContentTree = profilePackageWriter.getSummaryHeader(); + buildChildren(node, summaryContentTree); + packageContentTree.addContent(summaryContentTree); + } + + /** + * Build the summary for the interfaces in this package. + * + * @param node the XML element that specifies which components to document + * @param summaryContentTree the summary tree to which the interface summary + * will be added + */ + public void buildInterfaceSummary(XMLNode node, Content summaryContentTree) { + String interfaceTableSummary = + configuration.getText("doclet.Member_Table_Summary", + configuration.getText("doclet.Interface_Summary"), + configuration.getText("doclet.interfaces")); + String[] interfaceTableHeader = new String[] { + configuration.getText("doclet.Interface"), + configuration.getText("doclet.Description") + }; + ClassDoc[] interfaces = + packageDoc.isIncluded() + ? packageDoc.interfaces() + : configuration.classDocCatalog.interfaces( + Util.getPackageName(packageDoc)); + if (interfaces.length > 0) { + profilePackageWriter.addClassesSummary( + interfaces, + configuration.getText("doclet.Interface_Summary"), + interfaceTableSummary, interfaceTableHeader, summaryContentTree); + } + } + + /** + * Build the summary for the classes in this package. + * + * @param node the XML element that specifies which components to document + * @param summaryContentTree the summary tree to which the class summary will + * be added + */ + public void buildClassSummary(XMLNode node, Content summaryContentTree) { + String classTableSummary = + configuration.getText("doclet.Member_Table_Summary", + configuration.getText("doclet.Class_Summary"), + configuration.getText("doclet.classes")); + String[] classTableHeader = new String[] { + configuration.getText("doclet.Class"), + configuration.getText("doclet.Description") + }; + ClassDoc[] classes = + packageDoc.isIncluded() + ? packageDoc.ordinaryClasses() + : configuration.classDocCatalog.ordinaryClasses( + Util.getPackageName(packageDoc)); + if (classes.length > 0) { + profilePackageWriter.addClassesSummary( + classes, + configuration.getText("doclet.Class_Summary"), + classTableSummary, classTableHeader, summaryContentTree); + } + } + + /** + * Build the summary for the enums in this package. + * + * @param node the XML element that specifies which components to document + * @param summaryContentTree the summary tree to which the enum summary will + * be added + */ + public void buildEnumSummary(XMLNode node, Content summaryContentTree) { + String enumTableSummary = + configuration.getText("doclet.Member_Table_Summary", + configuration.getText("doclet.Enum_Summary"), + configuration.getText("doclet.enums")); + String[] enumTableHeader = new String[] { + configuration.getText("doclet.Enum"), + configuration.getText("doclet.Description") + }; + ClassDoc[] enums = + packageDoc.isIncluded() + ? packageDoc.enums() + : configuration.classDocCatalog.enums( + Util.getPackageName(packageDoc)); + if (enums.length > 0) { + profilePackageWriter.addClassesSummary( + enums, + configuration.getText("doclet.Enum_Summary"), + enumTableSummary, enumTableHeader, summaryContentTree); + } + } + + /** + * Build the summary for the exceptions in this package. + * + * @param node the XML element that specifies which components to document + * @param summaryContentTree the summary tree to which the exception summary will + * be added + */ + public void buildExceptionSummary(XMLNode node, Content summaryContentTree) { + String exceptionTableSummary = + configuration.getText("doclet.Member_Table_Summary", + configuration.getText("doclet.Exception_Summary"), + configuration.getText("doclet.exceptions")); + String[] exceptionTableHeader = new String[] { + configuration.getText("doclet.Exception"), + configuration.getText("doclet.Description") + }; + ClassDoc[] exceptions = + packageDoc.isIncluded() + ? packageDoc.exceptions() + : configuration.classDocCatalog.exceptions( + Util.getPackageName(packageDoc)); + if (exceptions.length > 0) { + profilePackageWriter.addClassesSummary( + exceptions, + configuration.getText("doclet.Exception_Summary"), + exceptionTableSummary, exceptionTableHeader, summaryContentTree); + } + } + + /** + * Build the summary for the errors in this package. + * + * @param node the XML element that specifies which components to document + * @param summaryContentTree the summary tree to which the error summary will + * be added + */ + public void buildErrorSummary(XMLNode node, Content summaryContentTree) { + String errorTableSummary = + configuration.getText("doclet.Member_Table_Summary", + configuration.getText("doclet.Error_Summary"), + configuration.getText("doclet.errors")); + String[] errorTableHeader = new String[] { + configuration.getText("doclet.Error"), + configuration.getText("doclet.Description") + }; + ClassDoc[] errors = + packageDoc.isIncluded() + ? packageDoc.errors() + : configuration.classDocCatalog.errors( + Util.getPackageName(packageDoc)); + if (errors.length > 0) { + profilePackageWriter.addClassesSummary( + errors, + configuration.getText("doclet.Error_Summary"), + errorTableSummary, errorTableHeader, summaryContentTree); + } + } + + /** + * Build the summary for the annotation type in this package. + * + * @param node the XML element that specifies which components to document + * @param summaryContentTree the summary tree to which the annotation type + * summary will be added + */ + public void buildAnnotationTypeSummary(XMLNode node, Content summaryContentTree) { + String annotationtypeTableSummary = + configuration.getText("doclet.Member_Table_Summary", + configuration.getText("doclet.Annotation_Types_Summary"), + configuration.getText("doclet.annotationtypes")); + String[] annotationtypeTableHeader = new String[] { + configuration.getText("doclet.AnnotationType"), + configuration.getText("doclet.Description") + }; + ClassDoc[] annotationTypes = + packageDoc.isIncluded() + ? packageDoc.annotationTypes() + : configuration.classDocCatalog.annotationTypes( + Util.getPackageName(packageDoc)); + if (annotationTypes.length > 0) { + profilePackageWriter.addClassesSummary( + annotationTypes, + configuration.getText("doclet.Annotation_Types_Summary"), + annotationtypeTableSummary, annotationtypeTableHeader, + summaryContentTree); + } + } + + /** + * Build the description of the summary. + * + * @param node the XML element that specifies which components to document + * @param packageContentTree the tree to which the package description will + * be added + */ + public void buildPackageDescription(XMLNode node, Content packageContentTree) { + if (configuration.nocomment) { + return; + } + profilePackageWriter.addPackageDescription(packageContentTree); + } + + /** + * Build the tags of the summary. + * + * @param node the XML element that specifies which components to document + * @param packageContentTree the tree to which the package tags will be added + */ + public void buildPackageTags(XMLNode node, Content packageContentTree) { + if (configuration.nocomment) { + return; + } + profilePackageWriter.addPackageTags(packageContentTree); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ProfileSummaryBuilder.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,328 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.doclets.internal.toolkit.builders; + +import java.io.*; + +import com.sun.javadoc.*; +import com.sun.tools.javac.jvm.Profile; +import com.sun.tools.doclets.internal.toolkit.*; +import com.sun.tools.doclets.internal.toolkit.util.*; + +/** + * Builds the summary for a given profile. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice.</b> + * + * @author Bhavesh Patel + */ +public class ProfileSummaryBuilder extends AbstractBuilder { + /** + * The root element of the profile summary XML is {@value}. + */ + public static final String ROOT = "ProfileDoc"; + + /** + * The profile being documented. + */ + private final Profile profile; + + /** + * The doclet specific writer that will output the result. + */ + private final ProfileSummaryWriter profileWriter; + + /** + * The content that will be added to the profile summary documentation tree. + */ + private Content contentTree; + + /** + * The profile package being documented. + */ + private PackageDoc pkg; + + /** + * Construct a new ProfileSummaryBuilder. + * + * @param context the build context. + * @param profile the profile being documented. + * @param profileWriter the doclet specific writer that will output the + * result. + */ + private ProfileSummaryBuilder(Context context, + Profile profile, ProfileSummaryWriter profileWriter) { + super(context); + this.profile = profile; + this.profileWriter = profileWriter; + } + + /** + * Construct a new ProfileSummaryBuilder. + * + * @param context the build context. + * @param profile the profile being documented. + * @param profileWriter the doclet specific writer that will output the + * result. + * + * @return an instance of a ProfileSummaryBuilder. + */ + public static ProfileSummaryBuilder getInstance(Context context, + Profile profile, ProfileSummaryWriter profileWriter) { + return new ProfileSummaryBuilder(context, profile, profileWriter); + } + + /** + * Build the profile summary. + */ + public void build() throws IOException { + if (profileWriter == null) { + //Doclet does not support this output. + return; + } + build(layoutParser.parseXML(ROOT), contentTree); + } + + /** + * {@inheritDoc} + */ + public String getName() { + return ROOT; + } + + /** + * Build the profile documentation. + * + * @param node the XML element that specifies which components to document + * @param contentTree the content tree to which the documentation will be added + */ + public void buildProfileDoc(XMLNode node, Content contentTree) throws Exception { + contentTree = profileWriter.getProfileHeader(profile.name); + buildChildren(node, contentTree); + profileWriter.addProfileFooter(contentTree); + profileWriter.printDocument(contentTree); + profileWriter.close(); + Util.copyDocFiles(configuration, DocPaths.profileSummary(profile.name)); + } + + /** + * Build the content for the profile doc. + * + * @param node the XML element that specifies which components to document + * @param contentTree the content tree to which the profile contents + * will be added + */ + public void buildContent(XMLNode node, Content contentTree) { + Content profileContentTree = profileWriter.getContentHeader(); + buildChildren(node, profileContentTree); + contentTree.addContent(profileContentTree); + } + + /** + * Build the profile summary. + * + * @param node the XML element that specifies which components to document + * @param profileContentTree the profile content tree to which the summaries will + * be added + */ + public void buildSummary(XMLNode node, Content profileContentTree) { + Content summaryContentTree = profileWriter.getSummaryHeader(); + buildChildren(node, summaryContentTree); + profileContentTree.addContent(profileWriter.getSummaryTree(summaryContentTree)); + } + + /** + * Build the profile package summary. + * + * @param node the XML element that specifies which components to document + * @param summaryContentTree the content tree to which the summaries will + * be added + */ + public void buildPackageSummary(XMLNode node, Content summaryContentTree) { + PackageDoc[] packages = configuration.profilePackages.get(profile.name); + for (int i = 0; i < packages.length; i++) { + this.pkg = packages[i]; + Content packageSummaryContentTree = profileWriter.getPackageSummaryHeader(this.pkg); + buildChildren(node, packageSummaryContentTree); + summaryContentTree.addContent(profileWriter.getPackageSummaryTree( + packageSummaryContentTree)); + } + } + + /** + * Build the summary for the interfaces in the package. + * + * @param node the XML element that specifies which components to document + * @param packageSummaryContentTree the tree to which the interface summary + * will be added + */ + public void buildInterfaceSummary(XMLNode node, Content packageSummaryContentTree) { + String interfaceTableSummary = + configuration.getText("doclet.Member_Table_Summary", + configuration.getText("doclet.Interface_Summary"), + configuration.getText("doclet.interfaces")); + String[] interfaceTableHeader = new String[] { + configuration.getText("doclet.Interface"), + configuration.getText("doclet.Description") + }; + ClassDoc[] interfaces = pkg.interfaces(); + if (interfaces.length > 0) { + profileWriter.addClassesSummary( + interfaces, + configuration.getText("doclet.Interface_Summary"), + interfaceTableSummary, interfaceTableHeader, packageSummaryContentTree); + } + } + + /** + * Build the summary for the classes in the package. + * + * @param node the XML element that specifies which components to document + * @param packageSummaryContentTree the tree to which the class summary will + * be added + */ + public void buildClassSummary(XMLNode node, Content packageSummaryContentTree) { + String classTableSummary = + configuration.getText("doclet.Member_Table_Summary", + configuration.getText("doclet.Class_Summary"), + configuration.getText("doclet.classes")); + String[] classTableHeader = new String[] { + configuration.getText("doclet.Class"), + configuration.getText("doclet.Description") + }; + ClassDoc[] classes = pkg.ordinaryClasses(); + if (classes.length > 0) { + profileWriter.addClassesSummary( + classes, + configuration.getText("doclet.Class_Summary"), + classTableSummary, classTableHeader, packageSummaryContentTree); + } + } + + /** + * Build the summary for the enums in the package. + * + * @param node the XML element that specifies which components to document + * @param packageSummaryContentTree the tree to which the enum summary will + * be added + */ + public void buildEnumSummary(XMLNode node, Content packageSummaryContentTree) { + String enumTableSummary = + configuration.getText("doclet.Member_Table_Summary", + configuration.getText("doclet.Enum_Summary"), + configuration.getText("doclet.enums")); + String[] enumTableHeader = new String[] { + configuration.getText("doclet.Enum"), + configuration.getText("doclet.Description") + }; + ClassDoc[] enums = pkg.enums(); + if (enums.length > 0) { + profileWriter.addClassesSummary( + enums, + configuration.getText("doclet.Enum_Summary"), + enumTableSummary, enumTableHeader, packageSummaryContentTree); + } + } + + /** + * Build the summary for the exceptions in the package. + * + * @param node the XML element that specifies which components to document + * @param packageSummaryContentTree the tree to which the exception summary will + * be added + */ + public void buildExceptionSummary(XMLNode node, Content packageSummaryContentTree) { + String exceptionTableSummary = + configuration.getText("doclet.Member_Table_Summary", + configuration.getText("doclet.Exception_Summary"), + configuration.getText("doclet.exceptions")); + String[] exceptionTableHeader = new String[] { + configuration.getText("doclet.Exception"), + configuration.getText("doclet.Description") + }; + ClassDoc[] exceptions = pkg.exceptions(); + if (exceptions.length > 0) { + profileWriter.addClassesSummary( + exceptions, + configuration.getText("doclet.Exception_Summary"), + exceptionTableSummary, exceptionTableHeader, packageSummaryContentTree); + } + } + + /** + * Build the summary for the errors in the package. + * + * @param node the XML element that specifies which components to document + * @param packageSummaryContentTree the tree to which the error summary will + * be added + */ + public void buildErrorSummary(XMLNode node, Content packageSummaryContentTree) { + String errorTableSummary = + configuration.getText("doclet.Member_Table_Summary", + configuration.getText("doclet.Error_Summary"), + configuration.getText("doclet.errors")); + String[] errorTableHeader = new String[] { + configuration.getText("doclet.Error"), + configuration.getText("doclet.Description") + }; + ClassDoc[] errors = pkg.errors(); + if (errors.length > 0) { + profileWriter.addClassesSummary( + errors, + configuration.getText("doclet.Error_Summary"), + errorTableSummary, errorTableHeader, packageSummaryContentTree); + } + } + + /** + * Build the summary for the annotation type in the package. + * + * @param node the XML element that specifies which components to document + * @param packageSummaryContentTree the tree to which the annotation type + * summary will be added + */ + public void buildAnnotationTypeSummary(XMLNode node, Content packageSummaryContentTree) { + String annotationtypeTableSummary = + configuration.getText("doclet.Member_Table_Summary", + configuration.getText("doclet.Annotation_Types_Summary"), + configuration.getText("doclet.annotationtypes")); + String[] annotationtypeTableHeader = new String[] { + configuration.getText("doclet.AnnotationType"), + configuration.getText("doclet.Description") + }; + ClassDoc[] annotationTypes = pkg.annotationTypes(); + if (annotationTypes.length > 0) { + profileWriter.addClassesSummary( + annotationTypes, + configuration.getText("doclet.Annotation_Types_Summary"), + annotationtypeTableSummary, annotationtypeTableHeader, + packageSummaryContentTree); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PropertyBuilder.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,228 @@ +/* + * Copyright (c) 2003, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.doclets.internal.toolkit.builders; + +import java.util.*; + +import com.sun.tools.doclets.internal.toolkit.util.*; +import com.sun.tools.doclets.internal.toolkit.*; +import com.sun.javadoc.*; + +/** + * Builds documentation for a property. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice.</b> + * + * @author Jamie Ho + * @author Bhavesh Patel (Modified) + * @since 1.7 + */ +public class PropertyBuilder extends AbstractMemberBuilder { + + /** + * The class whose properties are being documented. + */ + private final ClassDoc classDoc; + + /** + * The visible properties for the given class. + */ + private final VisibleMemberMap visibleMemberMap; + + /** + * The writer to output the property documentation. + */ + private final PropertyWriter writer; + + /** + * The list of properties being documented. + */ + private final List<ProgramElementDoc> properties; + + /** + * The index of the current property that is being documented at this point + * in time. + */ + private int currentPropertyIndex; + + /** + * Construct a new PropertyBuilder. + * + * @param context the build context. + * @param classDoc the class whoses members are being documented. + * @param writer the doclet specific writer. + */ + private PropertyBuilder(Context context, + ClassDoc classDoc, + PropertyWriter writer) { + super(context); + this.classDoc = classDoc; + this.writer = writer; + visibleMemberMap = + new VisibleMemberMap( + classDoc, + VisibleMemberMap.PROPERTIES, + configuration); + properties = + new ArrayList<ProgramElementDoc>(visibleMemberMap.getMembersFor(classDoc)); + if (configuration.getMemberComparator() != null) { + Collections.sort(properties, configuration.getMemberComparator()); + } + } + + /** + * Construct a new PropertyBuilder. + * + * @param context the build context. + * @param classDoc the class whoses members are being documented. + * @param writer the doclet specific writer. + */ + public static PropertyBuilder getInstance(Context context, + ClassDoc classDoc, + PropertyWriter writer) { + return new PropertyBuilder(context, classDoc, writer); + } + + /** + * {@inheritDoc} + */ + public String getName() { + return "PropertyDetails"; + } + + /** + * Returns a list of properties that will be documented for the given class. + * This information can be used for doclet specific documentation + * generation. + * + * @param classDoc the {@link ClassDoc} we want to check. + * @return a list of properties that will be documented. + */ + public List<ProgramElementDoc> members(ClassDoc classDoc) { + return visibleMemberMap.getMembersFor(classDoc); + } + + /** + * Returns the visible member map for the properties of this class. + * + * @return the visible member map for the properties of this class. + */ + public VisibleMemberMap getVisibleMemberMap() { + return visibleMemberMap; + } + + /** + * summaryOrder.size() + */ + public boolean hasMembersToDocument() { + return properties.size() > 0; + } + + /** + * Build the property documentation. + * + * @param node the XML element that specifies which components to document + * @param memberDetailsTree the content tree to which the documentation will be added + */ + public void buildPropertyDoc(XMLNode node, Content memberDetailsTree) { + if (writer == null) { + return; + } + int size = properties.size(); + if (size > 0) { + Content propertyDetailsTree = writer.getPropertyDetailsTreeHeader( + classDoc, memberDetailsTree); + for (currentPropertyIndex = 0; currentPropertyIndex < size; + currentPropertyIndex++) { + Content propertyDocTree = writer.getPropertyDocTreeHeader( + (MethodDoc) properties.get(currentPropertyIndex), + propertyDetailsTree); + buildChildren(node, propertyDocTree); + propertyDetailsTree.addContent(writer.getPropertyDoc( + propertyDocTree, (currentPropertyIndex == size - 1))); + } + memberDetailsTree.addContent( + writer.getPropertyDetails(propertyDetailsTree)); + } + } + + /** + * Build the signature. + * + * @param node the XML element that specifies which components to document + * @param propertyDocTree the content tree to which the documentation will be added + */ + public void buildSignature(XMLNode node, Content propertyDocTree) { + propertyDocTree.addContent( + writer.getSignature((MethodDoc) properties.get(currentPropertyIndex))); + } + + /** + * Build the deprecation information. + * + * @param node the XML element that specifies which components to document + * @param propertyDocTree the content tree to which the documentation will be added + */ + public void buildDeprecationInfo(XMLNode node, Content propertyDocTree) { + writer.addDeprecated( + (MethodDoc) properties.get(currentPropertyIndex), propertyDocTree); + } + + /** + * Build the comments for the property. Do nothing if + * {@link Configuration#nocomment} is set to true. + * + * @param node the XML element that specifies which components to document + * @param propertyDocTree the content tree to which the documentation will be added + */ + public void buildPropertyComments(XMLNode node, Content propertyDocTree) { + if (!configuration.nocomment) { + writer.addComments((MethodDoc) properties.get(currentPropertyIndex), propertyDocTree); + } + } + + /** + * Build the tag information. + * + * @param node the XML element that specifies which components to document + * @param propertyDocTree the content tree to which the documentation will be added + */ + public void buildTagInfo(XMLNode node, Content propertyDocTree) { + writer.addTags((MethodDoc) properties.get(currentPropertyIndex), propertyDocTree); + } + + /** + * Return the property writer for this builder. + * + * @return the property writer for this builder. + */ + public PropertyWriter getWriter() { + return writer; + } +}
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml Tue May 07 17:14:17 2013 -0700 @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='utf-8'?> <!-- - Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2003, 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 @@ -28,6 +28,21 @@ <Doclet> + <ProfileDoc> + <Content> + <Summary> + <PackageSummary> + <InterfaceSummary/> + <ClassSummary/> + <EnumSummary/> + <ExceptionSummary/> + <ErrorSummary/> + <AnnotationTypeSummary/> + </PackageSummary> + </Summary> + </Content> + </ProfileDoc> + <PackageDoc> <Content> <Summary> @@ -92,6 +107,7 @@ <ClassTagInfo/> </ClassInfo> <MemberSummary> + <PropertiesSummary/> <NestedClassesSummary/> <EnumConstantsSummary/> <FieldsSummary/> @@ -107,6 +123,13 @@ <TagInfo/> </EnumConstant> </EnumConstantsDetails> + <PropertyDetails> + <PropertyDoc> + <Signature/> + <PropertyComments/> + <TagInfo/> + </PropertyDoc> + </PropertyDetails> <FieldDetails> <FieldDoc> <Signature/>
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties Tue May 07 17:14:17 2013 -0700 @@ -31,6 +31,7 @@ doclet.Building_Index_For_All_Classes=Building index for all classes... doclet.sourcetab_warning=The argument for -sourcetab must be an integer greater than 0. doclet.Packages=Packages +doclet.Profiles=Profiles doclet.Other_Packages=Other Packages doclet.Notice_taglet_registered=Registered Taglet {0} ... doclet.Notice_taglet_unseen=Note: Custom tags that were not seen: {0} @@ -39,6 +40,12 @@ doclet.Error_taglet_not_registered=Error - Exception {0} thrown while trying to register Taglet {1}... doclet.Error_invalid_custom_tag_argument=Error - {0} is an invalid argument to the -tag option... doclet.Author=Author: +doclet.DefaultValue=Default value: +doclet.PropertyDescription=Property description: +doclet.PropertyGetter=Gets the value of the property +doclet.PropertySetter=Sets the value of the property +doclet.PropertyGetterWithName=Gets the value of the property {0}. +doclet.PropertySetterWithName=Sets the value of the property {0}. doclet.Default=Default: doclet.Parameters=Parameters: doclet.TypeParameters=Type Parameters: @@ -60,7 +67,9 @@ doclet.noInheritedDoc=@inheritDoc used but {0} does not override or implement any method. doclet.malformed_html_link_tag=<a> tag is malformed:\n"{0}" doclet.tag_misuse=Tag {0} cannot be used in {1} documentation. It can only be used in the following types of documentation: {2}. +doclet.javafx_tag_misuse=Tags @propertyGetter, @propertySetter and @propertyDescription can only be used in JavaFX properties getters and setters. doclet.Package_Summary=Package Summary +doclet.Profile_Summary=Profile Summary doclet.Interface_Summary=Interface Summary doclet.Annotation_Types_Summary=Annotation Types Summary doclet.Enum_Summary=Enum Summary @@ -71,6 +80,7 @@ doclet.Annotation_Type_Optional_Member_Summary=Optional Element Summary doclet.Annotation_Type_Required_Member_Summary=Required Element Summary doclet.Field_Summary=Field Summary +doclet.Property_Summary=Property Summary doclet.Enum_Constant_Summary=Enum Constant Summary doclet.Constructor_Summary=Constructor Summary doclet.Method_Summary=Method Summary @@ -82,6 +92,7 @@ doclet.Classes=Classes doclet.Packages=Packages doclet.packages=packages +doclet.profiles=profiles doclet.All_Classes=All Classes doclet.All_Superinterfaces=All Superinterfaces: doclet.All_Implemented_Interfaces=All Implemented Interfaces: @@ -112,10 +123,13 @@ doclet.Methods_Inherited_From_Interface=Methods inherited from interface doclet.Fields_Inherited_From_Class=Fields inherited from class doclet.Fields_Inherited_From_Interface=Fields inherited from interface +doclet.Properties_Inherited_From_Class=Properties inherited from class +doclet.Properties_Inherited_From_Interface=Properties inherited from interface doclet.Annotation_Type_Member_Detail=Element Detail doclet.Enum_Constant_Detail=Enum Constant Detail doclet.Constants_Summary=Constant Field Values doclet.Field_Detail=Field Detail +doclet.Property_Detail=Property Detail doclet.Method_Detail=Method Detail doclet.Constructor_Detail=Constructor Detail doclet.Deprecated=Deprecated. @@ -129,6 +143,8 @@ doclet.Member_Table_Summary={0} table, listing {1}, and an explanation doclet.fields=fields doclet.Fields=Fields +doclet.properties=properties +doclet.Properties=Properties doclet.constructors=constructors doclet.Constructors=Constructors doclet.methods=methods @@ -146,6 +162,7 @@ doclet.Modifier=Modifier doclet.Type=Type doclet.Field=Field +doclet.Property=Property doclet.Constructor=Constructor doclet.Method=Method doclet.Annotation_Type_Optional_Member=Optional Element
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties Tue May 07 17:14:17 2013 -0700 @@ -11,6 +11,8 @@ doclet.Class_0_extends_implements_serializable=Class {0} extends {1} implements Serializable doclet.Option_conflict=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u304C{1}\u3068\u77DB\u76FE\u3057\u307E\u3059 doclet.Option_reuse=\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u518D\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0} +doclet.Option_doclint_no_qualifiers=\u30A2\u30AF\u30BB\u30B9\u4FEE\u98FE\u5B50\u306F-Xdoclint\u306E\u5F15\u6570\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093 +doclet.Option_doclint_invalid_arg=-Xdoclint\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u304C\u7121\u52B9\u3067\u3059 doclet.exception_encountered= {0}\u3092\u691C\u51FA\n\t\u30D5\u30A1\u30A4\u30EB\u306E\u4F5C\u6210\u4E2D: {1} doclet.perform_copy_exception_encountered= \u30B3\u30D4\u30FC\u5B9F\u884C\u4E2D\u306B{0}\u3092\n\u691C\u51FA\u3057\u307E\u3057\u305F\u3002 doclet.File_not_found=\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0} @@ -19,10 +21,8 @@ doclet.Copying_File_0_To_File_1=\u30D5\u30A1\u30A4\u30EB{0}\u3092\u30D5\u30A1\u30A4\u30EB{1}\u306B\u30B3\u30D4\u30FC\u4E2D... doclet.No_Public_Classes_To_Document=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3059\u308Bpublic\u307E\u305F\u306Fprotected\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002 doclet.Unable_to_create_directory_0=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093 -doclet.destination_directory_not_found_0=\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093 doclet.destination_directory_not_directory_0=\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u306F\u3042\u308A\u307E\u305B\u3093 doclet.destination_directory_not_writable_0=\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u306F\u66F8\u8FBC\u307F\u53EF\u80FD\u3067\u306F\u3042\u308A\u307E\u305B\u3093 -doclet.Error_creating_tmp_file=\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3092\u4F7F\u7528\u3057\u3066\u4E00\u6642\u30D5\u30A1\u30A4\u30EB\u3092\u4F5C\u6210\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002 doclet.Encoding_not_supported=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0{0}\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093 doclet.Building_Tree=\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u3068\u30AF\u30E9\u30B9\u306E\u968E\u5C64\u30C4\u30EA\u30FC\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059... doclet.Building_Index=\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u3068\u30AF\u30E9\u30B9\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059... @@ -72,7 +72,6 @@ doclet.Enum_Constant_Summary=\u5217\u6319\u578B\u5B9A\u6570\u306E\u6982\u8981 doclet.Constructor_Summary=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u6982\u8981 doclet.Method_Summary=\u30E1\u30BD\u30C3\u30C9\u306E\u6982\u8981 -doclet.Factory_Method_Summary=static\u30D5\u30A1\u30AF\u30C8\u30EA\u30FB\u30E1\u30BD\u30C3\u30C9\u306E\u6982\u8981 doclet.Interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 doclet.Enums=\u5217\u6319\u578B doclet.AnnotationTypes=\u6CE8\u91C8\u578B @@ -86,15 +85,14 @@ doclet.All_Implemented_Interfaces=\u3059\u3079\u3066\u306E\u5B9F\u88C5\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9: doclet.All_classes_and_interfaces=\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9(\u975Estatic\u306E\u30CD\u30B9\u30C8\u3055\u308C\u305F\u578B\u3092\u9664\u304F) doclet.Package_class_and_interface_descriptions=\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E -doclet.Members=\u30E1\u30F3\u30D0\u30FC doclet.Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 doclet.Class=\u30AF\u30E9\u30B9 doclet.AnnotationType=\u6CE8\u91C8\u578B doclet.annotationtype=\u6CE8\u91C8\u578B doclet.annotationtypes=\u6CE8\u91C8\u578B doclet.Enum=\u5217\u6319\u578B -doclet.enum=\u5217\u6319 -doclet.enums=\u5217\u6319 +doclet.enum=\u5217\u6319\u578B +doclet.enums=\u5217\u6319\u578B doclet.interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 doclet.interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 doclet.class=\u30AF\u30E9\u30B9 @@ -105,26 +103,20 @@ doclet.Exception=\u4F8B\u5916 doclet.exception=\u4F8B\u5916 doclet.exceptions=\u4F8B\u5916 -doclet.extended_by=\u4E0A\u4F4D\u3092\u62E1\u5F35 -doclet.extends=extends doclet.Package_private=(package private) -doclet.implements=implementsdoclet.Same_package_name_used=\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u5F62\u5F0F\u304C2\u56DE\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0} doclet.Nested_Classes_Interfaces_Inherited_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9/\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 doclet.Nested_Classes_Interface_Inherited_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9/\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 doclet.Methods_Inherited_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9 doclet.Methods_Inherited_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9 doclet.Fields_Inherited_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30EB\u30C9 doclet.Fields_Inherited_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30EB\u30C9 -doclet.Serializable=\u76F4\u5217\u5316\u53EF\u80FD -doclet.Externalizable=\u5916\u90E8\u5316\u53EF\u80FD doclet.Annotation_Type_Member_Detail=\u8981\u7D20\u306E\u8A73\u7D30 doclet.Enum_Constant_Detail=\u5217\u6319\u578B\u5B9A\u6570\u306E\u8A73\u7D30 doclet.Constants_Summary=\u5B9A\u6570\u30D5\u30A3\u30FC\u30EB\u30C9\u5024 doclet.Field_Detail=\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u8A73\u7D30 doclet.Method_Detail=\u30E1\u30BD\u30C3\u30C9\u306E\u8A73\u7D30 doclet.Constructor_Detail=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u8A73\u7D30 -doclet.Deprecated=\u63A8\u5968\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 -doclet.Deprecated_class=\u3053\u306E\u30AF\u30E9\u30B9\u306F\u63A8\u5968\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 +doclet.Deprecated=\u975E\u63A8\u5968\u3067\u3059\u3002 doclet.Groupname_already_used=-group\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u304A\u3044\u3066\u3001\u3059\u3067\u306B\u30B0\u30EB\u30FC\u30D7\u540D\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0} doclet.value_tag_invalid_reference={0}(@value\u30BF\u30B0\u306B\u3088\u308A\u53C2\u7167\u3055\u308C\u3066\u3044\u308B)\u306F\u4E0D\u660E\u306A\u53C2\u7167\u3067\u3059\u3002 doclet.value_tag_invalid_constant=@value\u30BF\u30B0({0}\u3092\u53C2\u7167\u3057\u3066\u3044\u308B)\u306F\u5B9A\u6570\u5185\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002 @@ -144,7 +136,7 @@ doclet.annotation_type_required_members=\u5FC5\u9808\u8981\u7D20 doclet.Annotation_Type_Required_Members=\u5FC5\u9808\u8981\u7D20 doclet.enum_constants=\u5217\u6319\u578B\u5B9A\u6570 -doclet.Enum_Constants=\u5217\u6319\u5B9A\u6570 +doclet.Enum_Constants=\u5217\u6319\u578B\u5B9A\u6570 doclet.nested_classes=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9 doclet.Nested_Classes=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9 doclet.subclasses=\u30B5\u30D6\u30AF\u30E9\u30B9 @@ -167,4 +159,4 @@ #Documentation for Enums doclet.enum_values_doc=\n\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u914D\u5217\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u8FD4\u3057\u307E\u3059\u3002\n\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u6B21\u306E\u3088\u3046\u306B\u3057\u3066\u5B9A\u6570\u3092\u53CD\u5FA9\u3059\u308B\u305F\u3081\u306B\n\u4F7F\u7528\u3067\u304D\u307E\u3059:\n<pre>\nfor({0} c: {0}.values())\n System.out.println(c);\n</pre>\n@return\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\n\u542B\u3080\u914D\u5217 -doclet.enum_valueof_doc=\n\u6307\u5B9A\u3057\u305F\u540D\u524D\u3092\u6301\u3064\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u8FD4\u3057\u307E\u3059\u3002\n\u6587\u5B57\u5217\u306F\u3001\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u5BA3\u8A00\u3059\u308B\u306E\u306B\u4F7F\u7528\u3057\u305F\u8B58\u5225\u5B50\u3068\u53B3\u5BC6\u306B\n\u4E00\u81F4\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n(\u4F59\u5206\u306A\u7A7A\u767D\u6587\u5B57\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002)\n\n@param name\u8FD4\u3055\u308C\u308B\u5217\u6319\u578B\u5B9A\u6570\u306E\u540D\u524D\n@return\u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u3092\u6301\u3064\u5217\u6319\u578B\u5B9A\u6570\n@throws IllegalArgumentException\u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u3092\u6301\u3064\u5B9A\u6570\u3092\n\u3053\u306E\u5217\u6319\u578B\u304C\u6301\u3063\u3066\u3044\u306A\u3044\u5834\u5408\n@throws NullPointerException\u5F15\u6570\u304Cnull\u306E\u5834\u5408 +doclet.enum_valueof_doc=\n\u6307\u5B9A\u3057\u305F\u540D\u524D\u3092\u6301\u3064\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u8FD4\u3057\u307E\u3059\u3002\n\u6587\u5B57\u5217\u306F\u3001\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u5BA3\u8A00\u3059\u308B\u306E\u306B\u4F7F\u7528\u3057\u305F\u8B58\u5225\u5B50\u3068<i>\u6B63\u78BA\u306B</i>\n\u4E00\u81F4\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n(\u4F59\u5206\u306A\u7A7A\u767D\u6587\u5B57\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002)\n\n@param name\u8FD4\u3055\u308C\u308B\u5217\u6319\u578B\u5B9A\u6570\u306E\u540D\u524D\n@return\u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u3092\u6301\u3064\u5217\u6319\u578B\u5B9A\u6570\n@throws IllegalArgumentException\u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u3092\u6301\u3064\u5B9A\u6570\u3092\n\u3053\u306E\u5217\u6319\u578B\u304C\u6301\u3063\u3066\u3044\u306A\u3044\u5834\u5408\n@throws NullPointerException\u5F15\u6570\u304Cnull\u306E\u5834\u5408
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties Tue May 07 17:14:17 2013 -0700 @@ -11,6 +11,8 @@ doclet.Class_0_extends_implements_serializable=\u7C7B{0}\u6269\u5C55{1}\u5B9E\u73B0\u53EF\u5E8F\u5217\u5316 doclet.Option_conflict=\u9009\u9879{0}\u4E0E{1}\u51B2\u7A81 doclet.Option_reuse=\u91CD\u590D\u4F7F\u7528\u7684\u9009\u9879: {0} +doclet.Option_doclint_no_qualifiers=-Xdoclint \u53C2\u6570\u4E0D\u5141\u8BB8\u4F7F\u7528\u8BBF\u95EE\u9650\u5B9A\u7B26 +doclet.Option_doclint_invalid_arg=-Xdoclint \u9009\u9879\u7684\u53C2\u6570\u65E0\u6548 doclet.exception_encountered= \u5C1D\u8BD5\u521B\u5EFA\u6587\u4EF6{1}\u65F6 \n\t\u9047\u5230{0} doclet.perform_copy_exception_encountered= \u6267\u884C\u590D\u5236\u65F6 \n\u9047\u5230{0}\u3002 doclet.File_not_found=\u627E\u4E0D\u5230\u6587\u4EF6: {0} @@ -19,10 +21,8 @@ doclet.Copying_File_0_To_File_1=\u6B63\u5728\u5C06\u6587\u4EF6{0}\u590D\u5236\u5230\u6587\u4EF6{1}... doclet.No_Public_Classes_To_Document=\u627E\u4E0D\u5230\u53EF\u4EE5\u6587\u6863\u5316\u7684\u516C\u5171\u6216\u53D7\u4FDD\u62A4\u7684\u7C7B\u3002 doclet.Unable_to_create_directory_0=\u65E0\u6CD5\u521B\u5EFA\u76EE\u5F55 {0} -doclet.destination_directory_not_found_0=\u627E\u4E0D\u5230\u76EE\u6807\u76EE\u5F55 {0} doclet.destination_directory_not_directory_0=\u76EE\u6807\u76EE\u5F55\u4E0D\u662F\u76EE\u5F55 {0} doclet.destination_directory_not_writable_0=\u76EE\u6807\u76EE\u5F55\u4E0D\u53EF\u5199\u5165 {0} -doclet.Error_creating_tmp_file=\u4F7F\u7528\u9ED8\u8BA4\u5E73\u53F0\u7F16\u7801\u521B\u5EFA\u4E34\u65F6\u6587\u4EF6\u65F6\u51FA\u9519\u3002 doclet.Encoding_not_supported=\u4E0D\u652F\u6301\u7F16\u7801: {0} doclet.Building_Tree=\u6B63\u5728\u6784\u5EFA\u6240\u6709\u7A0B\u5E8F\u5305\u548C\u7C7B\u7684\u6811... doclet.Building_Index=\u6B63\u5728\u6784\u5EFA\u6240\u6709\u7A0B\u5E8F\u5305\u548C\u7C7B\u7684\u7D22\u5F15... @@ -72,7 +72,6 @@ doclet.Enum_Constant_Summary=\u679A\u4E3E\u5E38\u91CF\u6982\u8981 doclet.Constructor_Summary=\u6784\u9020\u5668\u6982\u8981 doclet.Method_Summary=\u65B9\u6CD5\u6982\u8981 -doclet.Factory_Method_Summary=\u9759\u6001\u5DE5\u5382\u65B9\u6CD5\u6982\u8981 doclet.Interfaces=\u63A5\u53E3 doclet.Enums=\u679A\u4E3E doclet.AnnotationTypes=\u6CE8\u91CA\u7C7B\u578B @@ -86,7 +85,6 @@ doclet.All_Implemented_Interfaces=\u6240\u6709\u5DF2\u5B9E\u73B0\u7684\u63A5\u53E3: doclet.All_classes_and_interfaces=\u6240\u6709\u7C7B\u548C\u63A5\u53E3 (\u9664\u4E86\u975E\u9759\u6001\u5D4C\u5957\u7C7B\u578B) doclet.Package_class_and_interface_descriptions=\u7A0B\u5E8F\u5305, \u7C7B\u548C\u63A5\u53E3\u8BF4\u660E -doclet.Members=\u6210\u5458 doclet.Interface=\u63A5\u53E3 doclet.Class=\u7C7B doclet.AnnotationType=\u6CE8\u91CA\u7C7B\u578B @@ -105,18 +103,13 @@ doclet.Exception=\u5F02\u5E38\u9519\u8BEF doclet.exception=\u5F02\u5E38\u9519\u8BEF doclet.exceptions=\u5F02\u5E38\u9519\u8BEF -doclet.extended_by=\u6269\u5C55\u8005 -doclet.extends=\u6269\u5C55 doclet.Package_private=(\u4E13\u7528\u7A0B\u5E8F\u5305) -doclet.implements=implementsdoclet.Same_package_name_used=\u7A0B\u5E8F\u5305\u540D\u79F0\u5F62\u5F0F\u4F7F\u7528\u4E86\u4E24\u6B21: {0} doclet.Nested_Classes_Interfaces_Inherited_From_Class=\u4ECE\u7C7B\u7EE7\u627F\u7684\u5D4C\u5957\u7C7B/\u63A5\u53E3 doclet.Nested_Classes_Interface_Inherited_From_Interface=\u4ECE\u63A5\u53E3\u7EE7\u627F\u7684\u5D4C\u5957\u7C7B/\u63A5\u53E3 doclet.Methods_Inherited_From_Class=\u4ECE\u7C7B\u7EE7\u627F\u7684\u65B9\u6CD5 doclet.Methods_Inherited_From_Interface=\u4ECE\u63A5\u53E3\u7EE7\u627F\u7684\u65B9\u6CD5 doclet.Fields_Inherited_From_Class=\u4ECE\u7C7B\u7EE7\u627F\u7684\u5B57\u6BB5 doclet.Fields_Inherited_From_Interface=\u4ECE\u63A5\u53E3\u7EE7\u627F\u7684\u5B57\u6BB5 -doclet.Serializable=\u53EF\u5E8F\u5217\u5316 -doclet.Externalizable=\u53EF\u5916\u90E8\u5316 doclet.Annotation_Type_Member_Detail=\u5143\u7D20\u8BE6\u7EC6\u8D44\u6599 doclet.Enum_Constant_Detail=\u679A\u4E3E\u5E38\u91CF\u8BE6\u7EC6\u8D44\u6599 doclet.Constants_Summary=\u5E38\u91CF\u5B57\u6BB5\u503C @@ -124,7 +117,6 @@ doclet.Method_Detail=\u65B9\u6CD5\u8BE6\u7EC6\u8D44\u6599 doclet.Constructor_Detail=\u6784\u9020\u5668\u8BE6\u7EC6\u8D44\u6599 doclet.Deprecated=\u5DF2\u8FC7\u65F6\u3002 -doclet.Deprecated_class=\u8BE5\u7C7B\u5DF2\u8FC7\u65F6\u3002 doclet.Groupname_already_used=\u5728 -group \u9009\u9879\u4E2D, groupname \u5DF2\u4F7F\u7528: {0} doclet.value_tag_invalid_reference={0} (\u7531 @value \u6807\u8BB0\u5F15\u7528) \u4E3A\u672A\u77E5\u5F15\u7528\u3002 doclet.value_tag_invalid_constant=@value \u6807\u8BB0 (\u5F15\u7528{0}) \u53EA\u80FD\u5728\u5E38\u91CF\u4E2D\u4F7F\u7528\u3002 @@ -167,4 +159,4 @@ #Documentation for Enums doclet.enum_values_doc=\n\u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F, \u8FD4\u56DE\n\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4\u3002\u8BE5\u65B9\u6CD5\u53EF\u7528\u4E8E\u8FED\u4EE3\n\u5E38\u91CF, \u5982\u4E0B\u6240\u793A:\n<pre>\nfor ({0} c : {0}.values())\n System.out.println(c);\n</pre>\n@\u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F, \u8FD4\u56DE\n\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4 -doclet.enum_valueof_doc=\n\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u3002\n\u5B57\u7B26\u4E32\u5FC5\u987B\u4E0E\u7528\u4E8E\u58F0\u660E\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u7684\n\u6807\u8BC6\u7B26<i>\u5B8C\u5168</i>\u5339\u914D\u3002(\u4E0D\u5141\u8BB8\u6709\u591A\u4F59\n\u7684\u7A7A\u683C\u5B57\u7B26\u3002)\n\n@param name \u8981\u8FD4\u56DE\u7684\u679A\u4E3E\u5E38\u91CF\u7684\u540D\u79F0\u3002\n@return \u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u679A\u4E3E\u5E38\u91CF\n@throws \u5982\u679C\u8BE5\u679A\u4E3E\u7C7B\u578B\u6CA1\u6709\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u5E38\u91CF, \n\u5219\u629B\u51FA IllegalArgumentException\n@throws \u5982\u679C\u53C2\u6570\u4E3A\u7A7A\u503C, \u5219\u629B\u51FA NullPointerException +doclet.enum_valueof_doc=\n\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u3002\n\u5B57\u7B26\u4E32\u5FC5\u987B\u4E0E\u7528\u4E8E\u58F0\u660E\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u7684\n\u6807\u8BC6\u7B26<i>\u5B8C\u5168</i>\u5339\u914D\u3002(\u4E0D\u5141\u8BB8\u6709\u591A\u4F59\n\u7684\u7A7A\u683C\u5B57\u7B26\u3002)\n\n@param name \u8981\u8FD4\u56DE\u7684\u679A\u4E3E\u5E38\u91CF\u7684\u540D\u79F0\u3002\n@\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u679A\u4E3E\u5E38\u91CF\n@\u5982\u679C\u8BE5\u679A\u4E3E\u7C7B\u578B\u6CA1\u6709\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u5E38\u91CF, \n\u5219\u629B\u51FA IllegalArgumentException\n@\u5982\u679C\u53C2\u6570\u4E3A\u7A7A\u503C, \u5219\u629B\u51FA NullPointerException
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Tue May 07 17:14:17 2013 -0700 @@ -191,6 +191,9 @@ margin:10px; position:relative; } +.indexHeader span{ + margin-right:15px; +} .indexHeader h1 { font-size:1.3em; }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BasePropertyTaglet.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,117 @@ +/* + * Copyright (c) 2001, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.doclets.internal.toolkit.taglets; + +import com.sun.javadoc.Tag; + +/** + * An abstract class that implements the {@link Taglet} interface and + * serves as a base for JavaFX property getter and setter taglets. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice.</b> + * + */ +public abstract class BasePropertyTaglet extends BaseTaglet { + + public BasePropertyTaglet() { + } + + /** + * This method returns the text to be put in the resulting javadoc before + * the property name. + * + * @param tagletWriter the taglet writer for output + * @return the string to be put in the resulting javadoc. + */ + abstract String getText(TagletWriter tagletWriter); + + /** + * Given the <code>Tag</code> representation of this custom + * tag, return its string representation, which is output + * to the generated page. + * @param tag the <code>Tag</code> representation of this custom tag. + * @param tagletWriter the taglet writer for output. + * @return the TagletOutput representation of this <code>Tag</code>. + */ + public TagletOutput getTagletOutput(Tag tag, TagletWriter tagletWriter) { + TagletOutput tagletOutput = tagletWriter.getOutputInstance(); + StringBuilder output = new StringBuilder("<P>"); + output.append(getText(tagletWriter)); + output.append(" <CODE>"); + output.append(tag.text()); + output.append("</CODE>.</P>"); + tagletOutput.setOutput(output.toString()); + return tagletOutput; + } + + /** + * Will return false because this tag may + * only appear in Methods. + * @return false since this is not a method. + */ + public boolean inConstructor() { + return false; + } + + /** + * Will return false because this tag may + * only appear in Methods. + * @return false since this is not a method. + */ + public boolean inOverview() { + return false; + } + + /** + * Will return false because this tag may + * only appear in Methods. + * @return false since this is not a method. + */ + public boolean inPackage() { + return false; + } + + /** + * Will return false because this tag may + * only appear in Methods. + * @return false since this is not a method. + */ + public boolean inType() { + return false; + } + + /** + * Will return false because this tag is not inline. + * @return false since this is not an inline tag. + */ + public boolean isInlineTag() { + return false; + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ExpertTaglet.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2003, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.doclets.internal.toolkit.taglets; + +import java.util.Map; + +import com.sun.tools.doclets.Taglet; +import com.sun.javadoc.Tag; + +/** + * An inline Taglet used to denote information for experts. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice.</b> + * + */ +public class ExpertTaglet implements Taglet { + + private static final String NAME = "expert"; + private static final String START_TAG = "<sub id=\"expert\">"; + private static final String END_TAG = "</sub>"; + + /** + * {@inheritDoc} + */ + public boolean inField() { + return true; + } + + public boolean inConstructor() { + return true; + } + + public boolean inMethod() { + return true; + } + + public boolean inOverview() { + return true; + } + + public boolean inPackage() { + return true; + } + + public boolean inType() { + return true; + } + + public boolean isInlineTag() { + return false; + } + + public String getName() { + return NAME; + } + + public static void register(Map<String, Taglet> map) { + map.remove(NAME); + map.put(NAME, new ExpertTaglet()); + } + + public String toString(Tag tag) { + return (tag.text() == null || tag.text().length() == 0) ? null : + START_TAG + LiteralTaglet.textToString(tag.text()) + END_TAG; + } + + + public String toString(Tag[] tags) { + if (tags == null || tags.length == 0) return null; + + StringBuffer sb = new StringBuffer(START_TAG); + + for(Tag t:tags) { + sb.append(LiteralTaglet.textToString(t.text())); + } + sb.append(END_TAG); + return sb.toString(); + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertyGetterTaglet.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2001, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.doclets.internal.toolkit.taglets; + +/** + * A taglet that adds the initial line of documentation to the JavaFX + * property getters. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice.</b> + */ +public class PropertyGetterTaglet extends BasePropertyTaglet { + + /** + * Construct a new PropertyGetterTaglet. + */ + public PropertyGetterTaglet () { + name = "propertyGetter"; + } + + @Override + String getText(TagletWriter tagletWriter) { + return tagletWriter.configuration().getText("doclet.PropertyGetter"); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertySetterTaglet.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2001, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.doclets.internal.toolkit.taglets; + +/** + * A taglet that adds the initial line of documentation to the JavaFX + * property setters. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice.</b> + */ +public class PropertySetterTaglet extends BasePropertyTaglet { + + /** + * Construct a new PropertyGetterTaglet. + */ + public PropertySetterTaglet () { + name = "propertySetter"; + } + + @Override + String getText(TagletWriter tagletWriter) { + return tagletWriter.configuration().getText("doclet.PropertySetter"); + } +}
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 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 @@ -157,6 +157,13 @@ private boolean showauthor; /** + * True if we want to use JavaFX-related tags (@propertyGetter, + * @propertySetter, @propertyDescription, @defaultValue, @treatAsPrivate, + * @expert). + */ + private boolean javafx; + + /** * Construct a new <code>TagletManager</code>. * @param nosince true if we do not want to use @since tags. * @param showversion true if we want to use @version tags. @@ -164,7 +171,8 @@ * @param message the message retriever to print warnings. */ public TagletManager(boolean nosince, boolean showversion, - boolean showauthor, MessageRetriever message) { + boolean showauthor, boolean javafx, + MessageRetriever message) { overridenStandardTags = new HashSet<String>(); potentiallyConflictingTags = new HashSet<String>(); standardTags = new HashSet<String>(); @@ -174,6 +182,7 @@ this.nosince = nosince; this.showversion = showversion; this.showauthor = showauthor; + this.javafx = javafx; this.message = message; initStandardTags(); initStandardTagsLowercase(); @@ -677,6 +686,33 @@ standardTags.add("Text"); standardTags.add("literal"); standardTags.add("code"); + + if (javafx) { + initJavaFXTags(); + } + } + + /** + * Initialize JavaFX-related tags. + */ + private void initJavaFXTags() { + Taglet temp; + customTags.put((temp = new PropertyGetterTaglet()).getName(), temp); + customTags.put((temp = new PropertySetterTaglet()).getName(), temp); + customTags.put((temp = new SimpleTaglet("propertyDescription", message.getText("doclet.PropertyDescription"), + SimpleTaglet.FIELD + SimpleTaglet.METHOD)).getName(), temp); + customTags.put((temp = new SimpleTaglet("defaultValue", message.getText("doclet.DefaultValue"), + SimpleTaglet.FIELD + SimpleTaglet.METHOD)).getName(), temp); + customTags.put((temp = new SimpleTaglet("treatAsPrivate", null, + SimpleTaglet.FIELD + SimpleTaglet.METHOD + SimpleTaglet.TYPE)).getName(), temp); + customTags.put((temp = new LegacyTaglet(new ExpertTaglet())).getName(), temp); + + standardTags.add("propertyGetter"); + standardTags.add("propertySetter"); + standardTags.add("propertyDescription"); + standardTags.add("defaultValue"); + standardTags.add("treatAsPrivate"); + standardTags.add("expert"); } /**
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -180,6 +180,7 @@ tagletManager.checkTags(doc, doc.inlineTags(), true); TagletOutput currentOutput = null; for (int i = 0; i < taglets.length; i++) { + currentOutput = null; if (doc instanceof ClassDoc && taglets[i] instanceof ParamTaglet) { //The type parameters are documented in a special section away //from the tag info, so skip here.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java Tue May 07 17:14:17 2013 -0700 @@ -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 @@ -132,6 +132,12 @@ Util.isDeprecated(classes[i].containingPackage()))) { continue; } + + if (configuration.javafx + && classes[i].tags("treatAsPrivate").length > 0) { + continue; + } + if (classes[i].isEnum()) { processType(classes[i], configuration, baseEnums, subEnums); } else if (classes[i].isClass()) {
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java Tue May 07 17:14:17 2013 -0700 @@ -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 @@ -87,6 +87,26 @@ /** The name of the file for the package frame. */ public static final DocPath PACKAGE_FRAME = DocPath.create("package-frame.html"); + /** The name of the file for the profile frame. */ + public static final DocPath profileFrame(String profileName) { + return DocPath.create(profileName + "-frame.html"); + } + + /** The name of the file for the profile package frame. */ + public static final DocPath profilePackageFrame(String profileName) { + return DocPath.create(profileName + "-package-frame.html"); + } + + /** The name of the file for the profile package summary. */ + public static final DocPath profilePackageSummary(String profileName) { + return DocPath.create(profileName + "-package-summary.html"); + } + + /** The name of the file for the profile summary. */ + public static final DocPath profileSummary(String profileName) { + return DocPath.create(profileName + "-summary.html"); + } + /** The name of the file for the package list. */ public static final DocPath PACKAGE_LIST = DocPath.create("package-list"); @@ -99,6 +119,9 @@ /** The name of the file for the package usage info. */ public static final DocPath PACKAGE_USE = DocPath.create("package-use.html"); + /** The name of the file for the overview frame. */ + public static final DocPath PROFILE_OVERVIEW_FRAME = DocPath.create("profile-overview-frame.html"); + /** The name of the directory in which resources are generated. * Also the name of the sub-package from which resources are read. */
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java Tue May 07 17:14:17 2013 -0700 @@ -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 @@ -63,6 +63,11 @@ */ private boolean classesOnly; + /** + * Indicates javafx mode. + */ + private boolean javafx; + // make ProgramElementDoc[] when new toArray is available protected final Object[] elements; @@ -115,6 +120,7 @@ } this.noDeprecated = noDeprecated; this.classesOnly = classesOnly; + this.javafx = configuration.javafx; buildIndexMap(configuration.root); Set<Character> set = indexmap.keySet(); elements = set.toArray(); @@ -209,6 +215,12 @@ * Should this doc element be added to the index map? */ protected boolean shouldAddToIndexMap(Doc element) { + if (javafx) { + if (element.tags("treatAsPrivate").length > 0) { + return false; + } + } + if (element instanceof PackageDoc) // Do not add to index map if -nodeprecated option is set and the // package is marked as deprecated.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 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 @@ -28,6 +28,7 @@ import java.util.*; import com.sun.javadoc.*; +import com.sun.tools.javac.jvm.Profile; import com.sun.tools.doclets.internal.toolkit.*; /** @@ -105,6 +106,20 @@ } /** + * Get the profile keywords. + * + * @param profile the profile being documented + */ + public String[] getMetaKeywords(Profile profile) { + if( configuration.keywords ) { + String profileName = profile.name; + return new String[] { profileName + " " + "profile" }; + } else { + return new String[] {}; + } + } + + /** * Get the overview keywords. */ public String[] getOverviewMetaKeywords(String title, String docTitle) {
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Tue May 07 17:14:17 2013 -0700 @@ -722,6 +722,56 @@ } /** + * A convenience method to get property name from the name of the + * getter or setter method. + * @param name name of the getter or setter method. + * @return the name of the property of the given setter of getter. + */ + public static String propertyNameFromMethodName(String name) { + String propertyName = null; + if (name.startsWith("get") || name.startsWith("set")) { + propertyName = name.substring(3); + } else if (name.startsWith("is")) { + propertyName = name.substring(2); + } + if ((propertyName == null) || propertyName.isEmpty()){ + return ""; + } + return propertyName.substring(0, 1).toLowerCase() + + propertyName.substring(1); + } + + /** + * In case of JavaFX mode on, filters out classes that are private, + * package private or having the @treatAsPrivate annotation. Those are not + * documented in JavaFX mode. + * + * @param classes array of classes to be filtered. + * @param javafx set to true if in JavaFX mode. + * @return list of filtered classes. + */ + public static ClassDoc[] filterOutPrivateClasses(final ClassDoc[] classes, + boolean javafx) { + if (!javafx) { + return classes; + } + final List<ClassDoc> filteredOutClasses = + new ArrayList<ClassDoc>(classes.length); + for (ClassDoc classDoc : classes) { + if (classDoc.isPrivate() || classDoc.isPackagePrivate()) { + continue; + } + Tag[] aspTags = classDoc.tags("treatAsPrivate"); + if (aspTags != null && aspTags.length > 0) { + continue; + } + filteredOutClasses.add(classDoc); + } + + return filteredOutClasses.toArray(new ClassDoc[0]); + } + + /** * Test whether the given FieldDoc is one of the declaration annotation ElementTypes * defined in Java 5. * Instead of testing for one of the new enum constants added in Java 8, test for
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -26,6 +26,7 @@ package com.sun.tools.doclets.internal.toolkit.util; import java.util.*; +import java.util.regex.Pattern; import com.sun.javadoc.*; import com.sun.tools.doclets.internal.toolkit.*; @@ -56,11 +57,12 @@ public static final int METHODS = 4; public static final int ANNOTATION_TYPE_MEMBER_OPTIONAL = 5; public static final int ANNOTATION_TYPE_MEMBER_REQUIRED = 6; + public static final int PROPERTIES = 7; /** * The total number of member types is {@value}. */ - public static final int NUM_MEMBER_TYPES = 7; + public static final int NUM_MEMBER_TYPES = 8; public static final String STARTLEVEL = "start"; @@ -93,23 +95,34 @@ private final int kind; /** - * Deprected members should be excluded or not? + * The configuration this VisibleMemberMap was created with. */ - private final boolean nodepr; + private final Configuration configuration; + + private static final Map<ClassDoc, ProgramElementDoc[]> propertiesCache = + new HashMap<ClassDoc, ProgramElementDoc[]>(); + private static final Map<ProgramElementDoc, ProgramElementDoc> classPropertiesMap = + new HashMap<ProgramElementDoc, ProgramElementDoc>(); + private static final Map<ProgramElementDoc, GetterSetter> getterSetterMap = + new HashMap<ProgramElementDoc, GetterSetter>(); /** * Construct a VisibleMemberMap of the given type for the given - * class. If nodepr is true, exclude the deprecated members from - * the map. + * class. * * @param classdoc the class whose members are being mapped. * @param kind the kind of member that is being mapped. - * @param nodepr if true, exclude the deprecated members from the map. + * @param configuration the configuration to use to construct this + * VisibleMemberMap. If the field configuration.nodeprecated is true the + * deprecated members are excluded from the map. If the field + * configuration.javafx is true the JavaFX features are used. */ - public VisibleMemberMap(ClassDoc classdoc, int kind, boolean nodepr) { + public VisibleMemberMap(ClassDoc classdoc, + int kind, + Configuration configuration) { this.classdoc = classdoc; - this.nodepr = nodepr; this.kind = kind; + this.configuration = configuration; new ClassMembers(classdoc, STARTLEVEL).build(); } @@ -124,6 +137,33 @@ } /** + * Returns the property field documentation belonging to the given member. + * @param ped the member for which the property documentation is needed. + * @return the property field documentation, null if there is none. + */ + public ProgramElementDoc getPropertyMemberDoc(ProgramElementDoc ped) { + return classPropertiesMap.get(ped); + } + + /** + * Returns the getter documentation belonging to the given property method. + * @param propertyMethod the method for which the getter is needed. + * @return the getter documentation, null if there is none. + */ + public ProgramElementDoc getGetterForProperty(ProgramElementDoc propertyMethod) { + return getterSetterMap.get(propertyMethod).getGetter(); + } + + /** + * Returns the setter documentation belonging to the given property method. + * @param propertyMethod the method for which the setter is needed. + * @return the setter documentation, null if there is none. + */ + public ProgramElementDoc getSetterForProperty(ProgramElementDoc propertyMethod) { + return getterSetterMap.get(propertyMethod).getSetter(); + } + + /** * Return the package private members inherited by the class. Only return * if parent is package private and not documented. * @@ -334,8 +374,9 @@ ProgramElementDoc pgmelem = cdmembers.get(i); if (!found(members, pgmelem) && memberIsVisible(pgmelem) && - !isOverridden(pgmelem, level)) { - incllist.add(pgmelem); + !isOverridden(pgmelem, level) && + !isTreatedAsPrivate(pgmelem)) { + incllist.add(pgmelem); } } if (incllist.size() > 0) { @@ -345,6 +386,16 @@ fillMemberLevelMap(getClassMembers(fromClass, false), level); } + private boolean isTreatedAsPrivate(ProgramElementDoc pgmelem) { + if (!configuration.javafx) { + return false; + } + + Tag[] aspTags = pgmelem.tags("@treatAsPrivate"); + boolean result = (aspTags != null) && (aspTags.length > 0); + return result; + } + /** * Is given doc item visible in given classdoc in terms fo inheritance? * The given doc item is visible in the given classdoc if it is public @@ -406,11 +457,16 @@ break; case METHODS: members = cd.methods(filter); + checkOnPropertiesTags((MethodDoc[])members); + break; + case PROPERTIES: + members = properties(cd, filter); break; default: members = new ProgramElementDoc[0]; } - if (nodepr) { + // Deprected members should be excluded or not? + if (configuration.nodeprecated) { return Util.excludeDeprecatedMembersAsList(members); } return Arrays.asList(members); @@ -472,6 +528,206 @@ } return false; } + + private ProgramElementDoc[] properties(final ClassDoc cd, final boolean filter) { + final MethodDoc[] allMethods = cd.methods(filter); + final FieldDoc[] allFields = cd.fields(false); + + if (propertiesCache.containsKey(cd)) { + return propertiesCache.get(cd); + } + + final List<MethodDoc> result = new ArrayList<MethodDoc>(); + + for (final MethodDoc propertyMethod : allMethods) { + + if (!isPropertyMethod(propertyMethod)) { + continue; + } + + final MethodDoc getter = getterForField(allMethods, propertyMethod); + final MethodDoc setter = setterForField(allMethods, propertyMethod); + final FieldDoc field = fieldForProperty(allFields, propertyMethod); + + addToPropertiesMap(setter, getter, propertyMethod, field); + getterSetterMap.put(propertyMethod, new GetterSetter(getter, setter)); + result.add(propertyMethod); + } + final ProgramElementDoc[] resultAray = + result.toArray(new ProgramElementDoc[result.size()]); + propertiesCache.put(cd, resultAray); + return resultAray; + } + + private void addToPropertiesMap(MethodDoc setter, + MethodDoc getter, + MethodDoc propertyMethod, + FieldDoc field) { + if ((field == null) + || (field.getRawCommentText() == null) + || field.getRawCommentText().length() == 0) { + addToPropertiesMap(setter, propertyMethod); + addToPropertiesMap(getter, propertyMethod); + addToPropertiesMap(propertyMethod, propertyMethod); + } else { + addToPropertiesMap(getter, field); + addToPropertiesMap(setter, field); + addToPropertiesMap(propertyMethod, field); + } + } + + private void addToPropertiesMap(ProgramElementDoc propertyMethod, + ProgramElementDoc commentSource) { + if (null == propertyMethod || null == commentSource) { + return; + } + final String methodRawCommentText = propertyMethod.getRawCommentText(); + + /* The second condition is required for the property buckets. In + * this case the comment is at the property method (not at the field) + * and it needs to be listed in the map. + */ + if ((null == methodRawCommentText || 0 == methodRawCommentText.length()) + || propertyMethod.equals(commentSource)) { + classPropertiesMap.put(propertyMethod, commentSource); + } + } + + private MethodDoc getterForField(MethodDoc[] methods, + MethodDoc propertyMethod) { + final String propertyMethodName = propertyMethod.name(); + final String fieldName = + propertyMethodName.substring(0, + propertyMethodName.lastIndexOf("Property")); + final String fieldNameUppercased = + "" + Character.toUpperCase(fieldName.charAt(0)) + + fieldName.substring(1); + final String getterNamePattern; + final String fieldTypeName = propertyMethod.returnType().toString(); + if ("boolean".equals(fieldTypeName) + || fieldTypeName.endsWith("BooleanProperty")) { + getterNamePattern = "(is|get)" + fieldNameUppercased; + } else { + getterNamePattern = "get" + fieldNameUppercased; + } + + for (MethodDoc methodDoc : methods) { + if (Pattern.matches(getterNamePattern, methodDoc.name())) { + if (0 == methodDoc.parameters().length + && (methodDoc.isPublic() || methodDoc.isProtected())) { + return methodDoc; + } + } + } + return null; + } + + private MethodDoc setterForField(MethodDoc[] methods, + MethodDoc propertyMethod) { + final String propertyMethodName = propertyMethod.name(); + final String fieldName = + propertyMethodName.substring(0, + propertyMethodName.lastIndexOf("Property")); + final String fieldNameUppercased = + "" + Character.toUpperCase(fieldName.charAt(0)) + + fieldName.substring(1); + final String setter = "set" + fieldNameUppercased; + + for (MethodDoc methodDoc : methods) { + if (setter.equals(methodDoc.name())) { + if (1 == methodDoc.parameters().length + && "void".equals(methodDoc.returnType().simpleTypeName()) + && (methodDoc.isPublic() || methodDoc.isProtected())) { + return methodDoc; + } + } + } + return null; + } + + private FieldDoc fieldForProperty(FieldDoc[] fields, MethodDoc property) { + + for (FieldDoc field : fields) { + final String fieldName = field.name(); + final String propertyName = fieldName + "Property"; + if (propertyName.equals(property.name())) { + return field; + } + } + return null; + } + + // properties aren't named setA* or getA* + private final Pattern pattern = Pattern.compile("[sg]et\\p{Upper}.*"); + private boolean isPropertyMethod(MethodDoc method) { + if (!method.name().endsWith("Property")) { + return false; + } + + if (! memberIsVisible(method)) { + return false; + } + + if (pattern.matcher(method.name()).matches()) { + return false; + } + + return 0 == method.parameters().length + && !"void".equals(method.returnType().simpleTypeName()); + } + + private void checkOnPropertiesTags(MethodDoc[] members) { + for (MethodDoc methodDoc: members) { + if (methodDoc.isIncluded()) { + for (Tag tag: methodDoc.tags()) { + String tagName = tag.name(); + if (tagName.equals("@propertySetter") + || tagName.equals("@propertyGetter") + || tagName.equals("@propertyDescription")) { + if (!isPropertyGetterOrSetter(members, methodDoc)) { + configuration.message.warning(tag.position(), + "doclet.javafx_tag_misuse"); + } + break; + } + } + } + } + } + + private boolean isPropertyGetterOrSetter(MethodDoc[] members, + MethodDoc methodDoc) { + boolean found = false; + String propertyName = Util.propertyNameFromMethodName(methodDoc.name()); + if (!propertyName.isEmpty()) { + String propertyMethodName = propertyName + "Property"; + for (MethodDoc member: members) { + if (member.name().equals(propertyMethodName)) { + found = true; + break; + } + } + } + return found; + } + } + + private class GetterSetter { + private final ProgramElementDoc getter; + private final ProgramElementDoc setter; + + public GetterSetter(ProgramElementDoc getter, ProgramElementDoc setter) { + this.getter = getter; + this.setter = setter; + } + + public ProgramElementDoc getGetter() { + return getter; + } + + public ProgramElementDoc getSetter() { + return setter; + } } /**
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java Tue May 07 17:14:17 2013 -0700 @@ -61,7 +61,7 @@ //Just a primitive. linkInfo.displayLength += type.typeName().length(); linkOutput.append(type.typeName()); - } else if (type.asAnnotatedType() != null) { + } else if (type.asAnnotatedType() != null && type.dimension().length() == 0) { linkOutput.append(getTypeAnnotationLinks(linkInfo)); linkInfo.type = type.asAnnotatedType().underlyingType(); linkOutput.append(getLinkOutput(linkInfo)); @@ -141,8 +141,21 @@ linkInfo.displayLength += 3; linkOutput.append("..."); } else { - linkInfo.displayLength += type.dimension().length(); - linkOutput.append(type.dimension()); + while (type != null && type.dimension().length() > 0) { + linkInfo.displayLength += type.dimension().length(); + if (type.asAnnotatedType() != null) { + linkInfo.type = type; + linkOutput.append(" "); + linkOutput.append(getTypeAnnotationLinks(linkInfo)); + linkOutput.append("[]"); + type = type.asAnnotatedType().underlyingType().getElementType(); + } else { + linkOutput.append("[]"); + type = type.getElementType(); + } + } + linkInfo.type = type; + linkOutput.insert(0, getTypeAnnotationLinks(linkInfo)); } return linkOutput; } else if (linkInfo.classDoc != null) {
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java Tue May 07 17:14:17 2013 -0700 @@ -44,4 +44,12 @@ * @param o the object to append. */ public void append(Object o); + + /** + * Insert the given object into the output sequence. + * + * @param offset the offset. + * @param o the object to be inserted. + */ + public void insert(int offset, Object o); }
--- a/src/share/classes/com/sun/tools/doclint/Checker.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclint/Checker.java Tue May 07 17:14:17 2013 -0700 @@ -25,20 +25,18 @@ package com.sun.tools.doclint; -import com.sun.source.doctree.LiteralTree; -import java.util.regex.Matcher; -import com.sun.source.doctree.LinkTree; +import java.io.IOException; +import java.io.StringWriter; import java.net.URI; -import java.util.regex.Pattern; -import java.io.IOException; -import com.sun.tools.javac.tree.DocPretty; -import java.io.StringWriter; +import java.net.URISyntaxException; import java.util.Deque; import java.util.EnumSet; import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; @@ -52,12 +50,15 @@ import com.sun.source.doctree.AttributeTree; import com.sun.source.doctree.AuthorTree; import com.sun.source.doctree.DocCommentTree; +import com.sun.source.doctree.DocRootTree; import com.sun.source.doctree.DocTree; import com.sun.source.doctree.EndElementTree; import com.sun.source.doctree.EntityTree; import com.sun.source.doctree.ErroneousTree; import com.sun.source.doctree.IdentifierTree; import com.sun.source.doctree.InheritDocTree; +import com.sun.source.doctree.LinkTree; +import com.sun.source.doctree.LiteralTree; import com.sun.source.doctree.ParamTree; import com.sun.source.doctree.ReferenceTree; import com.sun.source.doctree.ReturnTree; @@ -67,11 +68,12 @@ import com.sun.source.doctree.StartElementTree; import com.sun.source.doctree.TextTree; import com.sun.source.doctree.ThrowsTree; +import com.sun.source.doctree.ValueTree; import com.sun.source.doctree.VersionTree; import com.sun.source.util.DocTreeScanner; import com.sun.source.util.TreePath; import com.sun.tools.doclint.HtmlTag.AttrKind; -import java.net.URISyntaxException; +import com.sun.tools.javac.tree.DocPretty; import static com.sun.tools.doclint.Messages.Group.*; @@ -95,6 +97,7 @@ public enum Flag { TABLE_HAS_CAPTION, HAS_ELEMENT, + HAS_INLINE_TAG, HAS_TEXT, REPORTED_BAD_INLINE } @@ -119,12 +122,15 @@ private Deque<TagStackItem> tagStack; // TODO: maybe want to record starting tree as well private HtmlTag currHeaderTag; + private final int implicitHeaderLevel; + // <editor-fold defaultstate="collapsed" desc="Top level"> Checker(Env env) { env.getClass(); this.env = env; tagStack = new LinkedList<TagStackItem>(); + implicitHeaderLevel = env.implicitHeaderLevel; } public Void scan(DocCommentTree tree, TreePath p) { @@ -245,12 +251,19 @@ if (t == null) { env.messages.error(HTML, tree, "dc.tag.unknown", treeName); } else { + boolean done = false; for (TagStackItem tsi: tagStack) { if (tsi.tag.accepts(t)) { while (tagStack.peek() != tsi) tagStack.pop(); + done = true; break; - } else if (tsi.tag.endKind != HtmlTag.EndKind.OPTIONAL) + } else if (tsi.tag.endKind != HtmlTag.EndKind.OPTIONAL) { + done = true; break; + } + } + if (!done && HtmlTag.BODY.accepts(t)) { + tagStack.clear(); } checkStructure(tree, t); @@ -376,7 +389,7 @@ private int getHeaderLevel(HtmlTag tag) { if (tag == null) - return 0; + return implicitHeaderLevel; switch (tag) { case H1: return 1; case H2: return 2; @@ -411,7 +424,8 @@ } if (t.flags.contains(HtmlTag.Flag.EXPECT_CONTENT) && !top.flags.contains(Flag.HAS_TEXT) - && !top.flags.contains(Flag.HAS_ELEMENT)) { + && !top.flags.contains(Flag.HAS_ELEMENT) + && !top.flags.contains(Flag.HAS_INLINE_TAG)) { env.messages.warning(HTML, tree, "dc.tag.empty", treeName); } tagStack.pop(); @@ -564,7 +578,14 @@ } @Override + public Void visitDocRoot(DocRootTree tree, Void ignore) { + markEnclosingTag(Flag.HAS_INLINE_TAG); + return super.visitDocRoot(tree, ignore); + } + + @Override public Void visitInheritDoc(InheritDocTree tree, Void ignore) { + markEnclosingTag(Flag.HAS_INLINE_TAG); // TODO: verify on overridden method foundInheritDoc = true; return super.visitInheritDoc(tree, ignore); @@ -572,6 +593,7 @@ @Override public Void visitLink(LinkTree tree, Void ignore) { + markEnclosingTag(Flag.HAS_INLINE_TAG); // simulate inline context on tag stack HtmlTag t = (tree.getKind() == DocTree.Kind.LINK) ? HtmlTag.CODE : HtmlTag.SPAN; @@ -585,6 +607,7 @@ @Override public Void visitLiteral(LiteralTree tree, Void ignore) { + markEnclosingTag(Flag.HAS_INLINE_TAG); if (tree.getKind() == DocTree.Kind.CODE) { for (TagStackItem tsi: tagStack) { if (tsi.tag == HtmlTag.CODE) { @@ -739,6 +762,12 @@ } @Override + public Void visitValue(ValueTree tree, Void ignore) { + markEnclosingTag(Flag.HAS_INLINE_TAG); + return super.visitValue(tree, ignore); + } + + @Override public Void visitVersion(VersionTree tree, Void ignore) { warnIfEmpty(tree, tree.getBody()); return super.visitVersion(tree, ignore);
--- a/src/share/classes/com/sun/tools/doclint/DocLint.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclint/DocLint.java Tue May 07 17:14:17 2013 -0700 @@ -30,6 +30,7 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; +import java.util.regex.Pattern; import javax.lang.model.element.Name; import javax.tools.StandardLocation; @@ -72,6 +73,7 @@ public static final String XMSGS_OPTION = "-Xmsgs"; public static final String XMSGS_CUSTOM_PREFIX = "-Xmsgs:"; private static final String STATS = "-stats"; + public static final String XIMPLICIT_HEADERS = "-XimplicitHeaders:"; // <editor-fold defaultstate="collapsed" desc="Command-line entry point"> public static void main(String... args) { @@ -289,6 +291,9 @@ env.messages.setOptions(null); } else if (arg.startsWith(XMSGS_CUSTOM_PREFIX)) { env.messages.setOptions(arg.substring(arg.indexOf(":") + 1)); + } else if (arg.matches(XIMPLICIT_HEADERS + "[1-6]")) { + char ch = arg.charAt(arg.length() - 1); + env.setImplicitHeaders(Character.digit(ch, 10)); } else throw new IllegalArgumentException(arg); }
--- a/src/share/classes/com/sun/tools/doclint/Env.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/doclint/Env.java Tue May 07 17:14:17 2013 -0700 @@ -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 @@ -83,6 +83,8 @@ /** Message handler. */ final Messages messages; + int implicitHeaderLevel = 0; + // Utility classes DocTrees trees; Elements elements; @@ -102,7 +104,7 @@ DocCommentTree currDocComment; /** * The access kind of the declaration containing the comment currently being analyzed. - * This is the minimum (most restrictive) access kind of the declaration iteself + * This is the minimum (most restrictive) access kind of the declaration itself * and that of its containers. For example, a public method in a private class is * noted as private. */ @@ -128,6 +130,10 @@ java_lang_Void = elements.getTypeElement("java.lang.Void").asType(); } + void setImplicitHeaders(int n) { + implicitHeaderLevel = n; + } + /** Set the current declaration and its doc comment. */ void setCurrent(TreePath path, DocCommentTree comment) { currPath = path;
--- a/src/share/classes/com/sun/tools/javac/Main.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/Main.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -41,6 +41,7 @@ * risk. This code and its internal interfaces are subject to change * or deletion without notice. */ +@jdk.Supported public class Main { /** Unsupported command line interface.
--- a/src/share/classes/com/sun/tools/javac/Server.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,196 +0,0 @@ -/* - * Copyright (c) 2005, 2012, 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. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * 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 com.sun.tools.javac; - -import java.io.*; -import java.net.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.logging.Logger; -import javax.tools.*; - -/** - * Java Compiler Server. Can be used to speed up a set of (small) - * compilation tasks by caching jar files between compilations. - * - * <p><b>This is NOT part of any supported API. - * If you write code that depends on this, you do so at your own - * risk. This code and its internal interfaces are subject to change - * or deletion without notice.</b></p> - * - * @author Peter von der Ahé - * @since 1.6 - */ -class Server implements Runnable { - private final BufferedReader in; - private final OutputStream out; - private final boolean isSocket; - private static final JavaCompiler tool = ToolProvider.getSystemJavaCompiler(); - private static final Logger logger = Logger.getLogger("com.sun.tools.javac"); - static class CwdFileManager extends ForwardingJavaFileManager<JavaFileManager> { - String cwd; - CwdFileManager(JavaFileManager fileManager) { - super(fileManager); - } - String getAbsoluteName(String name) { - if (new File(name).isAbsolute()) { - return name; - } else { - return new File(cwd,name).getPath(); - } - } -// public JavaFileObject getFileForInput(String name) -// throws IOException -// { -// return super.getFileForInput(getAbsoluteName(name)); -// } - } - // static CwdFileManager fm = new CwdFileManager(tool.getStandardFileManager()); - static final StandardJavaFileManager fm = tool.getStandardFileManager(null, null, null); - static { - // Use the same file manager for all compilations. This will - // cache jar files in the standard file manager. Use - // tool.getStandardFileManager().close() to release. - // FIXME tool.setFileManager(fm); - logger.setLevel(java.util.logging.Level.SEVERE); - } - private Server(BufferedReader in, OutputStream out, boolean isSocket) { - this.in = in; - this.out = out; - this.isSocket = isSocket; - } - private Server(BufferedReader in, OutputStream out) { - this(in, out, false); - } - private Server(Socket socket) throws IOException, UnsupportedEncodingException { - this(new BufferedReader(new InputStreamReader(socket.getInputStream(), "utf-8")), - socket.getOutputStream(), - true); - } - public void run() { - List<String> args = new ArrayList<String>(); - int res = -1; - try { - String line = null; - try { - line = in.readLine(); - } catch (IOException e) { - System.err.println(e.getLocalizedMessage()); - System.exit(0); - line = null; - } - // fm.cwd=null; - String cwd = null; - while (line != null) { - if (line.startsWith("PWD:")) { - cwd = line.substring(4); - } else if (line.equals("END")) { - break; - } else if (!"-XDstdout".equals(line)) { - args.add(line); - } - try { - line = in.readLine(); - } catch (IOException e) { - System.err.println(e.getLocalizedMessage()); - System.exit(0); - line = null; - } - } - Iterable<File> path = cwd == null ? null : Arrays.<File>asList(new File(cwd)); - // try { in.close(); } catch (IOException e) {} - long msec = System.currentTimeMillis(); - try { - synchronized (tool) { - for (StandardLocation location : StandardLocation.values()) - fm.setLocation(location, path); - res = compile(out, fm, args); - // FIXME res = tool.run((InputStream)null, null, out, args.toArray(new String[args.size()])); - } - } catch (Throwable ex) { - logger.log(java.util.logging.Level.SEVERE, args.toString(), ex); - PrintWriter p = new PrintWriter(out, true); - ex.printStackTrace(p); - p.flush(); - } - if (res >= 3) { - logger.severe(String.format("problem: %s", args)); - } else { - logger.info(String.format("success: %s", args)); - } - // res = compile(args.toArray(new String[args.size()]), out); - msec -= System.currentTimeMillis(); - logger.info(String.format("Real time: %sms", -msec)); - } finally { - if (!isSocket) { - try { in.close(); } catch (IOException e) {} - } - try { - out.write(String.format("EXIT: %s%n", res).getBytes()); - } catch (IOException ex) { - logger.log(java.util.logging.Level.SEVERE, args.toString(), ex); - } - try { - out.flush(); - out.close(); - } catch (IOException ex) { - logger.log(java.util.logging.Level.SEVERE, args.toString(), ex); - } - logger.info(String.format("EXIT: %s", res)); - } - } - public static void main(String... args) throws FileNotFoundException { - if (args.length == 2) { - for (;;) { - throw new UnsupportedOperationException("TODO"); -// BufferedReader in = new BufferedReader(new FileReader(args[0])); -// PrintWriter out = new PrintWriter(args[1]); -// new Server(in, out).run(); -// System.out.flush(); -// System.err.flush(); - } - } else { - ExecutorService pool = Executors.newCachedThreadPool(); - try - { - ServerSocket socket = new ServerSocket(0xcafe, -1, null); - for (;;) { - pool.execute(new Server(socket.accept())); - } - } - catch (IOException e) { - System.err.format("Error: %s%n", e.getLocalizedMessage()); - pool.shutdown(); - } - } - } - - private int compile(OutputStream out, StandardJavaFileManager fm, List<String> args) { - // FIXME parse args and use getTask - // System.err.println("Running " + args); - return tool.run(null, null, out, args.toArray(new String[args.size()])); - } -}
--- a/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -121,19 +121,23 @@ return result.toList(); } - public Boolean call() { + public Main.Result doCall() { if (!used.getAndSet(true)) { initContext(); notYetEntered = new HashMap<JavaFileObject, JCCompilationUnit>(); compilerMain.setAPIMode(true); result = compilerMain.compile(args, classNames, context, fileObjects, processors); cleanup(); - return result.isOK(); + return result; } else { throw new IllegalStateException("multiple calls to method 'call'"); } } + public Boolean call() { + return doCall().isOK(); + } + public void setProcessors(Iterable<? extends Processor> processors) { processors.getClass(); // null check // not mt-safe @@ -154,10 +158,11 @@ throw new IllegalStateException(); } else { initContext(); + compilerMain.log = Log.instance(context); compilerMain.setOptions(Options.instance(context)); compilerMain.filenames = new LinkedHashSet<File>(); Collection<File> filenames = compilerMain.processArgs(CommandLine.parse(args), classNames); - if (!filenames.isEmpty()) + if (filenames != null && !filenames.isEmpty()) throw new IllegalArgumentException("Malformed arguments " + toString(filenames, " ")); compiler = JavaCompiler.instance(context); compiler.keepComments = true;
--- a/src/share/classes/com/sun/tools/javac/code/Flags.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/code/Flags.java Tue May 07 17:14:17 2013 -0700 @@ -74,6 +74,7 @@ if ((mask&DEPRECATED) != 0) flags.add(Flag.DEPRECATED); if ((mask&HASINIT) != 0) flags.add(Flag.HASINIT); if ((mask&ENUM) != 0) flags.add(Flag.ENUM); + if ((mask&MANDATED) != 0) flags.add(Flag.MANDATED); if ((mask&IPROXY) != 0) flags.add(Flag.IPROXY); if ((mask&NOOUTERTHIS) != 0) flags.add(Flag.NOOUTERTHIS); if ((mask&EXISTS) != 0) flags.add(Flag.EXISTS); @@ -114,6 +115,9 @@ * classfile v49.0. */ public static final int ENUM = 1<<14; + /** Added in SE8, represents constructs implicitly declared in source. */ + public static final int MANDATED = 1<<15; + public static final int StandardFlags = 0x0fff; public static final int ModifierFlags = StandardFlags & ~INTERFACE; @@ -254,7 +258,7 @@ public static final long CLASH = 1L<<42; /** - * Flag that marks either a default method or an interface containing default methods + * Flag that marks either a default method or an interface containing default methods. */ public static final long DEFAULT = 1L<<43; @@ -264,6 +268,16 @@ */ public static final long AUXILIARY = 1L<<44; + /** + * Flag that marks that a symbol is not available in the current profile + */ + public static final long NOT_IN_PROFILE = 1L<<45; + + /** + * Flag that indicates that an override error has been detected by Check. + */ + public static final long BAD_OVERRIDE = 1L<<45; + /** Modifier masks. */ public static final int @@ -300,6 +314,7 @@ modifiers.add(Modifier.SYNCHRONIZED); if (0 != (flags & NATIVE)) modifiers.add(Modifier.NATIVE); if (0 != (flags & STRICTFP)) modifiers.add(Modifier.STRICTFP); + if (0 != (flags & DEFAULT)) modifiers.add(Modifier.DEFAULT); modifiers = Collections.unmodifiableSet(modifiers); modifierSets.put(flags, modifiers); } @@ -342,6 +357,7 @@ DEPRECATED("deprecated"), HASINIT("hasinit"), ENUM("enum"), + MANDATED("mandated"), IPROXY("iproxy"), NOOUTERTHIS("noouterthis"), EXISTS("exists"),
--- a/src/share/classes/com/sun/tools/javac/code/Lint.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/code/Lint.java Tue May 07 17:14:17 2013 -0700 @@ -26,10 +26,7 @@ package com.sun.tools.javac.code; import java.util.EnumSet; -import java.util.HashMap; import java.util.Map; -import java.util.Set; -import javax.lang.model.element.Modifier; import com.sun.tools.javac.code.Symbol.*; import com.sun.tools.javac.util.Context; import com.sun.tools.javac.util.List;
--- a/src/share/classes/com/sun/tools/javac/code/Printer.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/code/Printer.java Tue May 07 17:14:17 2013 -0700 @@ -316,9 +316,9 @@ } if (args.head.unannotatedType().getKind() == TypeKind.ARRAY) { buf.append(visit(((ArrayType) args.head.unannotatedType()).elemtype, locale)); - if (args.head.getAnnotations().nonEmpty()) { + if (args.head.getAnnotationMirrors().nonEmpty()) { buf.append(' '); - buf.append(args.head.getAnnotations()); + buf.append(args.head.getAnnotationMirrors()); buf.append(' '); } buf.append("...");
--- a/src/share/classes/com/sun/tools/javac/code/Source.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/code/Source.java Tue May 07 17:14:17 2013 -0700 @@ -224,7 +224,7 @@ public boolean allowIntersectionTypesInCast() { return compareTo(JDK1_8) >= 0; } - public boolean allowEarlyReturnConstraints() { + public boolean allowGraphInference() { return compareTo(JDK1_8) >= 0; } public boolean allowStructuralMostSpecific() {
--- a/src/share/classes/com/sun/tools/javac/code/Symbol.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/code/Symbol.java Tue May 07 17:14:17 2013 -0700 @@ -220,6 +220,14 @@ return (flags() & INTERFACE) != 0; } + public boolean isPrivate() { + return (flags_field & Flags.AccessFlags) == PRIVATE; + } + + public boolean isEnum() { + return (flags() & ENUM) != 0; + } + /** Is this symbol declared (directly or indirectly) local * to a method or variable initializer? * Also includes fields of inner classes which are in @@ -232,7 +240,7 @@ } /** Has this symbol an empty name? This includes anonymous - * inner classses. + * inner classes. */ public boolean isAnonymous() { return name.isEmpty(); @@ -456,8 +464,7 @@ } public Set<Modifier> getModifiers() { - long flags = flags(); - return Flags.asModifierSet((flags & DEFAULT) != 0 ? flags & ~ABSTRACT : flags); + return Flags.asModifierSet(flags()); } public Name getSimpleName() { @@ -485,12 +492,12 @@ */ @Deprecated public <A extends java.lang.annotation.Annotation> A getAnnotation(Class<A> annoType) { - return JavacElements.getAnnotation(this, annoType); + return JavacAnnoConstructs.getAnnotation(this, annoType); } // This method is part of the javax.lang.model API, do not use this in javac code. - public <A extends java.lang.annotation.Annotation> A[] getAnnotations(Class<A> annoType) { - return JavacElements.getAnnotations(this, annoType); + public <A extends java.lang.annotation.Annotation> A[] getAnnotationsByType(Class<A> annoType) { + return JavacAnnoConstructs.getAnnotations(this, annoType); } // TODO: getEnclosedElements should return a javac List, fix in FilteredMemberList @@ -498,17 +505,18 @@ return List.nil(); } - public List<TypeSymbol> getTypeParameters() { - ListBuffer<TypeSymbol> l = ListBuffer.lb(); + public List<TypeVariableSymbol> getTypeParameters() { + ListBuffer<TypeVariableSymbol> l = ListBuffer.lb(); for (Type t : type.getTypeArguments()) { - l.append(t.tsym); + Assert.check(t.tsym.getKind() == ElementKind.TYPE_PARAMETER); + l.append((TypeVariableSymbol)t.tsym); } return l.toList(); } - public static class DelegatedSymbol extends Symbol { - protected Symbol other; - public DelegatedSymbol(Symbol other) { + public static class DelegatedSymbol<T extends Symbol> extends Symbol { + protected T other; + public DelegatedSymbol(T other) { super(other.kind, other.flags_field, other.name, other.type, other.owner); this.other = other; } @@ -542,21 +550,18 @@ public <R, P> R accept(Symbol.Visitor<R, P> v, P p) { return v.visitSymbol(other, p); } + + public T getUnderlyingSymbol() { + return other; + } } - /** A class for type symbols. Type variables are represented by instances - * of this class, classes and packages by instances of subclasses. + /** A base class for Symbols representing types. */ - public static class TypeSymbol - extends Symbol implements TypeParameterElement { - // Implements TypeParameterElement because type parameters don't - // have their own TypeSymbol subclass. - // TODO: type parameters should have their own TypeSymbol subclass - - public TypeSymbol(long flags, Name name, Type type, Symbol owner) { - super(TYP, flags, name, type, owner); + public static abstract class TypeSymbol extends Symbol { + public TypeSymbol(int kind, long flags, Name name, Type type, Symbol owner) { + super(kind, flags, name, type, owner); } - /** form a fully qualified name from a name and an owner */ static public Name formFullName(Name name, Symbol owner) { @@ -608,11 +613,7 @@ return this.type.hasTag(TYPEVAR); } - // For type params; overridden in subclasses. - public ElementKind getKind() { - return ElementKind.TYPE_PARAMETER; - } - + @Override public java.util.List<Symbol> getEnclosedElements() { List<Symbol> list = List.nil(); if (kind == TYP && type.hasTag(TYPEVAR)) { @@ -625,21 +626,29 @@ return list; } - // For type params. - // Perhaps not needed if getEnclosingElement can be spec'ed - // to do the same thing. - // TODO: getGenericElement() might not be needed - public Symbol getGenericElement() { - return owner; + @Override + public <R, P> R accept(Symbol.Visitor<R, P> v, P p) { + return v.visitTypeSymbol(this, p); + } + } + + /** + * Type variables are represented by instances of this class. + */ + public static class TypeVariableSymbol + extends TypeSymbol implements TypeParameterElement { + + public TypeVariableSymbol(long flags, Name name, Type type, Symbol owner) { + super(TYP, flags, name, type, owner); } - public <R, P> R accept(ElementVisitor<R, P> v, P p) { - Assert.check(type.hasTag(TYPEVAR)); // else override will be invoked - return v.visitTypeParameter(this, p); + public ElementKind getKind() { + return ElementKind.TYPE_PARAMETER; } - public <R, P> R accept(Symbol.Visitor<R, P> v, P p) { - return v.visitTypeSymbol(this, p); + @Override + public Symbol getGenericElement() { + return owner; } public List<Type> getBounds() { @@ -656,6 +665,11 @@ return ct.interfaces_field; } } + + @Override + public <R, P> R accept(ElementVisitor<R, P> v, P p) { + return v.visitTypeParameter(this, p); + } } /** A class for module symbols. @@ -677,14 +691,12 @@ public JavaFileManager.Location location; public ModuleSymbol() { - super(0, null, null, null); - this.kind = MDL; + super(MDL, 0, null, null, null); this.type = new ModuleType(this); } public ModuleSymbol(Name name, Symbol owner) { - super(0, name, null, owner); - this.kind = MDL; + super(MDL, 0, name, null, owner); this.type = new ModuleType(this); this.fullname = formFullName(name, owner); } @@ -803,6 +815,11 @@ public boolean isUnnamed() { return name.isEmpty() && owner != null; } + + public <R, P> R accept(ElementVisitor<R, P> v, P p) { + // ## + return v.visit(this, p); + } } /** A class for package symbols @@ -815,8 +832,7 @@ public ClassSymbol package_info; // see bug 6443073 public PackageSymbol(Name name, Type type, Symbol owner) { - super(0, name, type, owner); - this.kind = PCK; + super(PCK, 0, name, type, owner); this.members_field = null; this.fullname = formFullName(name, owner); } @@ -932,7 +948,7 @@ public Pool pool; public ClassSymbol(long flags, Name name, Type type, Symbol owner) { - super(flags, name, type, owner); + super(TYP, flags, name, type, owner); this.members_field = null; this.fullname = formFullName(name, owner); this.flatname = formFlatName(name, owner); @@ -1084,11 +1100,12 @@ } /** - * @deprecated this method should never be used by javac internally. + * Since this method works in terms of the runtime representation + * of annotations, it should never be used by javac internally. */ - @Override @Deprecated + @Override public <A extends java.lang.annotation.Annotation> A getAnnotation(Class<A> annoType) { - return JavacElements.getAnnotation(this, annoType); + return JavacAnnoConstructs.getAnnotation(this, annoType); } public <R, P> R accept(ElementVisitor<R, P> v, P p) { @@ -1239,6 +1256,9 @@ /** The code of the method. */ public Code code = null; + /** The extra (synthetic/mandated) parameters of the method. */ + public List<VarSymbol> extraParams = List.nil(); + /** The parameters of the method. */ public List<VarSymbol> params = null; @@ -1271,6 +1291,12 @@ return m; } + @Override + public Set<Modifier> getModifiers() { + long flags = flags(); + return Flags.asModifierSet((flags & DEFAULT) != 0 ? flags & ~ABSTRACT : flags); + } + /** The Java source which this symbol represents. */ public String toString() { @@ -1451,7 +1477,7 @@ return implementation(origin, types, checkResult, implementation_filter); } // where - private static final Filter<Symbol> implementation_filter = new Filter<Symbol>() { + public static final Filter<Symbol> implementation_filter = new Filter<Symbol>() { public boolean accepts(Symbol s) { return s.kind == Kinds.MTH && (s.flags() & SYNTHETIC) == 0; @@ -1590,6 +1616,10 @@ return v.visitMethodSymbol(this, p); } + public Type getReceiverType() { + return asType().getReceiverType(); + } + public Type getReturnType() { return asType().getReturnType(); }
--- a/src/share/classes/com/sun/tools/javac/code/Symtab.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/code/Symtab.java Tue May 07 17:14:17 2013 -0700 @@ -139,6 +139,7 @@ public final Type stringBuilderType; public final Type cloneableType; public final Type serializableType; + public final Type serializedLambdaType; public final Type methodHandleType; public final Type methodHandleLookupType; public final Type methodTypeType; @@ -160,6 +161,7 @@ public final Type listType; public final Type collectionsType; public final Type comparableType; + public final Type comparatorType; public final Type arraysType; public final Type iterableType; public final Type iteratorType; @@ -169,6 +171,7 @@ public final Type deprecatedType; public final Type suppressWarningsType; public final Type inheritedType; + public final Type profileType; public final Type proprietaryType; public final Type systemType; public final Type autoCloseableType; @@ -395,6 +398,22 @@ } + // Enter a synthetic class that is used to mark classes in ct.sym. + // This class does not have a class file. + private Type enterSyntheticAnnotation(String name) { + ClassType type = (ClassType)enterClass(name); + ClassSymbol sym = (ClassSymbol)type.tsym; + sym.completer = null; + sym.flags_field = PUBLIC|ACYCLIC|ANNOTATION|INTERFACE; + sym.erasure_field = type; + sym.members_field = new Scope(sym); + type.typarams_field = List.nil(); + type.allparams_field = List.nil(); + type.supertype_field = annotationType; + type.interfaces_field = List.nil(); + return type; + } + /** Constructor; enters all predefined identifiers and operators * into symbol table. */ @@ -429,13 +448,12 @@ return messages.getLocalizedString("compiler.misc.unnamed.package"); } }; - noSymbol = new TypeSymbol(0, names.empty, Type.noType, rootPackage) { + noSymbol = new TypeSymbol(Kinds.NIL, 0, names.empty, Type.noType, rootPackage) { @Override public <R, P> R accept(ElementVisitor<R, P> v, P p) { return v.visitUnknown(this, p); } }; - noSymbol.kind = Kinds.NIL; // create the error symbols errSymbol = new ClassSymbol(PUBLIC|STATIC|ACYCLIC, names.any, null, rootPackage); @@ -503,6 +521,7 @@ cloneableType = enterClass("java.lang.Cloneable"); throwableType = enterClass("java.lang.Throwable"); serializableType = enterClass("java.io.Serializable"); + serializedLambdaType = enterClass("java.lang.invoke.SerializedLambda"); methodHandleType = enterClass("java.lang.invoke.MethodHandle"); methodHandleLookupType = enterClass("java.lang.invoke.MethodHandles$Lookup"); methodTypeType = enterClass("java.lang.invoke.MethodType"); @@ -528,6 +547,7 @@ listType = enterClass("java.util.List"); collectionsType = enterClass("java.util.Collections"); comparableType = enterClass("java.lang.Comparable"); + comparatorType = enterClass("java.util.Comparator"); arraysType = enterClass("java.util.Arrays"); iterableType = target.hasIterable() ? enterClass("java.lang.Iterable") @@ -559,6 +579,7 @@ synthesizeEmptyInterfaceIfMissing(cloneableType); synthesizeEmptyInterfaceIfMissing(serializableType); synthesizeEmptyInterfaceIfMissing(lambdaMetafactory); + synthesizeEmptyInterfaceIfMissing(serializedLambdaType); synthesizeBoxTypeIfMissing(doubleType); synthesizeBoxTypeIfMissing(floatType); synthesizeBoxTypeIfMissing(voidType); @@ -566,17 +587,13 @@ // Enter a synthetic class that is used to mark internal // proprietary classes in ct.sym. This class does not have a // class file. - ClassType proprietaryType = (ClassType)enterClass("sun.Proprietary+Annotation"); - this.proprietaryType = proprietaryType; - ClassSymbol proprietarySymbol = (ClassSymbol)proprietaryType.tsym; - proprietarySymbol.completer = null; - proprietarySymbol.flags_field = PUBLIC|ACYCLIC|ANNOTATION|INTERFACE; - proprietarySymbol.erasure_field = proprietaryType; - proprietarySymbol.members_field = new Scope(proprietarySymbol); - proprietaryType.typarams_field = List.nil(); - proprietaryType.allparams_field = List.nil(); - proprietaryType.supertype_field = annotationType; - proprietaryType.interfaces_field = List.nil(); + proprietaryType = enterSyntheticAnnotation("sun.Proprietary+Annotation"); + + // Enter a synthetic class that is used to provide profile info for + // classes in ct.sym. This class does not have a class file. + profileType = enterSyntheticAnnotation("jdk.Profile+Annotation"); + MethodSymbol m = new MethodSymbol(PUBLIC | ABSTRACT, names.value, intType, profileType.tsym); + profileType.tsym.members().enter(m); // Enter a class for arrays. // The class implements java.lang.Cloneable and java.io.Serializable.
--- a/src/share/classes/com/sun/tools/javac/code/TargetType.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/code/TargetType.java Tue May 07 17:14:17 2013 -0700 @@ -82,34 +82,37 @@ /** For annotations on an exception parameter. */ EXCEPTION_PARAMETER(0x42, true), - /** For annotations on a typecast. */ - CAST(0x43, true), - /** For annotations on a type test. */ - INSTANCEOF(0x44, true), + INSTANCEOF(0x43, true), /** For annotations on an object creation expression. */ - NEW(0x45, true), + NEW(0x44, true), + + /** For annotations on a constructor reference receiver. */ + CONSTRUCTOR_REFERENCE(0x45, true), + + /** For annotations on a method reference receiver. */ + METHOD_REFERENCE(0x46, true), + + /** For annotations on a typecast. */ + CAST(0x47, true), /** For annotations on a type argument of an object creation expression. */ - CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT(0x46, true), + CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT(0x48, true), /** For annotations on a type argument of a method call. */ - METHOD_INVOCATION_TYPE_ARGUMENT(0x47, true), + METHOD_INVOCATION_TYPE_ARGUMENT(0x49, true), - /** For annotations on a lambda parameter type. */ - LAMBDA_FORMAL_PARAMETER(0x48, true), - - /** For annotations on a method reference. */ - METHOD_REFERENCE(0x49, true), + /** For annotations on a type argument of a constructor reference. */ + CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT(0x4A, true), /** For annotations on a type argument of a method reference. */ - METHOD_REFERENCE_TYPE_ARGUMENT(0x50, true), + METHOD_REFERENCE_TYPE_ARGUMENT(0x4B, true), /** For annotations with an unknown target. */ UNKNOWN(0xFF); - private static final int MAXIMUM_TARGET_TYPE_VALUE = 0x92; + private static final int MAXIMUM_TARGET_TYPE_VALUE = 0x4B; private final int targetTypeValue; private final boolean isLocal;
--- a/src/share/classes/com/sun/tools/javac/code/Type.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/code/Type.java Tue May 07 17:14:17 2013 -0700 @@ -25,6 +25,9 @@ package com.sun.tools.javac.code; +import com.sun.tools.javac.model.JavacAnnoConstructs; +import com.sun.tools.javac.model.JavacTypes; +import java.lang.annotation.Annotation; import java.util.Collections; import java.util.EnumMap; import java.util.EnumSet; @@ -246,6 +249,10 @@ return this; } + public boolean isAnnotated() { + return false; + } + /** * If this is an annotated type, return the underlying type. * Otherwise, return the type itself. @@ -254,6 +261,23 @@ return this; } + @Override + public List<? extends Attribute.TypeCompound> getAnnotationMirrors() { + return List.nil(); + } + + @Override + public <A extends Annotation> A getAnnotation(Class<A> annotationType) { + return null; + } + + @Override + public <A extends Annotation> A[] getAnnotationsByType(Class<A> annotationType) { + @SuppressWarnings("unchecked") + A[] tmp = (A[]) java.lang.reflect.Array.newInstance(annotationType, 0); + return tmp; + } + /** Return the base types of a list of types. */ public static List<Type> baseTypes(List<Type> ts) { @@ -350,8 +374,8 @@ } if (args.head.unannotatedType().tag == ARRAY) { buf.append(((ArrayType)args.head.unannotatedType()).elemtype); - if (args.head.getAnnotations().nonEmpty()) { - buf.append(args.head.getAnnotations()); + if (args.head.getAnnotationMirrors().nonEmpty()) { + buf.append(args.head.getAnnotationMirrors()); } buf.append("..."); } else { @@ -362,7 +386,6 @@ /** Access methods. */ - public List<? extends AnnotationMirror> getAnnotations() { return List.nil(); } public List<Type> getTypeArguments() { return List.nil(); } public Type getEnclosingType() { return null; } public List<Type> getParameterTypes() { return List.nil(); } @@ -885,6 +908,12 @@ return interfaces_field.prepend(supertype_field); } + public List<Type> getExplicitComponents() { + return allInterfaces ? + interfaces_field : + getComponents(); + } + @Override public TypeKind getKind() { return TypeKind.INTERSECTION; @@ -1144,7 +1173,7 @@ public TypeVar(Name name, Symbol owner, Type lower) { super(TYPEVAR, null); - tsym = new TypeSymbol(0, name, this, owner); + tsym = new TypeVariableSymbol(0, name, this, owner); this.lower = lower; } @@ -1337,6 +1366,9 @@ /** inference variable's inferred type (set from Infer.java) */ public Type inst = null; + /** number of declared (upper) bounds */ + public int declaredCount; + /** inference variable's change listener */ public UndetVarListener listener = null; @@ -1346,13 +1378,11 @@ } public UndetVar(TypeVar origin, Types types) { - this(origin, types, true); - } - - public UndetVar(TypeVar origin, Types types, boolean includeBounds) { super(UNDETVAR, origin); bounds = new EnumMap<InferenceBound, List<Type>>(InferenceBound.class); - bounds.put(InferenceBound.UPPER, includeBounds ? types.getBounds(origin) : List.<Type>nil()); + List<Type> declaredBounds = types.getBounds(origin); + declaredCount = declaredBounds.length(); + bounds.put(InferenceBound.UPPER, declaredBounds); bounds.put(InferenceBound.LOWER, List.<Type>nil()); bounds.put(InferenceBound.EQ, List.<Type>nil()); } @@ -1368,38 +1398,89 @@ } /** get all bounds of a given kind */ - public List<Type> getBounds(InferenceBound ib) { - return bounds.get(ib); + public List<Type> getBounds(InferenceBound... ibs) { + ListBuffer<Type> buf = ListBuffer.lb(); + for (InferenceBound ib : ibs) { + buf.appendList(bounds.get(ib)); + } + return buf.toList(); + } + + /** get the list of declared (upper) bounds */ + public List<Type> getDeclaredBounds() { + ListBuffer<Type> buf = ListBuffer.lb(); + int count = 0; + for (Type b : getBounds(InferenceBound.UPPER)) { + if (count++ == declaredCount) break; + buf.append(b); + } + return buf.toList(); } /** add a bound of a given kind - this might trigger listener notification */ public void addBound(InferenceBound ib, Type bound, Types types) { + Type bound2 = toTypeVarMap.apply(bound); List<Type> prevBounds = bounds.get(ib); for (Type b : prevBounds) { - if (types.isSameType(b, bound)) { - return; - } + //check for redundancy - use strict version of isSameType on tvars + //(as the standard version will lead to false positives w.r.t. clones ivars) + if (types.isSameType(b, bound2, true) || bound == qtype) return; } - bounds.put(ib, prevBounds.prepend(bound)); + bounds.put(ib, prevBounds.prepend(bound2)); notifyChange(EnumSet.of(ib)); } + //where + Type.Mapping toTypeVarMap = new Mapping("toTypeVarMap") { + @Override + public Type apply(Type t) { + if (t.hasTag(UNDETVAR)) { + UndetVar uv = (UndetVar)t; + return uv.qtype; + } else { + return t.map(this); + } + } + }; /** replace types in all bounds - this might trigger listener notification */ public void substBounds(List<Type> from, List<Type> to, Types types) { - EnumSet<InferenceBound> changed = EnumSet.noneOf(InferenceBound.class); - Map<InferenceBound, List<Type>> bounds2 = new EnumMap<InferenceBound, List<Type>>(InferenceBound.class); - for (Map.Entry<InferenceBound, List<Type>> _entry : bounds.entrySet()) { - InferenceBound ib = _entry.getKey(); - List<Type> prevBounds = _entry.getValue(); - List<Type> newBounds = types.subst(prevBounds, from, to); - bounds2.put(ib, newBounds); - if (prevBounds != newBounds) { - changed.add(ib); + List<Type> instVars = from.diff(to); + //if set of instantiated ivars is empty, there's nothing to do! + if (instVars.isEmpty()) return; + final EnumSet<InferenceBound> boundsChanged = EnumSet.noneOf(InferenceBound.class); + UndetVarListener prevListener = listener; + try { + //setup new listener for keeping track of changed bounds + listener = new UndetVarListener() { + public void varChanged(UndetVar uv, Set<InferenceBound> ibs) { + boundsChanged.addAll(ibs); + } + }; + for (Map.Entry<InferenceBound, List<Type>> _entry : bounds.entrySet()) { + InferenceBound ib = _entry.getKey(); + List<Type> prevBounds = _entry.getValue(); + ListBuffer<Type> newBounds = ListBuffer.lb(); + ListBuffer<Type> deps = ListBuffer.lb(); + //step 1 - re-add bounds that are not dependent on ivars + for (Type t : prevBounds) { + if (!t.containsAny(instVars)) { + newBounds.append(t); + } else { + deps.append(t); + } + } + //step 2 - replace bounds + bounds.put(ib, newBounds.toList()); + //step 3 - for each dependency, add new replaced bound + for (Type dep : deps) { + addBound(ib, types.subst(dep, from, to), types); + } } - } - if (!changed.isEmpty()) { - bounds = bounds2; - notifyChange(changed); + } finally { + listener = prevListener; + if (!boundsChanged.isEmpty()) { + notifyChange(boundsChanged); + } } } @@ -1515,7 +1596,12 @@ } public static class AnnotatedType extends Type - implements javax.lang.model.type.AnnotatedType { + implements + javax.lang.model.type.ArrayType, + javax.lang.model.type.DeclaredType, + javax.lang.model.type.PrimitiveType, + javax.lang.model.type.TypeVariable, + javax.lang.model.type.WildcardType { /** The type annotations on this type. */ public List<Attribute.TypeCompound> typeAnnotations; @@ -1528,7 +1614,7 @@ super(underlyingType.tag, underlyingType.tsym); this.typeAnnotations = List.nil(); this.underlyingType = underlyingType; - Assert.check(underlyingType.getKind() != TypeKind.ANNOTATED, + Assert.check(!underlyingType.isAnnotated(), "Can't annotate already annotated type: " + underlyingType); } @@ -1537,24 +1623,34 @@ super(underlyingType.tag, underlyingType.tsym); this.typeAnnotations = typeAnnotations; this.underlyingType = underlyingType; - Assert.check(underlyingType.getKind() != TypeKind.ANNOTATED, + Assert.check(!underlyingType.isAnnotated(), "Can't annotate already annotated type: " + underlyingType + "; adding: " + typeAnnotations); } @Override - public TypeKind getKind() { - return TypeKind.ANNOTATED; + public boolean isAnnotated() { + return true; } @Override - public List<? extends AnnotationMirror> getAnnotations() { + public List<? extends Attribute.TypeCompound> getAnnotationMirrors() { return typeAnnotations; } @Override - public TypeMirror getUnderlyingType() { - return underlyingType; + public <A extends Annotation> A getAnnotation(Class<A> annotationType) { + return JavacAnnoConstructs.getAnnotation(this, annotationType); + } + + @Override + public <A extends Annotation> A[] getAnnotationsByType(Class<A> annotationType) { + return JavacAnnoConstructs.getAnnotationsByType(this, annotationType); + } + + @Override + public TypeKind getKind() { + return underlyingType.getKind(); } @Override @@ -1569,7 +1665,7 @@ @Override public <R, P> R accept(TypeVisitor<R, P> v, P p) { - return v.visitAnnotated(this, p); + return underlyingType.accept(v, p); } @Override
--- a/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java Tue May 07 17:14:17 2013 -0700 @@ -126,7 +126,8 @@ // Tree position. public int pos = -1; - // For typecasts, type tests, new (and locals, as start_pc). + // For type casts, type tests, new, locals (as start_pc), + // and method and constructor reference type arguments. public boolean isValidOffset = false; public int offset = -1; @@ -156,12 +157,13 @@ sb.append(type); switch (type) { - // type cast - case CAST: // instanceof case INSTANCEOF: // new expression case NEW: + // constructor/method reference receiver + case CONSTRUCTOR_REFERENCE: + case METHOD_REFERENCE: sb.append(", offset = "); sb.append(offset); break; @@ -223,9 +225,12 @@ sb.append(", param_index = "); sb.append(parameter_index); break; + // type cast + case CAST: // method/constructor/reference type argument case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT: case METHOD_INVOCATION_TYPE_ARGUMENT: + case CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT: case METHOD_REFERENCE_TYPE_ARGUMENT: sb.append(", offset = "); sb.append(offset); @@ -236,12 +241,6 @@ case METHOD_RETURN: case FIELD: break; - // lambda formal parameter - case LAMBDA_FORMAL_PARAMETER: - // TODO: also needs an offset? - sb.append(", param_index = "); - sb.append(parameter_index); - break; case UNKNOWN: sb.append(", position UNKNOWN!"); break;
--- a/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java Tue May 07 17:14:17 2013 -0700 @@ -214,6 +214,9 @@ // Such an annotation is _not_ part of an JCAnnotatedType tree and we therefore // need to set its position explicitly. // The method returns a copy of type that contains these annotations. + // + // As a side effect the method sets the type annotation position of "annotations". + // Note that it is assumed that all annotations share the same position. private static Type typeWithAnnotations(final JCTree typetree, final Type type, final List<Attribute.TypeCompound> annotations, Log log) { // System.out.printf("typeWithAnnotations(typetree: %s, type: %s, annotations: %s)%n", @@ -227,7 +230,7 @@ Type.ArrayType arType; { Type touse = type; - if (type.getKind() == TypeKind.ANNOTATED) { + if (type.isAnnotated()) { Type.AnnotatedType atype = (Type.AnnotatedType)type; toreturn = new Type.AnnotatedType(atype.underlyingType); ((Type.AnnotatedType)toreturn).typeAnnotations = atype.typeAnnotations; @@ -246,7 +249,7 @@ ListBuffer<TypePathEntry> depth = ListBuffer.lb(); depth = depth.append(TypePathEntry.ARRAY); while (arType.elemtype.hasTag(TypeTag.ARRAY)) { - if (arType.elemtype.getKind() == TypeKind.ANNOTATED) { + if (arType.elemtype.isAnnotated()) { Type.AnnotatedType aelemtype = (Type.AnnotatedType) arType.elemtype; Type.AnnotatedType newAT = new Type.AnnotatedType(aelemtype.underlyingType); tomodify.elemtype = newAT; @@ -264,7 +267,9 @@ } Type arelemType = typeWithAnnotations(arTree.elemtype, arType.elemtype, annotations, log); tomodify.elemtype = arelemType; - for (Attribute.TypeCompound a : annotations) { + { + // All annotations share the same position; modify the first one. + Attribute.TypeCompound a = annotations.get(0); TypeAnnotationPosition p = a.position; p.location = p.location.prependList(depth.toList()); } @@ -342,10 +347,10 @@ if (depth.nonEmpty()) { // Only need to change the annotation positions // if they are on an enclosed type. - for (Attribute.TypeCompound a : annotations) { - TypeAnnotationPosition p = a.position; - p.location = p.location.appendList(depth.toList()); - } + // All annotations share the same position; modify the first one. + Attribute.TypeCompound a = annotations.get(0); + TypeAnnotationPosition p = a.position; + p.location = p.location.appendList(depth.toList()); } Type ret = typeWithAnnotations(type, enclTy, annotations); @@ -466,8 +471,7 @@ @Override public Type visitType(Type t, List<TypeCompound> s) { - // Error? - return t; + return new AnnotatedType(s, t); } }; @@ -578,6 +582,10 @@ System.out.println("Resolving tree: " + tree + " kind: " + tree.getKind()); System.out.println(" Framing tree: " + frame + " kind: " + frame.getKind()); */ + + // Note that p.offset is set in + // com.sun.tools.javac.jvm.Gen.setTypeAnnotationPositions(int) + switch (frame.getKind()) { case TYPE_CAST: p.type = TargetType.CAST; @@ -662,6 +670,45 @@ return; } + case MEMBER_REFERENCE: { + JCMemberReference mrframe = (JCMemberReference) frame; + + if (mrframe.expr == tree) { + switch (mrframe.mode) { + case INVOKE: + p.type = TargetType.METHOD_REFERENCE; + break; + case NEW: + p.type = TargetType.CONSTRUCTOR_REFERENCE; + break; + default: + Assert.error("Unknown method reference mode " + mrframe.mode + + " for tree " + tree + " within frame " + frame); + } + p.pos = frame.pos; + } else if (mrframe.typeargs != null && + mrframe.typeargs.contains(tree)) { + int arg = mrframe.typeargs.indexOf(tree); + p.type_index = arg; + switch (mrframe.mode) { + case INVOKE: + p.type = TargetType.METHOD_REFERENCE_TYPE_ARGUMENT; + break; + case NEW: + p.type = TargetType.CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT; + break; + default: + Assert.error("Unknown method reference mode " + mrframe.mode + + " for tree " + tree + " within frame " + frame); + } + p.pos = frame.pos; + } else { + Assert.error("Could not determine type argument position of tree " + tree + + " within frame " + frame); + } + return; + } + case ARRAY_TYPE: { ListBuffer<TypePathEntry> index = ListBuffer.lb(); index = index.append(TypePathEntry.ARRAY); @@ -769,6 +816,14 @@ return; } + case INTERSECTION_TYPE: { + JCTypeIntersection isect = (JCTypeIntersection)frame; + p.type_index = isect.bounds.indexOf(tree); + List<JCTree> newPath = path.tail; + resolveFrame(newPath.head, newPath.tail.head, newPath, p); + return; + } + case METHOD_INVOCATION: { JCMethodInvocation invocation = (JCMethodInvocation)frame; if (!invocation.typeargs.contains(tree)) { @@ -914,6 +969,8 @@ public void visitVarDef(final JCVariableDecl tree) { if (tree.sym == null) { // Something is wrong already. Quietly ignore. + } else if (tree.sym.getKind() == ElementKind.PARAMETER) { + // Parameters are handled in visitMethodDef above. } else if (tree.sym.getKind() == ElementKind.FIELD) { if (sigOnly) { TypeAnnotationPosition pos = new TypeAnnotationPosition(); @@ -927,7 +984,6 @@ pos.pos = tree.pos; separateAnnotationsKinds(tree.vartype, tree.sym.type, tree.sym, pos); } else if (tree.sym.getKind() == ElementKind.EXCEPTION_PARAMETER) { - // System.out.println("Found exception param: " + tree); TypeAnnotationPosition pos = new TypeAnnotationPosition(); pos.type = TargetType.EXCEPTION_PARAMETER; pos.pos = tree.pos; @@ -937,9 +993,11 @@ pos.type = TargetType.RESOURCE_VARIABLE; pos.pos = tree.pos; separateAnnotationsKinds(tree.vartype, tree.sym.type, tree.sym, pos); + } else if (tree.sym.getKind() == ElementKind.ENUM_CONSTANT) { + // No type annotations can occur here. } else { // There is nothing else in a variable declaration that needs separation. - // System.out.println("We found a: " + tree); + Assert.error("Unhandled variable kind: " + tree + " of kind: " + tree.sym.getKind()); } push(tree);
--- a/src/share/classes/com/sun/tools/javac/code/Types.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/code/Types.java Tue May 07 17:14:17 2013 -0700 @@ -48,6 +48,7 @@ import static com.sun.tools.javac.code.Symbol.*; import static com.sun.tools.javac.code.Type.*; import static com.sun.tools.javac.code.TypeTag.*; +import static com.sun.tools.javac.jvm.ClassFile.externalize; import static com.sun.tools.javac.util.ListBuffer.lb; /** @@ -356,26 +357,11 @@ } public Type getType(Type site) { - if (capture(site) != site) { - Type formalInterface = site.tsym.type; - ListBuffer<Type> typeargs = ListBuffer.lb(); - List<Type> actualTypeargs = site.getTypeArguments(); - //simply replace the wildcards with its bound - for (Type t : formalInterface.getTypeArguments()) { - if (actualTypeargs.head.hasTag(WILDCARD)) { - WildcardType wt = (WildcardType)actualTypeargs.head; - typeargs.append(wt.type); - } else { - typeargs.append(actualTypeargs.head); - } - actualTypeargs = actualTypeargs.tail; - } - site = subst(formalInterface, formalInterface.getTypeArguments(), typeargs.toList()); - if (!chk.checkValidGenericType(site)) { - //if the inferred functional interface type is not well-formed, - //or if it's not a subtype of the original target, issue an error - throw failure(diags.fragment("no.suitable.functional.intf.inst", site)); - } + site = removeWildcards(site); + if (!chk.checkValidGenericType(site)) { + //if the inferred functional interface type is not well-formed, + //or if it's not a subtype of the original target, issue an error + throw failure(diags.fragment("no.suitable.functional.intf.inst", site)); } return memberType(site, descSym); } @@ -526,7 +512,7 @@ @Override public Type getType(Type origin) { Type mt = memberType(origin, getSymbol()); - return new MethodType(mt.getParameterTypes(), mt.getReturnType(), thrown1, syms.methodClass); + return createMethodTypeWithThrown(mt, thrown1); } }; } @@ -584,11 +570,47 @@ return false; } } + + public Type removeWildcards(Type site) { + Type capturedSite = capture(site); + if (capturedSite != site) { + Type formalInterface = site.tsym.type; + ListBuffer<Type> typeargs = ListBuffer.lb(); + List<Type> actualTypeargs = site.getTypeArguments(); + List<Type> capturedTypeargs = capturedSite.getTypeArguments(); + //simply replace the wildcards with its bound + for (Type t : formalInterface.getTypeArguments()) { + if (actualTypeargs.head.hasTag(WILDCARD)) { + WildcardType wt = (WildcardType)actualTypeargs.head; + Type bound; + switch (wt.kind) { + case EXTENDS: + case UNBOUND: + CapturedType capVar = (CapturedType)capturedTypeargs.head; + //use declared bound if it doesn't depend on formal type-args + bound = capVar.bound.containsAny(capturedSite.getTypeArguments()) ? + wt.type : capVar.bound; + break; + default: + bound = wt.type; + } + typeargs.append(bound); + } else { + typeargs.append(actualTypeargs.head); + } + actualTypeargs = actualTypeargs.tail; + capturedTypeargs = capturedTypeargs.tail; + } + return subst(formalInterface, formalInterface.getTypeArguments(), typeargs.toList()); + } else { + return site; + } + } // </editor-fold> /** * Scope filter used to skip methods that should be ignored (such as methods - * overridden by j.l.Object) during function interface conversion/marker interface checks + * overridden by j.l.Object) during function interface conversion interface check */ class DescriptorFilter implements Filter<Symbol> { @@ -607,64 +629,6 @@ } }; - // <editor-fold defaultstate="collapsed" desc="isMarker"> - - /** - * A cache that keeps track of marker interfaces - */ - class MarkerCache { - - private WeakHashMap<TypeSymbol, Entry> _map = new WeakHashMap<TypeSymbol, Entry>(); - - class Entry { - final boolean isMarkerIntf; - final int prevMark; - - public Entry(boolean isMarkerIntf, - int prevMark) { - this.isMarkerIntf = isMarkerIntf; - this.prevMark = prevMark; - } - - boolean matches(int mark) { - return this.prevMark == mark; - } - } - - boolean get(TypeSymbol origin) throws FunctionDescriptorLookupError { - Entry e = _map.get(origin); - CompoundScope members = membersClosure(origin.type, false); - if (e == null || - !e.matches(members.getMark())) { - boolean isMarkerIntf = isMarkerInterfaceInternal(origin, members); - _map.put(origin, new Entry(isMarkerIntf, members.getMark())); - return isMarkerIntf; - } - else { - return e.isMarkerIntf; - } - } - - /** - * Is given symbol a marker interface - */ - public boolean isMarkerInterfaceInternal(TypeSymbol origin, CompoundScope membersCache) throws FunctionDescriptorLookupError { - return !origin.isInterface() ? - false : - !membersCache.getElements(new DescriptorFilter(origin)).iterator().hasNext(); - } - } - - private MarkerCache markerCache = new MarkerCache(); - - /** - * Is given type a marker interface? - */ - public boolean isMarkerInterface(Type site) { - return markerCache.get(site.tsym); - } - // </editor-fold> - // <editor-fold defaultstate="collapsed" desc="isSubtype"> /** * Is t an unchecked subtype of s? @@ -976,9 +940,12 @@ * lists are of different length, return false. */ public boolean isSameTypes(List<Type> ts, List<Type> ss) { + return isSameTypes(ts, ss, false); + } + public boolean isSameTypes(List<Type> ts, List<Type> ss, boolean strict) { while (ts.tail != null && ss.tail != null /*inlined: ts.nonEmpty() && ss.nonEmpty()*/ && - isSameType(ts.head, ss.head)) { + isSameType(ts.head, ss.head, strict)) { ts = ts.tail; ss = ss.tail; } @@ -990,10 +957,15 @@ * Is t the same type as s? */ public boolean isSameType(Type t, Type s) { - return isSameType.visit(t, s); + return isSameType(t, s, false); + } + public boolean isSameType(Type t, Type s, boolean strict) { + return strict ? + isSameTypeStrict.visit(t, s) : + isSameTypeLoose.visit(t, s); } // where - private TypeRelation isSameType = new TypeRelation() { + abstract class SameTypeVisitor extends TypeRelation { public Boolean visitType(Type t, Type s) { if (t == s) @@ -1010,8 +982,7 @@ if (s.tag == TYPEVAR) { //type-substitution does not preserve type-var types //check that type var symbols and bounds are indeed the same - return t.tsym == s.tsym && - visit(t.getUpperBound(), s.getUpperBound()); + return sameTypeVars((TypeVar)t, (TypeVar)s); } else { //special case for s == ? super X, where upper(s) = u @@ -1026,6 +997,8 @@ } } + abstract boolean sameTypeVars(TypeVar tv1, TypeVar tv2); + @Override public Boolean visitWildcardType(WildcardType t, Type s) { if (s.isPartial()) @@ -1060,9 +1033,11 @@ } return t.tsym == s.tsym && visit(t.getEnclosingType(), s.getEnclosingType()) - && containsTypeEquivalent(t.getTypeArguments(), s.getTypeArguments()); + && containsTypes(t.getTypeArguments(), s.getTypeArguments()); } + abstract protected boolean containsTypes(List<Type> ts1, List<Type> ts2); + @Override public Boolean visitArrayType(ArrayType t, Type s) { if (t == s) @@ -1115,6 +1090,47 @@ public Boolean visitErrorType(ErrorType t, Type s) { return true; } + } + + /** + * Standard type-equality relation - type variables are considered + * equals if they share the same type symbol. + */ + TypeRelation isSameTypeLoose = new SameTypeVisitor() { + @Override + boolean sameTypeVars(TypeVar tv1, TypeVar tv2) { + return tv1.tsym == tv2.tsym && visit(tv1.getUpperBound(), tv2.getUpperBound()); + } + @Override + protected boolean containsTypes(List<Type> ts1, List<Type> ts2) { + return containsTypeEquivalent(ts1, ts2); + } + }; + + /** + * Strict type-equality relation - type variables are considered + * equals if they share the same object identity. + */ + TypeRelation isSameTypeStrict = new SameTypeVisitor() { + @Override + boolean sameTypeVars(TypeVar tv1, TypeVar tv2) { + return tv1 == tv2; + } + @Override + protected boolean containsTypes(List<Type> ts1, List<Type> ts2) { + return isSameTypes(ts1, ts2, true); + } + + @Override + public Boolean visitWildcardType(WildcardType t, Type s) { + if (!s.hasTag(WILDCARD)) { + return false; + } else { + WildcardType t2 = (WildcardType)s; + return t.kind == t2.kind && + isSameType(t.type, t2.type, true); + } + } }; // </editor-fold> @@ -1355,23 +1371,10 @@ } } - if (t.isCompound()) { - Warner oldWarner = warnStack.head; - warnStack.head = noWarnings; - if (!visit(supertype(t), s)) - return false; - for (Type intf : interfaces(t)) { - if (!visit(intf, s)) - return false; - } - if (warnStack.head.hasLint(LintCategory.UNCHECKED)) - oldWarner.warn(LintCategory.UNCHECKED); - return true; - } - - if (s.isCompound()) { - // call recursively to reuse the above code - return visitClassType((ClassType)s, t); + if (t.isCompound() || s.isCompound()) { + return !t.isCompound() ? + visitIntersectionType((IntersectionClassType)s, t, true) : + visitIntersectionType((IntersectionClassType)t, s, false); } if (s.tag == CLASS || s.tag == ARRAY) { @@ -1449,6 +1452,18 @@ return false; } + boolean visitIntersectionType(IntersectionClassType ict, Type s, boolean reverse) { + Warner warn = noWarnings; + for (Type c : ict.getComponents()) { + warn.clear(); + if (reverse ? !isCastable(s, c, warn) : !isCastable(c, s, warn)) + return false; + } + if (warn.hasLint(LintCategory.UNCHECKED)) + warnStack.head.warn(LintCategory.UNCHECKED); + return true; + } + @Override public Boolean visitArrayType(ArrayType t, Type s) { switch (s.tag) { @@ -2027,7 +2042,15 @@ @Override public Type visitAnnotatedType(AnnotatedType t, Boolean recurse) { - return new AnnotatedType(t.typeAnnotations, erasure(t.underlyingType, recurse)); + Type erased = erasure(t.underlyingType, recurse); + if (erased.isAnnotated()) { + // This can only happen when the underlying type is a + // type variable and the upper bound of it is annotated. + // The annotation on the type variable overrides the one + // on the bound. + erased = ((AnnotatedType)erased).underlyingType; + } + return new AnnotatedType(t.typeAnnotations, erased); } }; @@ -2544,23 +2567,24 @@ public List<MethodSymbol> interfaceCandidates(Type site, MethodSymbol ms) { Filter<Symbol> filter = new MethodFilter(ms, site); List<MethodSymbol> candidates = List.nil(); - for (Symbol s : membersClosure(site, false).getElements(filter)) { - if (!site.tsym.isInterface() && !s.owner.isInterface()) { - return List.of((MethodSymbol)s); - } else if (!candidates.contains(s)) { - candidates = candidates.prepend((MethodSymbol)s); + for (Symbol s : membersClosure(site, false).getElements(filter)) { + if (!site.tsym.isInterface() && !s.owner.isInterface()) { + return List.of((MethodSymbol)s); + } else if (!candidates.contains(s)) { + candidates = candidates.prepend((MethodSymbol)s); + } } + return prune(candidates); } - return prune(candidates, ownerComparator); - } - - public List<MethodSymbol> prune(List<MethodSymbol> methods, Comparator<MethodSymbol> cmp) { + + public List<MethodSymbol> prune(List<MethodSymbol> methods) { ListBuffer<MethodSymbol> methodsMin = ListBuffer.lb(); for (MethodSymbol m1 : methods) { boolean isMin_m1 = true; for (MethodSymbol m2 : methods) { if (m1 == m2) continue; - if (cmp.compare(m2, m1) < 0) { + if (m2.owner != m1.owner && + asSuper(m2.owner.type, m1.owner) != null) { isMin_m1 = false; break; } @@ -2570,12 +2594,6 @@ } return methodsMin.toList(); } - - Comparator<MethodSymbol> ownerComparator = new Comparator<MethodSymbol>() { - public int compare(MethodSymbol s1, MethodSymbol s2) { - return s1.owner.isSubClass(s2.owner, Types.this) ? -1 : 1; - } - }; // where private class MethodFilter implements Filter<Symbol> { @@ -3823,11 +3841,18 @@ } private boolean giveWarning(Type from, Type to) { - Type subFrom = asSub(from, to.tsym); - return to.isParameterized() && - (!(isUnbounded(to) || - isSubtype(from, to) || - ((subFrom != null) && containsType(to.allparams(), subFrom.allparams())))); + List<Type> bounds = to.isCompound() ? + ((IntersectionClassType)to).getComponents() : List.of(to); + for (Type b : bounds) { + Type subFrom = asSub(from, b.tsym); + if (b.isParameterized() && + (!(isUnbounded(b) || + isSubtype(from, b) || + ((subFrom != null) && containsType(b.allparams(), subFrom.allparams()))))) { + return true; + } + } + return false; } private List<Type> superClosure(Type t, Type s) { @@ -4305,4 +4330,172 @@ return vis; } // </editor-fold> + + // <editor-fold defaultstate="collapsed" desc="Signature Generation"> + + public static abstract class SignatureGenerator { + + private final Types types; + + protected abstract void append(char ch); + protected abstract void append(byte[] ba); + protected abstract void append(Name name); + protected void classReference(ClassSymbol c) { /* by default: no-op */ } + + protected SignatureGenerator(Types types) { + this.types = types; + } + + /** + * Assemble signature of given type in string buffer. + */ + public void assembleSig(Type type) { + type = type.unannotatedType(); + switch (type.getTag()) { + case BYTE: + append('B'); + break; + case SHORT: + append('S'); + break; + case CHAR: + append('C'); + break; + case INT: + append('I'); + break; + case LONG: + append('J'); + break; + case FLOAT: + append('F'); + break; + case DOUBLE: + append('D'); + break; + case BOOLEAN: + append('Z'); + break; + case VOID: + append('V'); + break; + case CLASS: + append('L'); + assembleClassSig(type); + append(';'); + break; + case ARRAY: + ArrayType at = (ArrayType) type; + append('['); + assembleSig(at.elemtype); + break; + case METHOD: + MethodType mt = (MethodType) type; + append('('); + assembleSig(mt.argtypes); + append(')'); + assembleSig(mt.restype); + if (hasTypeVar(mt.thrown)) { + for (List<Type> l = mt.thrown; l.nonEmpty(); l = l.tail) { + append('^'); + assembleSig(l.head); + } + } + break; + case WILDCARD: { + Type.WildcardType ta = (Type.WildcardType) type; + switch (ta.kind) { + case SUPER: + append('-'); + assembleSig(ta.type); + break; + case EXTENDS: + append('+'); + assembleSig(ta.type); + break; + case UNBOUND: + append('*'); + break; + default: + throw new AssertionError(ta.kind); + } + break; + } + case TYPEVAR: + append('T'); + append(type.tsym.name); + append(';'); + break; + case FORALL: + Type.ForAll ft = (Type.ForAll) type; + assembleParamsSig(ft.tvars); + assembleSig(ft.qtype); + break; + default: + throw new AssertionError("typeSig " + type.getTag()); + } + } + + public boolean hasTypeVar(List<Type> l) { + while (l.nonEmpty()) { + if (l.head.hasTag(TypeTag.TYPEVAR)) { + return true; + } + l = l.tail; + } + return false; + } + + public void assembleClassSig(Type type) { + type = type.unannotatedType(); + ClassType ct = (ClassType) type; + ClassSymbol c = (ClassSymbol) ct.tsym; + classReference(c); + Type outer = ct.getEnclosingType(); + if (outer.allparams().nonEmpty()) { + boolean rawOuter = + c.owner.kind == Kinds.MTH || // either a local class + c.name == types.names.empty; // or anonymous + assembleClassSig(rawOuter + ? types.erasure(outer) + : outer); + append('.'); + Assert.check(c.flatname.startsWith(c.owner.enclClass().flatname)); + append(rawOuter + ? c.flatname.subName(c.owner.enclClass().flatname.getByteLength() + 1, c.flatname.getByteLength()) + : c.name); + } else { + append(externalize(c.flatname)); + } + if (ct.getTypeArguments().nonEmpty()) { + append('<'); + assembleSig(ct.getTypeArguments()); + append('>'); + } + } + + public void assembleParamsSig(List<Type> typarams) { + append('<'); + for (List<Type> ts = typarams; ts.nonEmpty(); ts = ts.tail) { + Type.TypeVar tvar = (Type.TypeVar) ts.head; + append(tvar.tsym.name); + List<Type> bounds = types.getBounds(tvar); + if ((bounds.head.tsym.flags() & INTERFACE) != 0) { + append(':'); + } + for (List<Type> l = bounds; l.nonEmpty(); l = l.tail) { + append(':'); + assembleSig(l.head); + } + } + append('>'); + } + + private void assembleSig(List<Type> types) { + for (List<Type> ts = types; ts.nonEmpty(); ts = ts.tail) { + assembleSig(ts.head); + } + } + } + // </editor-fold> }
--- a/src/share/classes/com/sun/tools/javac/comp/Annotate.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/comp/Annotate.java Tue May 07 17:14:17 2013 -0700 @@ -384,10 +384,16 @@ Assert.check(!annotations.isEmpty() && !annotations.tail.isEmpty()); // i.e. size() > 1 + int count = 0; for (List<T> al = annotations; !al.isEmpty(); al = al.tail) { + count++; + + // There must be more than a single anno in the annotation list + Assert.check(count > 1 || !al.tail.isEmpty()); + T currentAnno = al.head; origAnnoType = currentAnno.type; @@ -395,7 +401,9 @@ arrayOfOrigAnnoType = types.makeArrayType(origAnnoType); } - Type currentContainerType = getContainingType(currentAnno, ctx.pos.get(currentAnno)); + // Only report errors if this isn't the first occurrence I.E. count > 1 + boolean reportError = count > 1; + Type currentContainerType = getContainingType(currentAnno, ctx.pos.get(currentAnno), reportError); if (currentContainerType == null) { continue; } @@ -464,7 +472,8 @@ /** Fetches the actual Type that should be the containing annotation. */ private Type getContainingType(Attribute.Compound currentAnno, - DiagnosticPosition pos) + DiagnosticPosition pos, + boolean reportError) { Type origAnnoType = currentAnno.type; TypeSymbol origAnnoDecl = origAnnoType.tsym; @@ -473,7 +482,8 @@ // annotation's declaration, or null if it has none Attribute.Compound ca = origAnnoDecl.attribute(syms.repeatableType.tsym); if (ca == null) { // has no Repeatable annotation - log.error(pos, "duplicate.annotation.missing.container", origAnnoType, syms.repeatableType); + if (reportError) + log.error(pos, "duplicate.annotation.missing.container", origAnnoType, syms.repeatableType); return null; }
--- a/src/share/classes/com/sun/tools/javac/comp/Attr.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java Tue May 07 17:14:17 2013 -0700 @@ -49,7 +49,7 @@ import com.sun.tools.javac.comp.Check.CheckContext; import com.sun.tools.javac.comp.DeferredAttr.AttrMode; import com.sun.tools.javac.comp.Infer.InferenceContext; -import com.sun.tools.javac.comp.Infer.InferenceContext.FreeTypeListener; +import com.sun.tools.javac.comp.Infer.FreeTypeListener; import com.sun.tools.javac.jvm.*; import com.sun.tools.javac.tree.*; import com.sun.tools.javac.tree.JCTree.*; @@ -157,6 +157,7 @@ varInfo = new ResultInfo(VAR, Type.noType); unknownExprInfo = new ResultInfo(VAL, Type.noType); unknownTypeInfo = new ResultInfo(TYP, Type.noType); + unknownTypeExprInfo = new ResultInfo(Kinds.TYP | Kinds.VAL, Type.noType); recoveryInfo = new RecoveryInfo(deferredAttr.emptyDeferredAttrContext); } @@ -253,8 +254,8 @@ @Override public void typesInferred(InferenceContext inferenceContext) { ResultInfo pendingResult = - resultInfo.dup(inferenceContext.asInstType(resultInfo.pt, types)); - check(tree, inferenceContext.asInstType(found, types), ownkind, pendingResult); + resultInfo.dup(inferenceContext.asInstType(resultInfo.pt)); + check(tree, inferenceContext.asInstType(found), ownkind, pendingResult); } }); return tree.type = resultInfo.pt; @@ -568,6 +569,7 @@ final ResultInfo varInfo; final ResultInfo unknownExprInfo; final ResultInfo unknownTypeInfo; + final ResultInfo unknownTypeExprInfo; final ResultInfo recoveryInfo; Type pt() { @@ -676,7 +678,7 @@ List<Type> attribArgs(List<JCExpression> trees, Env<AttrContext> env) { ListBuffer<Type> argtypes = new ListBuffer<Type>(); for (JCExpression arg : trees) { - Type argtype = allowPoly && TreeInfo.isPoly(arg, env.tree) ? + Type argtype = allowPoly && deferredAttr.isDeferred(env, arg) ? deferredAttr.new DeferredType(arg, env) : chk.checkNonVoid(arg, attribExpr(arg, env, Infer.anyPoly)); argtypes.append(argtype); @@ -775,6 +777,8 @@ JavaFileObject prevSource = log.useSource(env.toplevel.sourcefile); try { + memberEnter.typeAnnotate(initializer, env, env.info.enclVar); + annotate.flush(); Type itype = attribExpr(initializer, env, type); if (itype.constValue() != null) return coerce(itype, type).constValue(); @@ -1108,8 +1112,9 @@ Env<AttrContext> localEnv = env.dup(tree, env.info.dup(env.info.scope.dupUnshared())); localEnv.info.scope.owner = - new MethodSymbol(tree.flags | BLOCK, names.empty, null, - env.info.scope.owner); + new MethodSymbol(tree.flags | BLOCK | + env.info.scope.owner.flags() & STRICTFP, names.empty, null, + env.info.scope.owner); if ((tree.flags & STATIC) != 0) localEnv.info.staticLevel++; // Attribute all type annotations in the block @@ -2157,8 +2162,11 @@ ResultInfo findDiamondResult = new ResultInfo(VAL, resultInfo.checkContext.inferenceContext().free(resultInfo.pt) ? Type.noType : pt()); Type inferred = deferredAttr.attribSpeculative(tree, env, findDiamondResult).type; + Type polyPt = allowPoly ? + syms.objectType : + clazztype; if (!inferred.isErroneous() && - types.isAssignable(inferred, pt().hasTag(NONE) ? syms.objectType : pt(), types.noWarnings)) { + types.isAssignable(inferred, pt().hasTag(NONE) ? polyPt : pt(), types.noWarnings)) { String key = types.isSameType(clazztype, inferred) ? "diamond.redundant.args" : "diamond.redundant.args.1"; @@ -2276,7 +2284,7 @@ Type lambdaType; if (pt() != Type.recoveryType) { - target = checkIntersectionTarget(that, target, resultInfo.checkContext); + target = targetChecker.visit(target, that); lambdaType = types.findDescriptorType(target); chk.checkFunctionalInterface(that, target); } else { @@ -2284,7 +2292,7 @@ lambdaType = fallbackDescriptorType(that); } - setFunctionalInfo(that, pt(), lambdaType, resultInfo.checkContext.inferenceContext()); + setFunctionalInfo(that, pt(), lambdaType, target, resultInfo.checkContext.inferenceContext()); if (lambdaType.hasTag(FORALL)) { //lambda expression target desc cannot be a generic method @@ -2343,11 +2351,34 @@ new ResultInfo(VAL, lambdaType.getReturnType(), funcContext); localEnv.info.returnResult = bodyResultInfo; - if (that.getBodyKind() == JCLambda.BodyKind.EXPRESSION) { - attribTree(that.getBody(), localEnv, bodyResultInfo); - } else { - JCBlock body = (JCBlock)that.body; - attribStats(body.stats, localEnv); + Log.DeferredDiagnosticHandler lambdaDeferredHandler = new Log.DeferredDiagnosticHandler(log); + try { + if (that.getBodyKind() == JCLambda.BodyKind.EXPRESSION) { + attribTree(that.getBody(), localEnv, bodyResultInfo); + } else { + JCBlock body = (JCBlock)that.body; + attribStats(body.stats, localEnv); + } + + if (resultInfo.checkContext.deferredAttrContext().mode == AttrMode.SPECULATIVE) { + //check for errors in lambda body + for (JCDiagnostic deferredDiag : lambdaDeferredHandler.getDiagnostics()) { + if (deferredDiag.getKind() == JCDiagnostic.Kind.ERROR) { + resultInfo.checkContext + .report(that, diags.fragment("bad.arg.types.in.lambda", TreeInfo.types(that.params))); + //we mark the lambda as erroneous - this is crucial in the recovery step + //as parameter-dependent type error won't be reported in that stage, + //meaning that a lambda will be deemed erroeneous only if there is + //a target-independent error (which will cause method diagnostic + //to be skipped). + result = that.type = types.createErrorType(target); + return; + } + } + } + } finally { + lambdaDeferredHandler.reportDeferredDiagnostics(); + log.popDiagnosticHandler(lambdaDeferredHandler); } result = check(that, target, VAL, resultInfo); @@ -2376,26 +2407,55 @@ } } } - - private Type checkIntersectionTarget(DiagnosticPosition pos, Type pt, CheckContext checkContext) { - if (pt != Type.recoveryType && pt.isCompound()) { - IntersectionClassType ict = (IntersectionClassType)pt; - List<Type> bounds = ict.allInterfaces ? - ict.getComponents().tail : - ict.getComponents(); - types.findDescriptorType(bounds.head); //propagate exception outwards! - for (Type bound : bounds.tail) { - if (!types.isMarkerInterface(bound)) { - checkContext.report(pos, diags.fragment("secondary.bound.must.be.marker.intf", bound)); + //where + Types.MapVisitor<DiagnosticPosition> targetChecker = new Types.MapVisitor<DiagnosticPosition>() { + + @Override + public Type visitClassType(ClassType t, DiagnosticPosition pos) { + return t.isCompound() ? + visitIntersectionClassType((IntersectionClassType)t, pos) : t; + } + + public Type visitIntersectionClassType(IntersectionClassType ict, DiagnosticPosition pos) { + Symbol desc = types.findDescriptorSymbol(makeNotionalInterface(ict)); + Type target = null; + for (Type bound : ict.getExplicitComponents()) { + TypeSymbol boundSym = bound.tsym; + if (types.isFunctionalInterface(boundSym) && + types.findDescriptorSymbol(boundSym) == desc) { + target = bound; + } else if (!boundSym.isInterface() || (boundSym.flags() & ANNOTATION) != 0) { + //bound must be an interface + reportIntersectionError(pos, "not.an.intf.component", boundSym); + } } + return target != null ? + target : + ict.getExplicitComponents().head; //error recovery } - //for now (translation doesn't support intersection types) - return bounds.head; - } else { - return pt; - } - } - //where + + private TypeSymbol makeNotionalInterface(IntersectionClassType ict) { + ListBuffer<Type> targs = ListBuffer.lb(); + ListBuffer<Type> supertypes = ListBuffer.lb(); + for (Type i : ict.interfaces_field) { + if (i.isParameterized()) { + targs.appendList(i.tsym.type.allparams()); + } + supertypes.append(i.tsym.type); + } + IntersectionClassType notionalIntf = + (IntersectionClassType)types.makeCompoundType(supertypes.toList()); + notionalIntf.allparams_field = targs.toList(); + notionalIntf.tsym.flags_field |= INTERFACE; + return notionalIntf.tsym; + } + + private void reportIntersectionError(DiagnosticPosition pos, String key, Object... args) { + resultInfo.checkContext.report(pos, diags.fragment("bad.intersection.target.for.functional.expr", + diags.fragment(key, args))); + } + }; + private Type fallbackDescriptorType(JCExpression tree) { switch (tree.getTag()) { case LAMBDA: @@ -2406,25 +2466,29 @@ argtypes.append(param.vartype.type) : argtypes.append(syms.errType); } - return new MethodType(argtypes, Type.recoveryType, List.<Type>nil(), syms.methodClass); + return new MethodType(argtypes, Type.recoveryType, + List.of(syms.throwableType), syms.methodClass); case REFERENCE: - return new MethodType(List.<Type>nil(), Type.recoveryType, List.<Type>nil(), syms.methodClass); + return new MethodType(List.<Type>nil(), Type.recoveryType, + List.of(syms.throwableType), syms.methodClass); default: Assert.error("Cannot get here!"); } return null; } - private void checkAccessibleTypes(final DiagnosticPosition pos, final Env<AttrContext> env, final InferenceContext inferenceContext, final Type... ts) { + private void checkAccessibleTypes(final DiagnosticPosition pos, final Env<AttrContext> env, + final InferenceContext inferenceContext, final Type... ts) { checkAccessibleTypes(pos, env, inferenceContext, List.from(ts)); } - private void checkAccessibleTypes(final DiagnosticPosition pos, final Env<AttrContext> env, final InferenceContext inferenceContext, final List<Type> ts) { + private void checkAccessibleTypes(final DiagnosticPosition pos, final Env<AttrContext> env, + final InferenceContext inferenceContext, final List<Type> ts) { if (inferenceContext.free(ts)) { inferenceContext.addFreeTypeListener(ts, new FreeTypeListener() { @Override public void typesInferred(InferenceContext inferenceContext) { - checkAccessibleTypes(pos, env, inferenceContext, inferenceContext.asInstTypes(ts, types)); + checkAccessibleTypes(pos, env, inferenceContext, inferenceContext.asInstTypes(ts)); } }); } else { @@ -2449,7 +2513,7 @@ @Override public boolean compatible(Type found, Type req, Warner warn) { //return type must be compatible in both current context and assignment context - return chk.basicHandler.compatible(found, inferenceContext().asFree(req, types), warn); + return chk.basicHandler.compatible(found, inferenceContext().asFree(req), warn); } @Override @@ -2484,7 +2548,7 @@ * descriptor. */ private void checkLambdaCompatible(JCLambda tree, Type descriptor, CheckContext checkContext, boolean speculativeAttr) { - Type returnType = checkContext.inferenceContext().asFree(descriptor.getReturnType(), types); + Type returnType = checkContext.inferenceContext().asFree(descriptor.getReturnType()); //return values have already been checked - but if lambda has no return //values, we must ensure that void/value compatibility is correct; @@ -2496,13 +2560,13 @@ diags.fragment("missing.ret.val", returnType))); } - List<Type> argTypes = checkContext.inferenceContext().asFree(descriptor.getParameterTypes(), types); + List<Type> argTypes = checkContext.inferenceContext().asFree(descriptor.getParameterTypes()); if (!types.isSameTypes(argTypes, TreeInfo.types(tree.params))) { checkContext.report(tree, diags.fragment("incompatible.arg.types.in.lambda")); } if (!speculativeAttr) { - List<Type> thrownTypes = checkContext.inferenceContext().asFree(descriptor.getThrownTypes(), types); + List<Type> thrownTypes = checkContext.inferenceContext().asFree(descriptor.getThrownTypes()); if (chk.unhandled(tree.inferredThrownTypes == null ? List.<Type>nil() : tree.inferredThrownTypes, thrownTypes).nonEmpty()) { log.error(tree, "incompatible.thrown.types.in.lambda", tree.inferredThrownTypes); } @@ -2538,8 +2602,7 @@ try { //attribute member reference qualifier - if this is a constructor //reference, the expected kind must be a type - Type exprType = attribTree(that.expr, - env, new ResultInfo(that.getMode() == ReferenceMode.INVOKE ? VAL | TYP : TYP, Type.noType)); + Type exprType = attribTree(that.expr, env, memberReferenceQualifierResult(that)); if (that.getMode() == JCMemberReference.ReferenceMode.NEW) { exprType = chk.checkConstructorRefType(that.expr, exprType); @@ -2547,7 +2610,7 @@ if (exprType.isErroneous()) { //if the qualifier expression contains problems, - //give up atttribution of method reference + //give up attribution of method reference result = that.type = exprType; return; } @@ -2567,7 +2630,7 @@ Type target; Type desc; if (pt() != Type.recoveryType) { - target = checkIntersectionTarget(that, pt(), resultInfo.checkContext); + target = targetChecker.visit(pt(), that); desc = types.findDescriptorType(target); chk.checkFunctionalInterface(that, target); } else { @@ -2575,11 +2638,12 @@ desc = fallbackDescriptorType(that); } - setFunctionalInfo(that, pt(), desc, resultInfo.checkContext.inferenceContext()); + setFunctionalInfo(that, pt(), desc, target, resultInfo.checkContext.inferenceContext()); List<Type> argtypes = desc.getParameterTypes(); - Pair<Symbol, Resolve.ReferenceLookupHelper> refResult = rs.resolveMemberReference(that.pos(), localEnv, that, - that.expr.type, that.name, argtypes, typeargtypes, true); + Pair<Symbol, Resolve.ReferenceLookupHelper> refResult = + rs.resolveMemberReference(that.pos(), localEnv, that, + that.expr.type, that.name, argtypes, typeargtypes, true, rs.resolveMethodCheck); Symbol refSym = refResult.fst; Resolve.ReferenceLookupHelper lookupHelper = refResult.snd; @@ -2628,8 +2692,39 @@ } } + that.sym = refSym.baseSymbol(); + that.kind = lookupHelper.referenceKind(that.sym); + that.ownerAccessible = rs.isAccessible(localEnv, that.sym.enclClass()); + + if (desc.getReturnType() == Type.recoveryType) { + // stop here + result = that.type = target; + return; + } + if (resultInfo.checkContext.deferredAttrContext().mode == AttrMode.CHECK) { - if (refSym.isStatic() && TreeInfo.isStaticSelector(that.expr, names) && + + if (!that.kind.isUnbound() && + that.getMode() == ReferenceMode.INVOKE && + TreeInfo.isStaticSelector(that.expr, names) && + !that.sym.isStatic()) { + log.error(that.expr.pos(), "invalid.mref", Kinds.kindName(that.getMode()), + diags.fragment("non-static.cant.be.ref", Kinds.kindName(refSym), refSym)); + result = that.type = types.createErrorType(target); + return; + } + + if (that.kind.isUnbound() && + that.getMode() == ReferenceMode.INVOKE && + TreeInfo.isStaticSelector(that.expr, names) && + that.sym.isStatic()) { + log.error(that.expr.pos(), "invalid.mref", Kinds.kindName(that.getMode()), + diags.fragment("static.method.in.unbound.lookup", Kinds.kindName(refSym), refSym)); + result = that.type = types.createErrorType(target); + return; + } + + if (that.sym.isStatic() && TreeInfo.isStaticSelector(that.expr, names) && exprType.getTypeArguments().nonEmpty()) { //static ref with class type-args log.error(that.expr.pos(), "invalid.mref", Kinds.kindName(that.getMode()), @@ -2638,20 +2733,19 @@ return; } - if (refSym.isStatic() && !TreeInfo.isStaticSelector(that.expr, names) && - !lookupHelper.referenceKind(refSym).isUnbound()) { + if (that.sym.isStatic() && !TreeInfo.isStaticSelector(that.expr, names) && + !that.kind.isUnbound()) { //no static bound mrefs log.error(that.expr.pos(), "invalid.mref", Kinds.kindName(that.getMode()), diags.fragment("static.bound.mref")); result = that.type = types.createErrorType(target); return; } - } - - if (desc.getReturnType() == Type.recoveryType) { - // stop here - result = that.type = target; - return; + + if (!refSym.isStatic() && that.kind == JCMemberReference.ReferenceKind.SUPER) { + // Check that super-qualified symbols are not abstract (JLS) + rs.checkNonAbstract(that.pos(), that.sym); + } } that.sym = refSym.baseSymbol(); @@ -2686,10 +2780,16 @@ return; } } + //where + ResultInfo memberReferenceQualifierResult(JCMemberReference tree) { + //if this is a constructor reference, the expected kind must be a type + return new ResultInfo(tree.getMode() == ReferenceMode.INVOKE ? VAL | TYP : TYP, Type.noType); + } + @SuppressWarnings("fallthrough") void checkReferenceCompatible(JCMemberReference tree, Type descriptor, Type refType, CheckContext checkContext, boolean speculativeAttr) { - Type returnType = checkContext.inferenceContext().asFree(descriptor.getReturnType(), types); + Type returnType = checkContext.inferenceContext().asFree(descriptor.getReturnType()); Type resType; switch (tree.getMode()) { @@ -2721,7 +2821,7 @@ } if (!speculativeAttr) { - List<Type> thrownTypes = checkContext.inferenceContext().asFree(descriptor.getThrownTypes(), types); + List<Type> thrownTypes = checkContext.inferenceContext().asFree(descriptor.getThrownTypes()); if (chk.unhandled(refType.getThrownTypes(), thrownTypes).nonEmpty()) { log.error(tree, "incompatible.thrown.types.in.mref", refType.getThrownTypes()); } @@ -2733,19 +2833,24 @@ * might contain inference variables, we might need to register an hook in the * current inference context. */ - private void setFunctionalInfo(final JCFunctionalExpression fExpr, final Type pt, final Type descriptorType, InferenceContext inferenceContext) { + private void setFunctionalInfo(final JCFunctionalExpression fExpr, final Type pt, + final Type descriptorType, final Type primaryTarget, InferenceContext inferenceContext) { if (inferenceContext.free(descriptorType)) { inferenceContext.addFreeTypeListener(List.of(pt, descriptorType), new FreeTypeListener() { public void typesInferred(InferenceContext inferenceContext) { - setFunctionalInfo(fExpr, pt, inferenceContext.asInstType(descriptorType, types), inferenceContext); + setFunctionalInfo(fExpr, pt, inferenceContext.asInstType(descriptorType), + inferenceContext.asInstType(primaryTarget), inferenceContext); } }); } else { ListBuffer<TypeSymbol> targets = ListBuffer.lb(); if (pt.hasTag(CLASS)) { if (pt.isCompound()) { + targets.append(primaryTarget.tsym); //this goes first for (Type t : ((IntersectionClassType)pt()).interfaces_field) { - targets.append(t.tsym); + if (t != primaryTarget) { + targets.append(t.tsym); + } } } else { targets.append(pt.tsym); @@ -2895,7 +3000,8 @@ Env<AttrContext> localEnv = env.dup(tree); //should we propagate the target type? final ResultInfo castInfo; - final boolean isPoly = TreeInfo.isPoly(tree.expr, tree); + JCExpression expr = TreeInfo.skipParens(tree.expr); + boolean isPoly = expr.hasTag(LAMBDA) || expr.hasTag(REFERENCE); if (isPoly) { //expression is a poly - we need to propagate target type info castInfo = new ResultInfo(VAL, clazztype, new Check.NestedCheckContext(resultInfo.checkContext) { @@ -3330,7 +3436,7 @@ Type normOuter = site; if (normOuter.hasTag(CLASS)) { normOuter = types.asEnclosingSuper(site, ownOuter.tsym); - if (site.getKind() == TypeKind.ANNOTATED) { + if (site.isAnnotated()) { // Propagate any type annotations. // TODO: should asEnclosingSuper do this? // Note that the type annotations in site will be updated @@ -3405,6 +3511,7 @@ if (sym.name != names.init) { chk.checkDeprecated(tree.pos(), env.info.scope.owner, sym); chk.checkSunAPI(tree.pos(), sym); + chk.checkProfile(tree.pos(), sym); } // Test (3): if symbol is a variable, check that its type and @@ -3563,8 +3670,7 @@ env.info.defaultSuperCallSite = null; } - if (sym.isStatic() && site.isInterface()) { - Assert.check(env.tree.hasTag(APPLY)); + if (sym.isStatic() && site.isInterface() && env.tree.hasTag(APPLY)) { JCMethodInvocation app = (JCMethodInvocation)env.tree; if (app.meth.hasTag(SELECT) && !TreeInfo.isStaticSelector(((JCFieldAccess)app.meth).selected, names)) { @@ -4182,13 +4288,13 @@ // Enums may not be extended by source-level classes if (st.tsym != null && ((st.tsym.flags_field & Flags.ENUM) != 0) && - ((c.flags_field & (Flags.ENUM | Flags.COMPOUND)) == 0) && - !target.compilerBootstrap(c)) { + ((c.flags_field & (Flags.ENUM | Flags.COMPOUND)) == 0)) { log.error(env.tree.pos(), "enum.types.not.extensible"); } attribClassBody(env, c); chk.checkDeprecatedAnnotation(env.tree.pos(), c); + chk.checkClassOverrideEqualsAndHashIfNeeded(env.tree.pos(), c); } finally { env.info.returnResult = prevReturnRes; log.useSource(prev); @@ -4365,7 +4471,9 @@ } private Type capture(Type type) { - return types.capture(type); + //do not capture free types + return resultInfo.checkContext.inferenceContext().free(type) ? + type : types.capture(type); } private void validateTypeAnnotations(JCTree tree) { @@ -4449,7 +4557,7 @@ validateAnnotatedType(errtree, type); if (type.tsym != null && type.tsym.isStatic() && - type.getAnnotations().nonEmpty()) { + type.getAnnotationMirrors().nonEmpty()) { // Enclosing static classes cannot have type annotations. log.error(errtree.pos(), "cant.annotate.static.class"); }
--- a/src/share/classes/com/sun/tools/javac/comp/Check.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/comp/Check.java Tue May 07 17:14:17 2013 -0700 @@ -36,7 +36,7 @@ import com.sun.tools.javac.code.Type.*; import com.sun.tools.javac.comp.DeferredAttr.DeferredAttrContext; import com.sun.tools.javac.comp.Infer.InferenceContext; -import com.sun.tools.javac.comp.Infer.InferenceContext.FreeTypeListener; +import com.sun.tools.javac.comp.Infer.FreeTypeListener; import com.sun.tools.javac.jvm.*; import com.sun.tools.javac.tree.*; import com.sun.tools.javac.tree.JCTree.*; @@ -77,6 +77,7 @@ private boolean enableSunApiLintControl; private final TreeInfo treeinfo; private final JavaFileManager fileManager; + private final Profile profile; // The set of lint options currently in effect. It is initialized // from the context, and then is set/reset as needed by Attr as it @@ -107,7 +108,7 @@ enter = Enter.instance(context); deferredAttr = DeferredAttr.instance(context); infer = Infer.instance(context); - this.types = Types.instance(context); + types = Types.instance(context); diags = JCDiagnostic.Factory.instance(context); Options options = Options.instance(context); lint = Lint.instance(context); @@ -130,6 +131,8 @@ Target target = Target.instance(context); syntheticNameChar = target.syntheticNameChar(); + profile = Profile.instance(context); + boolean verboseDeprecated = lint.isEnabled(LintCategory.DEPRECATION); boolean verboseUnchecked = lint.isEnabled(LintCategory.UNCHECKED); boolean verboseSunApi = lint.isEnabled(LintCategory.SUNAPI); @@ -279,7 +282,7 @@ * @param ex The failure to report. */ public Type completionError(DiagnosticPosition pos, CompletionFailure ex) { - log.error(pos, "cant.access", ex.sym, ex.getDetailValue()); + log.error(JCDiagnostic.DiagnosticFlag.NON_DEFERRABLE, pos, "cant.access", ex.sym, ex.getDetailValue()); if (ex instanceof ClassReader.BadClassFile && !suppressAbortOnBadClassFile) throw new Abort(); else return syms.errType; @@ -527,7 +530,7 @@ inferenceContext.addFreeTypeListener(List.of(req), new FreeTypeListener() { @Override public void typesInferred(InferenceContext inferenceContext) { - checkType(pos, found, inferenceContext.asInstType(req, types), checkContext); + checkType(pos, found, inferenceContext.asInstType(req), checkContext); } }); } @@ -664,11 +667,18 @@ t = checkClassOrArrayType(pos, t); if (t.hasTag(CLASS)) { if ((t.tsym.flags() & (ABSTRACT | INTERFACE)) != 0) { - log.error(pos, "abstract.cant.be.instantiated"); + log.error(pos, "abstract.cant.be.instantiated", t.tsym); t = types.createErrorType(t); } else if ((t.tsym.flags() & ENUM) != 0) { log.error(pos, "enum.cant.be.instantiated"); t = types.createErrorType(t); + } else { + t = checkClassType(pos, t, true); + } + } else if (t.hasTag(ARRAY)) { + if (!types.isReifiable(((ArrayType)t).elemtype)) { + log.error(pos, "generic.array.creation"); + t = types.createErrorType(t); } } return t; @@ -1066,7 +1076,7 @@ } // Imply STRICTFP if owner has STRICTFP set. if (((flags|implicit) & Flags.ABSTRACT) == 0) - implicit |= sym.owner.flags_field & STRICTFP; + implicit |= sym.owner.flags_field & STRICTFP; break; case TYP: if (sym.isLocal()) { @@ -1584,6 +1594,7 @@ (other.flags() & STATIC) == 0) { log.error(TreeInfo.diagnosticPositionFor(m, tree), "override.static", cannotOverride(m, other)); + m.flags_field |= BAD_OVERRIDE; return; } @@ -1595,6 +1606,7 @@ log.error(TreeInfo.diagnosticPositionFor(m, tree), "override.meth", cannotOverride(m, other), asFlagSet(other.flags() & (FINAL | STATIC))); + m.flags_field |= BAD_OVERRIDE; return; } @@ -1611,6 +1623,7 @@ other.flags() == 0 ? Flag.PACKAGE : asFlagSet(other.flags() & AccessFlags)); + m.flags_field |= BAD_OVERRIDE; return; } @@ -1638,6 +1651,7 @@ "override.incompatible.ret", cannotOverride(m, other), mtres, otres); + m.flags_field |= BAD_OVERRIDE; return; } } else if (overrideWarner.hasNonSilentLint(LintCategory.UNCHECKED)) { @@ -1657,6 +1671,7 @@ "override.meth.doesnt.throw", cannotOverride(m, other), unhandledUnerased.head); + m.flags_field |= BAD_OVERRIDE; return; } else if (unhandledUnerased.nonEmpty()) { @@ -1952,6 +1967,52 @@ } } + private Filter<Symbol> equalsHasCodeFilter = new Filter<Symbol>() { + public boolean accepts(Symbol s) { + return MethodSymbol.implementation_filter.accepts(s) && + (s.flags() & BAD_OVERRIDE) == 0; + + } + }; + + public void checkClassOverrideEqualsAndHashIfNeeded(DiagnosticPosition pos, + ClassSymbol someClass) { + /* At present, annotations cannot possibly have a method that is override + * equivalent with Object.equals(Object) but in any case the condition is + * fine for completeness. + */ + if (someClass == (ClassSymbol)syms.objectType.tsym || + someClass.isInterface() || someClass.isEnum() || + (someClass.flags() & ANNOTATION) != 0 || + (someClass.flags() & ABSTRACT) != 0) return; + //anonymous inner classes implementing interfaces need especial treatment + if (someClass.isAnonymous()) { + List<Type> interfaces = types.interfaces(someClass.type); + if (interfaces != null && !interfaces.isEmpty() && + interfaces.head.tsym == syms.comparatorType.tsym) return; + } + checkClassOverrideEqualsAndHash(pos, someClass); + } + + private void checkClassOverrideEqualsAndHash(DiagnosticPosition pos, + ClassSymbol someClass) { + if (lint.isEnabled(LintCategory.OVERRIDES)) { + MethodSymbol equalsAtObject = (MethodSymbol)syms.objectType + .tsym.members().lookup(names.equals).sym; + MethodSymbol hashCodeAtObject = (MethodSymbol)syms.objectType + .tsym.members().lookup(names.hashCode).sym; + boolean overridesEquals = types.implementation(equalsAtObject, + someClass, false, equalsHasCodeFilter).owner == someClass; + boolean overridesHashCode = types.implementation(hashCodeAtObject, + someClass, false, equalsHasCodeFilter) != hashCodeAtObject; + + if (overridesEquals && !overridesHashCode) { + log.warning(LintCategory.OVERRIDES, pos, + "override.equals.but.not.hashcode", someClass); + } + } + } + private boolean checkNameClash(ClassSymbol origin, Symbol s1, Symbol s2) { ClashFilter cf = new ClashFilter(origin.type); return (cf.accepts(s1) && @@ -2228,10 +2289,13 @@ void checkFunctionalInterface(JCTree tree, Type funcInterface) { ClassType c = new ClassType(Type.noType, List.<Type>nil(), null); ClassSymbol csym = new ClassSymbol(0, names.empty, c, syms.noSymbol); - c.interfaces_field = List.of(funcInterface); + c.interfaces_field = List.of(types.removeWildcards(funcInterface)); c.supertype_field = syms.objectType; c.tsym = csym; csym.members_field = new Scope(csym); + Symbol descSym = types.findDescriptorSymbol(funcInterface.tsym); + Type descType = types.findDescriptorType(funcInterface); + csym.members_field.enter(new MethodSymbol(PUBLIC, descSym.name, descType, csym)); csym.completer = null; checkImplementations(tree, csym, csym); } @@ -2711,25 +2775,17 @@ } private void validateTarget(Symbol container, Symbol contained, DiagnosticPosition pos) { - Attribute.Array containedTarget = getAttributeTargetAttribute(contained); - - // If contained has no Target, we are done - if (containedTarget == null) { - return; - } - - // If contained has Target m1, container must have a Target - // annotation, m2, and m2 must be a subset of m1. (This is - // trivially true if contained has no target as per above). - - // contained has target, but container has not, error + // The set of targets the container is applicable to must be a subset + // (with respect to annotation target semantics) of the set of targets + // the contained is applicable to. The target sets may be implicit or + // explicit. + + Set<Name> containerTargets; Attribute.Array containerTarget = getAttributeTargetAttribute(container); if (containerTarget == null) { - log.error(pos, "invalid.repeatable.annotation.incompatible.target", container, contained); - return; - } - - Set<Name> containerTargets = new HashSet<Name>(); + containerTargets = getDefaultTargetSet(); + } else { + containerTargets = new HashSet<Name>(); for (Attribute app : containerTarget.values) { if (!(app instanceof Attribute.Enum)) { continue; // recovery @@ -2737,8 +2793,14 @@ Attribute.Enum e = (Attribute.Enum)app; containerTargets.add(e.value.name); } - - Set<Name> containedTargets = new HashSet<Name>(); + } + + Set<Name> containedTargets; + Attribute.Array containedTarget = getAttributeTargetAttribute(contained); + if (containedTarget == null) { + containedTargets = getDefaultTargetSet(); + } else { + containedTargets = new HashSet<Name>(); for (Attribute app : containedTarget.values) { if (!(app instanceof Attribute.Enum)) { continue; // recovery @@ -2746,20 +2808,42 @@ Attribute.Enum e = (Attribute.Enum)app; containedTargets.add(e.value.name); } - - if (!isTargetSubset(containedTargets, containerTargets)) { + } + + if (!isTargetSubsetOf(containerTargets, containedTargets)) { log.error(pos, "invalid.repeatable.annotation.incompatible.target", container, contained); } } - /** Checks that t is a subset of s, with respect to ElementType + /* get a set of names for the default target */ + private Set<Name> getDefaultTargetSet() { + if (defaultTargets == null) { + Set<Name> targets = new HashSet<Name>(); + targets.add(names.ANNOTATION_TYPE); + targets.add(names.CONSTRUCTOR); + targets.add(names.FIELD); + targets.add(names.LOCAL_VARIABLE); + targets.add(names.METHOD); + targets.add(names.PACKAGE); + targets.add(names.PARAMETER); + targets.add(names.TYPE); + + defaultTargets = java.util.Collections.unmodifiableSet(targets); + } + + return defaultTargets; + } + private Set<Name> defaultTargets; + + + /** Checks that s is a subset of t, with respect to ElementType * semantics, specifically {ANNOTATION_TYPE} is a subset of {TYPE} */ - private boolean isTargetSubset(Set<Name> s, Set<Name> t) { - // Check that all elements in t are present in s - for (Name n2 : t) { + private boolean isTargetSubsetOf(Set<Name> s, Set<Name> t) { + // Check that all elements in s are present in t + for (Name n2 : s) { boolean currentElementOk = false; - for (Name n1 : s) { + for (Name n1 : t) { if (n1 == n2) { currentElementOk = true; break; @@ -3029,6 +3113,12 @@ } } + void checkProfile(final DiagnosticPosition pos, final Symbol s) { + if (profile != Profile.DEFAULT && (s.flags() & NOT_IN_PROFILE) != 0) { + log.error(pos, "not.in.profile", s, profile); + } + } + /* ************************************************************************* * Check for recursive annotation elements. **************************************************************************/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/javac/comp/CompileStates.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,92 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.javac.comp; + +import java.util.HashMap; + +import com.sun.tools.javac.util.Context; + +/** Partial map to record which compiler phases have been executed + * for each compilation unit. Used for ATTR and FLOW phases. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice.</b> + */ +public class CompileStates extends HashMap<Env<AttrContext>, CompileStates.CompileState> { + /** The context key for the compile states. */ + protected static final Context.Key<CompileStates> compileStatesKey = + new Context.Key<CompileStates>(); + + /** Get the CompileStates instance for this context. */ + public static CompileStates instance(Context context) { + CompileStates instance = context.get(compileStatesKey); + if (instance == null) { + instance = new CompileStates(context); + } + return instance; + } + + /** Ordered list of compiler phases for each compilation unit. */ + public enum CompileState { + INIT(0), + PARSE(1), + ENTER(2), + PROCESS(3), + ATTR(4), + FLOW(5), + TRANSTYPES(6), + UNLAMBDA(7), + LOWER(8), + GENERATE(9); + + CompileState(int value) { + this.value = value; + } + public boolean isAfter(CompileState other) { + return value > other.value; + } + public static CompileState max(CompileState a, CompileState b) { + return a.value > b.value ? a : b; + } + private final int value; + }; + + private static final long serialVersionUID = 1812267524140424433L; + + protected Context context; + + public CompileStates(Context context) { + this.context = context; + context.put(compileStatesKey, this); + } + + public boolean isDone(Env<AttrContext> env, CompileState cs) { + CompileState ecs = get(env); + return (ecs != null) && !cs.isAfter(ecs); + } +}
--- a/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java Tue May 07 17:14:17 2013 -0700 @@ -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 @@ -28,6 +28,7 @@ import com.sun.tools.javac.code.*; import com.sun.tools.javac.tree.*; import com.sun.tools.javac.util.*; +import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; import com.sun.tools.javac.code.Symbol.*; import com.sun.tools.javac.code.Type.*; import com.sun.tools.javac.comp.Attr.ResultInfo; @@ -68,6 +69,7 @@ final JCDiagnostic.Factory diags; final Enter enter; final Infer infer; + final Resolve rs; final Log log; final Symtab syms; final TreeMaker make; @@ -87,6 +89,7 @@ diags = JCDiagnostic.Factory.instance(context); enter = Enter.instance(context); infer = Infer.instance(context); + rs = Resolve.instance(context); log = Log.instance(context); syms = Symtab.instance(context); make = TreeMaker.instance(context); @@ -227,14 +230,14 @@ public Type complete(DeferredType dt, ResultInfo resultInfo, DeferredAttrContext deferredAttrContext) { switch (deferredAttrContext.mode) { case SPECULATIVE: - Assert.check(dt.mode == null || - (dt.mode == AttrMode.SPECULATIVE && - dt.speculativeType(deferredAttrContext.msym, deferredAttrContext.phase).hasTag(NONE))); + //Note: if a symbol is imported twice we might do two identical + //speculative rounds... + Assert.check(dt.mode == null || dt.mode == AttrMode.SPECULATIVE); JCTree speculativeTree = attribSpeculative(dt.tree, dt.env, resultInfo); dt.speculativeCache.put(deferredAttrContext.msym, speculativeTree, deferredAttrContext.phase); return speculativeTree.type; case CHECK: - Assert.check(dt.mode == AttrMode.SPECULATIVE); + Assert.check(dt.mode != null); return attr.attribTree(dt.tree, dt.env, resultInfo); } Assert.error(); @@ -242,6 +245,13 @@ } }; + DeferredTypeCompleter dummyCompleter = new DeferredTypeCompleter() { + public Type complete(DeferredType dt, ResultInfo resultInfo, DeferredAttrContext deferredAttrContext) { + Assert.check(deferredAttrContext.mode == AttrMode.CHECK); + return dt.tree.type = Type.noType; + } + }; + /** * The 'mode' in which the deferred type is to be type-checked */ @@ -267,25 +277,33 @@ * disabled during speculative type-checking. */ JCTree attribSpeculative(JCTree tree, Env<AttrContext> env, ResultInfo resultInfo) { - JCTree newTree = new TreeCopier<Object>(make).copy(tree); + final JCTree newTree = new TreeCopier<Object>(make).copy(tree); Env<AttrContext> speculativeEnv = env.dup(newTree, env.info.dup(env.info.scope.dupUnshared())); speculativeEnv.info.scope.owner = env.info.scope.owner; - final JavaFileObject currentSource = log.currentSourceFile(); Log.DeferredDiagnosticHandler deferredDiagnosticHandler = new Log.DeferredDiagnosticHandler(log, new Filter<JCDiagnostic>() { - public boolean accepts(JCDiagnostic t) { - return t.getDiagnosticSource().getFile().equals(currentSource); + public boolean accepts(final JCDiagnostic d) { + class PosScanner extends TreeScanner { + boolean found = false; + + @Override + public void scan(JCTree tree) { + if (tree != null && + tree.pos() == d.getDiagnosticPosition()) { + found = true; + } + super.scan(tree); + } + }; + PosScanner posScanner = new PosScanner(); + posScanner.scan(newTree); + return posScanner.found; } }); try { attr.attribTree(newTree, speculativeEnv, resultInfo); unenterScanner.scan(newTree); return newTree; - } catch (Abort ex) { - //if some very bad condition occurred during deferred attribution - //we should dump all errors before killing javac - deferredDiagnosticHandler.reportDeferredDiagnostics(); - throw ex; } finally { unenterScanner.scan(newTree); log.popDiagnosticHandler(deferredDiagnosticHandler); @@ -332,13 +350,22 @@ /** inference context */ final InferenceContext inferenceContext; + /** parent deferred context */ + final DeferredAttrContext parent; + + /** Warner object to report warnings */ + final Warner warn; + /** list of deferred attribution nodes to be processed */ ArrayList<DeferredAttrNode> deferredAttrNodes = new ArrayList<DeferredAttrNode>(); - DeferredAttrContext(AttrMode mode, Symbol msym, MethodResolutionPhase phase, InferenceContext inferenceContext) { + DeferredAttrContext(AttrMode mode, Symbol msym, MethodResolutionPhase phase, + InferenceContext inferenceContext, DeferredAttrContext parent, Warner warn) { this.mode = mode; this.msym = msym; this.phase = phase; + this.parent = parent; + this.warn = warn; this.inferenceContext = inferenceContext; } @@ -363,7 +390,7 @@ //scan a defensive copy of the node list - this is because a deferred //attribution round can add new nodes to the list for (DeferredAttrNode deferredAttrNode : List.from(deferredAttrNodes)) { - if (!deferredAttrNode.process()) { + if (!deferredAttrNode.process(this)) { stuckVars.addAll(deferredAttrNode.stuckVars); } else { deferredAttrNodes.remove(deferredAttrNode); @@ -373,123 +400,154 @@ if (!progress) { //remove all variables that have already been instantiated //from the list of stuck variables - inferenceContext.solveAny(inferenceContext.freeVarsIn(List.from(stuckVars)), types, infer); - inferenceContext.notifyChange(types); + inferenceContext.solveAny(List.from(stuckVars), warn); + inferenceContext.notifyChange(); } } } + } + + /** + * Class representing a deferred attribution node. It keeps track of + * a deferred type, along with the expected target type information. + */ + class DeferredAttrNode implements Infer.FreeTypeListener { + + /** underlying deferred type */ + DeferredType dt; + + /** underlying target type information */ + ResultInfo resultInfo; + + /** list of uninferred inference variables causing this node to be stuck */ + List<Type> stuckVars; + + DeferredAttrNode(DeferredType dt, ResultInfo resultInfo, List<Type> stuckVars) { + this.dt = dt; + this.resultInfo = resultInfo; + this.stuckVars = stuckVars; + if (!stuckVars.isEmpty()) { + resultInfo.checkContext.inferenceContext().addFreeTypeListener(stuckVars, this); + } + } + + @Override + public void typesInferred(InferenceContext inferenceContext) { + stuckVars = List.nil(); + resultInfo = resultInfo.dup(inferenceContext.asInstType(resultInfo.pt)); + } + + /** + * Process a deferred attribution node. + * Invariant: a stuck node cannot be processed. + */ + @SuppressWarnings("fallthrough") + boolean process(DeferredAttrContext deferredAttrContext) { + switch (deferredAttrContext.mode) { + case SPECULATIVE: + dt.check(resultInfo, List.<Type>nil(), new StructuralStuckChecker()); + return true; + case CHECK: + if (stuckVars.nonEmpty()) { + //stuck expression - see if we can propagate + if (deferredAttrContext.parent != emptyDeferredAttrContext && + Type.containsAny(deferredAttrContext.parent.inferenceContext.inferencevars, List.from(stuckVars))) { + deferredAttrContext.parent.deferredAttrNodes.add(this); + dt.check(resultInfo, List.<Type>nil(), dummyCompleter); + return true; + } else { + return false; + } + } else { + dt.check(resultInfo, stuckVars, basicCompleter); + return true; + } + default: + throw new AssertionError("Bad mode"); + } + } /** - * Class representing a deferred attribution node. It keeps track of - * a deferred type, along with the expected target type information. + * Structural checker for stuck expressions */ - class DeferredAttrNode implements Infer.InferenceContext.FreeTypeListener { + class StructuralStuckChecker extends TreeScanner implements DeferredTypeCompleter { - /** underlying deferred type */ - DeferredType dt; - - /** underlying target type information */ ResultInfo resultInfo; + InferenceContext inferenceContext; + Env<AttrContext> env; - /** list of uninferred inference variables causing this node to be stuck */ - List<Type> stuckVars; + public Type complete(DeferredType dt, ResultInfo resultInfo, DeferredAttrContext deferredAttrContext) { + this.resultInfo = resultInfo; + this.inferenceContext = deferredAttrContext.inferenceContext; + this.env = dt.env.dup(dt.tree, dt.env.info.dup()); + dt.tree.accept(this); + dt.speculativeCache.put(deferredAttrContext.msym, stuckTree, deferredAttrContext.phase); + return Type.noType; + } - DeferredAttrNode(DeferredType dt, ResultInfo resultInfo, List<Type> stuckVars) { - this.dt = dt; - this.resultInfo = resultInfo; - this.stuckVars = stuckVars; - if (!stuckVars.isEmpty()) { - resultInfo.checkContext.inferenceContext().addFreeTypeListener(stuckVars, this); + @Override + public void visitLambda(JCLambda tree) { + Check.CheckContext checkContext = resultInfo.checkContext; + Type pt = resultInfo.pt; + if (inferenceContext.inferencevars.contains(pt)) { + //ok + return; + } else { + //must be a functional descriptor + try { + Type desc = types.findDescriptorType(pt); + if (desc.getParameterTypes().length() != tree.params.length()) { + checkContext.report(tree, diags.fragment("incompatible.arg.types.in.lambda")); + } + } catch (Types.FunctionDescriptorLookupError ex) { + checkContext.report(null, ex.getDiagnostic()); + } } } @Override - public void typesInferred(InferenceContext inferenceContext) { - stuckVars = List.nil(); - resultInfo = resultInfo.dup(inferenceContext.asInstType(resultInfo.pt, types)); + public void visitNewClass(JCNewClass tree) { + //do nothing } - /** - * Process a deferred attribution node. - * Invariant: a stuck node cannot be processed. - */ - @SuppressWarnings("fallthrough") - boolean process() { - switch (mode) { - case SPECULATIVE: - dt.check(resultInfo, List.<Type>nil(), new StructuralStuckChecker()); - return true; - case CHECK: - if (stuckVars.nonEmpty()) { - return false; - } else { - dt.check(resultInfo, stuckVars, basicCompleter); - return true; - } - default: - throw new AssertionError("Bad mode"); - } + @Override + public void visitApply(JCMethodInvocation tree) { + //do nothing } - /** - * Structural checker for stuck expressions - */ - class StructuralStuckChecker extends TreeScanner implements DeferredTypeCompleter { - - ResultInfo resultInfo; - - public Type complete(DeferredType dt, ResultInfo resultInfo, DeferredAttrContext deferredAttrContext) { - this.resultInfo = resultInfo; - dt.tree.accept(this); - dt.speculativeCache.put(msym, stuckTree, phase); - return Type.noType; - } - - @Override - public void visitLambda(JCLambda tree) { - Check.CheckContext checkContext = resultInfo.checkContext; - Type pt = resultInfo.pt; - if (inferenceContext.inferencevars.contains(pt)) { - //ok - return; - } else { - //must be a functional descriptor - try { - Type desc = types.findDescriptorType(pt); - if (desc.getParameterTypes().length() != tree.params.length()) { - checkContext.report(tree, diags.fragment("incompatible.arg.types.in.lambda")); - } - } catch (Types.FunctionDescriptorLookupError ex) { - checkContext.report(null, ex.getDiagnostic()); - } + @Override + public void visitReference(JCMemberReference tree) { + Check.CheckContext checkContext = resultInfo.checkContext; + Type pt = resultInfo.pt; + if (inferenceContext.inferencevars.contains(pt)) { + //ok + return; + } else { + try { + types.findDescriptorType(pt); + } catch (Types.FunctionDescriptorLookupError ex) { + checkContext.report(null, ex.getDiagnostic()); } - } - - @Override - public void visitNewClass(JCNewClass tree) { - //do nothing - } - - @Override - public void visitApply(JCMethodInvocation tree) { - //do nothing - } - - @Override - public void visitReference(JCMemberReference tree) { - Check.CheckContext checkContext = resultInfo.checkContext; - Type pt = resultInfo.pt; - if (inferenceContext.inferencevars.contains(pt)) { - //ok - return; - } else { - try { - //TODO: we should speculative determine if there's a match - //based on arity - if yes, method is applicable. - types.findDescriptorType(pt); - } catch (Types.FunctionDescriptorLookupError ex) { - checkContext.report(null, ex.getDiagnostic()); - } + JCExpression exprTree = (JCExpression)attribSpeculative(tree.getQualifierExpression(), env, + attr.memberReferenceQualifierResult(tree)); + ListBuffer<Type> argtypes = ListBuffer.lb(); + for (Type t : types.findDescriptorType(pt).getParameterTypes()) { + argtypes.append(Type.noType); + } + JCMemberReference mref2 = new TreeCopier<Void>(make).copy(tree); + mref2.expr = exprTree; + Pair<Symbol, ?> lookupRes = + rs.resolveMemberReference(tree, env, mref2, exprTree.type, + tree.name, argtypes.toList(), null, true, rs.arityMethodCheck); + switch (lookupRes.fst.kind) { + //note: as argtypes are erroneous types, type-errors must + //have been caused by arity mismatch + case Kinds.ABSENT_MTH: + case Kinds.WRONG_MTH: + case Kinds.WRONG_MTHS: + case Kinds.STATICERR: + case Kinds.MISSING_ENCL: + checkContext.report(null, diags.fragment("incompatible.arg.types.in.mref")); } } } @@ -498,7 +556,7 @@ /** an empty deferred attribution context - all methods throw exceptions */ final DeferredAttrContext emptyDeferredAttrContext = - new DeferredAttrContext(AttrMode.CHECK, null, MethodResolutionPhase.BOX, null) { + new DeferredAttrContext(AttrMode.CHECK, null, MethodResolutionPhase.BOX, null, null, null) { @Override void addDeferredAttrNode(DeferredType dt, ResultInfo ri, List<Type> stuckVars) { Assert.error("Empty deferred context!"); @@ -521,7 +579,8 @@ protected DeferredTypeMap(AttrMode mode, Symbol msym, MethodResolutionPhase phase) { super(String.format("deferredTypeMap[%s]", mode)); - this.deferredAttrContext = new DeferredAttrContext(mode, msym, phase, infer.emptyContext); + this.deferredAttrContext = new DeferredAttrContext(mode, msym, phase, + infer.emptyContext, emptyDeferredAttrContext, types.noWarnings); } protected boolean validState(DeferredType dt) { @@ -741,4 +800,219 @@ } } } + + /** + * Does the argument expression {@code expr} need speculative type-checking? + */ + boolean isDeferred(Env<AttrContext> env, JCExpression expr) { + DeferredChecker dc = new DeferredChecker(env); + dc.scan(expr); + return dc.result.isPoly(); + } + + /** + * The kind of an argument expression. This is used by the analysis that + * determines as to whether speculative attribution is necessary. + */ + enum ArgumentExpressionKind { + + /** kind that denotes poly argument expression */ + POLY, + /** kind that denotes a standalone expression */ + NO_POLY, + /** kind that denotes a primitive/boxed standalone expression */ + PRIMITIVE; + + /** + * Does this kind denote a poly argument expression + */ + public final boolean isPoly() { + return this == POLY; + } + + /** + * Does this kind denote a primitive standalone expression + */ + public final boolean isPrimitive() { + return this == PRIMITIVE; + } + + /** + * Compute the kind of a standalone expression of a given type + */ + static ArgumentExpressionKind standaloneKind(Type type, Types types) { + return types.unboxedTypeOrType(type).isPrimitive() ? + ArgumentExpressionKind.PRIMITIVE : + ArgumentExpressionKind.NO_POLY; + } + + /** + * Compute the kind of a method argument expression given its symbol + */ + static ArgumentExpressionKind methodKind(Symbol sym, Types types) { + Type restype = sym.type.getReturnType(); + if (sym.type.hasTag(FORALL) && + restype.containsAny(((ForAll)sym.type).tvars)) { + return ArgumentExpressionKind.POLY; + } else { + return ArgumentExpressionKind.standaloneKind(restype, types); + } + } + } + + /** + * Tree scanner used for checking as to whether an argument expression + * requires speculative attribution + */ + final class DeferredChecker extends FilterScanner { + + Env<AttrContext> env; + ArgumentExpressionKind result; + + public DeferredChecker(Env<AttrContext> env) { + super(deferredCheckerTags); + this.env = env; + } + + @Override + public void visitLambda(JCLambda tree) { + //a lambda is always a poly expression + result = ArgumentExpressionKind.POLY; + } + + @Override + public void visitReference(JCMemberReference tree) { + //a method reference is always a poly expression + result = ArgumentExpressionKind.POLY; + } + + @Override + public void visitTypeCast(JCTypeCast tree) { + //a cast is always a standalone expression + result = ArgumentExpressionKind.NO_POLY; + } + + @Override + public void visitConditional(JCConditional tree) { + scan(tree.truepart); + if (!result.isPrimitive()) { + result = ArgumentExpressionKind.POLY; + return; + } + scan(tree.falsepart); + result = reduce(ArgumentExpressionKind.PRIMITIVE); + } + + @Override + public void visitNewClass(JCNewClass tree) { + result = (TreeInfo.isDiamond(tree) || attr.findDiamonds) ? + ArgumentExpressionKind.POLY : ArgumentExpressionKind.NO_POLY; + } + + @Override + public void visitApply(JCMethodInvocation tree) { + Name name = TreeInfo.name(tree.meth); + + //fast path + if (tree.typeargs.nonEmpty() || + name == name.table.names._this || + name == name.table.names._super) { + result = ArgumentExpressionKind.NO_POLY; + return; + } + + //slow path + final JCExpression rec = tree.meth.hasTag(SELECT) ? + ((JCFieldAccess)tree.meth).selected : + null; + + if (rec != null && !isSimpleReceiver(rec)) { + //give up if receiver is too complex (to cut down analysis time) + result = ArgumentExpressionKind.POLY; + return; + } + + Type site = rec != null ? + attribSpeculative(rec, env, attr.unknownTypeExprInfo).type : + env.enclClass.sym.type; + + ListBuffer<Type> args = ListBuffer.lb(); + for (int i = 0; i < tree.args.length(); i ++) { + args.append(Type.noType); + } + + Resolve.LookupHelper lh = rs.new LookupHelper(name, site, args.toList(), List.<Type>nil(), MethodResolutionPhase.VARARITY) { + @Override + Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) { + return rec == null ? + rs.findFun(env, name, argtypes, typeargtypes, phase.isBoxingRequired(), phase.isVarargsRequired()) : + rs.findMethod(env, site, name, argtypes, typeargtypes, phase.isBoxingRequired(), phase.isVarargsRequired(), false); + } + @Override + Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym) { + return sym; + } + }; + + Symbol sym = rs.lookupMethod(env, tree, site.tsym, rs.arityMethodCheck, lh); + + if (sym.kind == Kinds.AMBIGUOUS) { + Resolve.AmbiguityError err = (Resolve.AmbiguityError)sym.baseSymbol(); + result = ArgumentExpressionKind.PRIMITIVE; + for (List<Symbol> ambigousSyms = err.ambiguousSyms ; + ambigousSyms.nonEmpty() && !result.isPoly() ; + ambigousSyms = ambigousSyms.tail) { + Symbol s = ambigousSyms.head; + if (s.kind == Kinds.MTH) { + result = reduce(ArgumentExpressionKind.methodKind(s, types)); + } + } + } else { + result = (sym.kind == Kinds.MTH) ? + ArgumentExpressionKind.methodKind(sym, types) : + ArgumentExpressionKind.NO_POLY; + } + } + //where + private boolean isSimpleReceiver(JCTree rec) { + switch (rec.getTag()) { + case IDENT: + return true; + case SELECT: + return isSimpleReceiver(((JCFieldAccess)rec).selected); + case TYPEAPPLY: + case TYPEARRAY: + return true; + case ANNOTATED_TYPE: + return isSimpleReceiver(((JCAnnotatedType)rec).underlyingType); + default: + return false; + } + } + private ArgumentExpressionKind reduce(ArgumentExpressionKind kind) { + switch (result) { + case PRIMITIVE: return kind; + case NO_POLY: return kind.isPoly() ? kind : result; + case POLY: return result; + default: + Assert.error(); + return null; + } + } + + @Override + public void visitLiteral(JCLiteral tree) { + Type litType = attr.litType(tree.typetag); + result = ArgumentExpressionKind.standaloneKind(litType, types); + } + + @Override + void skip(JCTree tree) { + result = ArgumentExpressionKind.NO_POLY; + } + } + //where + private EnumSet<JCTree.Tag> deferredCheckerTags = + EnumSet.of(LAMBDA, REFERENCE, PARENS, TYPECAST, + CONDEXPR, NEWCLASS, APPLY, LITERAL); }
--- a/src/share/classes/com/sun/tools/javac/comp/Flow.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/comp/Flow.java Tue May 07 17:14:17 2013 -0700 @@ -719,7 +719,7 @@ Flow.this.make = make; pendingExits = new ListBuffer<PendingExit>(); alive = true; - scan(env.tree); + scan(tree); } finally { pendingExits = null; Flow.this.make = null;
--- a/src/share/classes/com/sun/tools/javac/comp/Infer.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/comp/Infer.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -25,22 +25,30 @@ package com.sun.tools.javac.comp; -import com.sun.tools.javac.code.*; -import com.sun.tools.javac.code.Symbol.*; -import com.sun.tools.javac.code.Type.*; -import com.sun.tools.javac.code.Type.UndetVar.InferenceBound; -import com.sun.tools.javac.comp.DeferredAttr.AttrMode; -import com.sun.tools.javac.comp.Resolve.InapplicableMethodException; -import com.sun.tools.javac.comp.Resolve.VerboseResolutionMode; import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.tree.JCTree.JCTypeCast; import com.sun.tools.javac.tree.TreeInfo; import com.sun.tools.javac.util.*; +import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; import com.sun.tools.javac.util.List; -import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; +import com.sun.tools.javac.code.*; +import com.sun.tools.javac.code.Type.*; +import com.sun.tools.javac.code.Type.UndetVar.InferenceBound; +import com.sun.tools.javac.code.Symbol.*; +import com.sun.tools.javac.comp.DeferredAttr.AttrMode; +import com.sun.tools.javac.comp.Infer.GraphSolver.InferenceGraph; +import com.sun.tools.javac.comp.Infer.GraphSolver.InferenceGraph.Node; +import com.sun.tools.javac.comp.Resolve.InapplicableMethodException; +import com.sun.tools.javac.comp.Resolve.VerboseResolutionMode; import java.util.HashMap; import java.util.Map; +import java.util.Set; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.EnumSet; +import java.util.HashSet; import static com.sun.tools.javac.code.TypeTag.*; @@ -55,19 +63,15 @@ protected static final Context.Key<Infer> inferKey = new Context.Key<Infer>(); - /** A value for prototypes that admit any type, including polymorphic ones. */ - public static final Type anyPoly = new Type(NONE, null); - + Resolve rs; + Check chk; Symtab syms; Types types; - Check chk; - Resolve rs; - DeferredAttr deferredAttr; + JCDiagnostic.Factory diags; Log log; - JCDiagnostic.Factory diags; - /** Should we inject return-type constraints earlier? */ - boolean allowEarlyReturnConstraints; + /** should the graph solver be used? */ + boolean allowGraphInference; public static Infer instance(Context context) { Infer instance = context.get(inferKey); @@ -78,17 +82,22 @@ protected Infer(Context context) { context.put(inferKey, this); + + rs = Resolve.instance(context); + chk = Check.instance(context); syms = Symtab.instance(context); types = Types.instance(context); - rs = Resolve.instance(context); - deferredAttr = DeferredAttr.instance(context); + diags = JCDiagnostic.Factory.instance(context); log = Log.instance(context); - chk = Check.instance(context); - diags = JCDiagnostic.Factory.instance(context); inferenceException = new InferenceException(diags); - allowEarlyReturnConstraints = Source.instance(context).allowEarlyReturnConstraints(); + Options options = Options.instance(context); + allowGraphInference = Source.instance(context).allowGraphInference() + && options.isUnset("useLegacyInference"); } + /** A value for prototypes that admit any type, including polymorphic ones. */ + public static final Type anyPoly = new Type(NONE, null); + /** * This exception class is design to store a list of diagnostics corresponding * to inference errors that can arise during a method applicability check. @@ -118,140 +127,12 @@ } } - final InferenceException inferenceException; - -/*************************************************************************** - * Mini/Maximization of UndetVars - ***************************************************************************/ - - /** Instantiate undetermined type variable to its minimal upper bound. - * Throw a NoInstanceException if this not possible. - */ - void maximizeInst(UndetVar that, Warner warn) throws InferenceException { - List<Type> hibounds = Type.filter(that.getBounds(InferenceBound.UPPER), boundFilter); - if (that.getBounds(InferenceBound.EQ).isEmpty()) { - if (hibounds.isEmpty()) - that.inst = syms.objectType; - else if (hibounds.tail.isEmpty()) - that.inst = hibounds.head; - else - that.inst = types.glb(hibounds); - } else { - that.inst = that.getBounds(InferenceBound.EQ).head; - } - if (that.inst == null || - that.inst.isErroneous()) - throw inferenceException - .setMessage("no.unique.maximal.instance.exists", - that.qtype, hibounds); - } + protected final InferenceException inferenceException; - private Filter<Type> boundFilter = new Filter<Type>() { - @Override - public boolean accepts(Type t) { - return !t.isErroneous() && !t.hasTag(BOT); - } - }; - - /** Instantiate undetermined type variable to the lub of all its lower bounds. - * Throw a NoInstanceException if this not possible. - */ - void minimizeInst(UndetVar that, Warner warn) throws InferenceException { - List<Type> lobounds = Type.filter(that.getBounds(InferenceBound.LOWER), boundFilter); - if (that.getBounds(InferenceBound.EQ).isEmpty()) { - if (lobounds.isEmpty()) { - //do nothing - the inference variable is under-constrained - return; - } else if (lobounds.tail.isEmpty()) - that.inst = lobounds.head.isPrimitive() ? syms.errType : lobounds.head; - else { - that.inst = types.lub(lobounds); - } - if (that.inst == null || that.inst.hasTag(ERROR)) - throw inferenceException - .setMessage("no.unique.minimal.instance.exists", - that.qtype, lobounds); - } else { - that.inst = that.getBounds(InferenceBound.EQ).head; - } - } - -/*************************************************************************** - * Exported Methods - ***************************************************************************/ - + // <editor-fold defaultstate="collapsed" desc="Inference routines"> /** - * Instantiate uninferred inference variables (JLS 15.12.2.8). First - * if the method return type is non-void, we derive constraints from the - * expected type - then we use declared bound well-formedness to derive additional - * constraints. If no instantiation exists, or if several incomparable - * best instantiations exist throw a NoInstanceException. - */ - public void instantiateUninferred(DiagnosticPosition pos, - InferenceContext inferenceContext, - MethodType mtype, - Attr.ResultInfo resultInfo, - Warner warn) throws InferenceException { - while (true) { - boolean stuck = true; - for (Type t : inferenceContext.undetvars) { - UndetVar uv = (UndetVar)t; - if (uv.inst == null && (uv.getBounds(InferenceBound.EQ).nonEmpty() || - !inferenceContext.free(uv.getBounds(InferenceBound.UPPER)))) { - maximizeInst((UndetVar)t, warn); - stuck = false; - } - } - if (inferenceContext.restvars().isEmpty()) { - //all variables have been instantiated - exit - break; - } else if (stuck) { - //some variables could not be instantiated because of cycles in - //upper bounds - provide a (possibly recursive) default instantiation - instantiateAsUninferredVars(inferenceContext); - break; - } else { - //some variables have been instantiated - replace newly instantiated - //variables in remaining upper bounds and continue - for (Type t : inferenceContext.undetvars) { - UndetVar uv = (UndetVar)t; - uv.substBounds(inferenceContext.inferenceVars(), inferenceContext.instTypes(), types); - } - } - } - } - - /** - * Infer cyclic inference variables as described in 15.12.2.8. - */ - private void instantiateAsUninferredVars(InferenceContext inferenceContext) { - ListBuffer<Type> todo = ListBuffer.lb(); - //step 1 - create fresh tvars - for (Type t : inferenceContext.undetvars) { - UndetVar uv = (UndetVar)t; - if (uv.inst == null) { - TypeSymbol fresh_tvar = new TypeSymbol(Flags.SYNTHETIC, uv.qtype.tsym.name, null, uv.qtype.tsym.owner); - fresh_tvar.type = new TypeVar(fresh_tvar, types.makeCompoundType(uv.getBounds(InferenceBound.UPPER)), null); - todo.append(uv); - uv.inst = fresh_tvar.type; - } - } - //step 2 - replace fresh tvars in their bounds - List<Type> formals = inferenceContext.inferenceVars(); - for (Type t : todo) { - UndetVar uv = (UndetVar)t; - TypeVar ct = (TypeVar)uv.inst; - ct.bound = types.glb(inferenceContext.asInstTypes(types.getBounds(ct), types)); - if (ct.bound.isErroneous()) { - //report inference error if glb fails - reportBoundError(uv, BoundErrorKind.BAD_UPPER); - } - formals = formals.tail; - } - } - - /** Instantiate a generic method type by finding instantiations for all its - * inference variables so that it can be applied to a given argument type list. + * Main inference entry point - instantiate a generic method type + * using given argument types and (possibly) an expected target-type. */ public Type instantiateMethod(Env<AttrContext> env, List<Type> tvars, @@ -262,262 +143,148 @@ boolean allowBoxing, boolean useVarargs, Resolve.MethodResolutionContext resolveContext, - Resolve.MethodCheck methodCheck, Warner warn) throws InferenceException { //-System.err.println("instantiateMethod(" + tvars + ", " + mt + ", " + argtypes + ")"); //DEBUG - final InferenceContext inferenceContext = new InferenceContext(tvars, this, true); + final InferenceContext inferenceContext = new InferenceContext(tvars); inferenceException.clear(); + try { + DeferredAttr.DeferredAttrContext deferredAttrContext = + resolveContext.deferredAttrContext(msym, inferenceContext, resultInfo, warn); - DeferredAttr.DeferredAttrContext deferredAttrContext = - resolveContext.deferredAttrContext(msym, inferenceContext); + resolveContext.methodCheck.argumentsAcceptable(env, deferredAttrContext, + argtypes, mt.getParameterTypes(), warn); - try { - methodCheck.argumentsAcceptable(env, deferredAttrContext, argtypes, mt.getParameterTypes(), warn); - - if (resultInfo != null && allowEarlyReturnConstraints && + if (allowGraphInference && + resultInfo != null && !warn.hasNonSilentLint(Lint.LintCategory.UNCHECKED)) { - generateReturnConstraints(mt, inferenceContext, resultInfo); + //inject return constraints earlier + checkWithinBounds(inferenceContext, warn); //propagation + generateReturnConstraints(resultInfo, mt, inferenceContext); + //propagate outwards if needed + if (resultInfo.checkContext.inferenceContext().free(resultInfo.pt)) { + //propagate inference context outwards and exit + inferenceContext.dupTo(resultInfo.checkContext.inferenceContext()); + deferredAttrContext.complete(); + return mt; + } } deferredAttrContext.complete(); // minimize as yet undetermined type variables - for (Type t : inferenceContext.undetvars) { - minimizeInst((UndetVar)t, warn); + if (allowGraphInference) { + inferenceContext.solve(warn); + } else { + inferenceContext.solveLegacy(true, warn, LegacyInferenceSteps.EQ_LOWER.steps); //minimizeInst } - checkWithinBounds(inferenceContext, warn); - - mt = (MethodType)inferenceContext.asInstType(mt, types); - - List<Type> restvars = inferenceContext.restvars(); + mt = (MethodType)inferenceContext.asInstType(mt); - if (!restvars.isEmpty()) { - if (resultInfo != null && !warn.hasNonSilentLint(Lint.LintCategory.UNCHECKED)) { - if (!allowEarlyReturnConstraints) { - generateReturnConstraints(mt, inferenceContext, resultInfo); - } - instantiateUninferred(env.tree.pos(), inferenceContext, mt, resultInfo, warn); - checkWithinBounds(inferenceContext, warn); - mt = (MethodType)inferenceContext.asInstType(mt, types); - if (rs.verboseResolutionMode.contains(VerboseResolutionMode.DEFERRED_INST)) { - log.note(env.tree.pos, "deferred.method.inst", msym, mt, resultInfo.pt); - } - } + if (!allowGraphInference && + inferenceContext.restvars().nonEmpty() && + resultInfo != null && + !warn.hasNonSilentLint(Lint.LintCategory.UNCHECKED)) { + generateReturnConstraints(resultInfo, mt, inferenceContext); + inferenceContext.solveLegacy(false, warn, LegacyInferenceSteps.EQ_UPPER.steps); //maximizeInst + mt = (MethodType)inferenceContext.asInstType(mt); + } + + if (resultInfo != null && rs.verboseResolutionMode.contains(VerboseResolutionMode.DEFERRED_INST)) { + log.note(env.tree.pos, "deferred.method.inst", msym, mt, resultInfo.pt); } // return instantiated version of method type return mt; } finally { - inferenceContext.notifyChange(types); - } - } - //where - void generateReturnConstraints(Type mt, InferenceContext inferenceContext, Attr.ResultInfo resultInfo) { - if (resultInfo != null) { - Type to = resultInfo.pt; - if (to.hasTag(NONE) || resultInfo.checkContext.inferenceContext().free(resultInfo.pt)) { - to = mt.getReturnType().isPrimitiveOrVoid() ? - mt.getReturnType() : syms.objectType; - } - Type qtype1 = inferenceContext.asFree(mt.getReturnType(), types); - Warner retWarn = new Warner(); - if (!resultInfo.checkContext.compatible(qtype1, qtype1.hasTag(UNDETVAR) ? types.boxedTypeOrType(to) : to, retWarn) || - //unchecked conversion is not allowed - retWarn.hasLint(Lint.LintCategory.UNCHECKED)) { - throw inferenceException - .setMessage("infer.no.conforming.instance.exists", - inferenceContext.restvars(), mt.getReturnType(), to); - } - } - } - - /** check that type parameters are within their bounds. - */ - void checkWithinBounds(InferenceContext inferenceContext, - Warner warn) throws InferenceException { - //step 1 - check compatibility of instantiated type w.r.t. initial bounds - for (Type t : inferenceContext.undetvars) { - UndetVar uv = (UndetVar)t; - uv.substBounds(inferenceContext.inferenceVars(), inferenceContext.instTypes(), types); - checkCompatibleUpperBounds(uv, inferenceContext.inferenceVars()); - if (!inferenceContext.restvars().contains(uv.qtype)) { - Type inst = inferenceContext.asInstType(t, types); - for (Type u : uv.getBounds(InferenceBound.UPPER)) { - if (!types.isSubtypeUnchecked(inst, inferenceContext.asFree(u, types), warn)) { - reportBoundError(uv, BoundErrorKind.UPPER); - } - } - for (Type l : uv.getBounds(InferenceBound.LOWER)) { - Assert.check(!inferenceContext.free(l)); - if (!types.isSubtypeUnchecked(l, inst, warn)) { - reportBoundError(uv, BoundErrorKind.LOWER); - } - } - for (Type e : uv.getBounds(InferenceBound.EQ)) { - Assert.check(!inferenceContext.free(e)); - if (!types.isSameType(inst, e)) { - reportBoundError(uv, BoundErrorKind.EQ); - } - } - } - } - - //step 2 - check that eq bounds are consistent w.r.t. eq/lower bounds - for (Type t : inferenceContext.undetvars) { - UndetVar uv = (UndetVar)t; - //check eq bounds consistency - Type eq = null; - for (Type e : uv.getBounds(InferenceBound.EQ)) { - Assert.check(!inferenceContext.free(e)); - if (eq != null && !types.isSameType(e, eq)) { - reportBoundError(uv, BoundErrorKind.EQ); - } - eq = e; - for (Type l : uv.getBounds(InferenceBound.LOWER)) { - Assert.check(!inferenceContext.free(l)); - if (!types.isSubtypeUnchecked(l, e, warn)) { - reportBoundError(uv, BoundErrorKind.BAD_EQ_LOWER); - } - } - for (Type u : uv.getBounds(InferenceBound.UPPER)) { - if (inferenceContext.free(u)) continue; - if (!types.isSubtypeUnchecked(e, u, warn)) { - reportBoundError(uv, BoundErrorKind.BAD_EQ_UPPER); - } - } + if (resultInfo != null || !allowGraphInference) { + inferenceContext.notifyChange(); + } else { + inferenceContext.notifyChange(inferenceContext.boundedVars()); } } } - void checkCompatibleUpperBounds(UndetVar uv, List<Type> tvars) { - // VGJ: sort of inlined maximizeInst() below. Adding - // bounds can cause lobounds that are above hibounds. - ListBuffer<Type> hiboundsNoVars = ListBuffer.lb(); - for (Type t : Type.filter(uv.getBounds(InferenceBound.UPPER), boundFilter)) { - if (!t.containsAny(tvars)) { - hiboundsNoVars.append(t); + /** + * Generate constraints from the generic method's return type. If the method + * call occurs in a context where a type T is expected, use the expected + * type to derive more constraints on the generic method inference variables. + */ + void generateReturnConstraints(Attr.ResultInfo resultInfo, + MethodType mt, InferenceContext inferenceContext) { + Type qtype1 = inferenceContext.asFree(mt.getReturnType()); + Type to = returnConstraintTarget(qtype1, resultInfo.pt); + Assert.check(allowGraphInference || !resultInfo.checkContext.inferenceContext().free(to), + "legacy inference engine cannot handle constraints on both sides of a subtyping assertion"); + //we need to skip capture? + Warner retWarn = new Warner(); + if (!resultInfo.checkContext.compatible(qtype1, resultInfo.checkContext.inferenceContext().asFree(to), retWarn) || + //unchecked conversion is not allowed + retWarn.hasLint(Lint.LintCategory.UNCHECKED)) { + throw inferenceException + .setMessage("infer.no.conforming.instance.exists", + inferenceContext.restvars(), mt.getReturnType(), to); + } + } + //where + private Type returnConstraintTarget(Type from, Type to) { + if (from.hasTag(VOID)) { + return syms.voidType; + } else if (to.hasTag(NONE)) { + return from.isPrimitive() ? from : syms.objectType; + } else if (from.hasTag(UNDETVAR) && to.isPrimitive()) { + if (!allowGraphInference) { + //if legacy, just return boxed type + return types.boxedClass(to).type; + } + //if graph inference we need to skip conflicting boxed bounds... + UndetVar uv = (UndetVar)from; + for (Type t : uv.getBounds(InferenceBound.EQ, InferenceBound.LOWER)) { + Type boundAsPrimitive = types.unboxedType(t); + if (boundAsPrimitive == null) continue; + if (types.isConvertible(boundAsPrimitive, to)) { + //effectively skip return-type constraint generation (compatibility) + return syms.objectType; + } + } + return types.boxedClass(to).type; + } else { + return to; } } - List<Type> hibounds = hiboundsNoVars.toList(); - Type hb = null; - if (hibounds.isEmpty()) - hb = syms.objectType; - else if (hibounds.tail.isEmpty()) - hb = hibounds.head; - else - hb = types.glb(hibounds); - if (hb == null || hb.isErroneous()) - reportBoundError(uv, BoundErrorKind.BAD_UPPER); - } - enum BoundErrorKind { - BAD_UPPER() { - @Override - InapplicableMethodException setMessage(InferenceException ex, UndetVar uv) { - return ex.setMessage("incompatible.upper.bounds", uv.qtype, - uv.getBounds(InferenceBound.UPPER)); - } - }, - BAD_EQ_UPPER() { - @Override - InapplicableMethodException setMessage(InferenceException ex, UndetVar uv) { - return ex.setMessage("incompatible.eq.upper.bounds", uv.qtype, - uv.getBounds(InferenceBound.EQ), uv.getBounds(InferenceBound.UPPER)); - } - }, - BAD_EQ_LOWER() { - @Override - InapplicableMethodException setMessage(InferenceException ex, UndetVar uv) { - return ex.setMessage("incompatible.eq.lower.bounds", uv.qtype, - uv.getBounds(InferenceBound.EQ), uv.getBounds(InferenceBound.LOWER)); - } - }, - UPPER() { - @Override - InapplicableMethodException setMessage(InferenceException ex, UndetVar uv) { - return ex.setMessage("inferred.do.not.conform.to.upper.bounds", uv.inst, - uv.getBounds(InferenceBound.UPPER)); - } - }, - LOWER() { - @Override - InapplicableMethodException setMessage(InferenceException ex, UndetVar uv) { - return ex.setMessage("inferred.do.not.conform.to.lower.bounds", uv.inst, - uv.getBounds(InferenceBound.LOWER)); - } - }, - EQ() { - @Override - InapplicableMethodException setMessage(InferenceException ex, UndetVar uv) { - return ex.setMessage("inferred.do.not.conform.to.eq.bounds", uv.inst, - uv.getBounds(InferenceBound.EQ)); + /** + * Infer cyclic inference variables as described in 15.12.2.8. + */ + private void instantiateAsUninferredVars(List<Type> vars, InferenceContext inferenceContext) { + ListBuffer<Type> todo = ListBuffer.lb(); + //step 1 - create fresh tvars + for (Type t : vars) { + UndetVar uv = (UndetVar)inferenceContext.asFree(t); + List<Type> upperBounds = uv.getBounds(InferenceBound.UPPER); + if (Type.containsAny(upperBounds, vars)) { + TypeSymbol fresh_tvar = new TypeVariableSymbol(Flags.SYNTHETIC, uv.qtype.tsym.name, null, uv.qtype.tsym.owner); + fresh_tvar.type = new TypeVar(fresh_tvar, types.makeCompoundType(uv.getBounds(InferenceBound.UPPER)), null); + todo.append(uv); + uv.inst = fresh_tvar.type; + } else if (upperBounds.nonEmpty()) { + uv.inst = types.glb(upperBounds); + } else { + uv.inst = syms.objectType; } - }; - - abstract InapplicableMethodException setMessage(InferenceException ex, UndetVar uv); - } - //where - void reportBoundError(UndetVar uv, BoundErrorKind bk) { - throw bk.setMessage(inferenceException, uv); - } - - // <editor-fold desc="functional interface instantiation"> - /** - * This method is used to infer a suitable target functional interface in case - * the original parameterized interface contains wildcards. An inference process - * is applied so that wildcard bounds, as well as explicit lambda/method ref parameters - * (where applicable) are used to constraint the solution. - */ - public Type instantiateFunctionalInterface(DiagnosticPosition pos, Type funcInterface, - List<Type> paramTypes, Check.CheckContext checkContext) { - if (types.capture(funcInterface) == funcInterface) { - //if capture doesn't change the type then return the target unchanged - //(this means the target contains no wildcards!) - return funcInterface; - } else { - Type formalInterface = funcInterface.tsym.type; - InferenceContext funcInterfaceContext = - new InferenceContext(funcInterface.tsym.type.getTypeArguments(), this, false); - Assert.check(paramTypes != null); - //get constraints from explicit params (this is done by - //checking that explicit param types are equal to the ones - //in the functional interface descriptors) - List<Type> descParameterTypes = types.findDescriptorType(formalInterface).getParameterTypes(); - if (descParameterTypes.size() != paramTypes.size()) { - checkContext.report(pos, diags.fragment("incompatible.arg.types.in.lambda")); - return types.createErrorType(funcInterface); + } + //step 2 - replace fresh tvars in their bounds + List<Type> formals = vars; + for (Type t : todo) { + UndetVar uv = (UndetVar)t; + TypeVar ct = (TypeVar)uv.inst; + ct.bound = types.glb(inferenceContext.asInstTypes(types.getBounds(ct))); + if (ct.bound.isErroneous()) { + //report inference error if glb fails + reportBoundError(uv, BoundErrorKind.BAD_UPPER); } - for (Type p : descParameterTypes) { - if (!types.isSameType(funcInterfaceContext.asFree(p, types), paramTypes.head)) { - checkContext.report(pos, diags.fragment("no.suitable.functional.intf.inst", funcInterface)); - return types.createErrorType(funcInterface); - } - paramTypes = paramTypes.tail; - } - List<Type> actualTypeargs = funcInterface.getTypeArguments(); - for (Type t : funcInterfaceContext.undetvars) { - UndetVar uv = (UndetVar)t; - minimizeInst(uv, types.noWarnings); - if (uv.inst == null && - Type.filter(uv.getBounds(InferenceBound.UPPER), boundFilter).nonEmpty()) { - maximizeInst(uv, types.noWarnings); - } - if (uv.inst == null) { - uv.inst = actualTypeargs.head; - } - actualTypeargs = actualTypeargs.tail; - } - Type owntype = funcInterfaceContext.asInstType(formalInterface, types); - if (!chk.checkValidGenericType(owntype)) { - //if the inferred functional interface type is not well-formed, - //or if it's not a subtype of the original target, issue an error - checkContext.report(pos, diags.fragment("no.suitable.functional.intf.inst", funcInterface)); - } - return owntype; + formals = formals.tail; } } - // </editor-fold> /** * Compute a synthetic method type corresponding to the requested polymorphic @@ -571,7 +338,7 @@ class ImplicitArgType extends DeferredAttr.DeferredTypeMap { public ImplicitArgType(Symbol msym, Resolve.MethodResolutionPhase phase) { - deferredAttr.super(AttrMode.SPECULATIVE, msym, phase); + rs.deferredAttr.super(AttrMode.SPECULATIVE, msym, phase); } public Type apply(Type t) { @@ -585,23 +352,934 @@ } /** - * Mapping that turns inference variables into undet vars - * (used by inference context) + * This method is used to infer a suitable target SAM in case the original + * SAM type contains one or more wildcards. An inference process is applied + * so that wildcard bounds, as well as explicit lambda/method ref parameters + * (where applicable) are used to constraint the solution. + */ + public Type instantiateFunctionalInterface(DiagnosticPosition pos, Type funcInterface, + List<Type> paramTypes, Check.CheckContext checkContext) { + if (types.capture(funcInterface) == funcInterface) { + //if capture doesn't change the type then return the target unchanged + //(this means the target contains no wildcards!) + return funcInterface; + } else { + Type formalInterface = funcInterface.tsym.type; + InferenceContext funcInterfaceContext = + new InferenceContext(funcInterface.tsym.type.getTypeArguments()); + + Assert.check(paramTypes != null); + //get constraints from explicit params (this is done by + //checking that explicit param types are equal to the ones + //in the functional interface descriptors) + List<Type> descParameterTypes = types.findDescriptorType(formalInterface).getParameterTypes(); + if (descParameterTypes.size() != paramTypes.size()) { + checkContext.report(pos, diags.fragment("incompatible.arg.types.in.lambda")); + return types.createErrorType(funcInterface); + } + for (Type p : descParameterTypes) { + if (!types.isSameType(funcInterfaceContext.asFree(p), paramTypes.head)) { + checkContext.report(pos, diags.fragment("no.suitable.functional.intf.inst", funcInterface)); + return types.createErrorType(funcInterface); + } + paramTypes = paramTypes.tail; + } + + try { + funcInterfaceContext.solve(funcInterfaceContext.boundedVars(), types.noWarnings); + } catch (InferenceException ex) { + checkContext.report(pos, diags.fragment("no.suitable.functional.intf.inst", funcInterface)); + } + + List<Type> actualTypeargs = funcInterface.getTypeArguments(); + for (Type t : funcInterfaceContext.undetvars) { + UndetVar uv = (UndetVar)t; + if (uv.inst == null) { + uv.inst = actualTypeargs.head; + } + actualTypeargs = actualTypeargs.tail; + } + + Type owntype = funcInterfaceContext.asInstType(formalInterface); + if (!chk.checkValidGenericType(owntype)) { + //if the inferred functional interface type is not well-formed, + //or if it's not a subtype of the original target, issue an error + checkContext.report(pos, diags.fragment("no.suitable.functional.intf.inst", funcInterface)); + } + return owntype; + } + } + // </editor-fold> + + // <editor-fold defaultstate="collapsed" desc="Bound checking"> + /** + * Check bounds and perform incorporation */ - class FromTypeVarFun extends Mapping { + void checkWithinBounds(InferenceContext inferenceContext, + Warner warn) throws InferenceException { + MultiUndetVarListener mlistener = new MultiUndetVarListener(inferenceContext.undetvars); + try { + while (true) { + mlistener.reset(); + if (!allowGraphInference) { + //in legacy mode we lack of transitivity, so bound check + //cannot be run in parallel with other incoprporation rounds + for (Type t : inferenceContext.undetvars) { + UndetVar uv = (UndetVar)t; + IncorporationStep.CHECK_BOUNDS.apply(uv, inferenceContext, warn); + } + } + for (Type t : inferenceContext.undetvars) { + UndetVar uv = (UndetVar)t; + //bound incorporation + EnumSet<IncorporationStep> incorporationSteps = allowGraphInference ? + incorporationStepsGraph : incorporationStepsLegacy; + for (IncorporationStep is : incorporationSteps) { + is.apply(uv, inferenceContext, warn); + } + } + if (!mlistener.changed || !allowGraphInference) break; + } + } + finally { + mlistener.detach(); + } + } + //where + /** + * This listener keeps track of changes on a group of inference variable + * bounds. Note: the listener must be detached (calling corresponding + * method) to make sure that the underlying inference variable is + * left in a clean state. + */ + class MultiUndetVarListener implements UndetVar.UndetVarListener { + + int rounds; + boolean changed; + List<Type> undetvars; + + public MultiUndetVarListener(List<Type> undetvars) { + this.undetvars = undetvars; + for (Type t : undetvars) { + UndetVar uv = (UndetVar)t; + uv.listener = this; + } + } + + public void varChanged(UndetVar uv, Set<InferenceBound> ibs) { + //avoid non-termination + if (rounds < MAX_INCORPORATION_STEPS) { + changed = true; + } + } + + void reset() { + rounds++; + changed = false; + } + + void detach() { + for (Type t : undetvars) { + UndetVar uv = (UndetVar)t; + uv.listener = null; + } + } + }; + + /** max number of incorporation rounds */ + static final int MAX_INCORPORATION_STEPS = 100; - boolean includeBounds; + /** + * This enumeration defines an entry point for doing inference variable + * bound incorporation - it can be used to inject custom incorporation + * logic into the basic bound checking routine + */ + enum IncorporationStep { + /** + * Performs basic bound checking - i.e. is the instantiated type for a given + * inference variable compatible with its bounds? + */ + CHECK_BOUNDS() { + public void apply(UndetVar uv, InferenceContext inferenceContext, Warner warn) { + Infer infer = inferenceContext.infer(); + uv.substBounds(inferenceContext.inferenceVars(), inferenceContext.instTypes(), infer.types); + infer.checkCompatibleUpperBounds(uv, inferenceContext); + if (uv.inst != null) { + Type inst = uv.inst; + for (Type u : uv.getBounds(InferenceBound.UPPER)) { + if (!infer.types.isSubtypeUnchecked(inst, inferenceContext.asFree(u), warn)) { + infer.reportBoundError(uv, BoundErrorKind.UPPER); + } + } + for (Type l : uv.getBounds(InferenceBound.LOWER)) { + if (!infer.types.isSubtypeUnchecked(inferenceContext.asFree(l), inst, warn)) { + infer.reportBoundError(uv, BoundErrorKind.LOWER); + } + } + for (Type e : uv.getBounds(InferenceBound.EQ)) { + if (!infer.types.isSameType(inst, inferenceContext.asFree(e))) { + infer.reportBoundError(uv, BoundErrorKind.EQ); + } + } + } + } + }, + /** + * Check consistency of equality constraints. This is a slightly more aggressive + * inference routine that is designed as to maximize compatibility with JDK 7. + * Note: this is not used in graph mode. + */ + EQ_CHECK_LEGACY() { + public void apply(UndetVar uv, InferenceContext inferenceContext, Warner warn) { + Infer infer = inferenceContext.infer(); + Type eq = null; + for (Type e : uv.getBounds(InferenceBound.EQ)) { + Assert.check(!inferenceContext.free(e)); + if (eq != null && !infer.types.isSameType(e, eq)) { + infer.reportBoundError(uv, BoundErrorKind.EQ); + } + eq = e; + for (Type l : uv.getBounds(InferenceBound.LOWER)) { + Assert.check(!inferenceContext.free(l)); + if (!infer.types.isSubtypeUnchecked(l, e, warn)) { + infer.reportBoundError(uv, BoundErrorKind.BAD_EQ_LOWER); + } + } + for (Type u : uv.getBounds(InferenceBound.UPPER)) { + if (inferenceContext.free(u)) continue; + if (!infer.types.isSubtypeUnchecked(e, u, warn)) { + infer.reportBoundError(uv, BoundErrorKind.BAD_EQ_UPPER); + } + } + } + } + }, + /** + * Check consistency of equality constraints. + */ + EQ_CHECK() { + public void apply(UndetVar uv, InferenceContext inferenceContext, Warner warn) { + Infer infer = inferenceContext.infer(); + for (Type e : uv.getBounds(InferenceBound.EQ)) { + if (e.containsAny(inferenceContext.inferenceVars())) continue; + for (Type u : uv.getBounds(InferenceBound.UPPER)) { + if (!infer.types.isSubtypeUnchecked(e, inferenceContext.asFree(u), warn)) { + infer.reportBoundError(uv, BoundErrorKind.BAD_EQ_UPPER); + } + } + for (Type l : uv.getBounds(InferenceBound.LOWER)) { + if (!infer.types.isSubtypeUnchecked(inferenceContext.asFree(l), e, warn)) { + infer.reportBoundError(uv, BoundErrorKind.BAD_EQ_LOWER); + } + } + } + } + }, + /** + * Given a bound set containing {@code alpha <: T} and {@code alpha :> S} + * perform {@code S <: T} (which could lead to new bounds). + */ + CROSS_UPPER_LOWER() { + public void apply(UndetVar uv, InferenceContext inferenceContext, Warner warn) { + Infer infer = inferenceContext.infer(); + for (Type b1 : uv.getBounds(InferenceBound.UPPER)) { + for (Type b2 : uv.getBounds(InferenceBound.LOWER)) { + infer.types.isSubtypeUnchecked(inferenceContext.asFree(b2), inferenceContext.asFree(b1)); + } + } + } + }, + /** + * Given a bound set containing {@code alpha <: T} and {@code alpha == S} + * perform {@code S <: T} (which could lead to new bounds). + */ + CROSS_UPPER_EQ() { + public void apply(UndetVar uv, InferenceContext inferenceContext, Warner warn) { + Infer infer = inferenceContext.infer(); + for (Type b1 : uv.getBounds(InferenceBound.UPPER)) { + for (Type b2 : uv.getBounds(InferenceBound.EQ)) { + infer.types.isSubtypeUnchecked(inferenceContext.asFree(b2), inferenceContext.asFree(b1)); + } + } + } + }, + /** + * Given a bound set containing {@code alpha :> S} and {@code alpha == T} + * perform {@code S <: T} (which could lead to new bounds). + */ + CROSS_EQ_LOWER() { + public void apply(UndetVar uv, InferenceContext inferenceContext, Warner warn) { + Infer infer = inferenceContext.infer(); + for (Type b1 : uv.getBounds(InferenceBound.EQ)) { + for (Type b2 : uv.getBounds(InferenceBound.LOWER)) { + infer.types.isSubtypeUnchecked(inferenceContext.asFree(b2), inferenceContext.asFree(b1)); + } + } + } + }, + /** + * Given a bound set containing {@code alpha == S} and {@code alpha == T} + * perform {@code S == T} (which could lead to new bounds). + */ + CROSS_EQ_EQ() { + public void apply(UndetVar uv, InferenceContext inferenceContext, Warner warn) { + Infer infer = inferenceContext.infer(); + for (Type b1 : uv.getBounds(InferenceBound.EQ)) { + for (Type b2 : uv.getBounds(InferenceBound.EQ)) { + if (b1 != b2) { + infer.types.isSameType(inferenceContext.asFree(b2), inferenceContext.asFree(b1)); + } + } + } + } + }, + /** + * Given a bound set containing {@code alpha <: beta} propagate lower bounds + * from alpha to beta; also propagate upper bounds from beta to alpha. + */ + PROP_UPPER() { + public void apply(UndetVar uv, InferenceContext inferenceContext, Warner warn) { + Infer infer = inferenceContext.infer(); + for (Type b : uv.getBounds(InferenceBound.UPPER)) { + if (inferenceContext.inferenceVars().contains(b)) { + UndetVar uv2 = (UndetVar)inferenceContext.asFree(b); + //alpha <: beta + //0. set beta :> alpha + uv2.addBound(InferenceBound.LOWER, uv.qtype, infer.types); + //1. copy alpha's lower to beta's + for (Type l : uv.getBounds(InferenceBound.LOWER)) { + uv2.addBound(InferenceBound.LOWER, inferenceContext.asInstType(l), infer.types); + } + //2. copy beta's upper to alpha's + for (Type u : uv2.getBounds(InferenceBound.UPPER)) { + uv.addBound(InferenceBound.UPPER, inferenceContext.asInstType(u), infer.types); + } + } + } + } + }, + /** + * Given a bound set containing {@code alpha :> beta} propagate lower bounds + * from beta to alpha; also propagate upper bounds from alpha to beta. + */ + PROP_LOWER() { + public void apply(UndetVar uv, InferenceContext inferenceContext, Warner warn) { + Infer infer = inferenceContext.infer(); + for (Type b : uv.getBounds(InferenceBound.LOWER)) { + if (inferenceContext.inferenceVars().contains(b)) { + UndetVar uv2 = (UndetVar)inferenceContext.asFree(b); + //alpha :> beta + //0. set beta <: alpha + uv2.addBound(InferenceBound.UPPER, uv.qtype, infer.types); + //1. copy alpha's upper to beta's + for (Type u : uv.getBounds(InferenceBound.UPPER)) { + uv2.addBound(InferenceBound.UPPER, inferenceContext.asInstType(u), infer.types); + } + //2. copy beta's lower to alpha's + for (Type l : uv2.getBounds(InferenceBound.LOWER)) { + uv.addBound(InferenceBound.LOWER, inferenceContext.asInstType(l), infer.types); + } + } + } + } + }, + /** + * Given a bound set containing {@code alpha == beta} propagate lower/upper + * bounds from alpha to beta and back. + */ + PROP_EQ() { + public void apply(UndetVar uv, InferenceContext inferenceContext, Warner warn) { + Infer infer = inferenceContext.infer(); + for (Type b : uv.getBounds(InferenceBound.EQ)) { + if (inferenceContext.inferenceVars().contains(b)) { + UndetVar uv2 = (UndetVar)inferenceContext.asFree(b); + //alpha == beta + //0. set beta == alpha + uv2.addBound(InferenceBound.EQ, uv.qtype, infer.types); + //1. copy all alpha's bounds to beta's + for (InferenceBound ib : InferenceBound.values()) { + for (Type b2 : uv.getBounds(ib)) { + if (b2 != uv2) { + uv2.addBound(ib, inferenceContext.asInstType(b2), infer.types); + } + } + } + //2. copy all beta's bounds to alpha's + for (InferenceBound ib : InferenceBound.values()) { + for (Type b2 : uv2.getBounds(ib)) { + if (b2 != uv) { + uv.addBound(ib, inferenceContext.asInstType(b2), infer.types); + } + } + } + } + } + } + }; - FromTypeVarFun(boolean includeBounds) { - super("fromTypeVarFunWithBounds"); - this.includeBounds = includeBounds; + abstract void apply(UndetVar uv, InferenceContext inferenceContext, Warner warn); + } + + /** incorporation steps to be executed when running in legacy mode */ + EnumSet<IncorporationStep> incorporationStepsLegacy = EnumSet.of(IncorporationStep.EQ_CHECK_LEGACY); + + /** incorporation steps to be executed when running in graph mode */ + EnumSet<IncorporationStep> incorporationStepsGraph = + EnumSet.complementOf(EnumSet.of(IncorporationStep.EQ_CHECK_LEGACY)); + + /** + * Make sure that the upper bounds we got so far lead to a solvable inference + * variable by making sure that a glb exists. + */ + void checkCompatibleUpperBounds(UndetVar uv, InferenceContext inferenceContext) { + List<Type> hibounds = + Type.filter(uv.getBounds(InferenceBound.UPPER), new BoundFilter(inferenceContext)); + Type hb = null; + if (hibounds.isEmpty()) + hb = syms.objectType; + else if (hibounds.tail.isEmpty()) + hb = hibounds.head; + else + hb = types.glb(hibounds); + if (hb == null || hb.isErroneous()) + reportBoundError(uv, BoundErrorKind.BAD_UPPER); + } + //where + protected static class BoundFilter implements Filter<Type> { + + InferenceContext inferenceContext; + + public BoundFilter(InferenceContext inferenceContext) { + this.inferenceContext = inferenceContext; + } + + @Override + public boolean accepts(Type t) { + return !t.isErroneous() && !inferenceContext.free(t) && + !t.hasTag(BOT); + } + }; + + /** + * This enumeration defines all possible bound-checking related errors. + */ + enum BoundErrorKind { + /** + * The (uninstantiated) inference variable has incompatible upper bounds. + */ + BAD_UPPER() { + @Override + InapplicableMethodException setMessage(InferenceException ex, UndetVar uv) { + return ex.setMessage("incompatible.upper.bounds", uv.qtype, + uv.getBounds(InferenceBound.UPPER)); + } + }, + /** + * An equality constraint is not compatible with an upper bound. + */ + BAD_EQ_UPPER() { + @Override + InapplicableMethodException setMessage(InferenceException ex, UndetVar uv) { + return ex.setMessage("incompatible.eq.upper.bounds", uv.qtype, + uv.getBounds(InferenceBound.EQ), uv.getBounds(InferenceBound.UPPER)); + } + }, + /** + * An equality constraint is not compatible with a lower bound. + */ + BAD_EQ_LOWER() { + @Override + InapplicableMethodException setMessage(InferenceException ex, UndetVar uv) { + return ex.setMessage("incompatible.eq.lower.bounds", uv.qtype, + uv.getBounds(InferenceBound.EQ), uv.getBounds(InferenceBound.LOWER)); + } + }, + /** + * Instantiated inference variable is not compatible with an upper bound. + */ + UPPER() { + @Override + InapplicableMethodException setMessage(InferenceException ex, UndetVar uv) { + return ex.setMessage("inferred.do.not.conform.to.upper.bounds", uv.inst, + uv.getBounds(InferenceBound.UPPER)); + } + }, + /** + * Instantiated inference variable is not compatible with a lower bound. + */ + LOWER() { + @Override + InapplicableMethodException setMessage(InferenceException ex, UndetVar uv) { + return ex.setMessage("inferred.do.not.conform.to.lower.bounds", uv.inst, + uv.getBounds(InferenceBound.LOWER)); + } + }, + /** + * Instantiated inference variable is not compatible with an equality constraint. + */ + EQ() { + @Override + InapplicableMethodException setMessage(InferenceException ex, UndetVar uv) { + return ex.setMessage("inferred.do.not.conform.to.eq.bounds", uv.inst, + uv.getBounds(InferenceBound.EQ)); + } + }; + + abstract InapplicableMethodException setMessage(InferenceException ex, UndetVar uv); + } + + /** + * Report a bound-checking error of given kind + */ + void reportBoundError(UndetVar uv, BoundErrorKind bk) { + throw bk.setMessage(inferenceException, uv); + } + // </editor-fold> + + // <editor-fold defaultstate="collapsed" desc="Inference engine"> + /** + * Graph inference strategy - act as an input to the inference solver; a strategy is + * composed of two ingredients: (i) find a node to solve in the inference graph, + * and (ii) tell th engine when we are done fixing inference variables + */ + interface GraphStrategy { + /** + * Pick the next node (leaf) to solve in the graph + */ + Node pickNode(InferenceGraph g); + /** + * Is this the last step? + */ + boolean done(); + } + + /** + * Simple solver strategy class that locates all leaves inside a graph + * and picks the first leaf as the next node to solve + */ + abstract class LeafSolver implements GraphStrategy { + public Node pickNode(InferenceGraph g) { + Assert.check(!g.nodes.isEmpty(), "No nodes to solve!"); + return g.nodes.get(0); + } + } + + /** + * This solver uses an heuristic to pick the best leaf - the heuristic + * tries to select the node that has maximal probability to contain one + * or more inference variables in a given list + */ + abstract class BestLeafSolver extends LeafSolver { + + List<Type> varsToSolve; + + BestLeafSolver(List<Type> varsToSolve) { + this.varsToSolve = varsToSolve; } - public Type apply(Type t) { - if (t.hasTag(TYPEVAR)) return new UndetVar((TypeVar)t, types, includeBounds); - else return t.map(this); + /** + * Computes the cost associated with a given node; the cost is computed + * as the total number of type-variables that should be eagerly instantiated + * in order to get to some of the variables in {@code varsToSolve} from + * a given node + */ + void computeCostIfNeeded(Node n, Map<Node, Integer> costMap) { + if (costMap.containsKey(n)) { + return; + } else if (!Collections.disjoint(n.data, varsToSolve)) { + costMap.put(n, n.data.size()); + } else { + int subcost = Integer.MAX_VALUE; + costMap.put(n, subcost); //avoid loops + for (Node n2 : n.getDependencies()) { + computeCostIfNeeded(n2, costMap); + subcost = Math.min(costMap.get(n2), subcost); + } + //update cost map to reflect real cost + costMap.put(n, subcost == Integer.MAX_VALUE ? + Integer.MAX_VALUE : + n.data.size() + subcost); + } + } + + /** + * Pick the leaf that minimize cost + */ + @Override + public Node pickNode(final InferenceGraph g) { + final Map<Node, Integer> costMap = new HashMap<Node, Integer>(); + ArrayList<Node> leaves = new ArrayList<Node>(); + for (Node n : g.nodes) { + computeCostIfNeeded(n, costMap); + if (n.isLeaf(n)) { + leaves.add(n); + } + } + Assert.check(!leaves.isEmpty(), "No nodes to solve!"); + Collections.sort(leaves, new java.util.Comparator<Node>() { + public int compare(Node n1, Node n2) { + return costMap.get(n1) - costMap.get(n2); + } + }); + return leaves.get(0); + } + } + + /** + * The inference process can be thought of as a sequence of steps. Each step + * instantiates an inference variable using a subset of the inference variable + * bounds, if certain condition are met. Decisions such as the sequence in which + * steps are applied, or which steps are to be applied are left to the inference engine. + */ + enum InferenceStep { + + /** + * Instantiate an inference variables using one of its (ground) equality + * constraints + */ + EQ(InferenceBound.EQ) { + @Override + Type solve(UndetVar uv, InferenceContext inferenceContext) { + return filterBounds(uv, inferenceContext).head; + } + }, + /** + * Instantiate an inference variables using its (ground) lower bounds. Such + * bounds are merged together using lub(). + */ + LOWER(InferenceBound.LOWER) { + @Override + Type solve(UndetVar uv, InferenceContext inferenceContext) { + Infer infer = inferenceContext.infer(); + List<Type> lobounds = filterBounds(uv, inferenceContext); + Type owntype = infer.types.lub(lobounds); + if (owntype.hasTag(ERROR)) { + throw infer.inferenceException + .setMessage("no.unique.minimal.instance.exists", + uv.qtype, lobounds); + } else { + return owntype; + } + } + }, + /** + * Instantiate an inference variables using its (ground) upper bounds. Such + * bounds are merged together using glb(). + */ + UPPER(InferenceBound.UPPER) { + @Override + Type solve(UndetVar uv, InferenceContext inferenceContext) { + Infer infer = inferenceContext.infer(); + List<Type> hibounds = filterBounds(uv, inferenceContext); + Type owntype = infer.types.glb(hibounds); + if (owntype.isErroneous()) { + throw infer.inferenceException + .setMessage("no.unique.maximal.instance.exists", + uv.qtype, hibounds); + } else { + return owntype; + } + } + }, + /** + * Like the former; the only difference is that this step can only be applied + * if all upper bounds are ground. + */ + UPPER_LEGACY(InferenceBound.UPPER) { + @Override + public boolean accepts(UndetVar t, InferenceContext inferenceContext) { + return !inferenceContext.free(t.getBounds(ib)); + } + + @Override + Type solve(UndetVar uv, InferenceContext inferenceContext) { + return UPPER.solve(uv, inferenceContext); + } + }; + + final InferenceBound ib; + + InferenceStep(InferenceBound ib) { + this.ib = ib; + } + + /** + * Find an instantiated type for a given inference variable within + * a given inference context + */ + abstract Type solve(UndetVar uv, InferenceContext inferenceContext); + + /** + * Can the inference variable be instantiated using this step? + */ + public boolean accepts(UndetVar t, InferenceContext inferenceContext) { + return filterBounds(t, inferenceContext).nonEmpty(); + } + + /** + * Return the subset of ground bounds in a given bound set (i.e. eq/lower/upper) + */ + List<Type> filterBounds(UndetVar uv, InferenceContext inferenceContext) { + return Type.filter(uv.getBounds(ib), new BoundFilter(inferenceContext)); + } + } + + /** + * This enumeration defines the sequence of steps to be applied when the + * solver works in legacy mode. The steps in this enumeration reflect + * the behavior of old inference routine (see JLS SE 7 15.12.2.7/15.12.2.8). + */ + enum LegacyInferenceSteps { + + EQ_LOWER(EnumSet.of(InferenceStep.EQ, InferenceStep.LOWER)), + EQ_UPPER(EnumSet.of(InferenceStep.EQ, InferenceStep.UPPER_LEGACY)); + + final EnumSet<InferenceStep> steps; + + LegacyInferenceSteps(EnumSet<InferenceStep> steps) { + this.steps = steps; + } + } + + /** + * This enumeration defines the sequence of steps to be applied when the + * graph solver is used. This order is defined so as to maximize compatibility + * w.r.t. old inference routine (see JLS SE 7 15.12.2.7/15.12.2.8). + */ + enum GraphInferenceSteps { + + EQ(EnumSet.of(InferenceStep.EQ)), + EQ_LOWER(EnumSet.of(InferenceStep.EQ, InferenceStep.LOWER)), + EQ_LOWER_UPPER(EnumSet.of(InferenceStep.EQ, InferenceStep.LOWER, InferenceStep.UPPER)); + + final EnumSet<InferenceStep> steps; + + GraphInferenceSteps(EnumSet<InferenceStep> steps) { + this.steps = steps; + } + } + + /** + * This is the graph inference solver - the solver organizes all inference variables in + * a given inference context by bound dependencies - in the general case, such dependencies + * would lead to a cyclic directed graph (hence the name); the dependency info is used to build + * an acyclic graph, where all cyclic variables are bundled together. An inference + * step corresponds to solving a node in the acyclic graph - this is done by + * relying on a given strategy (see GraphStrategy). + */ + class GraphSolver { + + InferenceContext inferenceContext; + Warner warn; + + GraphSolver(InferenceContext inferenceContext, Warner warn) { + this.inferenceContext = inferenceContext; + this.warn = warn; } - }; + + /** + * Solve variables in a given inference context. The amount of variables + * to be solved, and the way in which the underlying acyclic graph is explored + * depends on the selected solver strategy. + */ + void solve(GraphStrategy sstrategy) { + checkWithinBounds(inferenceContext, warn); //initial propagation of bounds + InferenceGraph inferenceGraph = new InferenceGraph(); + while (!sstrategy.done()) { + InferenceGraph.Node nodeToSolve = sstrategy.pickNode(inferenceGraph); + List<Type> varsToSolve = List.from(nodeToSolve.data); + inferenceContext.save(); + try { + //repeat until all variables are solved + outer: while (Type.containsAny(inferenceContext.restvars(), varsToSolve)) { + //for each inference phase + for (GraphInferenceSteps step : GraphInferenceSteps.values()) { + if (inferenceContext.solveBasic(varsToSolve, step.steps)) { + checkWithinBounds(inferenceContext, warn); + continue outer; + } + } + //no progress + throw inferenceException; + } + } + catch (InferenceException ex) { + inferenceContext.rollback(); + instantiateAsUninferredVars(varsToSolve, inferenceContext); + checkWithinBounds(inferenceContext, warn); + } + inferenceGraph.deleteNode(nodeToSolve); + } + } + + /** + * The dependencies between the inference variables that need to be solved + * form a (possibly cyclic) graph. This class reduces the original dependency graph + * to an acyclic version, where cyclic nodes are folded into a single 'super node'. + */ + class InferenceGraph { + + /** + * This class represents a node in the graph. Each node corresponds + * to an inference variable and has edges (dependencies) on other + * nodes. The node defines an entry point that can be used to receive + * updates on the structure of the graph this node belongs to (used to + * keep dependencies in sync). + */ + class Node extends GraphUtils.TarjanNode<ListBuffer<Type>> { + + Set<Node> deps; + + Node(Type ivar) { + super(ListBuffer.of(ivar)); + this.deps = new HashSet<Node>(); + } + + @Override + public Iterable<? extends Node> getDependencies() { + return deps; + } + + @Override + public String printDependency(GraphUtils.Node<ListBuffer<Type>> to) { + StringBuilder buf = new StringBuilder(); + String sep = ""; + for (Type from : data) { + UndetVar uv = (UndetVar)inferenceContext.asFree(from); + for (Type bound : uv.getBounds(InferenceBound.values())) { + if (bound.containsAny(List.from(to.data))) { + buf.append(sep); + buf.append(bound); + sep = ","; + } + } + } + return buf.toString(); + } + + boolean isLeaf(Node n) { + //no deps, or only one self dep + return (n.deps.isEmpty() || + n.deps.size() == 1 && n.deps.contains(n)); + } + + void mergeWith(List<? extends Node> nodes) { + for (Node n : nodes) { + Assert.check(n.data.length() == 1, "Attempt to merge a compound node!"); + data.appendList(n.data); + deps.addAll(n.deps); + } + //update deps + Set<Node> deps2 = new HashSet<Node>(); + for (Node d : deps) { + if (data.contains(d.data.first())) { + deps2.add(this); + } else { + deps2.add(d); + } + } + deps = deps2; + } + + void graphChanged(Node from, Node to) { + if (deps.contains(from)) { + deps.remove(from); + if (to != null) { + deps.add(to); + } + } + } + } + + /** the nodes in the inference graph */ + ArrayList<Node> nodes; + + InferenceGraph() { + initNodes(); + } + + /** + * Delete a node from the graph. This update the underlying structure + * of the graph (including dependencies) via listeners updates. + */ + public void deleteNode(Node n) { + Assert.check(nodes.contains(n)); + nodes.remove(n); + notifyUpdate(n, null); + } + + /** + * Notify all nodes of a change in the graph. If the target node is + * {@code null} the source node is assumed to be removed. + */ + void notifyUpdate(Node from, Node to) { + for (Node n : nodes) { + n.graphChanged(from, to); + } + } + + /** + * Create the graph nodes. First a simple node is created for every inference + * variables to be solved. Then Tarjan is used to found all connected components + * in the graph. For each component containing more than one node, a super node is + * created, effectively replacing the original cyclic nodes. + */ + void initNodes() { + nodes = new ArrayList<Node>(); + for (Type t : inferenceContext.restvars()) { + nodes.add(new Node(t)); + } + for (Node n_i : nodes) { + Type i = n_i.data.first(); + for (Node n_j : nodes) { + Type j = n_j.data.first(); + UndetVar uv_i = (UndetVar)inferenceContext.asFree(i); + if (Type.containsAny(uv_i.getBounds(InferenceBound.values()), List.of(j))) { + //update i's deps + n_i.deps.add(n_j); + } + } + } + ArrayList<Node> acyclicNodes = new ArrayList<Node>(); + for (List<? extends Node> conSubGraph : GraphUtils.tarjan(nodes)) { + if (conSubGraph.length() > 1) { + Node root = conSubGraph.head; + root.mergeWith(conSubGraph.tail); + for (Node n : conSubGraph) { + notifyUpdate(n, root); + } + } + acyclicNodes.add(conSubGraph.head); + } + nodes = acyclicNodes; + } + + /** + * Debugging: dot representation of this graph + */ + String toDot() { + StringBuilder buf = new StringBuilder(); + for (Type t : inferenceContext.undetvars) { + UndetVar uv = (UndetVar)t; + buf.append(String.format("var %s - upper bounds = %s, lower bounds = %s, eq bounds = %s\\n", + uv.qtype, uv.getBounds(InferenceBound.UPPER), uv.getBounds(InferenceBound.LOWER), + uv.getBounds(InferenceBound.EQ))); + } + return GraphUtils.toDot(nodes, "inferenceGraph" + hashCode(), buf.toString()); + } + } + } + // </editor-fold> + + // <editor-fold defaultstate="collapsed" desc="Inference context"> + /** + * Functional interface for defining inference callbacks. Certain actions + * (i.e. subtyping checks) might need to be redone after all inference variables + * have been fixed. + */ + interface FreeTypeListener { + void typesInferred(InferenceContext inferenceContext); + } /** * An inference context keeps track of the set of variables that are free @@ -611,16 +1289,7 @@ * it can be used as an entry point for performing upper/lower bound inference * (see InferenceKind). */ - static class InferenceContext { - - /** - * Single-method-interface for defining inference callbacks. Certain actions - * (i.e. subtyping checks) might need to be redone after all inference variables - * have been fixed. - */ - interface FreeTypeListener { - void typesInferred(InferenceContext inferenceContext); - } + class InferenceContext { /** list of inference vars as undet vars */ List<Type> undetvars; @@ -628,15 +1297,26 @@ /** list of inference vars in this context */ List<Type> inferencevars; + /** backed up inference variables */ + List<Type> saved_undet; + java.util.Map<FreeTypeListener, List<Type>> freeTypeListeners = new java.util.HashMap<FreeTypeListener, List<Type>>(); List<FreeTypeListener> freetypeListeners = List.nil(); - public InferenceContext(List<Type> inferencevars, Infer infer, boolean includeBounds) { - this.undetvars = Type.map(inferencevars, infer.new FromTypeVarFun(includeBounds)); + public InferenceContext(List<Type> inferencevars) { + this.undetvars = Type.map(inferencevars, fromTypeVarFun); this.inferencevars = inferencevars; } + //where + Mapping fromTypeVarFun = new Mapping("fromTypeVarFunWithBounds") { + // mapping that turns inference variables into undet vars + public Type apply(Type t) { + if (t.hasTag(TYPEVAR)) return new UndetVar((TypeVar)t, types); + else return t.map(this); + } + }; /** * returns the list of free variables (as type-variables) in this @@ -648,19 +1328,51 @@ /** * returns the list of uninstantiated variables (as type-variables) in this - * inference context (usually called after instantiate()) + * inference context */ List<Type> restvars() { - List<Type> undetvars = this.undetvars; - ListBuffer<Type> restvars = ListBuffer.lb(); - for (Type t : instTypes()) { - UndetVar uv = (UndetVar)undetvars.head; - if (uv.qtype == t) { - restvars.append(t); + return filterVars(new Filter<UndetVar>() { + public boolean accepts(UndetVar uv) { + return uv.inst == null; + } + }); + } + + /** + * returns the list of instantiated variables (as type-variables) in this + * inference context + */ + List<Type> instvars() { + return filterVars(new Filter<UndetVar>() { + public boolean accepts(UndetVar uv) { + return uv.inst != null; } - undetvars = undetvars.tail; + }); + } + + /** + * Get list of bounded inference variables (where bound is other than + * declared bounds). + */ + final List<Type> boundedVars() { + return filterVars(new Filter<UndetVar>() { + public boolean accepts(UndetVar uv) { + return uv.getBounds(InferenceBound.UPPER) + .diff(uv.getDeclaredBounds()) + .appendList(uv.getBounds(InferenceBound.EQ, InferenceBound.LOWER)).nonEmpty(); + } + }); + } + + private List<Type> filterVars(Filter<UndetVar> fu) { + ListBuffer<Type> res = ListBuffer.lb(); + for (Type t : undetvars) { + UndetVar uv = (UndetVar)t; + if (fu.accepts(uv)) { + res.append(uv.qtype); + } } - return restvars.toList(); + return res.toList(); } /** @@ -709,14 +1421,14 @@ * undet vars (used ahead of subtyping/compatibility checks to allow propagation * of inference constraints). */ - final Type asFree(Type t, Types types) { + final Type asFree(Type t) { return types.subst(t, inferencevars, undetvars); } - final List<Type> asFree(List<Type> ts, Types types) { + final List<Type> asFree(List<Type> ts) { ListBuffer<Type> buf = ListBuffer.lb(); for (Type t : ts) { - buf.append(asFree(t, types)); + buf.append(asFree(t)); } return buf.toList(); } @@ -735,14 +1447,14 @@ * instantiated types - if one or more free variable has not been * fully instantiated, it will still be available in the resulting type. */ - Type asInstType(Type t, Types types) { + Type asInstType(Type t) { return types.subst(t, inferencevars, instTypes()); } - List<Type> asInstTypes(List<Type> ts, Types types) { + List<Type> asInstTypes(List<Type> ts) { ListBuffer<Type> buf = ListBuffer.lb(); for (Type t : ts) { - buf.append(asInstType(t, types)); + buf.append(asInstType(t)); } return buf.toList(); } @@ -758,11 +1470,15 @@ * Mark the inference context as complete and trigger evaluation * of all deferred checks. */ - void notifyChange(Types types) { + void notifyChange() { + notifyChange(inferencevars.diff(restvars())); + } + + void notifyChange(List<Type> inferredVars) { InferenceException thrownEx = null; for (Map.Entry<FreeTypeListener, List<Type>> entry : new HashMap<FreeTypeListener, List<Type>>(freeTypeListeners).entrySet()) { - if (!Type.containsAny(entry.getValue(), restvars())) { + if (!Type.containsAny(entry.getValue(), inferencevars.diff(inferredVars))) { try { entry.getKey().typesInferred(this); freeTypeListeners.remove(entry.getKey()); @@ -780,22 +1496,156 @@ } } - void solveAny(List<Type> varsToSolve, Types types, Infer infer) { - boolean progress = false; - for (Type t : varsToSolve) { - UndetVar uv = (UndetVar)asFree(t, types); - if (uv.inst == null) { - infer.minimizeInst(uv, types.noWarnings); - if (uv.inst != null) { - progress = true; + /** + * Save the state of this inference context + */ + void save() { + ListBuffer<Type> buf = ListBuffer.lb(); + for (Type t : undetvars) { + UndetVar uv = (UndetVar)t; + UndetVar uv2 = new UndetVar((TypeVar)uv.qtype, types); + for (InferenceBound ib : InferenceBound.values()) { + for (Type b : uv.getBounds(ib)) { + uv2.addBound(ib, b, types); + } + } + uv2.inst = uv.inst; + buf.add(uv2); + } + saved_undet = buf.toList(); + } + + /** + * Restore the state of this inference context to the previous known checkpoint + */ + void rollback() { + Assert.check(saved_undet != null && saved_undet.length() == undetvars.length()); + undetvars = saved_undet; + saved_undet = null; + } + + /** + * Copy variable in this inference context to the given context + */ + void dupTo(final InferenceContext that) { + that.inferencevars = that.inferencevars.appendList(inferencevars); + that.undetvars = that.undetvars.appendList(undetvars); + //set up listeners to notify original inference contexts as + //propagated vars are inferred in new context + for (Type t : inferencevars) { + that.freeTypeListeners.put(new FreeTypeListener() { + public void typesInferred(InferenceContext inferenceContext) { + InferenceContext.this.notifyChange(); + } + }, List.of(t)); + } + } + + /** + * Solve with given graph strategy. + */ + private void solve(GraphStrategy ss, Warner warn) { + GraphSolver s = new GraphSolver(this, warn); + s.solve(ss); + } + + /** + * Solve all variables in this context. + */ + public void solve(Warner warn) { + solve(new LeafSolver() { + public boolean done() { + return restvars().isEmpty(); + } + }, warn); + } + + /** + * Solve all variables in the given list. + */ + public void solve(final List<Type> vars, Warner warn) { + solve(new BestLeafSolver(vars) { + public boolean done() { + return !free(asInstTypes(vars)); + } + }, warn); + } + + /** + * Solve at least one variable in given list. + */ + public void solveAny(List<Type> varsToSolve, Warner warn) { + checkWithinBounds(this, warn); //propagate bounds + List<Type> boundedVars = boundedVars().intersect(restvars()).intersect(varsToSolve); + if (boundedVars.isEmpty()) { + throw inferenceException.setMessage("cyclic.inference", + freeVarsIn(varsToSolve)); + } + solve(new BestLeafSolver(boundedVars) { + public boolean done() { + return instvars().intersect(varsToSolve).nonEmpty(); + } + }, warn); + } + + /** + * Apply a set of inference steps + */ + private boolean solveBasic(EnumSet<InferenceStep> steps) { + return solveBasic(inferencevars, steps); + } + + private boolean solveBasic(List<Type> varsToSolve, EnumSet<InferenceStep> steps) { + boolean changed = false; + for (Type t : varsToSolve.intersect(restvars())) { + UndetVar uv = (UndetVar)asFree(t); + for (InferenceStep step : steps) { + if (step.accepts(uv, this)) { + uv.inst = step.solve(uv, this); + changed = true; + break; } } } - if (!progress) { - throw infer.inferenceException.setMessage("cyclic.inference", varsToSolve); + return changed; + } + + /** + * Instantiate inference variables in legacy mode (JLS 15.12.2.7, 15.12.2.8). + * During overload resolution, instantiation is done by doing a partial + * inference process using eq/lower bound instantiation. During check, + * we also instantiate any remaining vars by repeatedly using eq/upper + * instantiation, until all variables are solved. + */ + public void solveLegacy(boolean partial, Warner warn, EnumSet<InferenceStep> steps) { + while (true) { + boolean stuck = !solveBasic(steps); + if (restvars().isEmpty() || partial) { + //all variables have been instantiated - exit + break; + } else if (stuck) { + //some variables could not be instantiated because of cycles in + //upper bounds - provide a (possibly recursive) default instantiation + instantiateAsUninferredVars(restvars(), this); + break; + } else { + //some variables have been instantiated - replace newly instantiated + //variables in remaining upper bounds and continue + for (Type t : undetvars) { + UndetVar uv = (UndetVar)t; + uv.substBounds(inferenceVars(), instTypes(), types); + } + } } + checkWithinBounds(this, warn); + } + + private Infer infer() { + //back-door to infer + return Infer.this; } } - final InferenceContext emptyContext = new InferenceContext(List.<Type>nil(), this, false); + final InferenceContext emptyContext = new InferenceContext(List.<Type>nil()); + // </editor-fold> }
--- a/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 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 @@ -31,8 +31,8 @@ import com.sun.tools.javac.tree.TreeMaker; import com.sun.tools.javac.tree.TreeScanner; import com.sun.tools.javac.tree.TreeTranslator; -import com.sun.tools.javac.code.Flags; import com.sun.tools.javac.code.Kinds; +import com.sun.tools.javac.code.Scope; import com.sun.tools.javac.code.Symbol; import com.sun.tools.javac.code.Symbol.ClassSymbol; import com.sun.tools.javac.code.Symbol.DynamicMethodSymbol; @@ -44,6 +44,7 @@ import com.sun.tools.javac.code.Type.MethodType; import com.sun.tools.javac.code.Types; import com.sun.tools.javac.comp.LambdaToMethod.LambdaAnalyzer.*; +import com.sun.tools.javac.comp.Lower.BasicFreeVarCollector; import com.sun.tools.javac.jvm.*; import com.sun.tools.javac.util.*; import com.sun.tools.javac.util.List; @@ -57,9 +58,7 @@ import static com.sun.tools.javac.comp.LambdaToMethod.LambdaSymbolKind.*; import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.code.Kinds.*; -import static com.sun.tools.javac.code.TypeTag.BOT; -import static com.sun.tools.javac.code.TypeTag.NONE; -import static com.sun.tools.javac.code.TypeTag.VOID; +import static com.sun.tools.javac.code.TypeTag.*; import static com.sun.tools.javac.tree.JCTree.Tag.*; /** @@ -72,6 +71,7 @@ */ public class LambdaToMethod extends TreeTranslator { + private Lower lower; private Names names; private Symtab syms; private Resolve rs; @@ -89,9 +89,52 @@ /** current translation context (visitor argument) */ private TranslationContext<?> context; - /** list of translated methods - **/ - private ListBuffer<JCTree> translatedMethodList; + /** info about the current class being processed */ + private KlassInfo kInfo; + + /** Flag for alternate metafactories indicating the lambda object is intended to be serializable */ + public static final int FLAG_SERIALIZABLE = 1 << 0; + + /** Flag for alternate metafactories indicating the lambda object has multiple targets */ + public static final int FLAG_MARKERS = 1 << 1; + + private class KlassInfo { + + /** + * list of methods to append + */ + private ListBuffer<JCTree> appendedMethodList; + + /** + * list of deserialization cases + */ + private final Map<String, ListBuffer<JCStatement>> deserializeCases; + + /** + * deserialize method symbol + */ + private final MethodSymbol deserMethodSym; + + /** + * deserialize method parameter symbol + */ + private final VarSymbol deserParamSym; + + private KlassInfo(Symbol kSym) { + appendedMethodList = ListBuffer.lb(); + deserializeCases = new HashMap<String, ListBuffer<JCStatement>>(); + long flags = PRIVATE | STATIC | SYNTHETIC; + MethodType type = new MethodType(List.of(syms.serializedLambdaType), syms.objectType, + List.<Type>nil(), syms.methodClass); + deserMethodSym = makeSyntheticMethod(flags, names.deserializeLambda, type, kSym); + deserParamSym = new VarSymbol(FINAL, names.fromString("lambda"), + syms.serializedLambdaType, deserMethodSym); + } + + private void addMethod(JCTree decl) { + appendedMethodList = appendedMethodList.prepend(decl); + } + } // <editor-fold defaultstate="collapsed" desc="Instantiating"> private static final Context.Key<LambdaToMethod> unlambdaKey = @@ -106,17 +149,14 @@ } private LambdaToMethod(Context context) { + lower = Lower.instance(context); names = Names.instance(context); syms = Symtab.instance(context); rs = Resolve.instance(context); make = TreeMaker.instance(context); types = Types.instance(context); transTypes = TransTypes.instance(context); - this.analyzer = makeAnalyzer(); - } - - private LambdaAnalyzer makeAnalyzer() { - return new LambdaAnalyzer(); + analyzer = new LambdaAnalyzer(); } // </editor-fold> @@ -168,18 +208,22 @@ //analyze class analyzer.analyzeClass(tree); } - ListBuffer<JCTree> prevTranslated = translatedMethodList; + KlassInfo prevKlassInfo = kInfo; try { - translatedMethodList = ListBuffer.lb(); + kInfo = new KlassInfo(tree.sym); super.visitClassDef(tree); + if (!kInfo.deserializeCases.isEmpty()) { + kInfo.addMethod(makeDeserializeMethod(tree.sym)); + } //add all translated instance methods here - tree.defs = tree.defs.appendList(translatedMethodList.toList()); - for (JCTree lambda : translatedMethodList) { + List<JCTree> newMethods = kInfo.appendedMethodList.toList(); + tree.defs = tree.defs.appendList(newMethods); + for (JCTree lambda : newMethods) { tree.sym.members().enter(((JCMethodDecl)lambda).sym); } result = tree; } finally { - translatedMethodList = prevTranslated; + kInfo = prevKlassInfo; } } @@ -217,7 +261,7 @@ lambdaDecl.body = translate(makeLambdaBody(tree, lambdaDecl)); //Add the method to the list of methods to be added to this class. - translatedMethodList = translatedMethodList.prepend(lambdaDecl); + kInfo.addMethod(lambdaDecl); //now that we have generated a method for the lambda expression, //we can translate the lambda into a method reference pointing to the newly @@ -234,7 +278,7 @@ if (!sym.isStatic()) { syntheticInits.append(makeThis( - sym.owner.asType(), + sym.owner.enclClass().asType(), localContext.owner.enclClass())); } @@ -253,7 +297,7 @@ int refKind = referenceKind(sym); //convert to an invokedynamic call - result = makeMetaFactoryIndyCall(tree, refKind, sym, indy_args); + result = makeMetaFactoryIndyCall(tree, context.needsAltMetafactory(), context.isSerializable(), refKind, sym, indy_args); } private JCIdent makeThis(Type type, Symbol owner) { @@ -291,8 +335,8 @@ case IMPLICIT_INNER: /** Inner :: new */ case SUPER: /** super :: instMethod */ init = makeThis( - localContext.owner.owner.asType(), - localContext.owner); + localContext.owner.enclClass().asType(), + localContext.owner.enclClass()); break; case BOUND: /** Expr :: instMethod */ @@ -314,7 +358,7 @@ //build a sam instance using an indy call to the meta-factory - result = makeMetaFactoryIndyCall(tree, localContext.referenceKind(), refSym, indy_args); + result = makeMetaFactoryIndyCall(tree, localContext.needsAltMetafactory(), localContext.isSerializable(), localContext.referenceKind(), refSym, indy_args); } /** @@ -333,22 +377,13 @@ } else if (lambdaContext.getSymbolMap(LOCAL_VAR).containsKey(tree.sym)) { Symbol translatedSym = lambdaContext.getSymbolMap(LOCAL_VAR).get(tree.sym); result = make.Ident(translatedSym).setType(tree.type); + } else if (lambdaContext.getSymbolMap(TYPE_VAR).containsKey(tree.sym)) { + Symbol translatedSym = lambdaContext.getSymbolMap(TYPE_VAR).get(tree.sym); + result = make.Ident(translatedSym).setType(translatedSym.type); } else if (lambdaContext.getSymbolMap(CAPTURED_VAR).containsKey(tree.sym)) { Symbol translatedSym = lambdaContext.getSymbolMap(CAPTURED_VAR).get(tree.sym); result = make.Ident(translatedSym).setType(tree.type); } else { - if (tree.sym.owner.kind == Kinds.TYP) { - for (Map.Entry<Symbol, Symbol> encl_entry : lambdaContext.getSymbolMap(CAPTURED_THIS).entrySet()) { - if (tree.sym.isMemberOf((ClassSymbol) encl_entry.getKey(), types)) { - JCExpression enclRef = make.Ident(encl_entry.getValue()); - result = tree.sym.name == names._this - ? enclRef.setType(tree.type) - : make.Select(enclRef, tree.sym).setType(tree.type); - result = tree; - return; - } - } - } //access to untranslated symbols (i.e. compile-time constants, //members defined inside the lambda body, etc.) ) super.visitIdent(tree); @@ -362,6 +397,16 @@ if (context != null && lambdaContext.getSymbolMap(LOCAL_VAR).containsKey(tree.sym)) { JCExpression init = translate(tree.init); result = make.VarDef((VarSymbol)lambdaContext.getSymbolMap(LOCAL_VAR).get(tree.sym), init); + } else if (context != null && lambdaContext.getSymbolMap(TYPE_VAR).containsKey(tree.sym)) { + JCExpression init = translate(tree.init); + VarSymbol xsym = (VarSymbol)lambdaContext.getSymbolMap(TYPE_VAR).get(tree.sym); + result = make.VarDef(xsym, init); + // Replace the entered symbol for this variable + Scope sc = tree.sym.owner.members(); + if (sc != null) { + sc.remove(tree.sym); + sc.enter(xsym); + } } else { super.visitVarDef(tree); } @@ -451,6 +496,135 @@ return trans_block; } + private JCMethodDecl makeDeserializeMethod(Symbol kSym) { + ListBuffer<JCCase> cases = ListBuffer.lb(); + ListBuffer<JCBreak> breaks = ListBuffer.lb(); + for (Map.Entry<String, ListBuffer<JCStatement>> entry : kInfo.deserializeCases.entrySet()) { + JCBreak br = make.Break(null); + breaks.add(br); + List<JCStatement> stmts = entry.getValue().append(br).toList(); + cases.add(make.Case(make.Literal(entry.getKey()), stmts)); + } + JCSwitch sw = make.Switch(deserGetter("getImplMethodName", syms.stringType), cases.toList()); + for (JCBreak br : breaks) { + br.target = sw; + } + JCBlock body = make.Block(0L, List.<JCStatement>of( + sw, + make.Throw(makeNewClass( + syms.illegalArgumentExceptionType, + List.<JCExpression>of(make.Literal("Invalid lambda deserialization")))))); + JCMethodDecl deser = make.MethodDef(make.Modifiers(kInfo.deserMethodSym.flags()), + names.deserializeLambda, + make.QualIdent(kInfo.deserMethodSym.getReturnType().tsym), + List.<JCTypeParameter>nil(), + List.of(make.VarDef(kInfo.deserParamSym, null)), + List.<JCExpression>nil(), + body, + null); + deser.sym = kInfo.deserMethodSym; + deser.type = kInfo.deserMethodSym.type; + //System.err.printf("DESER: '%s'\n", deser); + return deser; + } + + /** Make an attributed class instance creation expression. + * @param ctype The class type. + * @param args The constructor arguments. + */ + JCNewClass makeNewClass(Type ctype, List<JCExpression> args) { + JCNewClass tree = make.NewClass(null, + null, make.QualIdent(ctype.tsym), args, null); + tree.constructor = rs.resolveConstructor( + null, attrEnv, ctype, TreeInfo.types(args), List.<Type>nil()); + tree.type = ctype; + return tree; + } + + private void addDeserializationCase(int implMethodKind, Symbol refSym, Type targetType, MethodSymbol samSym, + DiagnosticPosition pos, List<Object> staticArgs, MethodType indyType) { + String functionalInterfaceClass = classSig(targetType); + String functionalInterfaceMethodName = samSym.getSimpleName().toString(); + String functionalInterfaceMethodSignature = methodSig(types.erasure(samSym.type)); + String implClass = classSig(types.erasure(refSym.owner.type)); + String implMethodName = refSym.getQualifiedName().toString(); + String implMethodSignature = methodSig(types.erasure(refSym.type)); + + JCExpression kindTest = eqTest(syms.intType, deserGetter("getImplMethodKind", syms.intType), make.Literal(implMethodKind)); + ListBuffer<JCExpression> serArgs = ListBuffer.lb(); + int i = 0; + for (Type t : indyType.getParameterTypes()) { + List<JCExpression> indexAsArg = ListBuffer.<JCExpression>lb().append(make.Literal(i)).toList(); + List<Type> argTypes = ListBuffer.<Type>lb().append(syms.intType).toList(); + serArgs.add(make.TypeCast(types.erasure(t), deserGetter("getCapturedArg", syms.objectType, argTypes, indexAsArg))); + ++i; + } + JCStatement stmt = make.If( + deserTest(deserTest(deserTest(deserTest(deserTest( + kindTest, + "getFunctionalInterfaceClass", functionalInterfaceClass), + "getFunctionalInterfaceMethodName", functionalInterfaceMethodName), + "getFunctionalInterfaceMethodSignature", functionalInterfaceMethodSignature), + "getImplClass", implClass), + "getImplMethodSignature", implMethodSignature), + make.Return(makeIndyCall( + pos, + syms.lambdaMetafactory, + names.altMetaFactory, + staticArgs, indyType, serArgs.toList())), + null); + ListBuffer<JCStatement> stmts = kInfo.deserializeCases.get(implMethodName); + if (stmts == null) { + stmts = ListBuffer.lb(); + kInfo.deserializeCases.put(implMethodName, stmts); + } + /**** + System.err.printf("+++++++++++++++++\n"); + System.err.printf("*functionalInterfaceClass: '%s'\n", functionalInterfaceClass); + System.err.printf("*functionalInterfaceMethodName: '%s'\n", functionalInterfaceMethodName); + System.err.printf("*functionalInterfaceMethodSignature: '%s'\n", functionalInterfaceMethodSignature); + System.err.printf("*implMethodKind: %d\n", implMethodKind); + System.err.printf("*implClass: '%s'\n", implClass); + System.err.printf("*implMethodName: '%s'\n", implMethodName); + System.err.printf("*implMethodSignature: '%s'\n", implMethodSignature); + ****/ + stmts.append(stmt); + } + + private JCExpression eqTest(Type argType, JCExpression arg1, JCExpression arg2) { + JCBinary testExpr = make.Binary(JCTree.Tag.EQ, arg1, arg2); + testExpr.operator = rs.resolveBinaryOperator(null, JCTree.Tag.EQ, attrEnv, argType, argType); + testExpr.setType(syms.booleanType); + return testExpr; + } + + private JCExpression deserTest(JCExpression prev, String func, String lit) { + MethodType eqmt = new MethodType(List.of(syms.objectType), syms.booleanType, List.<Type>nil(), syms.methodClass); + Symbol eqsym = rs.resolveQualifiedMethod(null, attrEnv, syms.objectType, names.equals, List.of(syms.objectType), List.<Type>nil()); + JCMethodInvocation eqtest = make.Apply( + List.<JCExpression>nil(), + make.Select(deserGetter(func, syms.stringType), eqsym).setType(eqmt), + List.<JCExpression>of(make.Literal(lit))); + eqtest.setType(syms.booleanType); + JCBinary compound = make.Binary(JCTree.Tag.AND, prev, eqtest); + compound.operator = rs.resolveBinaryOperator(null, JCTree.Tag.AND, attrEnv, syms.booleanType, syms.booleanType); + compound.setType(syms.booleanType); + return compound; + } + + private JCExpression deserGetter(String func, Type type) { + return deserGetter(func, type, List.<Type>nil(), List.<JCExpression>nil()); + } + + private JCExpression deserGetter(String func, Type type, List<Type> argTypes, List<JCExpression> args) { + MethodType getmt = new MethodType(argTypes, type, List.<Type>nil(), syms.methodClass); + Symbol getsym = rs.resolveQualifiedMethod(null, attrEnv, syms.serializedLambdaType, names.fromString(func), argTypes, List.<Type>nil()); + return make.Apply( + List.<JCExpression>nil(), + make.Select(make.Ident(kInfo.deserParamSym).setType(syms.serializedLambdaType), getsym).setType(getmt), + args).setType(type); + } + /** * Create new synthetic method with given flags, name, type, owner */ @@ -556,7 +730,8 @@ List<Type> refPTypes = tree.sym.type.getParameterTypes(); int refSize = refPTypes.size(); int samSize = samPTypes.size(); - int last = localContext.needsVarArgsConversion() ? refSize - 1 : refSize; // Last parameter to copy from referenced method + // Last parameter to copy from referenced method + int last = localContext.needsVarArgsConversion() ? refSize - 1 : refSize; List<Type> l = refPTypes; // Use parameter types of the referenced method, excluding final var args @@ -581,12 +756,13 @@ null, null); bridgeDecl.sym = (MethodSymbol) localContext.bridgeSym; - bridgeDecl.type = localContext.bridgeSym.type = types.createMethodTypeWithParameters(samDesc, TreeInfo.types(params.toList())); + bridgeDecl.type = localContext.bridgeSym.type = + types.createMethodTypeWithParameters(samDesc, TreeInfo.types(params.toList())); //bridge method body generation - this can be either a method call or a //new instance creation expression, depending on the member reference kind JCExpression bridgeExpr = (tree.getMode() == ReferenceMode.INVOKE) - ? bridgeExpressionInvoke(rcvr) + ? bridgeExpressionInvoke(makeReceiver(rcvr)) : bridgeExpressionNew(); //the body is either a return expression containing a method call, @@ -599,6 +775,16 @@ make.at(prevPos); } } + //where + private JCExpression makeReceiver(VarSymbol rcvr) { + if (rcvr == null) return null; + JCExpression rcvrExpr = make.Ident(rcvr); + Type rcvrType = tree.sym.enclClass().type; + if (!rcvr.type.tsym.isSubClass(rcvrType.tsym, types)) { + rcvrExpr = make.TypeCast(make.Type(rcvrType), rcvrExpr).setType(rcvrType); + } + return rcvrExpr; + } /** * determine the receiver of the bridged method call - the receiver can @@ -606,12 +792,12 @@ * original qualifier expression is never used here, as it might refer * to symbols not available in the static context of the bridge */ - private JCExpression bridgeExpressionInvoke(VarSymbol rcvr) { + private JCExpression bridgeExpressionInvoke(JCExpression rcvr) { JCExpression qualifier = tree.sym.isStatic() ? make.Type(tree.sym.owner.type) : (rcvr != null) ? - make.Ident(rcvr) : + rcvr : tree.getQualifierExpression(); //create the qualifier expression @@ -621,7 +807,8 @@ //create the method call expression JCExpression apply = make.Apply(List.<JCExpression>nil(), select, - convertArgs(tree.sym, args.toList(), tree.varargsElement)).setType(tree.sym.erasure(types).getReturnType()); + convertArgs(tree.sym, args.toList(), tree.varargsElement)). + setType(tree.sym.erasure(types).getReturnType()); apply = transTypes.coerce(apply, localContext.generatedRefSig().getReturnType()); setVarargsIfNeeded(apply, tree.varargsElement); @@ -635,7 +822,8 @@ private JCExpression bridgeExpressionNew() { if (tree.kind == ReferenceKind.ARRAY_CTOR) { //create the array creation expression - JCNewArray newArr = make.NewArray(make.Type(types.elemtype(tree.getQualifierExpression().type)), + JCNewArray newArr = make.NewArray( + make.Type(types.elemtype(tree.getQualifierExpression().type)), List.of(make.Ident(params.first())), null); newArr.type = tree.getQualifierExpression().type; @@ -678,19 +866,20 @@ * * super is used */ private void bridgeMemberReference(JCMemberReference tree, ReferenceTranslationContext localContext) { - JCMethodDecl bridgeDecl = (new MemberReferenceBridger(tree, localContext).bridge()); - translatedMethodList = translatedMethodList.prepend(bridgeDecl); + kInfo.addMethod(new MemberReferenceBridger(tree, localContext).bridge()); } /** * Generate an indy method call to the meta factory */ - private JCExpression makeMetaFactoryIndyCall(JCFunctionalExpression tree, int refKind, Symbol refSym, List<JCExpression> indy_args) { + private JCExpression makeMetaFactoryIndyCall(JCFunctionalExpression tree, boolean needsAltMetafactory, + boolean isSerializable, int refKind, Symbol refSym, List<JCExpression> indy_args) { //determine the static bsm args Type mtype = types.erasure(tree.descriptorType); MethodSymbol samSym = (MethodSymbol) types.findDescriptorSymbol(tree.type.tsym); List<Object> staticArgs = List.<Object>of( - new Pool.MethodHandle(ClassFile.REF_invokeInterface, types.findDescriptorSymbol(tree.type.tsym), types), + new Pool.MethodHandle(ClassFile.REF_invokeInterface, + types.findDescriptorSymbol(tree.type.tsym), types), new Pool.MethodHandle(refKind, refSym, types), new MethodType(mtype.getParameterTypes(), mtype.getReturnType(), @@ -709,14 +898,39 @@ List.<Type>nil(), syms.methodClass); - return makeIndyCall(tree, syms.lambdaMetafactory, names.metaFactory, staticArgs, indyType, indy_args); + Name metafactoryName = needsAltMetafactory ? + names.altMetaFactory : names.metaFactory; + + if (needsAltMetafactory) { + ListBuffer<Object> markers = ListBuffer.lb(); + for (Symbol t : tree.targets.tail) { + if (t != syms.serializableType.tsym) { + markers.append(t); + } + } + int flags = isSerializable? FLAG_SERIALIZABLE : 0; + boolean hasMarkers = markers.nonEmpty(); + flags |= hasMarkers ? FLAG_MARKERS : 0; + staticArgs = staticArgs.append(flags); + if (hasMarkers) { + staticArgs = staticArgs.append(markers.length()); + staticArgs = staticArgs.appendList(markers.toList()); + } + if (isSerializable) { + addDeserializationCase(refKind, refSym, tree.type, samSym, + tree, staticArgs, indyType); + } + } + + return makeIndyCall(tree, syms.lambdaMetafactory, metafactoryName, staticArgs, indyType, indy_args); } /** * Generate an indy method call with given name, type and static bootstrap * arguments types */ - private JCExpression makeIndyCall(DiagnosticPosition pos, Type site, Name bsmName, List<Object> staticArgs, MethodType indyType, List<JCExpression> indyArgs) { + private JCExpression makeIndyCall(DiagnosticPosition pos, Type site, Name bsmName, + List<Object> staticArgs, MethodType indyType, List<JCExpression> indyArgs) { int prevPos = make.pos; try { make.at(pos); @@ -730,7 +944,9 @@ DynamicMethodSymbol dynSym = new DynamicMethodSymbol(names.lambda, syms.noSymbol, - bsm.isStatic() ? ClassFile.REF_invokeStatic : ClassFile.REF_invokeVirtual, + bsm.isStatic() ? + ClassFile.REF_invokeStatic : + ClassFile.REF_invokeVirtual, (MethodSymbol)bsm, indyType, staticArgs.toArray()); @@ -791,13 +1007,14 @@ } else if (refSym.enclClass().isInterface()) { return ClassFile.REF_invokeInterface; } else { - return ClassFile.REF_invokeVirtual; + return (refSym.flags() & PRIVATE) != 0 ? + ClassFile.REF_invokeSpecial : + ClassFile.REF_invokeVirtual; } } } - // </editor-fold> - // <editor-fold defaultstate="collapsed" desc="Lambda/reference analyzer">\ + // <editor-fold defaultstate="collapsed" desc="Lambda/reference analyzer"> /** * This visitor collects information about translation of a lambda expression. * More specifically, it keeps track of the enclosing contexts and captured locals @@ -814,8 +1031,25 @@ */ private int lambdaCount = 0; + /** + * keep the count of lambda expression defined in given context (used to + * generate unambiguous names for serializable lambdas) + */ + private Map<String, Integer> serializableLambdaCounts = + new HashMap<String, Integer>(); + + private Map<Symbol, JCClassDecl> localClassDefs; + + /** + * maps for fake clinit symbols to be used as owners of lambda occurring in + * a static var init context + */ + private Map<ClassSymbol, Symbol> clinits = + new HashMap<ClassSymbol, Symbol>(); + private void analyzeClass(JCClassDecl tree) { frameStack = List.nil(); + localClassDefs = new HashMap<Symbol, JCClassDecl>(); scan(tree); } @@ -836,21 +1070,28 @@ @Override public void visitClassDef(JCClassDecl tree) { List<Frame> prevStack = frameStack; + Map<String, Integer> prevSerializableLambdaCount = + serializableLambdaCounts; + Map<ClassSymbol, Symbol> prevClinits = clinits; try { - if (frameStack.nonEmpty() && enclosingLambda() != null) { + serializableLambdaCounts = new HashMap<String, Integer>(); + prevClinits = new HashMap<ClassSymbol, Symbol>(); + if (tree.sym.owner.kind == MTH) { + localClassDefs.put(tree.sym, tree); + } + if (directlyEnclosingLambda() != null) { tree.sym.owner = owner(); - LambdaTranslationContext lambdaContext = (LambdaTranslationContext)contextMap.get(enclosingLambda()); - Type encl = lambdaContext.enclosingType(); - if (encl.hasTag(NONE)) { - //if the translated lambda body occurs in a static context, - //any class declaration within it must be made static - tree.sym.flags_field |= STATIC; - ((ClassType)tree.sym.type).setEnclosingType(Type.noType); - } else { - //if the translated lambda body is in an instance context - //the enclosing type of any class declaration within it - //must be updated to point to the new enclosing type (if any) - ((ClassType)tree.sym.type).setEnclosingType(encl); + if (tree.sym.hasOuterInstance()) { + //if a class is defined within a lambda, the lambda must capture + //its enclosing instance (if any) + TranslationContext<?> localContext = context(); + while (localContext != null) { + if (localContext.tree.getTag() == LAMBDA) { + ((LambdaTranslationContext)localContext) + .addSymbol(tree.sym.type.getEnclosingType().tsym, CAPTURED_THIS); + } + localContext = localContext.prev; + } } } frameStack = frameStack.prepend(new Frame(tree)); @@ -858,19 +1099,14 @@ } finally { frameStack = prevStack; - } - if (!tree.sym.isStatic() && frameStack.nonEmpty() && enclosingLambda() != null) { - // Any (non-static) class defined within a lambda is an implicit 'this' reference - // because its constructor will reference the enclosing class - ((LambdaTranslationContext) context()).addSymbol(tree.sym.type.getEnclosingType().tsym, CAPTURED_THIS); + serializableLambdaCounts = prevSerializableLambdaCount; + clinits = prevClinits; } } @Override public void visitIdent(JCIdent tree) { - if (context() == null || !lambdaIdentSymbolFilter(tree.sym)) { - super.visitIdent(tree); - } else { + if (context() != null && lambdaIdentSymbolFilter(tree.sym)) { if (tree.sym.kind == VAR && tree.sym.owner.kind == MTH && tree.type.constValue() == null) { @@ -879,7 +1115,8 @@ if (localContext.tree.getTag() == LAMBDA) { JCTree block = capturedDecl(localContext.depth, tree.sym); if (block == null) break; - ((LambdaTranslationContext)localContext).addSymbol(tree.sym, CAPTURED_VAR); + ((LambdaTranslationContext)localContext) + .addSymbol(tree.sym, CAPTURED_VAR); } localContext = localContext.prev; } @@ -892,7 +1129,8 @@ switch (block.getTag()) { case CLASSDEF: JCClassDecl cdecl = (JCClassDecl)block; - ((LambdaTranslationContext)localContext).addSymbol(cdecl.sym, CAPTURED_THIS); + ((LambdaTranslationContext)localContext) + .addSymbol(cdecl.sym, CAPTURED_THIS); break; default: Assert.error("bad block kind"); @@ -902,6 +1140,7 @@ } } } + super.visitIdent(tree); } @Override @@ -938,10 +1177,50 @@ @Override public void visitNewClass(JCNewClass tree) { if (lambdaNewClassFilter(context(), tree)) { - ((LambdaTranslationContext) context()).addSymbol(tree.type.getEnclosingType().tsym, CAPTURED_THIS); + TranslationContext<?> localContext = context(); + while (localContext != null) { + if (localContext.tree.getTag() == LAMBDA) { + ((LambdaTranslationContext)localContext) + .addSymbol(tree.type.getEnclosingType().tsym, CAPTURED_THIS); + } + localContext = localContext.prev; + } + } + if (context() != null && tree.type.tsym.owner.kind == MTH) { + LambdaTranslationContext lambdaContext = (LambdaTranslationContext)context(); + captureLocalClassDefs(tree.type.tsym, lambdaContext); } super.visitNewClass(tree); } + //where + void captureLocalClassDefs(Symbol csym, final LambdaTranslationContext lambdaContext) { + JCClassDecl localCDef = localClassDefs.get(csym); + if (localCDef != null && localCDef.pos < lambdaContext.tree.pos) { + BasicFreeVarCollector fvc = lower.new BasicFreeVarCollector() { + @Override + void addFreeVars(ClassSymbol c) { + captureLocalClassDefs(c, lambdaContext); + } + @Override + void visitSymbol(Symbol sym) { + if (sym.kind == VAR && + sym.owner.kind == MTH && + ((VarSymbol)sym).getConstValue() == null) { + TranslationContext<?> localContext = context(); + while (localContext != null) { + if (localContext.tree.getTag() == LAMBDA) { + JCTree block = capturedDecl(localContext.depth, sym); + if (block == null) break; + ((LambdaTranslationContext)localContext).addSymbol(sym, CAPTURED_VAR); + } + localContext = localContext.prev; + } + } + } + }; + fvc.scan(localCDef); + } + } @Override public void visitReference(JCMemberReference tree) { @@ -969,9 +1248,22 @@ @Override public void visitVarDef(JCVariableDecl tree) { - if (frameStack.head.tree.hasTag(LAMBDA)) { - ((LambdaTranslationContext)context()).addSymbol(tree.sym, LOCAL_VAR); + TranslationContext<?> context = context(); + LambdaTranslationContext ltc = (context != null && context instanceof LambdaTranslationContext)? + (LambdaTranslationContext)context : + null; + if (ltc != null) { + if (frameStack.head.tree.hasTag(LAMBDA)) { + ltc.addSymbol(tree.sym, LOCAL_VAR); + } + // Check for type variables (including as type arguments). + // If they occur within class nested in a lambda, mark for erasure + Type type = tree.sym.asType(); + if (inClassWithinLambda() && !types.isSameType(types.erasure(type), type)) { + ltc.addSymbol(tree.sym, TYPE_VAR); + } } + List<Frame> prevStack = frameStack; try { if (tree.sym.owner.kind == MTH) { @@ -986,7 +1278,47 @@ } private Name lambdaName() { - return names.lambda.append(names.fromString("$" + lambdaCount++)); + return names.lambda.append(names.fromString("" + lambdaCount++)); + } + + /** + * For a serializable lambda, generate a name which maximizes name + * stability across deserialization. + * @param owner + * @return Name to use for the synthetic lambda method name + */ + private Name serializedLambdaName(Symbol owner) { + StringBuilder buf = new StringBuilder(); + buf.append(names.lambda); + // Append the name of the method enclosing the lambda. + String methodName = owner.name.toString(); + if (methodName.equals("<clinit>")) + methodName = "static"; + else if (methodName.equals("<init>")) + methodName = "new"; + buf.append(methodName); + buf.append('$'); + // Append a hash of the enclosing method signature to differentiate + // overloaded enclosing methods. For lambdas enclosed in lambdas, + // the generated lambda method will not have type yet, but the + // enclosing method's name will have been generated with this same + // method, so it will be unique and never be overloaded. + Assert.check(owner.type != null || directlyEnclosingLambda() != null); + if (owner.type != null) { + int methTypeHash = methodSig(owner.type).hashCode(); + buf.append(Integer.toHexString(methTypeHash)); + } + buf.append('$'); + // The above appended name components may not be unique, append a + // count based on the above name components. + String temp = buf.toString(); + Integer count = serializableLambdaCounts.get(temp); + if (count == null) { + count = 0; + } + buf.append(count++); + serializableLambdaCounts.put(temp, count); + return names.fromString(buf.toString()); } /** @@ -1008,17 +1340,20 @@ break; } JCClassDecl cdecl = (JCClassDecl)frameStack2.tail.head.tree; - return makeSyntheticMethod(((JCVariableDecl)frameStack2.head.tree).sym.flags() & STATIC, names.empty, null, cdecl.sym); + return initSym(cdecl.sym, + ((JCVariableDecl)frameStack2.head.tree).sym.flags() & STATIC); case BLOCK: JCClassDecl cdecl2 = (JCClassDecl)frameStack2.tail.head.tree; - return makeSyntheticMethod(((JCBlock)frameStack2.head.tree).flags & STATIC | Flags.BLOCK, names.empty, null, cdecl2.sym); + return initSym(cdecl2.sym, + ((JCBlock)frameStack2.head.tree).flags & STATIC); case CLASSDEF: return ((JCClassDecl)frameStack2.head.tree).sym; case METHODDEF: return ((JCMethodDecl)frameStack2.head.tree).sym; case LAMBDA: if (!skipLambda) - return ((LambdaTranslationContext)contextMap.get(frameStack2.head.tree)).translatedSym; + return ((LambdaTranslationContext)contextMap + .get(frameStack2.head.tree)).translatedSym; default: frameStack2 = frameStack2.tail; } @@ -1027,7 +1362,33 @@ return null; } - private JCTree enclosingLambda() { + private Symbol initSym(ClassSymbol csym, long flags) { + boolean isStatic = (flags & STATIC) != 0; + if (isStatic) { + //static clinits are generated in Gen - so we need to fake them + Symbol clinit = clinits.get(csym); + if (clinit == null) { + clinit = makeSyntheticMethod(STATIC, + names.clinit, + new MethodType(List.<Type>nil(), syms.voidType, List.<Type>nil(), syms.methodClass), + csym); + clinits.put(csym, clinit); + } + return clinit; + } else { + //get the first constructor and treat it as the instance init sym + for (Symbol s : csym.members_field.getElementsByName(names.init)) { + return s; + } + } + Assert.error("init not found"); + return null; + } + + private JCTree directlyEnclosingLambda() { + if (frameStack.isEmpty()) { + return null; + } List<Frame> frameStack2 = frameStack; while (frameStack2.nonEmpty()) { switch (frameStack2.head.tree.getTag()) { @@ -1044,6 +1405,28 @@ return null; } + private boolean inClassWithinLambda() { + if (frameStack.isEmpty()) { + return false; + } + List<Frame> frameStack2 = frameStack; + boolean classFound = false; + while (frameStack2.nonEmpty()) { + switch (frameStack2.head.tree.getTag()) { + case LAMBDA: + return classFound; + case CLASSDEF: + classFound = true; + frameStack2 = frameStack2.tail; + break; + default: + frameStack2 = frameStack2.tail; + } + } + // No lambda + return false; + } + /** * Return the declaration corresponding to a symbol in the enclosing * scope; the depth parameter is used to filter out symbols defined @@ -1178,6 +1561,22 @@ this.depth = frameStack.size() - 1; this.prev = context(); } + + /** does this functional expression need to be created using alternate metafactory? */ + boolean needsAltMetafactory() { + return (tree.targets.length() > 1 || + isSerializable()); + } + + /** does this functional expression require serialization support? */ + boolean isSerializable() { + for (Symbol target : tree.targets) { + if (types.asSuper(target.type, syms.serializableType.tsym) != null) { + return true; + } + } + return false; + } } /** @@ -1203,6 +1602,9 @@ /** map from class symbols to translated synthetic parameters (for captured member access) */ Map<Symbol, Symbol> capturedThis = new LinkedHashMap<Symbol, Symbol>(); + /** map from original to translated lambda locals */ + Map<Symbol, Symbol> typeVars = new LinkedHashMap<Symbol, Symbol>(); + /** the synthetic symbol for the method hoisting the translated lambda */ Symbol translatedSym; @@ -1214,40 +1616,58 @@ if (frame.tree.hasTag(VARDEF)) { self = ((JCVariableDecl)frame.tree).sym; } - this.translatedSym = makeSyntheticMethod(0, lambdaName(), null, owner.enclClass()); + Name name = isSerializable() ? serializedLambdaName(owner) : lambdaName(); + this.translatedSym = makeSyntheticMethod(0, name, null, owner.enclClass()); } /** * Translate a symbol of a given kind into something suitable for the * synthetic lambda body */ - Symbol translate(String name, Symbol sym, LambdaSymbolKind skind) { - if (skind == CAPTURED_THIS) { - return sym; // self represented - } else { - return makeSyntheticVar(FINAL, name, types.erasure(sym.type), translatedSym); + Symbol translate(Name name, final Symbol sym, LambdaSymbolKind skind) { + switch (skind) { + case CAPTURED_THIS: + return sym; // self represented + case TYPE_VAR: + // Just erase the type var + return new VarSymbol(sym.flags(), name, + types.erasure(sym.type), sym.owner); + case CAPTURED_VAR: + return new VarSymbol(SYNTHETIC | FINAL, name, types.erasure(sym.type), translatedSym) { + @Override + public Symbol baseSymbol() { + //keep mapping with original captured symbol + return sym; + } + }; + default: + return makeSyntheticVar(FINAL, name, types.erasure(sym.type), translatedSym); } } void addSymbol(Symbol sym, LambdaSymbolKind skind) { Map<Symbol, Symbol> transMap = null; - String preferredName; + Name preferredName; switch (skind) { case CAPTURED_THIS: transMap = capturedThis; - preferredName = "encl$" + capturedThis.size(); + preferredName = names.fromString("encl$" + capturedThis.size()); break; case CAPTURED_VAR: transMap = capturedLocals; - preferredName = "cap$" + capturedLocals.size(); + preferredName = names.fromString("cap$" + capturedLocals.size()); break; case LOCAL_VAR: transMap = lambdaLocals; - preferredName = sym.name.toString(); + preferredName = sym.name; break; case PARAM: transMap = lambdaParams; - preferredName = sym.name.toString(); + preferredName = sym.name; + break; + case TYPE_VAR: + transMap = typeVars; + preferredName = sym.name; break; default: throw new AssertionError(); } @@ -1272,6 +1692,9 @@ case PARAM: translationMap.putAll(lambdaParams); break; + case TYPE_VAR: + translationMap.putAll(typeVars); + break; default: throw new AssertionError(); } } @@ -1294,7 +1717,8 @@ // If instance access isn't needed, make it static // Interface methods much be public default methods, otherwise make it private - translatedSym.flags_field = SYNTHETIC | (needInstance? 0 : STATIC) | (inInterface? PUBLIC | DEFAULT : PRIVATE); + translatedSym.flags_field = SYNTHETIC | (needInstance? 0 : STATIC) | + (inInterface? PUBLIC | DEFAULT : PRIVATE); //compute synthetic params ListBuffer<JCVariableDecl> params = ListBuffer.lb(); @@ -1311,17 +1735,11 @@ syntheticParams = params.toList(); //prepend synthetic args to translated lambda method signature - translatedSym.type = (MethodType) types.createMethodTypeWithParameters( - (MethodType) generatedLambdaSig(), + translatedSym.type = types.createMethodTypeWithParameters( + generatedLambdaSig(), TreeInfo.types(syntheticParams)); } - Type enclosingType() { - return owner.isStatic() ? - Type.noType : - owner.enclClass().type; - } - Type generatedLambdaSig() { return types.erasure(tree.descriptorType); } @@ -1366,12 +1784,27 @@ return tree.sym.owner == syms.arrayClass; } + boolean isPrivateConstructor() { + //hack needed to workaround 292 bug (8005122) + //when 292 issue is fixed we should simply remove this + return tree.sym.name == names.init && + (tree.sym.flags() & PRIVATE) != 0; + } + + boolean receiverAccessible() { + //hack needed to workaround 292 bug (7087658) + //when 292 issue is fixed we should remove this and change the backend + //code to always generate a method handle to an accessible method + return tree.ownerAccessible; + } + /** * Does this reference needs a bridge (i.e. var args need to be * expanded or "super" is used) */ final boolean needsBridge() { - return isSuper || needsVarArgsConversion() || isArrayOp(); + return isSuper || needsVarArgsConversion() || isArrayOp() || + isPrivateConstructor() || !receiverAccessible(); } Type generatedRefSig() { @@ -1389,6 +1822,60 @@ CAPTURED_VAR, CAPTURED_THIS, LOCAL_VAR, - PARAM; + PARAM, + TYPE_VAR; + } + + /** + * **************************************************************** + * Signature Generation + * **************************************************************** + */ + + private String methodSig(Type type) { + L2MSignatureGenerator sg = new L2MSignatureGenerator(); + sg.assembleSig(type); + return sg.toString(); + } + + private String classSig(Type type) { + L2MSignatureGenerator sg = new L2MSignatureGenerator(); + sg.assembleClassSig(type); + return sg.toString(); + } + + /** + * Signature Generation + */ + private class L2MSignatureGenerator extends Types.SignatureGenerator { + + /** + * An output buffer for type signatures. + */ + StringBuilder sb = new StringBuilder(); + + L2MSignatureGenerator() { + super(types); + } + + @Override + protected void append(char ch) { + sb.append(ch); + } + + @Override + protected void append(byte[] ba) { + sb.append(new String(ba)); + } + + @Override + protected void append(Name name) { + sb.append(name.toString()); + } + + @Override + public String toString() { + return sb.toString(); + } } }
--- a/src/share/classes/com/sun/tools/javac/comp/Lower.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/comp/Lower.java Tue May 07 17:14:17 2013 -0700 @@ -48,6 +48,7 @@ import static com.sun.tools.javac.code.TypeTag.*; import static com.sun.tools.javac.jvm.ByteCodes.*; import static com.sun.tools.javac.tree.JCTree.Tag.*; +import javax.lang.model.type.TypeKind; /** This pass translates away some syntactic sugar: inner classes, * class literals, assertions, foreach loops, etc. @@ -163,6 +164,12 @@ */ JCTree outermostMemberDef; + /** A map from local variable symbols to their translation (as per LambdaToMethod). + * This is required when a capturing local class is created from a lambda (in which + * case the captured symbols should be replaced with the translated lambda symbols). + */ + Map<Symbol, Symbol> lambdaTranslationMap = null; + /** A navigator class for assembling a mapping from local class symbols * to class definition trees. * There is only one case; all other cases simply traverse down the tree. @@ -206,10 +213,51 @@ Map<ClassSymbol,List<VarSymbol>> freevarCache; /** A navigator class for collecting the free variables accessed - * from a local class. - * There is only one case; all other cases simply traverse down the tree. + * from a local class. There is only one case; all other cases simply + * traverse down the tree. This class doesn't deal with the specific + * of Lower - it's an abstract visitor that is meant to be reused in + * order to share the local variable capture logic. */ - class FreeVarCollector extends TreeScanner { + abstract class BasicFreeVarCollector extends TreeScanner { + + /** Add all free variables of class c to fvs list + * unless they are already there. + */ + abstract void addFreeVars(ClassSymbol c); + + /** If tree refers to a variable in owner of local class, add it to + * free variables list. + */ + public void visitIdent(JCIdent tree) { + visitSymbol(tree.sym); + } + // where + abstract void visitSymbol(Symbol _sym); + + /** If tree refers to a class instance creation expression + * add all free variables of the freshly created class. + */ + public void visitNewClass(JCNewClass tree) { + ClassSymbol c = (ClassSymbol)tree.constructor.owner; + addFreeVars(c); + super.visitNewClass(tree); + } + + /** If tree refers to a superclass constructor call, + * add all free variables of the superclass. + */ + public void visitApply(JCMethodInvocation tree) { + if (TreeInfo.name(tree.meth) == names._super) { + addFreeVars((ClassSymbol) TreeInfo.symbol(tree.meth).owner); + } + super.visitApply(tree); + } + } + + /** + * Lower-specific subclass of {@code BasicFreeVarCollector}. + */ + class FreeVarCollector extends BasicFreeVarCollector { /** The owner of the local class. */ @@ -238,10 +286,8 @@ fvs = fvs.prepend(v); } - /** Add all free variables of class c to fvs list - * unless they are already there. - */ - private void addFreeVars(ClassSymbol c) { + @Override + void addFreeVars(ClassSymbol c) { List<VarSymbol> fvs = freevarCache.get(c); if (fvs != null) { for (List<VarSymbol> l = fvs; l.nonEmpty(); l = l.tail) { @@ -250,15 +296,8 @@ } } - /** If tree refers to a variable in owner of local class, add it to - * free variables list. - */ - public void visitIdent(JCIdent tree) { - result = tree; - visitSymbol(tree.sym); - } - // where - private void visitSymbol(Symbol _sym) { + @Override + void visitSymbol(Symbol _sym) { Symbol sym = _sym; if (sym.kind == VAR || sym.kind == MTH) { while (sym != null && sym.owner != owner) @@ -281,7 +320,6 @@ */ public void visitNewClass(JCNewClass tree) { ClassSymbol c = (ClassSymbol)tree.constructor.owner; - addFreeVars(c); if (tree.encl == null && c.hasOuterInstance() && outerThisStack.head != null) @@ -306,7 +344,6 @@ */ public void visitApply(JCMethodInvocation tree) { if (TreeInfo.name(tree.meth) == names._super) { - addFreeVars((ClassSymbol) TreeInfo.symbol(tree.meth).owner); Symbol constructor = TreeInfo.symbol(tree.meth); ClassSymbol c = (ClassSymbol)constructor.owner; if (c.hasOuterInstance() && @@ -570,10 +607,19 @@ * @param flags The class symbol's flags * @param owner The class symbol's owner */ - ClassSymbol makeEmptyClass(long flags, ClassSymbol owner) { + JCClassDecl makeEmptyClass(long flags, ClassSymbol owner) { + return makeEmptyClass(flags, owner, null, true); + } + + JCClassDecl makeEmptyClass(long flags, ClassSymbol owner, Name flatname, + boolean addToDefs) { // Create class symbol. ClassSymbol c = reader.defineClass(names.empty, owner); - c.flatname = chk.localClassName(c); + if (flatname != null) { + c.flatname = flatname; + } else { + c.flatname = chk.localClassName(c); + } c.sourcefile = owner.sourcefile; c.completer = null; c.members_field = new Scope(c); @@ -597,9 +643,8 @@ cdef.type = c.type; // Append class definition tree to owner's definitions. - odef.defs = odef.defs.prepend(cdef); - - return c; + if (addToDefs) odef.defs = odef.defs.prepend(cdef); + return cdef; } /************************************************************************** @@ -706,7 +751,7 @@ * and synthethise a class (with makeEmptyClass) if one is not available. * However, there is a small possibility that an existing class will not * be generated as expected if it is inside a conditional with a constant - * expression. If that is found to be the case, create an empty class here. + * expression. If that is found to be the case, create an empty class tree here. */ private void checkAccessConstructorTags() { for (List<ClassSymbol> l = accessConstrTags; l.nonEmpty(); l = l.tail) { @@ -714,14 +759,10 @@ if (isTranslatedClassAvailable(c)) continue; // Create class definition tree. - JCClassDecl cdef = make.ClassDef( - make.Modifiers(STATIC | SYNTHETIC), names.empty, - List.<JCTypeParameter>nil(), - null, List.<JCExpression>nil(), List.<JCTree>nil()); - cdef.sym = c; - cdef.type = c.type; - // add it to the list of classes to be generated - translated.append(cdef); + JCClassDecl cdec = makeEmptyClass(STATIC | SYNTHETIC, + c.outermostClass(), c.flatname, false); + swapAccessConstructorTag(c, cdec.sym); + translated.append(cdec); } } // where @@ -735,6 +776,19 @@ return false; } + void swapAccessConstructorTag(ClassSymbol oldCTag, ClassSymbol newCTag) { + for (MethodSymbol methodSymbol : accessConstrs.values()) { + Assert.check(methodSymbol.type.hasTag(METHOD)); + MethodType oldMethodType = + (MethodType)methodSymbol.type; + if (oldMethodType.argtypes.head.tsym == oldCTag) + methodSymbol.type = + types.createMethodTypeWithParameters(oldMethodType, + oldMethodType.getParameterTypes().tail + .prepend(newCTag.erasure(types))); + } + } + /************************************************************************** * Access methods *************************************************************************/ @@ -1154,6 +1208,14 @@ accessBase(tree.pos(), sym), sym).setType(tree.type); } } + } else if (sym.owner.kind == MTH && lambdaTranslationMap != null) { + //sym is a local variable - check the lambda translation map to + //see if sym has been translated to something else in the current + //scope (by LambdaToMethod) + Symbol translatedSym = lambdaTranslationMap.get(sym); + if (translatedSym != null) { + tree = make.at(tree.pos).Ident(translatedSym); + } } } return tree; @@ -1211,7 +1273,7 @@ "1"); ClassSymbol ctag = chk.compiled.get(flatname); if (ctag == null) - ctag = makeEmptyClass(STATIC | SYNTHETIC, topClass); + ctag = makeEmptyClass(STATIC | SYNTHETIC, topClass).sym; // keep a record of all tags, to verify that all are generated as required accessConstrTags = accessConstrTags.prepend(ctag); return ctag; @@ -1428,22 +1490,49 @@ return result; } + private VarSymbol makeOuterThisVarSymbol(Symbol owner, long flags) { + if (owner.kind == TYP && + target.usePrivateSyntheticFields()) + flags |= PRIVATE; + Type target = types.erasure(owner.enclClass().type.getEnclosingType()); + VarSymbol outerThis = + new VarSymbol(flags, outerThisName(target, owner), target, owner); + outerThisStack = outerThisStack.prepend(outerThis); + return outerThis; + } + + private JCVariableDecl makeOuterThisVarDecl(int pos, VarSymbol sym) { + JCVariableDecl vd = make.at(pos).VarDef(sym, null); + vd.vartype = access(vd.vartype); + return vd; + } + + /** Definition for this$n field. + * @param pos The source code position of the definition. + * @param owner The method in which the definition goes. + */ + JCVariableDecl outerThisDef(int pos, MethodSymbol owner) { + ClassSymbol c = owner.enclClass(); + boolean isMandated = + // Anonymous constructors + (owner.isConstructor() && owner.isAnonymous()) || + // Constructors of non-private inner member classes + (owner.isConstructor() && c.isInner() && + !c.isPrivate() && !c.isStatic()); + long flags = + FINAL | (isMandated ? MANDATED : SYNTHETIC); + VarSymbol outerThis = makeOuterThisVarSymbol(owner, flags); + owner.extraParams = owner.extraParams.prepend(outerThis); + return makeOuterThisVarDecl(pos, outerThis); + } + /** Definition for this$n field. * @param pos The source code position of the definition. * @param owner The class in which the definition goes. */ - JCVariableDecl outerThisDef(int pos, Symbol owner) { - long flags = FINAL | SYNTHETIC; - if (owner.kind == TYP && - target.usePrivateSyntheticFields()) - flags |= PRIVATE; - Type target = types.erasure(owner.enclClass().type.getEnclosingType()); - VarSymbol outerThis = new VarSymbol( - flags, outerThisName(target, owner), target, owner); - outerThisStack = outerThisStack.prepend(outerThis); - JCVariableDecl vd = make.at(pos).VarDef(outerThis, null); - vd.vartype = access(vd.vartype); - return vd; + JCVariableDecl outerThisDef(int pos, ClassSymbol owner) { + VarSymbol outerThis = makeOuterThisVarSymbol(owner, FINAL | SYNTHETIC); + return makeOuterThisVarDecl(pos, outerThis); } /** Return a list of trees that load the free variables in given list, @@ -1778,7 +1867,7 @@ if (e.sym.kind == TYP && e.sym.name == names.empty && (e.sym.flags() & INTERFACE) == 0) return (ClassSymbol) e.sym; - return makeEmptyClass(STATIC | SYNTHETIC, clazz); + return makeEmptyClass(STATIC | SYNTHETIC, clazz).sym; } /** Return symbol for "class$" method. If there is no method definition @@ -2526,11 +2615,6 @@ enumDefs.appendList(otherDefs.toList()); tree.defs = enumDefs.toList(); - - // Add the necessary members for the EnumCompatibleMode - if (target.compilerBootstrap(tree.sym)) { - addEnumCompatibleMembers(tree); - } } // where private MethodSymbol systemArraycopyMethod; @@ -2561,7 +2645,6 @@ "enum" + target.syntheticNameChar() + "name"), syms.stringType, tree.sym); nameParam.mods.flags |= SYNTHETIC; nameParam.sym.flags_field |= SYNTHETIC; - JCVariableDecl ordParam = make. Param(names.fromString(target.syntheticNameChar() + "enum" + target.syntheticNameChar() + @@ -2572,36 +2655,14 @@ tree.params = tree.params.prepend(ordParam).prepend(nameParam); MethodSymbol m = tree.sym; + m.extraParams = m.extraParams.prepend(ordParam.sym); + m.extraParams = m.extraParams.prepend(nameParam.sym); Type olderasure = m.erasure(types); m.erasure_field = new MethodType( olderasure.getParameterTypes().prepend(syms.intType).prepend(syms.stringType), olderasure.getReturnType(), olderasure.getThrownTypes(), syms.methodClass); - - if (target.compilerBootstrap(m.owner)) { - // Initialize synthetic name field - Symbol nameVarSym = lookupSynthetic(names.fromString("$name"), - tree.sym.owner.members()); - JCIdent nameIdent = make.Ident(nameParam.sym); - JCIdent id1 = make.Ident(nameVarSym); - JCAssign newAssign = make.Assign(id1, nameIdent); - newAssign.type = id1.type; - JCExpressionStatement nameAssign = make.Exec(newAssign); - nameAssign.type = id1.type; - tree.body.stats = tree.body.stats.prepend(nameAssign); - - // Initialize synthetic ordinal field - Symbol ordinalVarSym = lookupSynthetic(names.fromString("$ordinal"), - tree.sym.owner.members()); - JCIdent ordIdent = make.Ident(ordParam.sym); - id1 = make.Ident(ordinalVarSym); - newAssign = make.Assign(id1, ordIdent); - newAssign.type = id1.type; - JCExpressionStatement ordinalAssign = make.Exec(newAssign); - ordinalAssign.type = id1.type; - tree.body.stats = tree.body.stats.prepend(ordinalAssign); - } } JCMethodDecl prevMethodDef = currentMethodDef; @@ -2690,10 +2751,30 @@ outerThisStack = prevOuterThisStack; } else { - super.visitMethodDef(tree); + Map<Symbol, Symbol> prevLambdaTranslationMap = + lambdaTranslationMap; + try { + lambdaTranslationMap = (tree.sym.flags() & SYNTHETIC) != 0 && + tree.sym.name.startsWith(names.lambda) ? + makeTranslationMap(tree) : null; + super.visitMethodDef(tree); + } finally { + lambdaTranslationMap = prevLambdaTranslationMap; + } } result = tree; } + //where + private Map<Symbol, Symbol> makeTranslationMap(JCMethodDecl tree) { + Map<Symbol, Symbol> translationMap = new HashMap<Symbol,Symbol>(); + for (JCVariableDecl vd : tree.params) { + Symbol p = vd.sym; + if (p != p.baseSymbol()) { + translationMap.put(p.baseSymbol(), p); + } + } + return translationMap; + } public void visitAnnotatedType(JCAnnotatedType tree) { // No need to retain type annotations any longer. @@ -3059,8 +3140,11 @@ } public void visitAssignop(final JCAssignOp tree) { - if (!tree.lhs.type.isPrimitive() && - tree.operator.type.getReturnType().isPrimitive()) { + JCTree lhsAccess = access(TreeInfo.skipParens(tree.lhs)); + final boolean boxingReq = !tree.lhs.type.isPrimitive() && + tree.operator.type.getReturnType().isPrimitive(); + + if (boxingReq || lhsAccess.hasTag(APPLY)) { // boxing required; need to rewrite as x = (unbox typeof x)(x op y); // or if x == (typeof x)z then z = (unbox typeof x)((typeof x)z op y) // (but without recomputing x) @@ -3082,8 +3166,9 @@ JCBinary opResult = make.Binary(newTag, expr, tree.rhs); opResult.operator = newOperator; opResult.type = newOperator.type.getReturnType(); - JCTypeCast newRhs = make.TypeCast(types.unboxedType(tree.type), - opResult); + JCExpression newRhs = boxingReq ? + make.TypeCast(types.unboxedType(tree.type), opResult) : + opResult; return make.Assign((JCExpression)lhs, newRhs).setType(tree.type); } }); @@ -3326,19 +3411,24 @@ if (iterableType.getTypeArguments().nonEmpty()) iteratorTarget = types.erasure(iterableType.getTypeArguments().head); Type eType = tree.expr.type; + while (eType.hasTag(TYPEVAR)) { + eType = eType.getUpperBound(); + } tree.expr.type = types.erasure(eType); - if (eType.hasTag(TYPEVAR) && eType.getUpperBound().isCompound()) + if (eType.isCompound()) tree.expr = make.TypeCast(types.erasure(iterableType), tree.expr); Symbol iterator = lookupMethod(tree.expr.pos(), names.iterator, - types.erasure(syms.iterableType), + eType, List.<Type>nil()); VarSymbol itvar = new VarSymbol(0, names.fromString("i" + target.syntheticNameChar()), types.erasure(iterator.type.getReturnType()), currentMethodSym); - JCStatement init = make. - VarDef(itvar, - make.App(make.Select(tree.expr, iterator))); + + JCStatement init = make. + VarDef(itvar, make.App(make.Select(tree.expr, iterator) + .setType(types.erasure(iterator.type)))); + Symbol hasNext = lookupMethod(tree.expr.pos(), names.hasNext, itvar.type, @@ -3704,8 +3794,16 @@ @Override public void visitTry(JCTry tree) { + /* special case of try without catchers and with finally emtpy. + * Don't give it a try, translate only the body. + */ if (tree.resources.isEmpty()) { - super.visitTry(tree); + if (tree.catchers.isEmpty() && + tree.finalizer.getStatements().isEmpty()) { + result = translate(tree.body); + } else { + super.visitTry(tree); + } } else { result = makeTwrTry(tree); } @@ -3775,168 +3873,4 @@ } return translated.toList(); } - - ////////////////////////////////////////////////////////////// - // The following contributed by Borland for bootstrapping purposes - ////////////////////////////////////////////////////////////// - private void addEnumCompatibleMembers(JCClassDecl cdef) { - make_at(null); - - // Add the special enum fields - VarSymbol ordinalFieldSym = addEnumOrdinalField(cdef); - VarSymbol nameFieldSym = addEnumNameField(cdef); - - // Add the accessor methods for name and ordinal - MethodSymbol ordinalMethodSym = addEnumFieldOrdinalMethod(cdef, ordinalFieldSym); - MethodSymbol nameMethodSym = addEnumFieldNameMethod(cdef, nameFieldSym); - - // Add the toString method - addEnumToString(cdef, nameFieldSym); - - // Add the compareTo method - addEnumCompareTo(cdef, ordinalFieldSym); - } - - private VarSymbol addEnumOrdinalField(JCClassDecl cdef) { - VarSymbol ordinal = new VarSymbol(PRIVATE|FINAL|SYNTHETIC, - names.fromString("$ordinal"), - syms.intType, - cdef.sym); - cdef.sym.members().enter(ordinal); - cdef.defs = cdef.defs.prepend(make.VarDef(ordinal, null)); - return ordinal; - } - - private VarSymbol addEnumNameField(JCClassDecl cdef) { - VarSymbol name = new VarSymbol(PRIVATE|FINAL|SYNTHETIC, - names.fromString("$name"), - syms.stringType, - cdef.sym); - cdef.sym.members().enter(name); - cdef.defs = cdef.defs.prepend(make.VarDef(name, null)); - return name; - } - - private MethodSymbol addEnumFieldOrdinalMethod(JCClassDecl cdef, VarSymbol ordinalSymbol) { - // Add the accessor methods for ordinal - Symbol ordinalSym = lookupMethod(cdef.pos(), - names.ordinal, - cdef.type, - List.<Type>nil()); - - Assert.check(ordinalSym instanceof MethodSymbol); - - JCStatement ret = make.Return(make.Ident(ordinalSymbol)); - cdef.defs = cdef.defs.append(make.MethodDef((MethodSymbol)ordinalSym, - make.Block(0L, List.of(ret)))); - - return (MethodSymbol)ordinalSym; - } - - private MethodSymbol addEnumFieldNameMethod(JCClassDecl cdef, VarSymbol nameSymbol) { - // Add the accessor methods for name - Symbol nameSym = lookupMethod(cdef.pos(), - names._name, - cdef.type, - List.<Type>nil()); - - Assert.check(nameSym instanceof MethodSymbol); - - JCStatement ret = make.Return(make.Ident(nameSymbol)); - - cdef.defs = cdef.defs.append(make.MethodDef((MethodSymbol)nameSym, - make.Block(0L, List.of(ret)))); - - return (MethodSymbol)nameSym; - } - - private MethodSymbol addEnumToString(JCClassDecl cdef, - VarSymbol nameSymbol) { - Symbol toStringSym = lookupMethod(cdef.pos(), - names.toString, - cdef.type, - List.<Type>nil()); - - JCTree toStringDecl = null; - if (toStringSym != null) - toStringDecl = TreeInfo.declarationFor(toStringSym, cdef); - - if (toStringDecl != null) - return (MethodSymbol)toStringSym; - - JCStatement ret = make.Return(make.Ident(nameSymbol)); - - JCTree resTypeTree = make.Type(syms.stringType); - - MethodType toStringType = new MethodType(List.<Type>nil(), - syms.stringType, - List.<Type>nil(), - cdef.sym); - toStringSym = new MethodSymbol(PUBLIC, - names.toString, - toStringType, - cdef.type.tsym); - toStringDecl = make.MethodDef((MethodSymbol)toStringSym, - make.Block(0L, List.of(ret))); - - cdef.defs = cdef.defs.prepend(toStringDecl); - cdef.sym.members().enter(toStringSym); - - return (MethodSymbol)toStringSym; - } - - private MethodSymbol addEnumCompareTo(JCClassDecl cdef, VarSymbol ordinalSymbol) { - Symbol compareToSym = lookupMethod(cdef.pos(), - names.compareTo, - cdef.type, - List.of(cdef.sym.type)); - - Assert.check(compareToSym instanceof MethodSymbol); - - JCMethodDecl compareToDecl = (JCMethodDecl) TreeInfo.declarationFor(compareToSym, cdef); - - ListBuffer<JCStatement> blockStatements = new ListBuffer<JCStatement>(); - - JCModifiers mod1 = make.Modifiers(0L); - Name oName = names.fromString("o"); - JCVariableDecl par1 = make.Param(oName, cdef.type, compareToSym); - - JCIdent paramId1 = make.Ident(names.java_lang_Object); - paramId1.type = cdef.type; - paramId1.sym = par1.sym; - - ((MethodSymbol)compareToSym).params = List.of(par1.sym); - - JCIdent par1UsageId = make.Ident(par1.sym); - JCIdent castTargetIdent = make.Ident(cdef.sym); - JCTypeCast cast = make.TypeCast(castTargetIdent, par1UsageId); - cast.setType(castTargetIdent.type); - - Name otherName = names.fromString("other"); - - VarSymbol otherVarSym = new VarSymbol(mod1.flags, - otherName, - cdef.type, - compareToSym); - JCVariableDecl otherVar = make.VarDef(otherVarSym, cast); - blockStatements.append(otherVar); - - JCIdent id1 = make.Ident(ordinalSymbol); - - JCIdent fLocUsageId = make.Ident(otherVarSym); - JCExpression sel = make.Select(fLocUsageId, ordinalSymbol); - JCBinary bin = makeBinary(MINUS, id1, sel); - JCReturn ret = make.Return(bin); - blockStatements.append(ret); - JCMethodDecl compareToMethod = make.MethodDef((MethodSymbol)compareToSym, - make.Block(0L, - blockStatements.toList())); - compareToMethod.params = List.of(par1); - cdef.defs = cdef.defs.append(compareToMethod); - - return (MethodSymbol)compareToSym; - } - ////////////////////////////////////////////////////////////// - // The above contributed by Borland for bootstrapping purposes - ////////////////////////////////////////////////////////////// }
--- a/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Tue May 07 17:14:17 2013 -0700 @@ -467,51 +467,14 @@ names.valueOf, make.Type(tree.sym.type), List.<JCTypeParameter>nil(), - List.of(make.VarDef(make.Modifiers(Flags.PARAMETER), + List.of(make.VarDef(make.Modifiers(Flags.PARAMETER | + Flags.MANDATED), names.fromString("name"), make.Type(syms.stringType), null)), List.<JCExpression>nil(), // thrown null, //make.Block(0, Tree.emptyList.prepend(make.Return(make.Ident(names._null)))), null); memberEnter(valueOf, env); - - // the remaining members are for bootstrapping only - if (!target.compilerBootstrap(tree.sym)) return; - - // public final int ordinal() { return ???; } - JCMethodDecl ordinal = make.at(tree.pos). - MethodDef(make.Modifiers(Flags.PUBLIC|Flags.FINAL), - names.ordinal, - make.Type(syms.intType), - List.<JCTypeParameter>nil(), - List.<JCVariableDecl>nil(), - List.<JCExpression>nil(), - null, - null); - memberEnter(ordinal, env); - - // public final String name() { return ???; } - JCMethodDecl name = make. - MethodDef(make.Modifiers(Flags.PUBLIC|Flags.FINAL), - names._name, - make.Type(syms.stringType), - List.<JCTypeParameter>nil(), - List.<JCVariableDecl>nil(), - List.<JCExpression>nil(), - null, - null); - memberEnter(name, env); - - // public int compareTo(E other) { return ???; } - MethodSymbol compareTo = new - MethodSymbol(Flags.PUBLIC, - names.compareTo, - new MethodType(List.of(tree.sym.type), - syms.intType, - List.<Type>nil(), - syms.methodClass), - tree.sym); - memberEnter(make.MethodDef(compareTo, null), env); } public void visitTopLevel(JCCompilationUnit tree) { @@ -945,7 +908,7 @@ Type supertype = (tree.extending != null) ? attr.attribBase(tree.extending, baseEnv, true, false, true) - : ((tree.mods.flags & Flags.ENUM) != 0 && !target.compilerBootstrap(c)) + : ((tree.mods.flags & Flags.ENUM) != 0) ? attr.attribBase(enumBase(tree.pos, c), baseEnv, true, false, false) : (c.fullname == names.java_lang_Object) @@ -958,16 +921,6 @@ ListBuffer<Type> all_interfaces = null; // lazy init Set<Type> interfaceSet = new HashSet<Type>(); List<JCExpression> interfaceTrees = tree.implementing; - if ((tree.mods.flags & Flags.ENUM) != 0 && target.compilerBootstrap(c)) { - // add interface Comparable<T> - interfaceTrees = - interfaceTrees.prepend(make.Type(new ClassType(syms.comparableType.getEnclosingType(), - List.of(c.type), - syms.comparableType.tsym))); - // add interface Serializable - interfaceTrees = - interfaceTrees.prepend(make.Type(syms.serializableType)); - } for (JCExpression iface : interfaceTrees) { Type i = attr.attribBase(iface, baseEnv, false, true, true); if (i.hasTag(CLASS)) { @@ -1410,8 +1363,7 @@ if (c.type != syms.objectType) stats = stats.prepend(SuperCall(make, typarams, params, based)); if ((c.flags() & ENUM) != 0 && - (types.supertype(c.type).tsym == syms.enumSym || - target.compilerBootstrap(c))) { + (types.supertype(c.type).tsym == syms.enumSym)) { // constructors of true enums are private flags = (flags & ~AccessFlags) | PRIVATE | GENERATEDCONSTR; } else
--- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java Tue May 07 17:14:17 2013 -0700 @@ -44,7 +44,7 @@ import com.sun.tools.javac.comp.DeferredAttr.DeferredAttrContext; import com.sun.tools.javac.comp.DeferredAttr.DeferredType; import com.sun.tools.javac.comp.Infer.InferenceContext; -import com.sun.tools.javac.comp.Infer.InferenceContext.FreeTypeListener; +import com.sun.tools.javac.comp.Infer.FreeTypeListener; import com.sun.tools.javac.comp.Resolve.MethodResolutionContext.Candidate; import com.sun.tools.javac.jvm.*; import com.sun.tools.javac.tree.*; @@ -505,7 +505,6 @@ List<Type> typeargtypes, boolean allowBoxing, boolean useVarargs, - MethodCheck methodCheck, Warner warn) throws Infer.InferenceException { Type mt = types.memberType(site, m); @@ -558,10 +557,9 @@ allowBoxing, useVarargs, currentResolutionContext, - methodCheck, warn); - methodCheck.argumentsAcceptable(env, currentResolutionContext.deferredAttrContext(m, infer.emptyContext), + currentResolutionContext.methodCheck.argumentsAcceptable(env, currentResolutionContext.deferredAttrContext(m, infer.emptyContext, resultInfo, warn), argtypes, mt.getParameterTypes(), warn); return mt; } @@ -579,7 +577,7 @@ currentResolutionContext.attrMode = DeferredAttr.AttrMode.CHECK; MethodResolutionPhase step = currentResolutionContext.step = env.info.pendingResolutionPhase; return rawInstantiate(env, site, m, resultInfo, argtypes, typeargtypes, - step.isBoxingRequired(), step.isVarargsRequired(), resolveMethodCheck, warn); + step.isBoxingRequired(), step.isVarargsRequired(), warn); } finally { currentResolutionContext = prevContext; @@ -596,11 +594,10 @@ List<Type> typeargtypes, boolean allowBoxing, boolean useVarargs, - MethodCheck methodCheck, Warner warn) { try { return rawInstantiate(env, site, m, resultInfo, argtypes, typeargtypes, - allowBoxing, useVarargs, methodCheck, warn); + allowBoxing, useVarargs, warn); } catch (InapplicableMethodException ex) { return null; } @@ -625,6 +622,12 @@ List<Type> argtypes, List<Type> formals, Warner warn); + + /** + * Retrieve the method check object that will be used during a + * most specific check. + */ + MethodCheck mostSpecificCheck(List<Type> actuals, boolean strict); } /** @@ -658,24 +661,25 @@ } /** - * Main method applicability routine. Given a list of actual types A, - * a list of formal types F, determines whether the types in A are - * compatible (by method invocation conversion) with the types in F. - * - * Since this routine is shared between overload resolution and method - * type-inference, a (possibly empty) inference context is used to convert - * formal types to the corresponding 'undet' form ahead of a compatibility - * check so that constraints can be propagated and collected. - * - * Moreover, if one or more types in A is a deferred type, this routine uses - * DeferredAttr in order to perform deferred attribution. If one or more actual - * deferred types are stuck, they are placed in a queue and revisited later - * after the remainder of the arguments have been seen. If this is not sufficient - * to 'unstuck' the argument, a cyclic inference error is called out. - * - * A method check handler (see above) is used in order to report errors. + * Dummy method check object. All methods are deemed applicable, regardless + * of their formal parameter types. */ - MethodCheck resolveMethodCheck = new MethodCheck() { + MethodCheck nilMethodCheck = new MethodCheck() { + public void argumentsAcceptable(Env<AttrContext> env, DeferredAttrContext deferredAttrContext, List<Type> argtypes, List<Type> formals, Warner warn) { + //do nothing - method always applicable regardless of actuals + } + + public MethodCheck mostSpecificCheck(List<Type> actuals, boolean strict) { + return this; + } + }; + + /** + * Base class for 'real' method checks. The class defines the logic for + * iterating through formals and actuals and provides and entry point + * that can be used by subclasses in order to define the actual check logic. + */ + abstract class AbstractMethodCheck implements MethodCheck { @Override public void argumentsAcceptable(final Env<AttrContext> env, DeferredAttrContext deferredAttrContext, @@ -696,8 +700,7 @@ } while (argtypes.nonEmpty() && formals.head != varargsFormal) { - ResultInfo mresult = methodCheckResult(false, formals.head, deferredAttrContext, warn); - mresult.check(null, argtypes.head); + checkArg(false, argtypes.head, formals.head, deferredAttrContext, warn); argtypes = argtypes.tail; formals = formals.tail; } @@ -710,17 +713,19 @@ //note: if applicability check is triggered by most specific test, //the last argument of a varargs is _not_ an array type (see JLS 15.12.2.5) final Type elt = types.elemtype(varargsFormal); - ResultInfo mresult = methodCheckResult(true, elt, deferredAttrContext, warn); while (argtypes.nonEmpty()) { - mresult.check(null, argtypes.head); + checkArg(true, argtypes.head, elt, deferredAttrContext, warn); argtypes = argtypes.tail; } - //check varargs element type accessibility - varargsAccessible(env, elt, inferenceContext); } } - private void reportMC(MethodCheckDiag diag, InferenceContext inferenceContext, Object... args) { + /** + * Does the actual argument conforms to the corresponding formal? + */ + abstract void checkArg(boolean varargs, Type actual, Type formal, DeferredAttrContext deferredAttrContext, Warner warn); + + protected void reportMC(MethodCheckDiag diag, InferenceContext inferenceContext, Object... args) { boolean inferDiag = inferenceContext != infer.emptyContext; InapplicableMethodException ex = inferDiag ? infer.inferenceException : inapplicableMethodException; @@ -733,12 +738,69 @@ throw ex.setMessage(inferDiag ? diag.inferKey : diag.basicKey, args); } + public MethodCheck mostSpecificCheck(List<Type> actuals, boolean strict) { + return nilMethodCheck; + } + } + + /** + * Arity-based method check. A method is applicable if the number of actuals + * supplied conforms to the method signature. + */ + MethodCheck arityMethodCheck = new AbstractMethodCheck() { + @Override + void checkArg(boolean varargs, Type actual, Type formal, DeferredAttrContext deferredAttrContext, Warner warn) { + //do nothing - actual always compatible to formals + } + }; + + /** + * Main method applicability routine. Given a list of actual types A, + * a list of formal types F, determines whether the types in A are + * compatible (by method invocation conversion) with the types in F. + * + * Since this routine is shared between overload resolution and method + * type-inference, a (possibly empty) inference context is used to convert + * formal types to the corresponding 'undet' form ahead of a compatibility + * check so that constraints can be propagated and collected. + * + * Moreover, if one or more types in A is a deferred type, this routine uses + * DeferredAttr in order to perform deferred attribution. If one or more actual + * deferred types are stuck, they are placed in a queue and revisited later + * after the remainder of the arguments have been seen. If this is not sufficient + * to 'unstuck' the argument, a cyclic inference error is called out. + * + * A method check handler (see above) is used in order to report errors. + */ + MethodCheck resolveMethodCheck = new AbstractMethodCheck() { + + @Override + void checkArg(boolean varargs, Type actual, Type formal, DeferredAttrContext deferredAttrContext, Warner warn) { + ResultInfo mresult = methodCheckResult(varargs, formal, deferredAttrContext, warn); + mresult.check(null, actual); + } + + @Override + public void argumentsAcceptable(final Env<AttrContext> env, + DeferredAttrContext deferredAttrContext, + List<Type> argtypes, + List<Type> formals, + Warner warn) { + super.argumentsAcceptable(env, deferredAttrContext, argtypes, formals, warn); + //should we expand formals? + if (deferredAttrContext.phase.isVarargsRequired()) { + //check varargs element type accessibility + varargsAccessible(env, types.elemtype(formals.last()), + deferredAttrContext.inferenceContext); + } + } + private void varargsAccessible(final Env<AttrContext> env, final Type t, final InferenceContext inferenceContext) { if (inferenceContext.free(t)) { inferenceContext.addFreeTypeListener(List.of(t), new FreeTypeListener() { @Override public void typesInferred(InferenceContext inferenceContext) { - varargsAccessible(env, inferenceContext.asInstType(t, types), inferenceContext); + varargsAccessible(env, inferenceContext.asInstType(t), inferenceContext); } }); } else { @@ -762,6 +824,11 @@ }; return new MethodResultInfo(to, checkContext); } + + @Override + public MethodCheck mostSpecificCheck(List<Type> actuals, boolean strict) { + return new MostSpecificCheck(strict, actuals); + } }; /** @@ -782,8 +849,8 @@ public boolean compatible(Type found, Type req, Warner warn) { return strict ? - types.isSubtypeUnchecked(found, deferredAttrContext.inferenceContext.asFree(req, types), warn) : - types.isConvertible(found, deferredAttrContext.inferenceContext.asFree(req, types), warn); + types.isSubtypeUnchecked(found, deferredAttrContext.inferenceContext.asFree(req), warn) : + types.isConvertible(found, deferredAttrContext.inferenceContext.asFree(req), warn); } public void report(DiagnosticPosition pos, JCDiagnostic details) { @@ -981,7 +1048,7 @@ Type ret_t = desc_t.getReturnType(); Type ret_s = desc_s.getReturnType(); result &= ((tree.refPolyKind == PolyKind.STANDALONE) - ? standaloneMostSpecific(ret_t, ret_s, tree.type, warn) + ? standaloneMostSpecific(ret_t, ret_s, tree.sym.type.getReturnType(), warn) : polyMostSpecific(ret_t, ret_s, warn)); } else { return; @@ -1039,6 +1106,11 @@ } } } + + public MethodCheck mostSpecificCheck(List<Type> actuals, boolean strict) { + Assert.error("Cannot get here!"); + return null; + } } public static class InapplicableMethodException extends RuntimeException { @@ -1241,14 +1313,17 @@ boolean useVarargs, boolean operator) { if (sym.kind == ERR || - !sym.isInheritedIn(site.tsym, types) || - (useVarargs && (sym.flags() & VARARGS) == 0)) { + !sym.isInheritedIn(site.tsym, types)) { return bestSoFar; + } else if (useVarargs && (sym.flags() & VARARGS) == 0) { + return bestSoFar.kind >= ERRONEOUS ? + new BadVarargsMethod((ResolveError)bestSoFar) : + bestSoFar; } Assert.check(sym.kind < AMBIGUOUS); try { Type mt = rawInstantiate(env, site, sym, null, argtypes, typeargtypes, - allowBoxing, useVarargs, resolveMethodCheck, types.noWarnings); + allowBoxing, useVarargs, types.noWarnings); if (!operator) currentResolutionContext.addApplicableCandidate(sym, mt); } catch (InapplicableMethodException ex) { @@ -1352,11 +1427,20 @@ int maxLength = Math.max( Math.max(m1.type.getParameterTypes().length(), actuals.length()), m2.type.getParameterTypes().length()); - Type mst = instantiate(env, site, m2, null, - adjustArgs(types.lowerBounds(types.memberType(site, m1).getParameterTypes()), m1, maxLength, useVarargs), null, - allowBoxing, useVarargs, new MostSpecificCheck(!allowBoxing, actuals), noteWarner); - return mst != null && - !noteWarner.hasLint(Lint.LintCategory.UNCHECKED); + MethodResolutionContext prevResolutionContext = currentResolutionContext; + try { + currentResolutionContext = new MethodResolutionContext(); + currentResolutionContext.step = prevResolutionContext.step; + currentResolutionContext.methodCheck = + prevResolutionContext.methodCheck.mostSpecificCheck(actuals, !allowBoxing); + Type mst = instantiate(env, site, m2, null, + adjustArgs(types.lowerBounds(types.memberType(site, m1).getParameterTypes()), m1, maxLength, useVarargs), null, + allowBoxing, useVarargs, noteWarner); + return mst != null && + !noteWarner.hasLint(Lint.LintCategory.UNCHECKED); + } finally { + currentResolutionContext = prevResolutionContext; + } } private List<Type> adjustArgs(List<Type> args, Symbol msym, int length, boolean allowVarargs) { if ((msym.flags() & VARARGS) != 0 && allowVarargs) { @@ -2118,14 +2202,14 @@ Name name, List<Type> argtypes, List<Type> typeargtypes) { - return lookupMethod(env, pos, env.enclClass.sym, new BasicLookupHelper(name, env.enclClass.sym.type, argtypes, typeargtypes) { - @Override - Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) { - return findFun(env, name, argtypes, typeargtypes, - phase.isBoxingRequired(), - phase.isVarargsRequired()); - } - }); + return lookupMethod(env, pos, env.enclClass.sym, resolveMethodCheck, + new BasicLookupHelper(name, env.enclClass.sym.type, argtypes, typeargtypes) { + @Override + Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) { + return findFun(env, name, argtypes, typeargtypes, + phase.isBoxingRequired(), + phase.isVarargsRequired()); + }}); } /** Resolve a qualified method identifier @@ -2307,36 +2391,36 @@ Type site, List<Type> argtypes, List<Type> typeargtypes) { - return lookupMethod(env, pos, site.tsym, new BasicLookupHelper(names.init, site, argtypes, typeargtypes) { - @Override - Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) { - return findDiamond(env, site, argtypes, typeargtypes, - phase.isBoxingRequired(), - phase.isVarargsRequired()); - } - @Override - Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym) { - if (sym.kind >= AMBIGUOUS) { - final JCDiagnostic details = sym.kind == WRONG_MTH ? - ((InapplicableSymbolError)sym).errCandidate().details : - null; - sym = new InapplicableSymbolError(sym.kind, "diamondError", currentResolutionContext) { - @Override - JCDiagnostic getDiagnostic(DiagnosticType dkind, DiagnosticPosition pos, - Symbol location, Type site, Name name, List<Type> argtypes, List<Type> typeargtypes) { - String key = details == null ? - "cant.apply.diamond" : - "cant.apply.diamond.1"; - return diags.create(dkind, log.currentSource(), pos, key, - diags.fragment("diamond", site.tsym), details); + return lookupMethod(env, pos, site.tsym, resolveMethodCheck, + new BasicLookupHelper(names.init, site, argtypes, typeargtypes) { + @Override + Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) { + return findDiamond(env, site, argtypes, typeargtypes, + phase.isBoxingRequired(), + phase.isVarargsRequired()); + } + @Override + Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym) { + if (sym.kind >= AMBIGUOUS) { + final JCDiagnostic details = sym.kind == WRONG_MTH ? + ((InapplicableSymbolError)sym).errCandidate().details : + null; + sym = new InapplicableSymbolError(sym.kind, "diamondError", currentResolutionContext) { + @Override + JCDiagnostic getDiagnostic(DiagnosticType dkind, DiagnosticPosition pos, + Symbol location, Type site, Name name, List<Type> argtypes, List<Type> typeargtypes) { + String key = details == null ? + "cant.apply.diamond" : + "cant.apply.diamond.1"; + return diags.create(dkind, log.currentSource(), pos, key, + diags.fragment("diamond", site.tsym), details); + } + }; + sym = accessMethod(sym, pos, site, names.init, true, argtypes, typeargtypes); + env.info.pendingResolutionPhase = currentResolutionContext.step; } - }; - sym = accessMethod(sym, pos, site, names.init, true, argtypes, typeargtypes); - env.info.pendingResolutionPhase = currentResolutionContext.step; - } - return sym; - } - }); + return sym; + }}); } /** This method scans all the constructor symbol in a given class scope - @@ -2469,7 +2553,8 @@ Type site, Name name, List<Type> argtypes, List<Type> typeargtypes, - boolean boxingAllowed) { + boolean boxingAllowed, + MethodCheck methodCheck) { MethodResolutionPhase maxPhase = boxingAllowed ? VARARITY : BASIC; ReferenceLookupHelper boundLookupHelper; @@ -2489,19 +2574,19 @@ //step 1 - bound lookup Env<AttrContext> boundEnv = env.dup(env.tree, env.info.dup()); - Symbol boundSym = lookupMethod(boundEnv, env.tree.pos(), site.tsym, boundLookupHelper); + Symbol boundSym = lookupMethod(boundEnv, env.tree.pos(), site.tsym, methodCheck, boundLookupHelper); //step 2 - unbound lookup ReferenceLookupHelper unboundLookupHelper = boundLookupHelper.unboundLookup(); Env<AttrContext> unboundEnv = env.dup(env.tree, env.info.dup()); - Symbol unboundSym = lookupMethod(unboundEnv, env.tree.pos(), site.tsym, unboundLookupHelper); + Symbol unboundSym = lookupMethod(unboundEnv, env.tree.pos(), site.tsym, methodCheck, unboundLookupHelper); //merge results Pair<Symbol, ReferenceLookupHelper> res; - if (unboundSym.kind != MTH) { + if (!lookupSuccess(unboundSym)) { res = new Pair<Symbol, ReferenceLookupHelper>(boundSym, boundLookupHelper); env.info.pendingResolutionPhase = boundEnv.info.pendingResolutionPhase; - } else if (boundSym.kind == MTH) { + } else if (lookupSuccess(boundSym)) { res = new Pair<Symbol, ReferenceLookupHelper>(ambiguityError(boundSym, unboundSym), boundLookupHelper); env.info.pendingResolutionPhase = boundEnv.info.pendingResolutionPhase; } else { @@ -2511,6 +2596,10 @@ return res; } + //private + boolean lookupSuccess(Symbol s) { + return s.kind == MTH || s.kind == AMBIGUOUS; + } /** * Helper for defining custom method-like lookup logic; a lookup helper @@ -2651,27 +2740,17 @@ super(referenceTree, name, site, argtypes, typeargtypes, maxPhase); } - protected Symbol lookupReferenceInternal(Env<AttrContext> env, MethodResolutionPhase phase) { + @Override + final Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) { return findMethod(env, site, name, argtypes, typeargtypes, phase.isBoxingRequired(), phase.isVarargsRequired(), syms.operatorNames.contains(name)); } - protected Symbol adjustLookupResult(Env<AttrContext> env, Symbol sym) { - return !TreeInfo.isStaticSelector(referenceTree.expr, names) || - sym.kind != MTH || - sym.isStatic() ? sym : new StaticError(sym); - } - - @Override - final Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) { - return adjustLookupResult(env, lookupReferenceInternal(env, phase)); - } - @Override ReferenceLookupHelper unboundLookup() { if (TreeInfo.isStaticSelector(referenceTree.expr, names) && argtypes.nonEmpty() && - types.isSubtypeUnchecked(argtypes.head, site)) { + (argtypes.head.hasTag(NONE) || types.isSubtypeUnchecked(argtypes.head, site))) { return new UnboundMethodReferenceLookupHelper(referenceTree, name, site, argtypes, typeargtypes, maxPhase); } else { @@ -2703,14 +2782,11 @@ UnboundMethodReferenceLookupHelper(JCMemberReference referenceTree, Name name, Type site, List<Type> argtypes, List<Type> typeargtypes, MethodResolutionPhase maxPhase) { - super(referenceTree, name, - site.isRaw() ? types.asSuper(argtypes.head, site.tsym) : site, - argtypes.tail, typeargtypes, maxPhase); - } - - @Override - protected Symbol adjustLookupResult(Env<AttrContext> env, Symbol sym) { - return sym.kind != MTH || !sym.isStatic() ? sym : new StaticError(sym); + super(referenceTree, name, site, argtypes.tail, typeargtypes, maxPhase); + if (site.isRaw() && !argtypes.head.hasTag(NONE)) { + Type asSuperSite = types.asSuper(argtypes.head, site.tsym); + this.site = asSuperSite; + } } @Override @@ -2803,8 +2879,10 @@ * at the end of the lookup, the helper is used to validate the results * (this last step might trigger overload resolution diagnostics). */ - Symbol lookupMethod(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, LookupHelper lookupHelper) { - return lookupMethod(env, pos, location, new MethodResolutionContext(), lookupHelper); + Symbol lookupMethod(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, MethodCheck methodCheck, LookupHelper lookupHelper) { + MethodResolutionContext resolveContext = new MethodResolutionContext(); + resolveContext.methodCheck = methodCheck; + return lookupMethod(env, pos, location, resolveContext, lookupHelper); } Symbol lookupMethod(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, @@ -3513,6 +3591,36 @@ } } + class BadVarargsMethod extends ResolveError { + + ResolveError delegatedError; + + BadVarargsMethod(ResolveError delegatedError) { + super(delegatedError.kind, "badVarargs"); + this.delegatedError = delegatedError; + } + + @Override + public Symbol baseSymbol() { + return delegatedError.baseSymbol(); + } + + @Override + protected Symbol access(Name name, TypeSymbol location) { + return delegatedError.access(name, location); + } + + @Override + public boolean exists() { + return true; + } + + @Override + JCDiagnostic getDiagnostic(DiagnosticType dkind, DiagnosticPosition pos, Symbol location, Type site, Name name, List<Type> argtypes, List<Type> typeargtypes) { + return delegatedError.getDiagnostic(dkind, pos, location, site, name, argtypes, typeargtypes); + } + } + enum MethodResolutionPhase { BASIC(false, false), BOX(true, false), @@ -3573,6 +3681,8 @@ MethodResolutionPhase step = null; + MethodCheck methodCheck = resolveMethodCheck; + private boolean internalResolution = false; private DeferredAttr.AttrMode attrMode = DeferredAttr.AttrMode.SPECULATIVE; @@ -3586,8 +3696,8 @@ candidates = candidates.append(c); } - DeferredAttrContext deferredAttrContext(Symbol sym, InferenceContext inferenceContext) { - return deferredAttr.new DeferredAttrContext(attrMode, sym, step, inferenceContext); + DeferredAttrContext deferredAttrContext(Symbol sym, InferenceContext inferenceContext, ResultInfo pendingResult, Warner warn) { + return deferredAttr.new DeferredAttrContext(attrMode, sym, step, inferenceContext, pendingResult != null ? pendingResult.checkContext.deferredAttrContext() : deferredAttr.emptyDeferredAttrContext, warn); } /** @@ -3597,6 +3707,7 @@ * while inapplicable candidates contain further details about the * reason why the method has been considered inapplicable. */ + @SuppressWarnings("overrides") class Candidate { final MethodResolutionPhase step;
--- a/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Tue May 07 17:14:17 2013 -0700 @@ -40,6 +40,7 @@ import static com.sun.tools.javac.code.TypeTag.CLASS; import static com.sun.tools.javac.code.TypeTag.TYPEVAR; import static com.sun.tools.javac.code.TypeTag.VOID; +import static com.sun.tools.javac.comp.CompileStates.CompileState; /** This pass translates Generic Java to conventional Java. * @@ -77,8 +78,11 @@ */ private final boolean addBridges; + private final CompileStates compileStates; + protected TransTypes(Context context) { context.put(transTypesKey, this); + compileStates = CompileStates.instance(context); names = Names.instance(context); log = Log.instance(context); syms = Symtab.instance(context); @@ -706,8 +710,18 @@ public void visitTypeCast(JCTypeCast tree) { tree.clazz = translate(tree.clazz, null); + Type originalTarget = tree.type; tree.type = erasure(tree.type); tree.expr = translate(tree.expr, tree.type); + if (originalTarget.isCompound()) { + Type.IntersectionClassType ict = (Type.IntersectionClassType)originalTarget; + for (Type c : ict.getExplicitComponents()) { + Type ec = erasure(c); + if (!types.isSameType(ec, tree.type)) { + tree.expr = coerce(tree.expr, ec); + } + } + } result = tree; } @@ -904,16 +918,40 @@ private Env<AttrContext> env; + private static final String statePreviousToFlowAssertMsg = + "The current compile state [%s] of class %s is previous to FLOW"; + void translateClass(ClassSymbol c) { Type st = types.supertype(c.type); - // process superclass before derived - if (st.hasTag(CLASS)) + if (st.hasTag(CLASS)) { translateClass((ClassSymbol)st.tsym); + } Env<AttrContext> myEnv = enter.typeEnvs.remove(c); - if (myEnv == null) + if (myEnv == null) { return; + } + + /* The two assertions below are set for early detection of any attempt + * to translate a class that: + * + * 1) has no compile state being it the most outer class. + * We accept this condition for inner classes. + * + * 2) has a compile state which is previous to Flow state. + */ + boolean envHasCompState = compileStates.get(myEnv) != null; + if (!envHasCompState && c.outermostClass() == c) { + Assert.error("No info for outermost class: " + myEnv.enclClass.sym); + } + + if (envHasCompState && + CompileState.FLOW.isAfter(compileStates.get(myEnv))) { + Assert.error(String.format(statePreviousToFlowAssertMsg, + compileStates.get(myEnv), myEnv.enclClass.sym)); + } + Env<AttrContext> oldEnv = env; try { env = myEnv;
--- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Tue May 07 17:14:17 2013 -0700 @@ -154,6 +154,11 @@ **/ public boolean preferSource; + /** + * The currently selected profile. + */ + public final Profile profile; + /** The log to use for verbose output */ final Log log; @@ -311,6 +316,7 @@ annotate = Annotate.instance(context); verbose = options.isSet(VERBOSE); checkClassFile = options.isSet("-checkclassfile"); + Source source = Source.instance(context); allowGenerics = source.allowGenerics(); allowVarargs = source.allowVarargs(); @@ -318,10 +324,13 @@ allowSimplifiedVarargs = source.allowSimplifiedVarargs(); allowModules = source.allowModules(); allowDefaultMethods = source.allowDefaultMethods(); + saveParameterNames = options.isSet("save-parameter-names"); cacheCompletionFailure = options.isUnset("dev"); preferSource = "source".equals(options.get("-Xprefer")); + profile = Profile.instance(context); + completionFailureName = options.isSet("failcomplete") ? names.fromString(options.get("failcomplete")) @@ -337,7 +346,9 @@ /** Add member to class unless it is synthetic. */ private void enterMember(ClassSymbol c, Symbol sym) { - if ((sym.flags_field & (SYNTHETIC|BRIDGE)) != SYNTHETIC) + // Synthetic members are not entered -- reason lost to history (optimization?). + // Lambda methods must be entered because they may have inner classes (which reference them) + if ((sym.flags_field & (SYNTHETIC|BRIDGE)) != SYNTHETIC || sym.name.startsWith(names.lambda)) c.members_field.enter(sym); } @@ -1126,7 +1137,7 @@ haveParameterNameIndices = true; for (int i = 0; i < numEntries; i++) { int nameIndex = nextChar(); - int flags = nextInt(); + int flags = nextChar(); parameterNameIndices[i] = nameIndex; } } @@ -1564,7 +1575,18 @@ CompoundAnnotationProxy proxy = readCompoundAnnotation(); if (proxy.type.tsym == syms.proprietaryType.tsym) sym.flags_field |= PROPRIETARY; - else + else if (proxy.type.tsym == syms.profileType.tsym) { + if (profile != Profile.DEFAULT) { + for (Pair<Name,Attribute> v: proxy.values) { + if (v.fst == names.value && v.snd instanceof Attribute.Constant) { + Attribute.Constant c = (Attribute.Constant) v.snd; + if (c.type == syms.intType && ((Integer) c.value) > profile.value) { + sym.flags_field |= NOT_IN_PROFILE; + } + } + } + } + } else proxies.append(proxy); } annotate.normal(new AnnotationCompleter(sym, proxies.toList())); @@ -1664,12 +1686,13 @@ position.type = type; switch (type) { - // type cast - case CAST: // instanceof case INSTANCEOF: // new expression case NEW: + // constructor/method reference receiver + case CONSTRUCTOR_REFERENCE: + case METHOD_REFERENCE: position.offset = nextChar(); break; // local variable @@ -1718,9 +1741,12 @@ case METHOD_FORMAL_PARAMETER: position.parameter_index = nextByte(); break; + // type cast + case CAST: // method/constructor/reference type argument case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT: case METHOD_INVOCATION_TYPE_ARGUMENT: + case CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT: case METHOD_REFERENCE_TYPE_ARGUMENT: position.offset = nextChar(); position.type_index = nextByte(); @@ -1729,10 +1755,6 @@ case METHOD_RETURN: case FIELD: break; - // lambda formal parameter - case LAMBDA_FORMAL_PARAMETER: - position.parameter_index = nextByte(); - break; case UNKNOWN: throw new AssertionError("jvm.ClassReader: UNKNOWN target type should never occur!"); default:
--- a/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Tue May 07 17:14:17 2013 -0700 @@ -41,6 +41,9 @@ import com.sun.tools.javac.code.Attribute.RetentionPolicy; import com.sun.tools.javac.code.Attribute.TypeCompound; import com.sun.tools.javac.code.Directive.*; +import static com.sun.tools.javac.code.BoundKind.EXTENDS; +import static com.sun.tools.javac.code.BoundKind.SUPER; +import static com.sun.tools.javac.code.BoundKind.UNBOUND; import com.sun.tools.javac.code.Symbol.*; import com.sun.tools.javac.code.Type.*; import com.sun.tools.javac.code.Types.UniqueType; @@ -128,10 +131,6 @@ */ ByteBuffer poolbuf = new ByteBuffer(POOL_BUF_SIZE); - /** An output buffer for type signatures. - */ - ByteBuffer sigbuf = new ByteBuffer(); - /** The constant pool. */ Pool pool; @@ -160,6 +159,9 @@ /** Access to files. */ private final JavaFileManager fileManager; + /** Sole signature generator */ + private final CWSignatureGenerator signatureGen; + /** The tags and constants used in compressed stackmap. */ static final int SAME_FRAME_SIZE = 64; static final int SAME_LOCALS_1_STACK_ITEM_EXTENDED = 247; @@ -187,6 +189,7 @@ source = Source.instance(context); types = Types.instance(context); fileManager = context.get(JavaFileManager.class); + signatureGen = new CWSignatureGenerator(types); verbose = options.isSet(VERBOSE); scramble = options.isSet("-scramble"); @@ -272,172 +275,81 @@ buf.elems[adr+3] = (byte)((x ) & 0xFF); } -/****************************************************************** - * Signature Generation - ******************************************************************/ - - /** Assemble signature of given type in string buffer. + /** + * Signature Generation */ - void assembleSig(Type type) { - type = type.unannotatedType(); - switch (type.getTag()) { - case BYTE: - sigbuf.appendByte('B'); - break; - case SHORT: - sigbuf.appendByte('S'); - break; - case CHAR: - sigbuf.appendByte('C'); - break; - case INT: - sigbuf.appendByte('I'); - break; - case LONG: - sigbuf.appendByte('J'); - break; - case FLOAT: - sigbuf.appendByte('F'); - break; - case DOUBLE: - sigbuf.appendByte('D'); - break; - case BOOLEAN: - sigbuf.appendByte('Z'); - break; - case VOID: - sigbuf.appendByte('V'); - break; - case CLASS: - sigbuf.appendByte('L'); - assembleClassSig(type); - sigbuf.appendByte(';'); - break; - case ARRAY: - ArrayType at = (ArrayType)type; - sigbuf.appendByte('['); - assembleSig(at.elemtype); - break; - case METHOD: - MethodType mt = (MethodType)type; - sigbuf.appendByte('('); - assembleSig(mt.argtypes); - sigbuf.appendByte(')'); - assembleSig(mt.restype); - if (hasTypeVar(mt.thrown)) { - for (List<Type> l = mt.thrown; l.nonEmpty(); l = l.tail) { - sigbuf.appendByte('^'); - assembleSig(l.head); - } + private class CWSignatureGenerator extends Types.SignatureGenerator { + + /** + * An output buffer for type signatures. + */ + ByteBuffer sigbuf = new ByteBuffer(); + + CWSignatureGenerator(Types types) { + super(types); + } + + /** + * Assemble signature of given type in string buffer. + * Check for uninitialized types before calling the general case. + */ + @Override + public void assembleSig(Type type) { + type = type.unannotatedType(); + switch (type.getTag()) { + case UNINITIALIZED_THIS: + case UNINITIALIZED_OBJECT: + // we don't yet have a spec for uninitialized types in the + // local variable table + assembleSig(types.erasure(((UninitializedType)type).qtype)); + break; + default: + super.assembleSig(type); } - break; - case WILDCARD: { - WildcardType ta = (WildcardType) type; - switch (ta.kind) { - case SUPER: - sigbuf.appendByte('-'); - assembleSig(ta.type); - break; - case EXTENDS: - sigbuf.appendByte('+'); - assembleSig(ta.type); - break; - case UNBOUND: - sigbuf.appendByte('*'); - break; - default: - throw new AssertionError(ta.kind); - } - break; + } + + @Override + protected void append(char ch) { + sigbuf.appendByte(ch); + } + + @Override + protected void append(byte[] ba) { + sigbuf.appendBytes(ba); + } + + @Override + protected void append(Name name) { + sigbuf.appendName(name); } - case TYPEVAR: - sigbuf.appendByte('T'); - sigbuf.appendName(type.tsym.name); - sigbuf.appendByte(';'); - break; - case FORALL: - ForAll ft = (ForAll)type; - assembleParamsSig(ft.tvars); - assembleSig(ft.qtype); - break; - case UNINITIALIZED_THIS: - case UNINITIALIZED_OBJECT: - // we don't yet have a spec for uninitialized types in the - // local variable table - assembleSig(types.erasure(((UninitializedType)type).qtype)); - break; - default: - throw new AssertionError("typeSig " + type.getTag()); + + @Override + protected void classReference(ClassSymbol c) { + enterInner(c); + } + + private void reset() { + sigbuf.reset(); + } + + private Name toName() { + return sigbuf.toName(names); + } + + private boolean isEmpty() { + return sigbuf.length == 0; } } - boolean hasTypeVar(List<Type> l) { - while (l.nonEmpty()) { - if (l.head.hasTag(TYPEVAR)) return true; - l = l.tail; - } - return false; - } - - void assembleClassSig(Type type) { - type = type.unannotatedType(); - ClassType ct = (ClassType)type; - ClassSymbol c = (ClassSymbol)ct.tsym; - enterInner(c); - Type outer = ct.getEnclosingType(); - if (outer.allparams().nonEmpty()) { - boolean rawOuter = - c.owner.kind == MTH || // either a local class - c.name == names.empty; // or anonymous - assembleClassSig(rawOuter - ? types.erasure(outer) - : outer); - sigbuf.appendByte('.'); - Assert.check(c.flatname.startsWith(c.owner.enclClass().flatname)); - sigbuf.appendName(rawOuter - ? c.flatname.subName(c.owner.enclClass().flatname.getByteLength()+1,c.flatname.getByteLength()) - : c.name); - } else { - sigbuf.appendBytes(externalize(c.flatname)); - } - if (ct.getTypeArguments().nonEmpty()) { - sigbuf.appendByte('<'); - assembleSig(ct.getTypeArguments()); - sigbuf.appendByte('>'); - } - } - - - void assembleSig(List<Type> types) { - for (List<Type> ts = types; ts.nonEmpty(); ts = ts.tail) - assembleSig(ts.head); - } - - void assembleParamsSig(List<Type> typarams) { - sigbuf.appendByte('<'); - for (List<Type> ts = typarams; ts.nonEmpty(); ts = ts.tail) { - TypeVar tvar = (TypeVar)ts.head; - sigbuf.appendName(tvar.tsym.name); - List<Type> bounds = types.getBounds(tvar); - if ((bounds.head.tsym.flags() & INTERFACE) != 0) { - sigbuf.appendByte(':'); - } - for (List<Type> l = bounds; l.nonEmpty(); l = l.tail) { - sigbuf.appendByte(':'); - assembleSig(l.head); - } - } - sigbuf.appendByte('>'); - } - - /** Return signature of given type + /** + * Return signature of given type */ Name typeSig(Type type) { - Assert.check(sigbuf.length == 0); + Assert.check(signatureGen.isEmpty()); //- System.out.println(" ? " + type); - assembleSig(type); - Name n = sigbuf.toName(names); - sigbuf.reset(); + signatureGen.assembleSig(type); + Name n = signatureGen.toName(); + signatureGen.reset(); //- System.out.println(" " + n); return n; } @@ -484,10 +396,8 @@ while (i < pool.pp) { Object value = pool.pool[i]; Assert.checkNonNull(value); - if (value instanceof Method) - value = ((Method)value).m; - else if (value instanceof Variable) - value = ((Variable)value).v; + if (value instanceof Method || value instanceof Variable) + value = ((DelegatedSymbol)value).getUnderlyingSymbol(); if (value instanceof MethodSymbol) { MethodSymbol m = (MethodSymbol)value; @@ -730,7 +640,7 @@ (flags & (SYNTHETIC|BRIDGE)) != SYNTHETIC && (flags & ANONCONSTR) == 0 && (!types.isSameType(sym.type, sym.erasure(types)) || - hasTypeVar(sym.type.getThrownTypes()))) { + signatureGen.hasTypeVar(sym.type.getThrownTypes()))) { // note that a local class with captured variables // will get a signature attribute int alenIdx = writeAttr(names.Signature); @@ -747,16 +657,26 @@ * Write method parameter names attribute. */ int writeMethodParametersAttr(MethodSymbol m) { - if (m.params != null && 0 != m.params.length()) { - int attrIndex = writeAttr(names.MethodParameters); - databuf.appendByte(m.params.length()); + MethodType ty = m.externalType(types).asMethodType(); + final int allparams = ty.argtypes.size(); + if (m.params != null && allparams != 0) { + final int attrIndex = writeAttr(names.MethodParameters); + databuf.appendByte(allparams); + // Write extra parameters first + for (VarSymbol s : m.extraParams) { + final int flags = + ((int) s.flags() & (FINAL | SYNTHETIC | MANDATED)) | + ((int) m.flags() & SYNTHETIC); + databuf.appendChar(pool.put(s.name)); + databuf.appendChar(flags); + } + // Now write the real parameters for (VarSymbol s : m.params) { - // TODO: expand to cover synthesized, once we figure out - // how to represent that. - final int flags = (int) s.flags() & (FINAL | SYNTHETIC); - // output parameter info + final int flags = + ((int) s.flags() & (FINAL | SYNTHETIC | MANDATED)) | + ((int) m.flags() & SYNTHETIC); databuf.appendChar(pool.put(s.name)); - databuf.appendInt(flags); + databuf.appendChar(flags); } endAttr(attrIndex); return 1; @@ -1011,12 +931,13 @@ void writePosition(TypeAnnotationPosition p) { databuf.appendByte(p.type.targetTypeValue()); // TargetType tag is a byte switch (p.type) { - // type cast - case CAST: // instanceof case INSTANCEOF: // new expression case NEW: + // constructor/method reference receiver + case CONSTRUCTOR_REFERENCE: + case METHOD_REFERENCE: databuf.appendChar(p.offset); break; // local variable @@ -1061,9 +982,12 @@ case METHOD_FORMAL_PARAMETER: databuf.appendByte(p.parameter_index); break; + // type cast + case CAST: // method/constructor/reference type argument case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT: case METHOD_INVOCATION_TYPE_ARGUMENT: + case CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT: case METHOD_REFERENCE_TYPE_ARGUMENT: databuf.appendChar(p.offset); databuf.appendByte(p.type_index); @@ -1072,10 +996,6 @@ case METHOD_RETURN: case FIELD: break; - // lambda formal parameter - case LAMBDA_FORMAL_PARAMETER: - databuf.appendByte(p.parameter_index); - break; case UNKNOWN: throw new AssertionError("jvm.ClassWriter: UNKNOWN target type should never occur!"); default: @@ -1203,7 +1123,8 @@ // log.errWriter.println("enter inner " + c);//DEBUG enterInner(c.owner.enclClass()); pool.put(c); - pool.put(c.name); + if (c.name != names.empty) + pool.put(c.name); if (innerClasses == null) { innerClasses = new HashSet<ClassSymbol>(); innerClassesQueue = new ListBuffer<ClassSymbol>(); @@ -1845,7 +1766,7 @@ Assert.check((c.flags() & COMPOUND) == 0); databuf.reset(); poolbuf.reset(); - sigbuf.reset(); + signatureGen.reset(); pool = c.pool; innerClasses = null; innerClassesQueue = null; @@ -1906,12 +1827,12 @@ if (sigReq) { Assert.check(source.allowGenerics()); int alenIdx = writeAttr(names.Signature); - if (typarams.length() != 0) assembleParamsSig(typarams); - assembleSig(supertype); + if (typarams.length() != 0) signatureGen.assembleParamsSig(typarams); + signatureGen.assembleSig(supertype); for (List<Type> l = interfaces; l.nonEmpty(); l = l.tail) - assembleSig(l.head); - databuf.appendChar(pool.put(sigbuf.toName(names))); - sigbuf.reset(); + signatureGen.assembleSig(l.head); + databuf.appendChar(pool.put(signatureGen.toName())); + signatureGen.reset(); endAttr(alenIdx); acount++; }
--- a/src/share/classes/com/sun/tools/javac/jvm/Code.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/jvm/Code.java Tue May 07 17:14:17 2013 -0700 @@ -373,6 +373,17 @@ Assert.check(alive || state.stacksize == 0); } + /** Emit a ldc (or ldc_w) instruction, taking into account operand size + */ + public void emitLdc(int od) { + if (od <= 255) { + emitop1(ldc1, od); + } + else { + emitop2(ldc2, od); + } + } + /** Emit a multinewarray instruction. */ public void emitMultianewarray(int ndims, int type, Type arrayType) { @@ -459,7 +470,15 @@ public void emitInvokedynamic(int desc, Type mtype) { // N.B. this format is under consideration by the JSR 292 EG int argsize = width(mtype.getParameterTypes()); - emitop(invokedynamic); + int prevPos = pendingStatPos; + try { + //disable line number generation (we could have used 'emit1', that + //bypasses stackmap generation - which is needed for indy calls) + pendingStatPos = Position.NOPOS; + emitop(invokedynamic); + } finally { + pendingStatPos = prevPos; + } if (!alive) return; emit2(desc); emit2(0);
--- a/src/share/classes/com/sun/tools/javac/jvm/Gen.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/jvm/Gen.java Tue May 07 17:14:17 2013 -0700 @@ -513,7 +513,8 @@ // that contains them as its body. if (clinitCode.length() != 0) { MethodSymbol clinit = new MethodSymbol( - STATIC, names.clinit, + STATIC | (c.flags() & STRICTFP), + names.clinit, new MethodType( List.<Type>nil(), syms.voidType, List.<Type>nil(), syms.methodClass), @@ -1747,10 +1748,13 @@ // Generate code for all arguments, where the expected types are // the parameters of the method's external type (that is, any implicit // outer instance of a super(...) call appears as first parameter). + MethodSymbol msym = (MethodSymbol)TreeInfo.symbol(tree.meth); genArgs(tree.args, - TreeInfo.symbol(tree.meth).externalType(types).getParameterTypes()); - code.statBegin(tree.pos); - code.markStatBegin(); + msym.externalType(types).getParameterTypes()); + if (!msym.isDynamic()) { + code.statBegin(tree.pos); + code.markStatBegin(); + } result = m.invoke(); } @@ -2226,7 +2230,7 @@ if (tree.name == names._class) { Assert.check(target.hasClassLiterals()); - code.emitop2(ldc2, makeRef(tree.pos(), tree.selected.type)); + code.emitLdc(makeRef(tree.pos(), tree.selected.type)); result = items.makeStackItem(pt); return; }
--- a/src/share/classes/com/sun/tools/javac/jvm/Items.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/jvm/Items.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -571,10 +571,8 @@ int idx = pool.put(value); if (typecode == LONGcode || typecode == DOUBLEcode) { code.emitop2(ldc2w, idx); - } else if (idx <= 255) { - code.emitop1(ldc1, idx); } else { - code.emitop2(ldc2, idx); + code.emitLdc(idx); } }
--- a/src/share/classes/com/sun/tools/javac/jvm/Pool.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/jvm/Pool.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -142,23 +142,23 @@ return n == null ? -1 : n.intValue(); } - static class Method extends DelegatedSymbol { - MethodSymbol m; + static class Method extends DelegatedSymbol<MethodSymbol> { UniqueType uniqueType; Method(MethodSymbol m, Types types) { super(m); - this.m = m; this.uniqueType = new UniqueType(m.type, types); } - public boolean equals(Object other) { - if (!(other instanceof Method)) return false; - MethodSymbol o = ((Method)other).m; + public boolean equals(Object any) { + if (!(any instanceof Method)) return false; + MethodSymbol o = ((Method)any).other; + MethodSymbol m = this.other; return o.name == m.name && o.owner == m.owner && - ((Method)other).uniqueType.equals(uniqueType); + ((Method)any).uniqueType.equals(uniqueType); } public int hashCode() { + MethodSymbol m = this.other; return m.name.hashCode() * 33 + m.owner.hashCode() * 9 + @@ -175,21 +175,21 @@ } @Override - public boolean equals(Object other) { - if (!super.equals(other)) return false; - if (!(other instanceof DynamicMethod)) return false; - DynamicMethodSymbol dm1 = (DynamicMethodSymbol)m; - DynamicMethodSymbol dm2 = (DynamicMethodSymbol)((DynamicMethod)other).m; + public boolean equals(Object any) { + if (!super.equals(any)) return false; + if (!(any instanceof DynamicMethod)) return false; + DynamicMethodSymbol dm1 = (DynamicMethodSymbol)other; + DynamicMethodSymbol dm2 = (DynamicMethodSymbol)((DynamicMethod)any).other; return dm1.bsm == dm2.bsm && dm1.bsmKind == dm2.bsmKind && Arrays.equals(uniqueStaticArgs, - ((DynamicMethod)other).uniqueStaticArgs); + ((DynamicMethod)any).uniqueStaticArgs); } @Override public int hashCode() { int hash = super.hashCode(); - DynamicMethodSymbol dm = (DynamicMethodSymbol)m; + DynamicMethodSymbol dm = (DynamicMethodSymbol)other; hash += dm.bsmKind * 7 + dm.bsm.hashCode() * 11; for (int i = 0; i < dm.staticArgs.length; i++) { @@ -211,23 +211,23 @@ } } - static class Variable extends DelegatedSymbol { - VarSymbol v; + static class Variable extends DelegatedSymbol<VarSymbol> { UniqueType uniqueType; Variable(VarSymbol v, Types types) { super(v); - this.v = v; this.uniqueType = new UniqueType(v.type, types); } - public boolean equals(Object other) { - if (!(other instanceof Variable)) return false; - VarSymbol o = ((Variable)other).v; + public boolean equals(Object any) { + if (!(any instanceof Variable)) return false; + VarSymbol o = ((Variable)any).other; + VarSymbol v = other; return o.name == v.name && o.owner == v.owner && - ((Variable)other).uniqueType.equals(uniqueType); + ((Variable)any).uniqueType.equals(uniqueType); } public int hashCode() { + VarSymbol v = other; return v.name.hashCode() * 33 + v.owner.hashCode() * 9 + @@ -295,6 +295,7 @@ expectedKind = Kinds.MTH; break; case ClassFile.REF_invokeStatic: + interfaceOwner = true; staticOk = true; case ClassFile.REF_invokeVirtual: case ClassFile.REF_invokeSpecial:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/javac/jvm/Profile.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2002, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.javac.jvm; + +import com.sun.tools.javac.util.Context; +import com.sun.tools.javac.util.Options; +import java.util.EnumSet; +import java.util.Set; + +import static com.sun.tools.javac.main.Option.PROFILE; + +/** The target profile. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice.</b> + */ +public enum Profile { + COMPACT1("compact1", 1, Target.JDK1_8), + COMPACT2("compact2", 2, Target.JDK1_8), + COMPACT3("compact3", 3, Target.JDK1_8), + + DEFAULT { + @Override + public boolean isValid(Target t) { + return true; + } + }; + + private static final Context.Key<Profile> profileKey = + new Context.Key<Profile>(); + + public static Profile instance(Context context) { + Profile instance = context.get(profileKey); + if (instance == null) { + Options options = Options.instance(context); + String profileString = options.get(PROFILE); + if (profileString != null) instance = lookup(profileString); + if (instance == null) instance = DEFAULT; + context.put(profileKey, instance); + } + return instance; + } + + public final String name; + public final int value; + final Set<Target> targets; + + Profile() { + name = null; + value = Integer.MAX_VALUE; + targets = null; + } + + Profile(String name, int value, Target t, Target... targets) { + this.name = name; + this.value = value; + this.targets = EnumSet.of(t, targets); + } + + public static Profile lookup(String name) { + // the set of values is small enough to do linear search + for (Profile p: values()) { + if (name.equals(p.name)) + return p; + } + return null; + } + + public static Profile lookup(int value) { + // the set of values is small enough to do linear search + for (Profile p: values()) { + if (value == p.value) + return p; + } + return null; + } + + public boolean isValid(Target t) { + return targets.contains(t); + } +}
--- a/src/share/classes/com/sun/tools/javac/jvm/Target.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/jvm/Target.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 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 @@ -31,7 +31,7 @@ import com.sun.tools.javac.code.Symbol; import com.sun.tools.javac.util.*; -import static com.sun.tools.javac.main.Option.*; +import static com.sun.tools.javac.main.Option.TARGET; /** The classfile version target. * @@ -48,17 +48,6 @@ /** J2SE1.4 = Merlin. */ JDK1_4("1.4", 48, 0), - /** Support for the JSR14 prototype compiler (targeting 1.4 VMs - * augmented with a few support classes). This is a transitional - * option that will not be supported in the product. */ - JSR14("jsr14", 48, 0), - - /** The following are undocumented transitional targets that we - * had used to test VM fixes in update releases. We do not - * promise to retain support for them. */ - JDK1_4_1("1.4.1", 48, 0), - JDK1_4_2("1.4.2", 48, 0), - /** Tiger. */ JDK1_5("1.5", 49, 0), @@ -175,23 +164,23 @@ return compareTo(JDK1_5) >= 0; } - /** Beginning in -target 1.4.2, we make synthetic variables + /** Beginning in -target 1.5, we make synthetic variables * package-private instead of private. This is to prevent the * necessity of access methods, which effectively relax the * protection of the field but bloat the class files and affect * execution. */ public boolean usePrivateSyntheticFields() { - return compareTo(JDK1_4_2) < 0; + return compareTo(JDK1_5) < 0; } /** Sometimes we need to create a field to cache a value like a - * class literal of the assertions flag. In -target 1.4.2 and + * class literal of the assertions flag. In -target 1.5 and * later we create a new synthetic class for this instead of * using the outermost class. See 4401576. */ public boolean useInnerCacheClass() { - return compareTo(JDK1_4_2) >= 0; + return compareTo(JDK1_5) >= 0; } /** Return true if cldc-style stack maps need to be generated. */ @@ -276,7 +265,7 @@ * See 4468823 */ public boolean classLiteralsNoInit() { - return compareTo(JDK1_4_2) >= 0; + return compareTo(JDK1_5) >= 0; } /** Although we may not have support for class literals, when we @@ -300,23 +289,11 @@ return compareTo(JDK1_5) >= 0; } - /** For bootstrapping javac only, we do without java.lang.Enum if - * necessary. - */ - public boolean compilerBootstrap(Symbol c) { - return - this == JSR14 && - (c.flags() & Flags.ENUM) != 0 && - c.flatName().toString().startsWith("com.sun.tools.") - // && !Target.class.getSuperclass().getName().equals("java.lang.Enum") - ; - } - /** In J2SE1.5.0, we introduced the "EnclosingMethod" attribute * for improved reflection support. */ public boolean hasEnclosingMethodAttribute() { - return compareTo(JDK1_5) >= 0 || this == JSR14; + return compareTo(JDK1_5) >= 0; } public boolean useModules() {
--- a/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Tue May 07 17:14:17 2013 -0700 @@ -25,6 +25,7 @@ package com.sun.tools.javac.main; +import com.sun.tools.javac.comp.CompileStates; import java.io.*; import java.util.HashMap; import java.util.HashSet; @@ -61,6 +62,7 @@ import com.sun.tools.javac.tree.*; import com.sun.tools.javac.tree.JCTree.*; import com.sun.tools.javac.util.*; +import com.sun.tools.javac.comp.CompileStates.CompileState; import com.sun.tools.javac.util.Log.WriterKind; import static com.sun.tools.javac.code.TypeTag.CLASS; import static com.sun.tools.javac.main.Option.*; @@ -325,6 +327,8 @@ **/ protected boolean implicitSourceFilesRead; + protected CompileStates compileStates; + /** Construct a new compiler using a shared context. */ public JavaCompiler(Context context) { @@ -347,6 +351,7 @@ fileManager = context.get(JavaFileManager.class); parserFactory = ParserFactory.instance(context); + compileStates = CompileStates.instance(context); try { // catch completion problems with predefineds @@ -520,42 +525,6 @@ */ public List<Closeable> closeables = List.nil(); - /** Ordered list of compiler phases for each compilation unit. */ - public enum CompileState { - INIT(0), - PARSE(1), - ENTER(2), - PROCESS(3), - ATTR(4), - FLOW(5), - TRANSTYPES(6), - UNLAMBDA(7), - LOWER(8), - GENERATE(9); - - CompileState(int value) { - this.value = value; - } - boolean isAfter(CompileState other) { - return value > other.value; - } - public static CompileState max(CompileState a, CompileState b) { - return a.value > b.value ? a : b; - } - private final int value; - }; - /** Partial map to record which compiler phases have been executed - * for each compilation unit. Used for ATTR and FLOW phases. - */ - protected class CompileStates extends HashMap<Env<AttrContext>,CompileState> { - private static final long serialVersionUID = 1812267524140424433L; - boolean isDone(Env<AttrContext> env, CompileState cs) { - CompileState ecs = get(env); - return (ecs != null) && !cs.isAfter(ecs); - } - } - private CompileStates compileStates = new CompileStates(); - /** The set of currently compiled inputfiles, needed to ensure * we don't accidentally overwrite an input file when -s is set. * initialized by `compile'. @@ -627,6 +596,8 @@ if (!taskListener.isEmpty()) { TaskEvent e = new TaskEvent(TaskEvent.Kind.PARSE, filename); taskListener.started(e); + keepComments = true; + genEndPos = true; } Parser parser = parserFactory.newParser(content, keepComments(), genEndPos, lineDebugInfo); tree = parser.parseCompilationUnit(); @@ -1418,13 +1389,17 @@ @Override public void visitClassDef(JCClassDecl node) { Type st = types.supertype(node.sym.type); - if (st.hasTag(CLASS)) { + boolean envForSuperTypeFound = false; + while (!envForSuperTypeFound && st.hasTag(CLASS)) { ClassSymbol c = st.tsym.outermostClass(); Env<AttrContext> stEnv = enter.getEnv(c); if (stEnv != null && env != stEnv) { - if (dependencies.add(stEnv)) + if (dependencies.add(stEnv)) { scan(stEnv.tree); + } + envForSuperTypeFound = true; } + st = types.supertype(st); } super.visitClassDef(node); }
--- a/src/share/classes/com/sun/tools/javac/main/Main.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/main/Main.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -49,6 +49,7 @@ import com.sun.tools.javac.code.Source; import com.sun.tools.javac.file.CacheFSInfo; import com.sun.tools.javac.file.JavacFileManager; +import com.sun.tools.javac.jvm.Profile; import com.sun.tools.javac.jvm.Target; import com.sun.tools.javac.processing.AnnotationProcessingError; import com.sun.tools.javac.processing.JavacProcessingEnvironment; @@ -76,7 +77,7 @@ /** The log to use for diagnostic output. */ - Log log; + public Log log; /** * If true, certain errors will cause an exception, such as command line @@ -165,6 +166,7 @@ this.ownName = name; this.out = out; } + /** A table of all options that's passed to the JavaCompiler constructor. */ private Options options = null; @@ -338,6 +340,15 @@ return null; } + String profileString = options.get(PROFILE); + if (profileString != null) { + Profile profile = Profile.lookup(profileString); + if (!profile.isValid(target)) { + warning("warn.profile.target.conflict", profileString, target.name); + return null; + } + } + // handle this here so it works even if no other options given String showClass = options.get("showClass"); if (showClass != null) { @@ -517,6 +528,8 @@ if (!(doclintOpts.size() == 1 && doclintOpts.iterator().next().equals(DocLint.XMSGS_CUSTOM_PREFIX + "none"))) { JavacTask t = BasicJavacTask.instance(context); + // standard doclet normally generates H1, H2 + doclintOpts.add(DocLint.XIMPLICIT_HEADERS + "2"); new DocLint().init(t, doclintOpts.toArray(new String[doclintOpts.size()])); comp.keepComments = true; }
--- a/src/share/classes/com/sun/tools/javac/main/Option.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/main/Option.java Tue May 07 17:14:17 2013 -0700 @@ -40,6 +40,7 @@ import com.sun.tools.javac.code.Lint; import com.sun.tools.javac.code.Source; import com.sun.tools.javac.code.Type; +import com.sun.tools.javac.jvm.Profile; import com.sun.tools.javac.jvm.Target; import com.sun.tools.javac.processing.JavacProcessingEnvironment; import com.sun.tools.javac.util.Log; @@ -222,6 +223,18 @@ } }, + PROFILE("-profile", "opt.arg.profile", "opt.profile", STANDARD, BASIC) { + @Override + public boolean process(OptionHelper helper, String option, String operand) { + Profile profile = Profile.lookup(operand); + if (profile == null) { + helper.error("err.invalid.profile", operand); + return true; + } + return super.process(helper, option, operand); + } + }, + VERSION("-version", "opt.version", STANDARD, INFO) { @Override public boolean process(OptionHelper helper, String option) {
--- a/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -273,7 +273,7 @@ /** * ExceptionProxy for MirroredTypeException. - * The toString, hashCode, and equals methods foward to the underlying + * The toString, hashCode, and equals methods forward to the underlying * type. */ private static final class MirroredTypeExceptionProxy extends ExceptionProxy {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/javac/model/JavacAnnoConstructs.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,412 @@ +/* + * Copyright (c) 2005, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.javac.model; + +import java.lang.annotation.Annotation; +import java.lang.annotation.Inherited; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import com.sun.tools.javac.code.Attribute; +import com.sun.tools.javac.code.Kinds; +import com.sun.tools.javac.code.Symbol; +import com.sun.tools.javac.code.Symbol.ClassSymbol; +import com.sun.tools.javac.code.Type; +import com.sun.tools.javac.code.Type.AnnotatedType; +import com.sun.tools.javac.util.ListBuffer; +import static com.sun.tools.javac.code.TypeTag.CLASS; + +/** + * Utility methods for operating on annotated constructs. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own + * risk. This code and its internal interfaces are subject to change + * or deletion without notice.</b></p> + */ +public class JavacAnnoConstructs { + + // <editor-fold defaultstate="collapsed" desc="Symbols"> + + /** + * An internal-use utility that creates a runtime view of an + * annotation. This is the implementation of + * Element.getAnnotation(Class). + */ + public static <A extends Annotation> A getAnnotation(Symbol annotated, + Class<A> annoType) { + if (!annoType.isAnnotation()) + throw new IllegalArgumentException("Not an annotation type: " + + annoType); + Attribute.Compound c; + if (annotated.kind == Kinds.TYP && annotated instanceof ClassSymbol) { + c = getAttributeOnClass((ClassSymbol)annotated, annoType); + } else { + c = getAttribute(annotated, annoType); + } + return c == null ? null : AnnotationProxyMaker.generateAnnotation(c, annoType); + } + + // Helper to getAnnotation[s] + private static <A extends Annotation> Attribute.Compound getAttribute(Symbol annotated, + Class<A> annoType) { + String name = annoType.getName(); + + for (Attribute.Compound anno : annotated.getRawAttributes()) { + if (name.equals(anno.type.tsym.flatName().toString())) + return anno; + } + + return null; + } + + // Helper to getAnnotation[s] + private static <A extends Annotation> Attribute.Compound getAttributeOnClass(ClassSymbol annotated, + Class<A> annoType) { + boolean inherited = annoType.isAnnotationPresent(Inherited.class); + Attribute.Compound result = null; + while (annotated.name != annotated.name.table.names.java_lang_Object) { + result = getAttribute(annotated, annoType); + if (result != null || !inherited) + break; + Type sup = annotated.getSuperclass(); + if (!sup.hasTag(CLASS) || sup.isErroneous()) + break; + annotated = (ClassSymbol) sup.tsym; + } + return result; + } + + /** + * An internal-use utility that creates a runtime view of + * annotations. This is the implementation of + * Element.getAnnotations(Class). + */ + public static <A extends Annotation> A[] getAnnotations(Symbol annotated, + Class<A> annoType) { + if (!annoType.isAnnotation()) + throw new IllegalArgumentException("Not an annotation type: " + + annoType); + // If annoType does not declare a container this is equivalent to wrapping + // getAnnotation(...) in an array. + Class <? extends Annotation> containerType = getContainer(annoType); + if (containerType == null) { + A res = getAnnotation(annotated, annoType); + int size; + if (res == null) { + size = 0; + } else { + size = 1; + } + @SuppressWarnings("unchecked") // annoType is the Class for A + A[] arr = (A[])java.lang.reflect.Array.newInstance(annoType, size); + if (res != null) + arr[0] = res; + return arr; + } + + // So we have a containing type + String name = annoType.getName(); + String annoTypeName = annoType.getSimpleName(); + String containerTypeName = containerType.getSimpleName(); + int directIndex = -1, containerIndex = -1; + Attribute.Compound direct = null, container = null; + Attribute.Compound[] rawAttributes = annotated.getRawAttributes().toArray(new Attribute.Compound[0]); + + // Find directly present annotations + for (int i = 0; i < rawAttributes.length; i++) { + if (annoTypeName.equals(rawAttributes[i].type.tsym.flatName().toString())) { + directIndex = i; + direct = rawAttributes[i]; + } else if(containerTypeName != null && + containerTypeName.equals(rawAttributes[i].type.tsym.flatName().toString())) { + containerIndex = i; + container = rawAttributes[i]; + } + } + + // Deal with inherited annotations + if (annotated.kind == Kinds.TYP && + (annotated instanceof ClassSymbol)) { + ClassSymbol s = (ClassSymbol)annotated; + if (direct == null && container == null) { + direct = getAttributeOnClass(s, annoType); + container = getAttributeOnClass(s, containerType); + + // both are inherited and found, put container last + if (direct != null && container != null) { + directIndex = 0; + containerIndex = 1; + } else if (direct != null) { + directIndex = 0; + } else { + containerIndex = 0; + } + } else if (direct == null) { + direct = getAttributeOnClass(s, annoType); + if (direct != null) + directIndex = containerIndex + 1; + } else if (container == null) { + container = getAttributeOnClass(s, containerType); + if (container != null) + containerIndex = directIndex + 1; + } + } + + // Pack them in an array + Attribute[] contained0 = new Attribute[0]; + if (container != null) + contained0 = unpackAttributes(container); + ListBuffer<Attribute.Compound> compounds = ListBuffer.lb(); + for (Attribute a : contained0) + if (a instanceof Attribute.Compound) + compounds = compounds.append((Attribute.Compound)a); + Attribute.Compound[] contained = compounds.toArray(new Attribute.Compound[0]); + + int size = (direct == null ? 0 : 1) + contained.length; + @SuppressWarnings("unchecked") // annoType is the Class for A + A[] arr = (A[])java.lang.reflect.Array.newInstance(annoType, size); + + // if direct && container, which is first? + int insert = -1; + int length = arr.length; + if (directIndex >= 0 && containerIndex >= 0) { + if (directIndex < containerIndex) { + arr[0] = AnnotationProxyMaker.generateAnnotation(direct, annoType); + insert = 1; + } else { + arr[arr.length - 1] = AnnotationProxyMaker.generateAnnotation(direct, annoType); + insert = 0; + length--; + } + } else if (directIndex >= 0) { + arr[0] = AnnotationProxyMaker.generateAnnotation(direct, annoType); + return arr; + } else { + // Only container + insert = 0; + } + + for (int i = 0; i + insert < length; i++) + arr[insert + i] = AnnotationProxyMaker.generateAnnotation(contained[i], annoType); + + return arr; + } + + // </editor-fold> + + // <editor-fold defaultstate="collapsed" desc="Types"> + + /** + * An internal-use utility that creates a runtime view of an + * annotation. This is the implementation of + * TypeMirror.getAnnotation(Class). + */ + public static <A extends Annotation> A getAnnotation(AnnotatedType annotated, Class<A> annoType) { + if (!annoType.isAnnotation()) + throw new IllegalArgumentException("Not an annotation type: " + + annoType); + Attribute.Compound c = getAttribute(annotated, annoType); + return c == null ? null : AnnotationProxyMaker.generateAnnotation(c, annoType); + } + + // Helper to getAnnotation[s] + private static <A extends Annotation> Attribute.Compound getAttribute(Type annotated, + Class<A> annoType) { + String name = annoType.getName(); + + for (Attribute.Compound anno : annotated.getAnnotationMirrors()) { + if (name.equals(anno.type.tsym.flatName().toString())) + return anno; + } + + return null; + } + + /** + * An internal-use utility that creates a runtime view of + * annotations. This is the implementation of + * TypeMirror.getAnnotationsByType(Class). + */ + public static <A extends Annotation> A[] getAnnotationsByType(AnnotatedType annotated, Class<A> annoType) { + if (!annoType.isAnnotation()) + throw new IllegalArgumentException("Not an annotation type: " + + annoType); + // If annoType does not declare a container this is equivalent to wrapping + // getAnnotation(...) in an array. + Class <? extends Annotation> containerType = getContainer(annoType); + if (containerType == null) { + A res = getAnnotation(annotated, annoType); + int size; + if (res == null) { + size = 0; + } else { + size = 1; + } + @SuppressWarnings("unchecked") // annoType is the Class for A + A[] arr = (A[])java.lang.reflect.Array.newInstance(annoType, size); + if (res != null) + arr[0] = res; + return arr; + } + + // So we have a containing type + String name = annoType.getName(); + String annoTypeName = annoType.getSimpleName(); + String containerTypeName = containerType.getSimpleName(); + int directIndex = -1, containerIndex = -1; + Attribute.Compound direct = null, container = null; + Attribute.Compound[] rawAttributes = annotated.getAnnotationMirrors().toArray(new Attribute.Compound[0]); + + // Find directly present annotations + for (int i = 0; i < rawAttributes.length; i++) { + if (annoTypeName.equals(rawAttributes[i].type.tsym.flatName().toString())) { + directIndex = i; + direct = rawAttributes[i]; + } else if(containerTypeName != null && + containerTypeName.equals(rawAttributes[i].type.tsym.flatName().toString())) { + containerIndex = i; + container = rawAttributes[i]; + } + } + + // Pack them in an array + Attribute[] contained0 = new Attribute[0]; + if (container != null) + contained0 = unpackAttributes(container); + ListBuffer<Attribute.Compound> compounds = ListBuffer.lb(); + for (Attribute a : contained0) { + if (a instanceof Attribute.Compound) + compounds = compounds.append((Attribute.Compound)a); + } + Attribute.Compound[] contained = compounds.toArray(new Attribute.Compound[0]); + + int size = (direct == null ? 0 : 1) + contained.length; + @SuppressWarnings("unchecked") // annoType is the Class for A + A[] arr = (A[])java.lang.reflect.Array.newInstance(annoType, size); + + // if direct && container, which is first? + int insert = -1; + int length = arr.length; + if (directIndex >= 0 && containerIndex >= 0) { + if (directIndex < containerIndex) { + arr[0] = AnnotationProxyMaker.generateAnnotation(direct, annoType); + insert = 1; + } else { + arr[arr.length - 1] = AnnotationProxyMaker.generateAnnotation(direct, annoType); + insert = 0; + length--; + } + } else if (directIndex >= 0) { + arr[0] = AnnotationProxyMaker.generateAnnotation(direct, annoType); + return arr; + } else { + // Only container + insert = 0; + } + + for (int i = 0; i + insert < length; i++) + arr[insert + i] = AnnotationProxyMaker.generateAnnotation(contained[i], annoType); + + return arr; + } + + // </editor-fold> + + // <editor-fold defaultstate="collapsed" desc="Container support"> + + // Needed to unpack the runtime view of containing annotations + private static final Class<? extends Annotation> REPEATABLE_CLASS = initRepeatable(); + private static final Method VALUE_ELEMENT_METHOD = initValueElementMethod(); + + private static Class<? extends Annotation> initRepeatable() { + try { + // Repeatable will not be available when bootstrapping on + // JDK 7 so use a reflective lookup instead of a class + // literal for Repeatable.class. + return Class.forName("java.lang.annotation.Repeatable").asSubclass(Annotation.class); + } catch (ClassNotFoundException e) { + return null; + } catch (SecurityException e) { + return null; + } + } + + private static Method initValueElementMethod() { + if (REPEATABLE_CLASS == null) + return null; + + Method m = null; + try { + m = REPEATABLE_CLASS.getMethod("value"); + if (m != null) + m.setAccessible(true); + return m; + } catch (NoSuchMethodException e) { + return null; + } + } + + // Helper to getAnnotations + private static Class<? extends Annotation> getContainer(Class<? extends Annotation> annoType) { + // Since we can not refer to java.lang.annotation.Repeatable until we are + // bootstrapping with java 8 we need to get the Repeatable annotation using + // reflective invocations instead of just using its type and element method. + if (REPEATABLE_CLASS != null && + VALUE_ELEMENT_METHOD != null) { + // Get the Repeatable instance on the annotations declaration + Annotation repeatable = (Annotation)annoType.getAnnotation(REPEATABLE_CLASS); + if (repeatable != null) { + try { + // Get the value element, it should be a class + // indicating the containing annotation type + @SuppressWarnings("unchecked") + Class<? extends Annotation> containerType = (Class)VALUE_ELEMENT_METHOD.invoke(repeatable); + if (containerType == null) + return null; + + return containerType; + } catch (ClassCastException e) { + return null; + } catch (IllegalAccessException e) { + return null; + } catch (InvocationTargetException e ) { + return null; + } + } + } + return null; + } + + // Helper to getAnnotations + private static Attribute[] unpackAttributes(Attribute.Compound container) { + // We now have an instance of the container, + // unpack it returning an instance of the + // contained type or null + return ((Attribute.Array)container.member(container.type.tsym.name.table.names.value)).values; + } + + // </editor-fold> +}
--- a/src/share/classes/com/sun/tools/javac/model/JavacElements.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/model/JavacElements.java Tue May 07 17:14:17 2013 -0700 @@ -25,10 +25,6 @@ package com.sun.tools.javac.model; -import java.lang.annotation.Annotation; -import java.lang.annotation.Inherited; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.util.Map; import javax.lang.model.SourceVersion; @@ -40,7 +36,6 @@ import com.sun.tools.javac.code.*; import com.sun.tools.javac.code.Symbol.*; -import com.sun.tools.javac.code.TypeTag; import com.sun.tools.javac.comp.AttrContext; import com.sun.tools.javac.comp.Enter; import com.sun.tools.javac.comp.Env; @@ -98,237 +93,6 @@ enter = Enter.instance(context); } - /** - * An internal-use utility that creates a runtime view of an - * annotation. This is the implementation of - * Element.getAnnotation(Class). - */ - public static <A extends Annotation> A getAnnotation(Symbol annotated, - Class<A> annoType) { - if (!annoType.isAnnotation()) - throw new IllegalArgumentException("Not an annotation type: " - + annoType); - Attribute.Compound c; - if (annotated.kind == Kinds.TYP && annotated instanceof ClassSymbol) { - c = getAttributeOnClass((ClassSymbol)annotated, annoType); - } else { - c = getAttribute(annotated, annoType); - } - return c == null ? null : AnnotationProxyMaker.generateAnnotation(c, annoType); - } - - // Helper to getAnnotation[s] - private static <A extends Annotation> Attribute.Compound getAttribute(Symbol annotated, - Class<A> annoType) { - String name = annoType.getName(); - - for (Attribute.Compound anno : annotated.getRawAttributes()) - if (name.equals(anno.type.tsym.flatName().toString())) - return anno; - - return null; - } - // Helper to getAnnotation[s] - private static <A extends Annotation> Attribute.Compound getAttributeOnClass(ClassSymbol annotated, - Class<A> annoType) { - boolean inherited = annoType.isAnnotationPresent(Inherited.class); - Attribute.Compound result = null; - while (annotated.name != annotated.name.table.names.java_lang_Object) { - result = getAttribute(annotated, annoType); - if (result != null || !inherited) - break; - Type sup = annotated.getSuperclass(); - if (!sup.hasTag(CLASS) || sup.isErroneous()) - break; - annotated = (ClassSymbol) sup.tsym; - } - return result; - } - - /** - * An internal-use utility that creates a runtime view of - * annotations. This is the implementation of - * Element.getAnnotations(Class). - */ - public static <A extends Annotation> A[] getAnnotations(Symbol annotated, - Class<A> annoType) { - if (!annoType.isAnnotation()) - throw new IllegalArgumentException("Not an annotation type: " - + annoType); - // If annoType does not declare a container this is equivalent to wrapping - // getAnnotation(...) in an array. - Class <? extends Annotation> containerType = getContainer(annoType); - if (containerType == null) { - A res = getAnnotation(annotated, annoType); - int size; - if (res == null) { - size = 0; - } else { - size = 1; - } - @SuppressWarnings("unchecked") // annoType is the Class for A - A[] arr = (A[])java.lang.reflect.Array.newInstance(annoType, size); - if (res != null) - arr[0] = res; - return arr; - } - - // So we have a containing type - String name = annoType.getName(); - String annoTypeName = annoType.getSimpleName(); - String containerTypeName = containerType.getSimpleName(); - int directIndex = -1, containerIndex = -1; - Attribute.Compound direct = null, container = null; - Attribute.Compound[] rawAttributes = annotated.getRawAttributes().toArray(new Attribute.Compound[0]); - - // Find directly present annotations - for (int i = 0; i < rawAttributes.length; i++) { - if (annoTypeName.equals(rawAttributes[i].type.tsym.flatName().toString())) { - directIndex = i; - direct = rawAttributes[i]; - } else if(containerTypeName != null && - containerTypeName.equals(rawAttributes[i].type.tsym.flatName().toString())) { - containerIndex = i; - container = rawAttributes[i]; - } - } - // Deal with inherited annotations - if (annotated.kind == Kinds.TYP && - (annotated instanceof ClassSymbol)) { - ClassSymbol s = (ClassSymbol)annotated; - if (direct == null && container == null) { - direct = getAttributeOnClass(s, annoType); - container = getAttributeOnClass(s, containerType); - - // both are inherited and found, put container last - if (direct != null && container != null) { - directIndex = 0; - containerIndex = 1; - } else if (direct != null) { - directIndex = 0; - } else { - containerIndex = 0; - } - } else if (direct == null) { - direct = getAttributeOnClass(s, annoType); - if (direct != null) - directIndex = containerIndex + 1; - } else if (container == null) { - container = getAttributeOnClass(s, containerType); - if (container != null) - containerIndex = directIndex + 1; - } - } - - // Pack them in an array - Attribute[] contained0 = new Attribute[0]; - if (container != null) - contained0 = unpackAttributes(container); - ListBuffer<Attribute.Compound> compounds = ListBuffer.lb(); - for (Attribute a : contained0) - if (a instanceof Attribute.Compound) - compounds = compounds.append((Attribute.Compound)a); - Attribute.Compound[] contained = compounds.toArray(new Attribute.Compound[0]); - - int size = (direct == null ? 0 : 1) + contained.length; - @SuppressWarnings("unchecked") // annoType is the Class for A - A[] arr = (A[])java.lang.reflect.Array.newInstance(annoType, size); - - // if direct && container, which is first? - int insert = -1; - int length = arr.length; - if (directIndex >= 0 && containerIndex >= 0) { - if (directIndex < containerIndex) { - arr[0] = AnnotationProxyMaker.generateAnnotation(direct, annoType); - insert = 1; - } else { - arr[arr.length - 1] = AnnotationProxyMaker.generateAnnotation(direct, annoType); - insert = 0; - length--; - } - } else if (directIndex >= 0) { - arr[0] = AnnotationProxyMaker.generateAnnotation(direct, annoType); - return arr; - } else { - // Only container - insert = 0; - } - - for (int i = 0; i + insert < length; i++) - arr[insert + i] = AnnotationProxyMaker.generateAnnotation(contained[i], annoType); - - return arr; - } - - // Needed to unpack the runtime view of containing annotations - private static final Class<? extends Annotation> REPEATABLE_CLASS = initRepeatable(); - private static final Method VALUE_ELEMENT_METHOD = initValueElementMethod(); - - private static Class<? extends Annotation> initRepeatable() { - try { - // Repeatable will not be available when bootstrapping on - // JDK 7 so use a reflective lookup instead of a class - // literal for Repeatable.class. - return Class.forName("java.lang.annotation.Repeatable").asSubclass(Annotation.class); - } catch (ClassNotFoundException e) { - return null; - } catch (SecurityException e) { - return null; - } - } - private static Method initValueElementMethod() { - if (REPEATABLE_CLASS == null) - return null; - - Method m = null; - try { - m = REPEATABLE_CLASS.getMethod("value"); - if (m != null) - m.setAccessible(true); - return m; - } catch (NoSuchMethodException e) { - return null; - } - } - - // Helper to getAnnotations - private static Class<? extends Annotation> getContainer(Class<? extends Annotation> annoType) { - // Since we can not refer to java.lang.annotation.Repeatable until we are - // bootstrapping with java 8 we need to get the Repeatable annotation using - // reflective invocations instead of just using its type and element method. - if (REPEATABLE_CLASS != null && - VALUE_ELEMENT_METHOD != null) { - // Get the Repeatable instance on the annotations declaration - Annotation repeatable = (Annotation)annoType.getAnnotation(REPEATABLE_CLASS); - if (repeatable != null) { - try { - // Get the value element, it should be a class - // indicating the containing annotation type - @SuppressWarnings("unchecked") - Class<? extends Annotation> containerType = (Class)VALUE_ELEMENT_METHOD.invoke(repeatable); - if (containerType == null) - return null; - - return containerType; - } catch (ClassCastException e) { - return null; - } catch (IllegalAccessException e) { - return null; - } catch (InvocationTargetException e ) { - return null; - } - } - } - return null; - } - // Helper to getAnnotations - private static Attribute[] unpackAttributes(Attribute.Compound container) { - // We now have an instance of the container, - // unpack it returning an instance of the - // contained type or null - return ((Attribute.Array)container.member(container.type.tsym.name.table.names.value)).values; - } - public PackageSymbol getPackageElement(CharSequence name) { String strName = name.toString(); if (strName.equals("")) @@ -760,6 +524,16 @@ return names.fromString(cs.toString()); } + @Override + public boolean isFunctionalInterface(TypeElement element) { + if (element.getKind() != ElementKind.INTERFACE) + return false; + else { + TypeSymbol tsym = cast(TypeSymbol.class, element); + return types.isFunctionalInterface(tsym); + } + } + /** * Returns the tree node and compilation unit corresponding to this * element, or null if they can't be found.
--- a/src/share/classes/com/sun/tools/javac/model/JavacTypes.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/model/JavacTypes.java Tue May 07 17:14:17 2013 -0700 @@ -25,7 +25,6 @@ package com.sun.tools.javac.model; -import java.lang.annotation.Annotation; import java.util.Collections; import java.util.EnumSet; import java.util.LinkedHashSet; @@ -333,28 +332,4 @@ return results; } - - public List<? extends AnnotationMirror> typeAnnotationsOf(TypeMirror type) { - // TODO: these methods can be removed. - return null; // ((Type)type).typeAnnotations; - } - - public <A extends Annotation> A typeAnnotationOf(TypeMirror type, - Class<A> annotationType) { - // TODO: these methods can be removed. - return null; // JavacElements.getAnnotation(((Type)type).typeAnnotations, annotationType); - } - - public TypeMirror receiverTypeOf(ExecutableType type) { - return ((Type)type).asMethodType().recvtype; - } - - /* - public <A extends Annotation> A receiverTypeAnnotationOf( - ExecutableType type, Class<A> annotationType) { - return JavacElements.getAnnotation( - ((Type)type).asMethodType().receiverTypeAnnotations, - annotationType); - }*/ - }
--- a/src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java Tue May 07 17:14:17 2013 -0700 @@ -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 @@ -279,13 +279,7 @@ try { nextChar(); if (isIdentifierStart(ch)) { - int namePos = bp; - nextChar(); - while (isIdentifierPart(ch)) - nextChar(); - int nameLen = bp - namePos; - - Name name = names.fromChars(buf, namePos, nameLen); + Name name = readIdentifier(); TagParser tp = tagParsers.get(name); if (tp == null) { List<DCTree> content = blockContent(); @@ -334,14 +328,9 @@ try { nextChar(); if (isIdentifierStart(ch)) { - int namePos = bp; - nextChar(); - while (isIdentifierPart(ch)) - nextChar(); - int nameLen = bp - namePos; + Name name = readIdentifier(); skipWhitespace(); - Name name = names.fromChars(buf, namePos, nameLen); TagParser tp = tagParsers.get(name); if (tp == null) { DCTree text = inlineText(); @@ -575,10 +564,8 @@ int pos = bp; if (isJavaIdentifierStart(ch)) { - nextChar(); - while (isJavaIdentifierPart(ch)) - nextChar(); - return m.at(pos).Identifier(names.fromChars(buf, pos, bp - pos)); + Name name = readJavaIdentifier(); + return m.at(pos).Identifier(name); } throw new ParseException("dc.identifier.expected"); @@ -703,39 +690,36 @@ protected DCTree entity() { int p = bp; nextChar(); - int namep = bp; + Name name = null; boolean checkSemi = false; if (ch == '#') { + int namep = bp; nextChar(); if (isDecimalDigit(ch)) { nextChar(); while (isDecimalDigit(ch)) nextChar(); - checkSemi = true; + name = names.fromChars(buf, namep, bp - namep); } else if (ch == 'x' || ch == 'X') { nextChar(); if (isHexDigit(ch)) { nextChar(); while (isHexDigit(ch)) nextChar(); - checkSemi = true; + name = names.fromChars(buf, namep, bp - namep); } } } else if (isIdentifierStart(ch)) { - nextChar(); - while (isIdentifierPart(ch)) - nextChar(); - checkSemi = true; + name = readIdentifier(); } - if (checkSemi && ch == ';') { + if (name == null) + return erroneous("dc.bad.entity", p); + else { + if (ch != ';') + return erroneous("dc.missing.semicolon", p); nextChar(); - return m.at(p).Entity(names.fromChars(buf, namep, bp - namep - 1)); - } else { - String code = checkSemi - ? "dc.missing.semicolon" - : "dc.bad.entity"; - return erroneous(code, p); + return m.at(p).Entity(name); } } @@ -747,11 +731,7 @@ int p = bp; nextChar(); if (isIdentifierStart(ch)) { - int namePos = bp; - nextChar(); - while (isIdentifierPart(ch)) - nextChar(); - int nameLen = bp - namePos; + Name name = readIdentifier(); List<DCTree> attrs = htmlAttrs(); if (attrs != null) { boolean selfClosing = false; @@ -761,22 +741,16 @@ } if (ch == '>') { nextChar(); - Name name = names.fromChars(buf, namePos, nameLen); return m.at(p).StartElement(name, attrs, selfClosing); } } } else if (ch == '/') { nextChar(); if (isIdentifierStart(ch)) { - int namePos = bp; - nextChar(); - while (isIdentifierPart(ch)) - nextChar(); - int nameLen = bp - namePos; + Name name = readIdentifier(); skipWhitespace(); if (ch == '>') { nextChar(); - Name name = names.fromChars(buf, namePos, nameLen); return m.at(p).EndElement(name); } } @@ -822,10 +796,7 @@ loop: while (isIdentifierStart(ch)) { int namePos = bp; - nextChar(); - while (isIdentifierPart(ch)) - nextChar(); - int nameLen = bp - namePos; + Name name = readIdentifier(); skipWhitespace(); List<DCTree> value = null; ValueKind vkind = ValueKind.EMPTY; @@ -862,7 +833,6 @@ skipWhitespace(); value = v.toList(); } - Name name = names.fromChars(buf, namePos, nameLen); DCAttribute attr = m.at(namePos).Attribute(name, vkind, value); attrs.add(attr); } @@ -897,7 +867,7 @@ protected DCErroneous erroneous(String code, int pos) { int i = bp - 1; loop: - while (i > 0) { + while (i > pos) { switch (buf[i]) { case '\f': case '\n': case '\r': newline = true; @@ -926,16 +896,24 @@ return Character.isUnicodeIdentifierStart(ch); } - protected boolean isIdentifierPart(char ch) { - return Character.isUnicodeIdentifierPart(ch); + protected Name readIdentifier() { + int start = bp; + nextChar(); + while (bp < buflen && Character.isUnicodeIdentifierPart(ch)) + nextChar(); + return names.fromChars(buf, start, bp - start); } protected boolean isJavaIdentifierStart(char ch) { return Character.isJavaIdentifierStart(ch); } - protected boolean isJavaIdentifierPart(char ch) { - return Character.isJavaIdentifierPart(ch); + protected Name readJavaIdentifier() { + int start = bp; + nextChar(); + while (bp < buflen && Character.isJavaIdentifierPart(ch)) + nextChar(); + return names.fromChars(buf, start, bp - start); } protected boolean isDecimalDigit(char ch) {
--- a/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -852,7 +852,7 @@ * (which is treated as the beginning of the first line). * Stops positioned at the closing '/'. */ - protected class BasicComment<U extends UnicodeReader> implements Comment { + protected static class BasicComment<U extends UnicodeReader> implements Comment { CommentStyle cs; U comment_reader;
--- a/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Tue May 07 17:14:17 2013 -0700 @@ -174,8 +174,8 @@ protected AbstractEndPosTable newEndPosTable(boolean keepEndPositions) { return keepEndPositions - ? new SimpleEndPosTable() - : new EmptyEndPosTable(); + ? new SimpleEndPosTable(this) + : new EmptyEndPosTable(this); } protected DocCommentTable newDocCommentTable(boolean keepDocComments, ParserFactory fac) { @@ -1185,7 +1185,7 @@ } else return illegal(); break; case MONKEYS_AT: - // Only annotated cast types are valid + // Only annotated cast types and method references are valid List<JCAnnotation> typeAnnos = typeAnnotationsOpt(); if (typeAnnos.isEmpty()) { // else there would be no '@' @@ -1196,17 +1196,27 @@ if ((mode & TYPE) == 0) { // Type annotations on class literals no longer legal - if (!expr.hasTag(Tag.SELECT)) { + switch (expr.getTag()) { + case REFERENCE: { + JCMemberReference mref = (JCMemberReference) expr; + mref.expr = toP(F.at(pos).AnnotatedType(typeAnnos, mref.expr)); + t = mref; + break; + } + case SELECT: { + JCFieldAccess sel = (JCFieldAccess) expr; + + if (sel.name != names._class) { + return illegal(); + } else { + log.error(token.pos, "no.annotations.on.dot.class"); + return expr; + } + } + default: return illegal(typeAnnos.head.pos); } - JCFieldAccess sel = (JCFieldAccess)expr; - - if (sel.name != names._class) { - return illegal(); - } else { - log.error(token.pos, "no.annotations.on.dot.class"); - return expr; - } + } else { // Type annotations targeting a cast t = insertAnnotationsToMostInner(expr, typeAnnos, false); @@ -1478,18 +1488,40 @@ /** * If we see an identifier followed by a '<' it could be an unbound * method reference or a binary expression. To disambiguate, look for a - * matching '>' and see if the subsequent terminal is either '.' or '#'. + * matching '>' and see if the subsequent terminal is either '.' or '::'. */ @SuppressWarnings("fallthrough") boolean isUnboundMemberRef() { int pos = 0, depth = 0; - for (Token t = S.token(pos) ; ; t = S.token(++pos)) { + outer: for (Token t = S.token(pos) ; ; t = S.token(++pos)) { switch (t.kind) { case IDENTIFIER: case UNDERSCORE: case QUES: case EXTENDS: case SUPER: case DOT: case RBRACKET: case LBRACKET: case COMMA: case BYTE: case SHORT: case INT: case LONG: case FLOAT: case DOUBLE: case BOOLEAN: case CHAR: + case MONKEYS_AT: break; + + case LPAREN: + // skip annotation values + int nesting = 0; + for (; ; pos++) { + TokenKind tk2 = S.token(pos).kind; + switch (tk2) { + case EOF: + return false; + case LPAREN: + nesting++; + break; + case RPAREN: + nesting--; + if (nesting == 0) { + continue outer; + } + break; + } + } + case LT: depth++; break; case GTGTGT: @@ -1515,7 +1547,7 @@ /** * If we see an identifier followed by a '<' it could be an unbound * method reference or a binary expression. To disambiguate, look for a - * matching '>' and see if the subsequent terminal is either '.' or '#'. + * matching '>' and see if the subsequent terminal is either '.' or '::'. */ @SuppressWarnings("fallthrough") ParensResult analyzeParens() { @@ -2856,7 +2888,7 @@ * | Identifier "=" AnnotationValue */ JCExpression annotationFieldValue() { - if (token.kind == IDENTIFIER) { + if (LAX_IDENTIFIER.accepts(token.kind)) { mode = EXPR; JCExpression t1 = term1(); if (t1.hasTag(IDENT) && token.kind == EQ) { @@ -3089,6 +3121,7 @@ toplevel.docComments = docComments; if (keepLineMap) toplevel.lineMap = S.getLineMap(); + this.endPosTable.setParser(null); // remove reference to parser toplevel.endPositions = this.endPosTable; return toplevel; } @@ -4218,11 +4251,12 @@ /* * a functional source tree and end position mappings */ - protected class SimpleEndPosTable extends AbstractEndPosTable { + protected static class SimpleEndPosTable extends AbstractEndPosTable { private final Map<JCTree, Integer> endPosMap; - SimpleEndPosTable() { + SimpleEndPosTable(JavacParser parser) { + super(parser); endPosMap = new HashMap<JCTree, Integer>(); } @@ -4231,12 +4265,12 @@ } protected <T extends JCTree> T to(T t) { - storeEnd(t, token.endPos); + storeEnd(t, parser.token.endPos); return t; } protected <T extends JCTree> T toP(T t) { - storeEnd(t, S.prevToken().endPos); + storeEnd(t, parser.S.prevToken().endPos); return t; } @@ -4258,7 +4292,11 @@ /* * a default skeletal implementation without any mapping overhead. */ - protected class EmptyEndPosTable extends AbstractEndPosTable { + protected static class EmptyEndPosTable extends AbstractEndPosTable { + + EmptyEndPosTable(JavacParser parser) { + super(parser); + } protected void storeEnd(JCTree tree, int endpos) { /* empty */ } @@ -4280,13 +4318,21 @@ } - protected abstract class AbstractEndPosTable implements EndPosTable { + protected static abstract class AbstractEndPosTable implements EndPosTable { + /** + * The current parser. + */ + protected JavacParser parser; /** * Store the last error position. */ protected int errorEndPos; + public AbstractEndPosTable(JavacParser parser) { + this.parser = parser; + } + /** * Store ending position for a tree, the value of which is the greater * of last error position and the given ending position. @@ -4321,5 +4367,9 @@ errorEndPos = errPos; } } + + protected void setParser(JavacParser parser) { + this.parser = parser; + } } }
--- a/src/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 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 @@ -206,7 +206,7 @@ } } - protected class JavadocComment extends JavaTokenizer.BasicComment<DocReader> { + protected static class JavadocComment extends JavaTokenizer.BasicComment<DocReader> { /** * Translated and stripped contents of doc comment @@ -236,7 +236,7 @@ // relative to the best match found in the array. if (pos == Position.NOPOS) return Position.NOPOS; - if (pos < 0 || pos >= docComment.length()) + if (pos < 0 || pos > docComment.length()) throw new StringIndexOutOfBoundsException(String.valueOf(pos)); if (docPosns == null) return Position.NOPOS;
--- a/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Tue May 07 17:14:17 2013 -0700 @@ -59,7 +59,6 @@ import com.sun.tools.javac.jvm.*; import com.sun.tools.javac.jvm.ClassReader.BadClassFile; import com.sun.tools.javac.main.JavaCompiler; -import com.sun.tools.javac.main.JavaCompiler.CompileState; import com.sun.tools.javac.model.JavacElements; import com.sun.tools.javac.model.JavacTypes; import com.sun.tools.javac.parser.*; @@ -79,6 +78,7 @@ import com.sun.tools.javac.util.Options; import static com.sun.tools.javac.code.Lint.LintCategory.PROCESSING; import static com.sun.tools.javac.main.Option.*; +import static com.sun.tools.javac.comp.CompileStates.CompileState; import static com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag.*; /**
--- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties Tue May 07 17:14:17 2013 -0700 @@ -216,9 +216,14 @@ compiler.misc.no.suitable.functional.intf.inst=\ cannot infer functional interface descriptor for {0} +# 0: message segment +compiler.misc.bad.intersection.target.for.functional.expr=\ + bad intersection type target for lambda or method reference\n\ + {0} + # 0: type -compiler.misc.secondary.bound.must.be.marker.intf=\ - secondary bound {0} must be a marker interface +compiler.misc.not.an.intf.component=\ + component type {0} is not an interface # 0: symbol kind, 1: message segment compiler.err.invalid.mref=\ @@ -485,6 +490,10 @@ compiler.err.illegal.forward.ref=\ illegal forward reference +# 0: symbol, 1: string +compiler.err.not.in.profile=\ + {0} is not available in profile ''{1}'' + # 0: symbol compiler.warn.forward.ref=\ reference to variable ''{0}'' before it has been initialized @@ -724,6 +733,14 @@ compiler.misc.incompatible.arg.types.in.lambda=\ incompatible parameter types in lambda expression +compiler.misc.incompatible.arg.types.in.mref=\ + incompatible parameter types in method reference + +# 0: list of type +compiler.misc.bad.arg.types.in.lambda=\ + cannot type-check lambda expression with inferred parameter types\n\ + inferred types: {0} + compiler.err.new.not.allowed.in.annotation=\ ''new'' not allowed in an annotation @@ -759,6 +776,10 @@ compiler.err.not.def.public.cant.access=\ {0} is not public in {1}; cannot be accessed from outside package +# 0: symbol, 1: symbol +compiler.misc.not.def.public.cant.access=\ + {0} is not public in {1}; cannot be accessed from outside package + # 0: name compiler.err.not.loop.label=\ not a loop label: {0} @@ -1999,6 +2020,10 @@ compiler.misc.non-static.cant.be.ref=\ non-static {0} {1} cannot be referenced from a static context +# 0: symbol kind, 1: symbol +compiler.misc.static.method.in.unbound.lookup=\ + static {0} {1} found in unbound lookup + ## Both arguments ({0}, {1}) are "kindname"s. {0} is a comma-separated list ## of kindnames (the list should be identical to that provided in source. compiler.err.unexpected.type=\ @@ -2170,6 +2195,10 @@ {0}\n\ overridden method does not throw {1} +# 0: symbol +compiler.warn.override.equals.but.not.hashcode=\ + Class {0} overrides equals, but neither it nor any superclass overrides hashCode method + ## The following are all possible strings for the first argument ({0}) of the ## above strings. # 0: symbol, 1: symbol, 2: symbol, 3: symbol
--- a/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Tue May 07 17:14:17 2013 -0700 @@ -65,8 +65,11 @@ compiler.err.already.annotated={0} {1}\u306F\u6CE8\u91C8\u304C\u4ED8\u3044\u3066\u3044\u307E\u3059 -# 0: symbol, 1: symbol -compiler.err.already.defined={0}\u306F{1}\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059 +# 0: symbol kind, 1: symbol, 2: symbol kind, 3: symbol +compiler.err.already.defined={0} {1}\u306F\u3059\u3067\u306B{2} {3}\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059 + +# 0: symbol kind, 1: symbol, 2: symbol kind, 3: symbol kind, 4: symbol +compiler.err.already.defined.in.clinit={0} {1}\u306F\u3059\u3067\u306B{3} {4}\u306E{2}\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059 # 0: string compiler.err.already.defined.single.import={0}\u306F\u5358\u4E00\u306E\u578B\u30A4\u30F3\u30DD\u30FC\u30C8\u5BA3\u8A00\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059 @@ -109,28 +112,84 @@ # 0: type compiler.err.array.req.but.found=\u914D\u5217\u304C\u8981\u6C42\u3055\u308C\u307E\u3057\u305F\u304C\u3001{0}\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F -compiler.err.assignment.from.super-bound=\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9{0}\u304B\u3089\u4EE3\u5165\u3057\u3066\u3044\u307E\u3059 - -compiler.err.assignment.to.extends-bound=\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9{0}\u3078\u4EE3\u5165\u3057\u3066\u3044\u307E\u3059 - compiler.err.attribute.value.must.be.constant=\u5C5E\u6027\u306E\u5024\u306F\u5B9A\u6570\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059 +# 0: statement type +compiler.err.bad.initializer={0}\u306E\u4E0D\u6B63\u306A\u521D\u671F\u5316\u5B50 + compiler.err.break.outside.switch.loop=break\u304Cswitch\u6587\u307E\u305F\u306F\u30EB\u30FC\u30D7\u306E\u5916\u306B\u3042\u308A\u307E\u3059 # 0: name compiler.err.call.must.be.first.stmt.in.ctor={0}\u306E\u547C\u51FA\u3057\u306F\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u5148\u982D\u6587\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059 -compiler.err.cant.apply.symbol={4} {5}\u306E{0} {1}\u306F\u6307\u5B9A\u3055\u308C\u305F\u578B\u306B\u9069\u7528\u3067\u304D\u307E\u305B\u3093\n\u671F\u5F85\u5024: {2}\n\u691C\u51FA\u5024: {3} - # 0: symbol kind, 1: name, 2: list of type or message segment, 3: list of type or message segment, 4: symbol kind, 5: type, 6: message segment -compiler.err.cant.apply.symbol.1={4} {5}\u306E{0} {1}\u306F\u6307\u5B9A\u3055\u308C\u305F\u578B\u306B\u9069\u7528\u3067\u304D\u307E\u305B\u3093\u3002\n\u671F\u5F85\u5024: {2}\n\u691C\u51FA\u5024: {3}\n\u7406\u7531: {6} +compiler.err.cant.apply.symbol={4} {5}\u306E{0} {1}\u306F\u6307\u5B9A\u3055\u308C\u305F\u578B\u306B\u9069\u7528\u3067\u304D\u307E\u305B\u3093\u3002\n\u671F\u5F85\u5024: {2}\n\u691C\u51FA\u5024: {3}\n\u7406\u7531: {6} # 0: symbol kind, 1: name, 2: list of type compiler.err.cant.apply.symbols={1}\u306B\u9069\u5207\u306A{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093({2}) +# 0: symbol kind, 1: name, 2: list of type or message segment, 3: list of type or message segment, 4: symbol kind, 5: type, 6: message segment +compiler.misc.cant.apply.symbol={4} {5}\u306E{0} {1}\u306F\u6307\u5B9A\u3055\u308C\u305F\u578B\u306B\u9069\u7528\u3067\u304D\u307E\u305B\u3093\n\u671F\u5F85\u5024: {2}\n\u691C\u51FA\u5024: {3}\n\u7406\u7531: {6} + +# 0: symbol kind, 1: name, 2: list of type +compiler.misc.cant.apply.symbols={1}\u306B\u9069\u5207\u306A{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093({2}) + +# 0: symbol kind, 1: symbol +compiler.misc.no.abstracts={0} {1}\u3067\u62BD\u8C61\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093 + +# 0: symbol kind, 1: symbol +compiler.misc.incompatible.abstracts={0} {1}\u3067\u8907\u6570\u306E\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u306A\u3044\u62BD\u8C61\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F + +compiler.err.bad.functional.intf.anno=\u4E88\u671F\u3057\u306A\u3044@FunctionalInterface\u6CE8\u91C8 + +# 0: message segment +compiler.err.bad.functional.intf.anno.1=\u4E88\u671F\u3057\u306A\u3044@FunctionalInterface\u6CE8\u91C8\n{0} + +# 0: symbol +compiler.misc.not.a.functional.intf={0}\u306F\u6A5F\u80FD\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093 + +# 0: symbol, 1: message segment +compiler.misc.not.a.functional.intf.1={0}\u306F\u6A5F\u80FD\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\n{1} + +# 0: symbol, 1: symbol kind, 2: symbol +compiler.misc.invalid.generic.lambda.target=\u30E9\u30E0\u30C0\u5F0F\u306E\u6A5F\u80FD\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u304C\u7121\u52B9\u3067\u3059\n{1} {2}\u306E\u30E1\u30BD\u30C3\u30C9{0}\u306F\u6C4E\u7528\u3067\u3059 + +# 0: symbol kind, 1: symbol +compiler.misc.incompatible.descs.in.functional.intf={0} {1}\u3067\u4E0D\u9069\u5408\u306A\u6A5F\u80FD\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F + +# 0: name, 1: list of type, 2: type, 3: list of type +compiler.misc.descriptor=\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF: {2} {0}({1}) + +# 0: name, 1: list of type, 2: type, 3: list of type +compiler.misc.descriptor.throws=\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF: {2} {0}({1})\u3067{3}\u304C\u30B9\u30ED\u30FC\u3055\u308C\u307E\u3059 + +# 0: type +compiler.misc.no.suitable.functional.intf.inst={0}\u306E\u6A5F\u80FD\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093 + +# 0: type +compiler.misc.secondary.bound.must.be.marker.intf=\u30BB\u30AB\u30F3\u30C0\u30EA\u30FB\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0{0}\u306F\u30DE\u30FC\u30AB\u30FC\u30FB\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059 + +# 0: symbol kind, 1: message segment +compiler.err.invalid.mref={0}\u53C2\u7167\u304C\u7121\u52B9\u3067\u3059\u3002{1} + +# 0: symbol kind, 1: message segment +compiler.misc.invalid.mref={0}\u53C2\u7167\u304C\u7121\u52B9\u3067\u3059\u3002{1} + +compiler.misc.static.mref.with.targs=static\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u5316\u3055\u308C\u305F\u4FEE\u98FE\u5B50 + +compiler.misc.static.bound.mref=static\u306E\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9\u53C2\u7167 + # 0: symbol compiler.err.cant.assign.val.to.final.var=final\u5909\u6570{0}\u306B\u5024\u3092\u4EE3\u5165\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 +# 0: symbol, 1: message segment +compiler.err.cant.ref.non.effectively.final.var={1}\u304B\u3089\u53C2\u7167\u3055\u308C\u308B\u30ED\u30FC\u30AB\u30EB\u5909\u6570\u306F\u3001final\u307E\u305F\u306F\u4E8B\u5B9F\u4E0A\u306Efinal\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059 + + +compiler.misc.lambda=\u30E9\u30E0\u30C0\u5F0F + +compiler.misc.inner.cls=\u5185\u90E8\u30AF\u30E9\u30B9 + # 0: type compiler.err.cant.deref={0}\u306F\u9593\u63A5\u53C2\u7167\u3067\u304D\u307E\u305B\u3093 @@ -142,8 +201,6 @@ # 0: symbol compiler.err.cant.ref.before.ctor.called=\u30B9\u30FC\u30D1\u30FC\u30BF\u30A4\u30D7\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u547C\u51FA\u3057\u524D\u306F{0}\u3092\u53C2\u7167\u3067\u304D\u307E\u305B\u3093 -compiler.err.cant.ret.val.from.meth.decl.void=\u623B\u308A\u5024\u306E\u578B\u304Cvoid\u306E\u30E1\u30BD\u30C3\u30C9\u304B\u3089\u306F\u5024\u3092\u8FD4\u305B\u307E\u305B\u3093 - compiler.err.cant.select.static.class.from.param.type=\u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u3055\u308C\u305F\u578B\u304B\u3089static\u30AF\u30E9\u30B9\u3092\u9078\u629E\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 # 0: symbol, 1: string, 2: string @@ -154,6 +211,8 @@ # 0: symbol kind, 1: symbol compiler.err.clash.with.pkg.of.same.name={0} {1}\u306F\u540C\u540D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3068\u7AF6\u5408\u3057\u307E\u3059 +compiler.err.class.not.allowed=\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u307E\u305F\u306F\u5217\u6319\u578B\u306E\u5BA3\u8A00\u3092\u3053\u3053\u3067\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 + compiler.err.const.expr.req=\u5B9A\u6570\u5F0F\u304C\u5FC5\u8981\u3067\u3059 compiler.err.cont.outside.loop=continue\u304C\u30EB\u30FC\u30D7\u306E\u5916\u306B\u3042\u308A\u307E\u3059 @@ -169,10 +228,8 @@ # 0: type compiler.err.no.superclass={0}\u306B\u306F\u30B9\u30FC\u30D1\u30FC\u30AF\u30E9\u30B9\u304C\u3042\u308A\u307E\u305B\u3093 -compiler.err.wrong.target.for.polymorphic.signature.definition=MethodHandle API\u306E\u4F5C\u6210\u306B\u306F-target 7\u30E9\u30F3\u30BF\u30A4\u30E0\u4EE5\u4E0A\u304C\u5FC5\u8981\u3067\u3059\u3002\u73FE\u5728\u306F-target {0}\u3067\u3059 - # 0: symbol, 1: type, 2: symbol, 3: type, 4: unused -compiler.err.concrete.inheritance.conflict={1}\u306E\u30E1\u30BD\u30C3\u30C9{0}\u3068{3}\u306E{2}\u306F\u540C\u3058\u30B7\u30B0\u30CB\u30C1\u30E3\u304B\u3089\u7D99\u627F\u3055\u308C\u3066\u3044\u307E\u3059 +compiler.err.concrete.inheritance.conflict={1}\u306E\u30E1\u30BD\u30C3\u30C9{0}\u3068{3}\u306E{2}\u306F\u540C\u3058\u30B7\u30B0\u30CD\u30C1\u30E3\u304B\u3089\u7D99\u627F\u3055\u308C\u3066\u3044\u307E\u3059 compiler.err.default.allowed.in.intf.annotation.member=\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u306F@interface\u30E1\u30F3\u30D0\u30FC\u5185\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059 @@ -181,9 +238,48 @@ compiler.err.duplicate.annotation=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059 +# 0: type +compiler.err.duplicate.annotation.invalid.repeated=\u6CE8\u91C8{0}\u3092\u7E70\u308A\u8FD4\u305B\u307E\u305B\u3093\n\u6709\u52B9\u306A\u5305\u542B\u3059\u308B\u6CE8\u91C8\u304C\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 + # 0: name, 1: type compiler.err.duplicate.annotation.member.value={1}\u306E\u6CE8\u91C8\u30E1\u30F3\u30D0\u30FC\u306E\u5024{0}\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059 +# 0: type, 1: type +compiler.err.duplicate.annotation.missing.container=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002{0}\u306E\u5BA3\u8A00\u306B\u306F\u6709\u52B9\u306A{1}\u6CE8\u91C8\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093 + +# 0: type +compiler.err.invalid.repeatable.annotation=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002{0}\u306F\u7121\u52B9\u306A\u7E70\u8FD4\u3057\u53EF\u80FD\u6CE8\u91C8\u3067\u6CE8\u91C8\u4ED8\u3051\u3055\u308C\u3066\u3044\u307E\u3059 + +# 0: type +compiler.err.invalid.repeatable.annotation.no.value=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002{0}\u306F\u6709\u52B9\u306A\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u3082\u306E\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u5024\u8981\u7D20\u30E1\u30BD\u30C3\u30C9\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093 + +# 0: type, 1: number +compiler.err.invalid.repeatable.annotation.multiple.values=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002{0}\u306F\u6709\u52B9\u306A\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u3082\u306E\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002{1}\u5024\u8981\u7D20\u30E1\u30BD\u30C3\u30C9\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059 + +# 0: type +compiler.err.invalid.repeatable.annotation.invalid.value=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002{0}\u306F\u6709\u52B9\u306A\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u3082\u306E\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u5024\u8981\u7D20\u304C\u7121\u52B9\u3067\u3059\u3002\u30E1\u30BD\u30C3\u30C9\u304C\u5FC5\u8981\u3067\u3059 + +# 0: type, 1: type, 2: type +compiler.err.invalid.repeatable.annotation.value.return=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002\u5305\u542B\u3059\u308B\u6CE8\u91C8{0}\u306E\u5024\u8981\u7D20\u306B\u306F\u578B{2}\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002{1}\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F + +# 0: type, 1: symbol +compiler.err.invalid.repeatable.annotation.elem.nondefault=\u5305\u542B\u3059\u308B\u6CE8\u91C8{0}\u306B\u306F\u8981\u7D20{1}\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093 + +# 0: symbol, 1: type, 2: symbol, 3: type +compiler.err.invalid.repeatable.annotation.retention=\u5305\u542B\u3059\u308B\u6CE8\u91C8{0}\u306B\u306F\u3001\u4FDD\u6709{3}\u3092\u542B\u3080\u5305\u542B\u3055\u308C\u305F\u6CE8\u91C8{2}\u3088\u308A\u77ED\u3044\u4FDD\u6709({1})\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059 + +# 0: symbol, 1: symbol +compiler.err.invalid.repeatable.annotation.not.documented=\u7E70\u308A\u8FD4\u3055\u308C\u305F\u6CE8\u91C8{1}\u306F@Documented\u3067\u3059\u304C\u3001\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30BF\u30A4\u30D7{0}\u306F\u9055\u3044\u307E\u3059 + +# 0: symbol, 1: symbol +compiler.err.invalid.repeatable.annotation.not.inherited=\u308A\u8FD4\u3055\u308C\u305F\u6CE8\u91C8\u30BF\u30A4\u30D7{1}\u306F@Inherited\u3067\u3059\u304C\u3001\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30BF\u30A4\u30D7{0}\u306F\u9055\u3044\u307E\u3059 + +# 0: symbol, 1: symbol +compiler.err.invalid.repeatable.annotation.incompatible.target=\u30B3\u30F3\u30C6\u30CA\u6CE8\u91C8{0}\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u306F\u3001\u7E70\u308A\u8FD4\u3055\u308C\u305F\u6CE8\u91C8{1}\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u306E\u30B5\u30D6\u30BB\u30C3\u30C8\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002 + +# 0: symbol +compiler.err.invalid.repeatable.annotation.repeated.and.container.present=\u30B3\u30F3\u30C6\u30CA{0}\u306F\u542B\u307E\u308C\u3066\u3044\u308B\u8981\u7D20\u3068\u540C\u6642\u306B\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093 + # 0: name compiler.err.duplicate.class=\u30AF\u30E9\u30B9{0}\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059 @@ -245,10 +341,10 @@ compiler.err.generic.throwable=\u6C4E\u7528\u30AF\u30E9\u30B9\u306Fjava.lang.Throwable\u3092\u62E1\u5F35\u3067\u304D\u307E\u305B\u3093 # 0: symbol -compiler.err.icls.cant.have.static.decl=\u5185\u90E8\u30AF\u30E9\u30B9{0}\u306E\u9759\u7684\u5BA3\u8A00\u304C\u4E0D\u6B63\u3067\u3059\n\u4FEE\u98FE\u5B50\''static\''\u306F\u5B9A\u6570\u304A\u3088\u3073\u5909\u6570\u306E\u5BA3\u8A00\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059 +compiler.err.icls.cant.have.static.decl=\u5185\u90E8\u30AF\u30E9\u30B9{0}\u306E\u9759\u7684\u5BA3\u8A00\u304C\u4E0D\u6B63\u3067\u3059\n\u4FEE\u98FE\u5B50''static''\u306F\u5B9A\u6570\u304A\u3088\u3073\u5909\u6570\u306E\u5BA3\u8A00\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059 # 0: string -compiler.err.illegal.char=\\{0}\u306F\u4E0D\u6B63\u306A\u6587\u5B57\u3067\u3059 +compiler.err.illegal.char=''{0}''\u306F\u4E0D\u6B63\u306A\u6587\u5B57\u3067\u3059 compiler.err.illegal.char.for.encoding=\u3053\u306E\u6587\u5B57\u306F\u3001\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0{0}\u306B\u30DE\u30C3\u30D7\u3067\u304D\u307E\u305B\u3093 @@ -280,11 +376,15 @@ compiler.err.illegal.underscore=\u4E0D\u6B63\u306A\u30A2\u30F3\u30C0\u30FC\u30B9\u30B3\u30A2\u3067\u3059 +compiler.err.illegal.dot=\u4E0D\u6B63\u306A''.''\u3067\u3059 + # 0: symbol compiler.err.illegal.qual.not.icls=\u4FEE\u98FE\u5B50\u304C\u4E0D\u6B63\u3067\u3059\u3002{0}\u306F\u5185\u90E8\u30AF\u30E9\u30B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093 compiler.err.illegal.start.of.expr=\u5F0F\u306E\u958B\u59CB\u304C\u4E0D\u6B63\u3067\u3059 +compiler.err.illegal.start.of.stmt=\u6587\u306E\u958B\u59CB\u304C\u4E0D\u6B63\u3067\u3059 + compiler.err.illegal.start.of.type=\u578B\u306E\u958B\u59CB\u304C\u4E0D\u6B63\u3067\u3059 compiler.err.illegal.unicode.esc=Unicode\u30A8\u30B9\u30B1\u30FC\u30D7\u304C\u4E0D\u6B63\u3067\u3059 @@ -302,8 +402,6 @@ # 0: number compiler.err.int.number.too.large=\u6574\u6570{0}\u304C\u5927\u304D\u3059\u304E\u307E\u3059 -compiler.err.internal.error.cant.instantiate=\u5185\u90E8\u30A8\u30E9\u30FC\u3067\u3059\u3002{0}\u3092{1}\u3067({2})\u306B\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u751F\u6210\u3067\u304D\u307E\u305B\u3093 - compiler.err.intf.annotation.members.cant.have.params=@interface\u30E1\u30F3\u30D0\u30FC\u304C\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 compiler.err.intf.annotation.cant.have.type.params=@interface\u304C\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 @@ -315,7 +413,7 @@ compiler.err.intf.expected.here=\u3053\u3053\u306B\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304C\u5FC5\u8981\u3067\u3059 -compiler.err.intf.meth.cant.have.body=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u30FB\u30E1\u30BD\u30C3\u30C9\u304C\u672C\u4F53\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 +compiler.err.intf.meth.cant.have.body=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u62BD\u8C61\u30E1\u30BD\u30C3\u30C9\u304C\u672C\u4F53\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 compiler.err.invalid.annotation.member.type=\u6CE8\u91C8\u30E1\u30F3\u30D0\u30FC\u306E\u578B\u304C\u4E0D\u6B63\u3067\u3059 @@ -327,6 +425,8 @@ compiler.err.varargs.and.old.array.syntax=\u65E7\u5F0F\u306E\u914D\u5217\u8868\u8A18\u6CD5\u306F\u53EF\u5909\u5F15\u6570\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093 +compiler.err.variable.not.allowed=\u5909\u6570\u306E\u5BA3\u8A00\u3092\u3053\u3053\u3067\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 + # 0: name compiler.err.label.already.in.use=\u30E9\u30D9\u30EB{0}\u306F\u3059\u3067\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059 @@ -337,6 +437,8 @@ compiler.err.cannot.create.array.with.type.arguments=\u578B\u5F15\u6570\u3092\u6301\u3064\u914D\u5217\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093 +compiler.err.cannot.create.array.with.diamond=''<>''\u3092\u6301\u3064\u914D\u5217\u306F\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093 + # # limits. We don't give the limits in the diagnostic because we expect # them to change, yet we want to use the same diagnostic. These are all @@ -360,7 +462,7 @@ compiler.err.limit.string=\u5B9A\u6570\u6587\u5B57\u5217\u304C\u9577\u3059\u304E\u307E\u3059 -compiler.err.limit.string.overflow=\u6587\u5B57\u5217\"{0}...\"\u306EUTF8\u8868\u73FE\u304C\u3001\u5B9A\u6570\u30D7\u30FC\u30EB\u306B\u5BFE\u3057\u3066\u9577\u3059\u304E\u307E\u3059 +compiler.err.limit.string.overflow=\u6587\u5B57\u5217"{0}..."\u306EUTF8\u8868\u73FE\u304C\u3001\u5B9A\u6570\u30D7\u30FC\u30EB\u306B\u5BFE\u3057\u3066\u9577\u3059\u304E\u307E\u3059 compiler.err.malformed.fp.lit=\u6D6E\u52D5\u5C0F\u6570\u70B9\u30EA\u30C6\u30E9\u30EB\u304C\u4E0D\u6B63\u3067\u3059 @@ -370,7 +472,9 @@ compiler.err.missing.ret.stmt=return\u6587\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093 -compiler.err.missing.ret.val=\u623B\u308A\u5024\u304C\u3042\u308A\u307E\u305B\u3093 +compiler.misc.missing.ret.val=\u623B\u308A\u5024\u304C\u3042\u308A\u307E\u305B\u3093 + +compiler.misc.unexpected.ret.val=\u4E88\u671F\u3057\u306A\u3044\u623B\u308A\u5024 # 0: set of modifier compiler.err.mod.not.allowed.here=\u4FEE\u98FE\u5B50{0}\u3092\u3053\u3053\u3067\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 @@ -396,7 +500,26 @@ compiler.err.native.meth.cant.have.body=native\u30E1\u30BD\u30C3\u30C9\u304C\u672C\u4F53\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 # 0: type, 1: type -compiler.err.neither.conditional.subtype=?\u306B\u5BFE\u3059\u308B\u4E92\u63DB\u6027\u306E\u306A\u3044\u578B : \u3069\u3061\u3089\u3082\u4ED6\u65B9\u306E\u30B5\u30D6\u30BF\u30A4\u30D7\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\n2\u756A\u76EE\u306E\u30AA\u30DA\u30E9\u30F3\u30C9 : {0}\n3\u756A\u76EE\u306E\u30AA\u30DA\u30E9\u30F3\u30C9 : {1} +compiler.err.neither.conditional.subtype=?\u306B\u5BFE\u3059\u308B\u4E0D\u9069\u5408\u306A\u578B : \u3069\u3061\u3089\u3082\u4ED6\u65B9\u306E\u30B5\u30D6\u30BF\u30A4\u30D7\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\n2\u756A\u76EE\u306E\u30AA\u30DA\u30E9\u30F3\u30C9 : {0}\n3\u756A\u76EE\u306E\u30AA\u30DA\u30E9\u30F3\u30C9 : {1} + +# 0: message segment +compiler.misc.incompatible.type.in.conditional=\u6761\u4EF6\u5F0F\u306E\u578B\u304C\u4E0D\u6B63\u3067\u3059\u3002{0} + +compiler.misc.conditional.target.cant.be.void=\u6761\u4EF6\u5F0F\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u578B\u306Fvoid\u306B\u3067\u304D\u307E\u305B\u3093 + +# 0: type +compiler.misc.incompatible.ret.type.in.lambda=\u30E9\u30E0\u30C0\u5F0F\u306E\u623B\u308A\u578B\u304C\u4E0D\u6B63\u3067\u3059\n{0} + +# 0: type +compiler.misc.incompatible.ret.type.in.mref=\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306E\u623B\u308A\u578B\u304C\u4E0D\u6B63\u3067\u3059\n{0} + +# 0: list of type +compiler.err.incompatible.thrown.types.in.lambda=\u30E9\u30E0\u30C0\u5F0F\u3067\u30B9\u30ED\u30FC\u3055\u308C\u305F\u30BF\u30A4\u30D7{0}\u306F\u4E0D\u9069\u5408\u3067\u3059 + +# 0: list of type +compiler.err.incompatible.thrown.types.in.mref=\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306E\u30B9\u30ED\u30FC\u3055\u308C\u305F\u30BF\u30A4\u30D7{0}\u306F\u4E0D\u9069\u5408\u3067\u3059 + +compiler.misc.incompatible.arg.types.in.lambda=\u30E9\u30E0\u30C0\u5F0F\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u578B\u306F\u4E0D\u9069\u5408\u3067\u3059 compiler.err.new.not.allowed.in.annotation=''new''\u306F\u6CE8\u91C8\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093 @@ -414,6 +537,12 @@ compiler.err.not.def.access.class.intf.cant.access={1}\u306E{0}\u304C\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u306A\u3044\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059 # 0: symbol, 1: symbol +compiler.misc.not.def.access.class.intf.cant.access={1}\u306E{0}\u304C\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u306A\u3044\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059 + +# 0: symbol, 1: list of type, 2: type +compiler.misc.cant.access.inner.cls.constr=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF{0}({1})\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n\u5185\u90E8\u30AF\u30E9\u30B9\u3092\u56F2\u3080\u578B{2}\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u30B9\u30B3\u30FC\u30D7\u5185\u306B\u3042\u308A\u307E\u305B\u3093 + +# 0: symbol, 1: symbol compiler.err.not.def.public.cant.access={1}\u306E{0}\u306Fpublic\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u5916\u304B\u3089\u306F\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093 # 0: name @@ -440,7 +569,7 @@ # Errors related to annotation processing # 0: symbol, 1: string, 2: stack-trace -compiler.err.proc.cant.access={0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n{1}\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n{2} +compiler.err.proc.cant.access={0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n{1}\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n{2} # 0: symbol, 1: string compiler.err.proc.cant.access.1={0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n{1} @@ -455,15 +584,13 @@ # 0: list of string compiler.err.proc.no.explicit.annotation.processing.requested=\u30AF\u30E9\u30B9\u540D''{0}''\u304C\u53D7\u3051\u5165\u308C\u3089\u308C\u308B\u306E\u306F\u3001\u6CE8\u91C8\u51E6\u7406\u304C\u660E\u793A\u7684\u306B\u30EA\u30AF\u30A8\u30B9\u30C8\u3055\u308C\u305F\u5834\u5408\u306E\u307F\u3067\u3059 -compiler.err.proc.no.service=\u30B5\u30FC\u30D3\u30B9\u30FB\u30ED\u30FC\u30C0\u30FC\u30FB\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002\njava.util.ServiceLoader\u304Bsun.misc.Service\u304C\u4F7F\u7528\u3067\u304D\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +compiler.err.proc.no.service=\u30B5\u30FC\u30D3\u30B9\u30FB\u30ED\u30FC\u30C0\u30FC\u304C\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u304C\u3001\u6CE8\u91C8\u51E6\u7406\u306B\u5FC5\u8981\u3067\u3059\u3002 compiler.err.proc.processor.bad.option.name=\u30D7\u30ED\u30BB\u30C3\u30B5''{1}''\u306B\u3088\u3063\u3066\u6307\u5B9A\u3055\u308C\u305F\u30AA\u30D7\u30B7\u30E7\u30F3\u540D''{0}''\u304C\u4E0D\u6B63\u3067\u3059 # 0: string compiler.err.proc.processor.cant.instantiate=\u30D7\u30ED\u30BB\u30C3\u30B5''{0}''\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F -compiler.err.proc.processor.constructor.error=\u30D7\u30ED\u30BB\u30C3\u30B5\u30FB\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u69CB\u7BC9\u4E2D\u306B\u4F8B\u5916\u304C\u30B9\u30ED\u30FC\u3055\u308C\u307E\u3057\u305F: {0} - # 0: string compiler.err.proc.processor.not.found=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{0}''\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093 @@ -482,7 +609,10 @@ compiler.err.recursive.ctor.invocation=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u547C\u51FA\u3057\u304C\u518D\u5E30\u7684\u3067\u3059 # 0: name, 1: symbol kind, 2: symbol, 3: symbol, 4: symbol kind, 5: symbol, 6: symbol -compiler.err.ref.ambiguous={0}\u306E\u53C2\u7167\u306F\u3042\u3044\u307E\u3044\u3067\u3059\u3002{3}\u306E{1} {2}\u3068{6}\u306E{4} {5}\u304C\u4E21\u65B9\u9069\u5408\u3057\u307E\u3059 +compiler.err.ref.ambiguous={0}\u306E\u53C2\u7167\u306F\u3042\u3044\u307E\u3044\u3067\u3059\n{3}\u306E{1} {2}\u3068{6}\u306E{4} {5}\u306E\u4E21\u65B9\u304C\u4E00\u81F4\u3057\u307E\u3059 + +# 0: name, 1: symbol kind, 2: symbol, 3: symbol, 4: symbol kind, 5: symbol, 6: symbol +compiler.misc.ref.ambiguous={0}\u306E\u53C2\u7167\u306F\u3042\u3044\u307E\u3044\u3067\u3059\n{3}\u306E{1} {2}\u3068{6}\u306E{4} {5}\u306E\u4E21\u65B9\u304C\u4E00\u81F4\u3057\u307E\u3059 compiler.err.repeated.annotation.target=\u6CE8\u91C8\u30BF\u30FC\u30B2\u30C3\u30C8\u304C\u7E70\u308A\u8FD4\u3055\u308C\u3066\u3044\u307E\u3059 @@ -495,9 +625,9 @@ compiler.err.ret.outside.meth=\u30E1\u30BD\u30C3\u30C9\u306E\u5916\u306Ereturn\u6587\u3067\u3059 -compiler.err.signature.doesnt.match.supertype=\u30B7\u30B0\u30CB\u30C1\u30E3\u304C{0}\u306B\u9069\u5408\u3057\u307E\u305B\u3093\u3002\u4E92\u63DB\u6027\u306E\u306A\u3044\u30B9\u30FC\u30D1\u30FC\u30BF\u30A4\u30D7\u3067\u3059 - -compiler.err.signature.doesnt.match.intf=\u30B7\u30B0\u30CB\u30C1\u30E3\u304C{0}\u306B\u9069\u5408\u3057\u307E\u305B\u3093\u3002\u4E92\u63DB\u6027\u306E\u306A\u3044\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u3059 +compiler.err.signature.doesnt.match.supertype=\u30B7\u30B0\u30CD\u30C1\u30E3\u304C{0}\u306B\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002\u4E0D\u9069\u5408\u306A\u30B9\u30FC\u30D1\u30FC\u30BF\u30A4\u30D7\u3067\u3059 + +compiler.err.signature.doesnt.match.intf=\u30B7\u30B0\u30CD\u30C1\u30E3\u304C{0}\u306B\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002\u4E0D\u9069\u5408\u306A\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u3059 # 0: symbol, 1: symbol, 2: symbol compiler.err.does.not.override.abstract={0}\u306Fabstract\u3067\u306A\u304F\u3001{2}\u5185\u306Eabstract\u30E1\u30BD\u30C3\u30C9{1}\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u305B\u3093 @@ -534,7 +664,28 @@ compiler.err.type.var.more.than.once.in.result=\u578B\u5909\u6570{0}\u306F{1}\u306E\u578B\u30672\u56DE\u4EE5\u4E0A\u51FA\u73FE\u3057\u307E\u3059\u3002\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u751F\u6210\u3055\u308C\u306A\u3044\u307E\u307E\u306B\u306F\u3067\u304D\u307E\u305B\u3093 # 0: type, 1: type, 2: string -compiler.err.types.incompatible.diff.ret=\u578B{0}\u3068\u578B{1}\u306E\u4E92\u63DB\u6027\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u4E21\u65B9\u3068\u3082{2}\u3092\u5B9A\u7FA9\u3057\u3066\u3044\u307E\u3059\u304C\u3001\u623B\u308A\u5024\u306E\u578B\u304C\u7121\u95A2\u4FC2\u3067\u3059 +compiler.err.types.incompatible.diff.ret=\u578B{0}\u3068\u578B{1}\u304C\u9069\u5408\u3057\u3066\u3044\u307E\u305B\u3093\u3002\u4E21\u65B9\u3068\u3082{2}\u3092\u5B9A\u7FA9\u3057\u3066\u3044\u307E\u3059\u304C\u3001\u623B\u308A\u5024\u306E\u578B\u304C\u7121\u95A2\u4FC2\u3067\u3059 + +# 0: kind, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol +compiler.err.types.incompatible.unrelated.defaults={0} {1}\u306F\u578B{4}\u3068{5}\u304B\u3089{2}({3})\u306E\u95A2\u9023\u3057\u306A\u3044\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u7D99\u627F\u3057\u307E\u3059 + +# 0: kind, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol +compiler.err.types.incompatible.abstract.default={0} {1}\u306F\u578B{4}\u3068{5}\u304B\u3089{2}({3})\u306E\u62BD\u8C61\u3068\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u7D99\u627F\u3057\u307E\u3059 + +# 0: name, 1: kind, 2: symbol +compiler.err.default.overrides.object.member={1} {2}\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E1\u30BD\u30C3\u30C9{0}\u306Fjava.lang.Object\u306E\u30E1\u30F3\u30D0\u30FC\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059 + +# 0: type +compiler.err.illegal.static.intf.meth.call=static\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u30FB\u30E1\u30BD\u30C3\u30C9\u30FB\u30B3\u30FC\u30EB\u304C\u4E0D\u6B63\u3067\u3059\n\u53D7\u4FE1\u5F0F\u306F\u578B\u4FEE\u98FE\u5B50''{0}''\u3067\u7F6E\u63DB\u3055\u308C\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059 + +# 0: type, 1: message segment +compiler.err.illegal.default.super.call=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30B9\u30FC\u30D1\u30FC\u30FB\u30B3\u30FC\u30EB\u306E\u578B\u4FEE\u98FE\u5B50{0}\u304C\u4E0D\u6B63\u3067\u3059\n{1} + +# 0: symbol, 1: type +compiler.misc.overridden.default={1}\u306E\u30E1\u30BD\u30C3\u30C9{0}\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3055\u308C\u307E\u3059 + +# 0: symbol, 1: symbol +compiler.misc.redundant.supertype=\u5197\u9577\u306A\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9{0}\u306F{1}\u306B\u3088\u3063\u3066\u62E1\u5F35\u3055\u308C\u307E\u3057\u305F compiler.err.unclosed.char.lit=\u6587\u5B57\u30EA\u30C6\u30E9\u30EB\u304C\u9589\u3058\u3089\u308C\u3066\u3044\u307E\u305B\u3093 @@ -550,19 +701,14 @@ # 0: name compiler.err.undef.label=\u30E9\u30D9\u30EB{0}\u306F\u672A\u5B9A\u7FA9\u3067\u3059 -compiler.err.undetermined.type={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u5B9A\u3067\u304D\u307E\u305B\u3093 - -# 0: type, 1: message segment -compiler.err.undetermined.type.1={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\n\u7406\u7531: {1} - -# 0: list of type, 1: message segment -compiler.err.invalid.inferred.types={0}\u306E\u63A8\u5B9A\u578B\u304C\u7121\u52B9\u3067\u3059\u3002{1} - # 0: message segment, 1: unused -compiler.err.cant.apply.diamond={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u5B9A\u3067\u304D\u307E\u305B\u3093 - -# 0: message segment, 1: message segment -compiler.err.cant.apply.diamond.1={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\n\u7406\u7531: {1} +compiler.err.cant.apply.diamond={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093 + +# 0: message segment or type, 1: message segment +compiler.err.cant.apply.diamond.1={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093\n\u7406\u7531: {1} + +# 0: message segment or type, 1: message segment +compiler.misc.cant.apply.diamond.1={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093\n\u7406\u7531: {1} compiler.err.unreachable.stmt=\u3053\u306E\u6587\u306B\u5236\u5FA1\u304C\u79FB\u308B\u3053\u3068\u306F\u3042\u308A\u307E\u305B\u3093 @@ -605,7 +751,7 @@ # 0: symbol compiler.misc.varargs.trustme.on.virtual.varargs=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30E1\u30BD\u30C3\u30C9{0}\u306Ffinal\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002 -# 0: type, 1: kind, 2: symbol +# 0: type, 1: symbol kind, 2: symbol compiler.misc.inaccessible.varargs.type=\u4EEE\u53EF\u5909\u5F15\u6570\u8981\u7D20\u578B{0}\u306F{1} {2}\u304B\u3089\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093 # In the following string, {1} will always be the detail message from @@ -620,7 +766,7 @@ ## All errors which do not refer to a particular line in the source code are ## preceded by this string. -compiler.err.error=\u30A8\u30E9\u30FC:\u0020 +compiler.err.error=\u30A8\u30E9\u30FC: # The following error messages do not refer to a line in the source code. compiler.err.cant.read.file={0}\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093 @@ -637,7 +783,7 @@ compiler.misc.fatal.err.cant.locate.ctor=\u81F4\u547D\u7684\u30A8\u30E9\u30FC: {0}\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3092\u691C\u51FA\u3067\u304D\u307E\u305B\u3093 -compiler.misc.fatal.err.cant.close.loader=\u81F4\u547D\u7684\u30A8\u30E9\u30FC: \u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u306E\u30AF\u30E9\u30B9\u30FB\u30ED\u30FC\u30C0\u30FC\u3092\u9589\u3058\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093 +compiler.misc.fatal.err.cant.close=\u81F4\u547D\u7684\u30A8\u30E9\u30FC: \u30B3\u30F3\u30D1\u30A4\u30E9\u30FB\u30EA\u30BD\u30FC\u30B9\u3092\u9589\u3058\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093 ##### @@ -659,21 +805,24 @@ ## The following string will appear before all messages keyed as: ## "compiler.note". + +compiler.note.potential.lambda.found=\u3053\u306E\u533F\u540D\u5185\u90E8\u30AF\u30E9\u30B9\u3092\u30E9\u30E0\u30C0\u5F0F\u306B\u5909\u63DB\u3067\u304D\u307E\u3059\u3002 + compiler.note.note=\u6CE8\u610F: # 0: file name -compiler.note.deprecated.filename={0}\u306F\u63A8\u5968\u3055\u308C\u306A\u3044API\u3092\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002 - -compiler.note.deprecated.plural=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u63A8\u5968\u3055\u308C\u306A\u3044API\u3092\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002 +compiler.note.deprecated.filename={0}\u306F\u975E\u63A8\u5968\u306EAPI\u3092\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002 + +compiler.note.deprecated.plural=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u975E\u63A8\u5968\u306EAPI\u3092\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002 # The following string may appear after one of the above deprecation # messages. compiler.note.deprecated.recompile=\u8A73\u7D30\u306F\u3001-Xlint:deprecation\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u3066\u518D\u30B3\u30F3\u30D1\u30A4\u30EB\u3057\u3066\u304F\u3060\u3055\u3044\u3002 # 0: file name -compiler.note.deprecated.filename.additional={0}\u306B\u63A8\u5968\u3055\u308C\u306A\u3044API\u306E\u8FFD\u52A0\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u304C\u3042\u308A\u307E\u3059\u3002 - -compiler.note.deprecated.plural.additional=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u63A8\u5968\u3055\u308C\u306A\u3044API\u3092\u8FFD\u52A0\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002 +compiler.note.deprecated.filename.additional={0}\u306B\u975E\u63A8\u5968\u306EAPI\u306E\u8FFD\u52A0\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u304C\u3042\u308A\u307E\u3059\u3002 + +compiler.note.deprecated.plural.additional=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u975E\u63A8\u5968\u306EAPI\u3092\u8FFD\u52A0\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002 # 0: file name compiler.note.unchecked.filename={0}\u306E\u64CD\u4F5C\u306F\u3001\u672A\u30C1\u30A7\u30C3\u30AF\u307E\u305F\u306F\u5B89\u5168\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002 @@ -773,12 +922,12 @@ ## ## All warning messages are preceded by the following string. -compiler.warn.warning=\u8B66\u544A: +compiler.warn.warning=\u8B66\u544A: ## Warning messages may also include the following prefix to identify a ## lint option # 0: option name -compiler.warn.lintOption=[{0}]\u0020 +compiler.warn.lintOption=[{0}] # 0: symbol compiler.warn.constant.SVUID=serialVersionUID\u306F\u30AF\u30E9\u30B9{0}\u306E\u5B9A\u6570\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059 @@ -789,7 +938,7 @@ compiler.warn.finally.cannot.complete=finally\u7BC0\u304C\u6B63\u5E38\u306B\u5B8C\u4E86\u3067\u304D\u307E\u305B\u3093 # 0: symbol, 1: symbol -compiler.warn.has.been.deprecated={1}\u306E{0}\u306F\u63A8\u5968\u3055\u308C\u307E\u305B\u3093 +compiler.warn.has.been.deprecated={1}\u306E{0}\u306F\u975E\u63A8\u5968\u306B\u306A\u308A\u307E\u3057\u305F # 0: symbol compiler.warn.sun.proprietary={0}\u306F\u5185\u90E8\u6240\u6709\u306EAPI\u3067\u3042\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059 @@ -925,7 +1074,7 @@ # 0: symbol compiler.warn.varargs.unsafe.use.varargs.param=\u53EF\u5909\u5F15\u6570\u30E1\u30BD\u30C3\u30C9\u306F\u3001\u578B\u60C5\u5831\u4FDD\u6301\u53EF\u80FD\u3067\u306A\u3044\u53EF\u5909\u5F15\u6570\u30D1\u30E9\u30E1\u30FC\u30BF{0}\u304B\u3089\u306E\u30D2\u30FC\u30D7\u6C5A\u67D3\u306E\u539F\u56E0\u3068\u306A\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059 -compiler.warn.missing.deprecated.annotation=\u63A8\u5968\u3055\u308C\u306A\u3044\u9805\u76EE\u306F@Deprecated\u3067\u6CE8\u91C8\u304C\u4ED8\u3051\u3089\u308C\u3066\u3044\u307E\u305B\u3093 +compiler.warn.missing.deprecated.annotation=\u975E\u63A8\u5968\u306E\u9805\u76EE\u306F@Deprecated\u3067\u6CE8\u91C8\u304C\u4ED8\u3051\u3089\u308C\u3066\u3044\u307E\u305B\u3093 compiler.warn.invalid.archive.file=\u30D1\u30B9\u4E0A\u306E\u4E88\u671F\u3057\u306A\u3044\u30D5\u30A1\u30A4\u30EB: {0} @@ -952,7 +1101,7 @@ compiler.warn.diamond.redundant.args=\u65B0\u3057\u3044\u5F0F\u306E\u578B\u5F15\u6570\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059(\u304B\u308F\u308A\u306B\u30C0\u30A4\u30E4\u30E2\u30F3\u30C9\u6F14\u7B97\u5B50\u3092\u4F7F\u7528\u3057\u307E\u3059)\u3002 # 0: type, 1: type -compiler.warn.diamond.redundant.args.1=\u65B0\u3057\u3044\u5F0F\u306E\u578B\u5F15\u6570\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059(\u304B\u308F\u308A\u306B\u30C0\u30A4\u30E4\u30E2\u30F3\u30C9\u6F14\u7B97\u5B50\u3092\u4F7F\u7528\u3057\u307E\u3059)\u3002\n\u660E\u793A\u7684: {0}\n\u63A8\u5B9A: {1} +compiler.warn.diamond.redundant.args.1=\u65B0\u3057\u3044\u5F0F\u306E\u578B\u5F15\u6570\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059(\u304B\u308F\u308A\u306B\u30C0\u30A4\u30E4\u30E2\u30F3\u30C9\u6F14\u7B97\u5B50\u3092\u4F7F\u7528\u3057\u307E\u3059)\u3002\n\u660E\u793A\u7684: {0}\n\u63A8\u8AD6: {1} # 0: symbol, 1: message segment compiler.warn.varargs.redundant.trustme.anno={0}\u6CE8\u91C8\u304C\u5197\u9577\u3067\u3059\u3002{1} @@ -1030,7 +1179,7 @@ ## The following are all possible strings for the second argument ({1}) of the ## above strings. -compiler.misc.bad.class.signature=\u30AF\u30E9\u30B9{0}\u306E\u30B7\u30B0\u30CB\u30C1\u30E3\u304C\u4E0D\u6B63\u3067\u3059 +compiler.misc.bad.class.signature=\u30AF\u30E9\u30B9{0}\u306E\u30B7\u30B0\u30CD\u30C1\u30E3\u304C\u4E0D\u6B63\u3067\u3059 #0: symbol, 1: symbol compiler.misc.bad.enclosing.class={0}\u306E\u5185\u90E8\u30AF\u30E9\u30B9\u304C\u4E0D\u6B63\u3067\u3059: {1} @@ -1044,7 +1193,9 @@ compiler.misc.bad.const.pool.tag.at=\u5B9A\u6570\u30D7\u30FC\u30EB\u30FB\u30BF\u30B0{1}\u3067\u306E{0}\u304C\u4E0D\u6B63\u3067\u3059 -compiler.misc.bad.signature=\u30B7\u30B0\u30CB\u30C1\u30E3{0}\u304C\u4E0D\u6B63\u3067\u3059 +compiler.misc.bad.signature=\u30B7\u30B0\u30CD\u30C1\u30E3{0}\u304C\u4E0D\u6B63\u3067\u3059 + +compiler.misc.bad.type.annotation.value=\u6CE8\u91C8\u30BF\u30FC\u30B2\u30C3\u30C8\u578B\u306E\u5024\u306E\u578B\u304C\u4E0D\u6B63\u3067\u3059: {0} compiler.misc.class.file.wrong.class=\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB{0}\u306B\u4E0D\u6B63\u306A\u30AF\u30E9\u30B9\u304C\u3042\u308A\u307E\u3059 @@ -1077,24 +1228,17 @@ ##### -# 0: message segment, 1: type, 2: type -compiler.err.prob.found.req={0}\n\u671F\u5F85\u5024: {2}\n\u691C\u51FA\u5024: {1} +# 0: message segment +compiler.err.prob.found.req=\u4E0D\u9069\u5408\u306A\u578B: {0} # 0: message segment, 1: type, 2: type compiler.warn.prob.found.req={0}\n\u671F\u5F85\u5024: {2}\n\u691C\u51FA\u5024: {1} -compiler.err.prob.found.req.1={0} {3}\n\u671F\u5F85\u5024: {2}\n\u691C\u51FA\u5024: {1} - -## The following are all possible strings for the first argument ({0}) of the -## above strings. -compiler.misc.incompatible.types=\u4E92\u63DB\u6027\u306E\u306A\u3044\u578B - -# 0: message segment -compiler.misc.incompatible.types.1=\u4E92\u63DB\u6027\u306E\u306A\u3044\u578B\u3002{0} - -compiler.misc.inconvertible.types=\u5909\u63DB\u3067\u304D\u306A\u3044\u578B - -compiler.misc.possible.loss.of.precision=\u7CBE\u5EA6\u304C\u4F4E\u4E0B\u3057\u3066\u3044\u308B\u53EF\u80FD\u6027 +# 0: type, 1: type +compiler.misc.inconvertible.types={0}\u3092{1}\u306B\u5909\u63DB\u3067\u304D\u307E\u305B\u3093: + +# 0: type, 1: type +compiler.misc.possible.loss.of.precision=\u7CBE\u5EA6\u304C\u5931\u308F\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308B{0}\u304B\u3089{1}\u3078\u306E\u5909\u63DB compiler.misc.unchecked.assign=\u7121\u691C\u67FB\u5909\u63DB @@ -1104,16 +1248,13 @@ # assigned array cannot dynamically check its stores compiler.misc.unchecked.cast.to.type=\u7121\u691C\u67FB\u30AD\u30E3\u30B9\u30C8 -compiler.misc.assignment.from.super-bound=\u30B9\u30FC\u30D1\u30FC\u30D0\u30A6\u30F3\u30C9\u578B{0}\u304B\u3089\u306E\u4EE3\u5165 - -compiler.misc.assignment.to.extends-bound=\u62E1\u5F35\u30D0\u30A6\u30F3\u30C9\u578B{0}\u3078\u306E\u4EE3\u5165 - # compiler.err.star.expected=\ # ''*'' expected # compiler.err.no.elem.type=\ # \[\*\] cannot have a type -compiler.misc.try.not.applicable.to.type=try-with-resource\u306F\u5909\u6570\u578B\u306B\u9069\u7528\u3055\u308C\u307E\u305B\u3093 +# 0: type +compiler.misc.try.not.applicable.to.type=try-with-resource\u306F\u5909\u6570\u578B\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\n({0}) ##### @@ -1139,25 +1280,44 @@ ## The following are all possible strings for the last argument of all those ## diagnostics whose key ends in ".1" -compiler.misc.undetermined.type=\u672A\u5B9A\u578B - -compiler.misc.type.variable.has.undetermined.type=\u578B\u5909\u6570{0}\u306F\u672A\u5B9A\u578B\u3067\u3059 # 0: type, 1: list of type compiler.misc.no.unique.maximal.instance.exists=\u578B\u5909\u6570{0}(\u4E0A\u9650{1})\u306E\u56FA\u6709\u306E\u6700\u5927\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u5B58\u5728\u3057\u307E\u305B\u3093 compiler.misc.no.unique.minimal.instance.exists=\u578B\u5909\u6570{0}(\u4E0B\u9650{1})\u306E\u56FA\u6709\u306E\u6700\u5C0F\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u5B58\u5728\u3057\u307E\u305B\u3093 -# 0: list of type, 1: type, 2: type -compiler.misc.infer.no.conforming.instance.exists=\u578B\u5909\u6570{0}\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u5B58\u5728\u3057\u306A\u3044\u306E\u3067\u3001{1}\u306F{2}\u306B\u9069\u5408\u3057\u307E\u305B\u3093 +# 0: type, 1: list of type +compiler.misc.incompatible.upper.bounds=\u63A8\u8AD6\u5909\u6570{0}\u306B\u306F\u3001\u4E0D\u9069\u5408\u306A\u4E0A\u9650{1}\u304C\u3042\u308A\u307E\u3059 + +# 0: type, 1: list of type, 2: list of type +compiler.misc.incompatible.eq.upper.bounds=\u63A8\u8AD6\u5909\u6570{0}\u306B\u306F\u3001\u4E0D\u9069\u5408\u306A\u5883\u754C\u304C\u3042\u308A\u307E\u3059\n\u7B49\u4FA1\u5236\u7D04: {1}\n\u4E0A\u9650: {2} + +# 0: type, 1: list of type, 2: list of type +compiler.misc.incompatible.eq.lower.bounds=\u63A8\u8AD6\u5909\u6570{0}\u306B\u306F\u3001\u4E0D\u9069\u5408\u306A\u5883\u754C\u304C\u3042\u308A\u307E\u3059\n\u7B49\u4FA1\u5236\u7D04: {1}\n\u4E0B\u9650: {2} # 0: list of type, 1: type, 2: type -compiler.misc.infer.no.conforming.assignment.exists=\u578B\u5909\u6570{0}\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u5B58\u5728\u3057\u306A\u3044\u306E\u3067\u3001\u5F15\u6570\u578B{1}\u306F\u4EEE\u30D1\u30E9\u30E1\u30FC\u30BF\u578B{2}\u306B\u9069\u5408\u3057\u307E\u305B\u3093 - -compiler.misc.infer.arg.length.mismatch=\u5B9F\u5F15\u6570\u30EA\u30B9\u30C8\u3068\u4EEE\u5F15\u6570\u30EA\u30B9\u30C8\u306E\u9577\u3055\u304C\u7570\u306A\u308B\u305F\u3081\u3001\u5F15\u6570\u304B\u3089\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093 +compiler.misc.infer.no.conforming.instance.exists=\u578B\u5909\u6570{0}\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u5B58\u5728\u3057\u306A\u3044\u306E\u3067\u3001{1}\u306F{2}\u306B\u9069\u5408\u3057\u307E\u305B\u3093 + +# 0: list of type, 1: message segment +compiler.misc.infer.no.conforming.assignment.exists=\u578B\u5909\u6570{0}\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093\n(\u5F15\u6570\u306E\u4E0D\u4E00\u81F4: {1}) + +# 0: list of type +compiler.misc.infer.arg.length.mismatch=\u578B\u5909\u6570{0}\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093\n(\u5B9F\u5F15\u6570\u30EA\u30B9\u30C8\u3068\u4EEE\u5F15\u6570\u30EA\u30B9\u30C8\u306E\u9577\u3055\u304C\u7570\u306A\u308A\u307E\u3059) + +# 0: list of type, 1: message segment +compiler.misc.infer.varargs.argument.mismatch=\u578B\u5909\u6570{0}\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093\n(\u53EF\u5909\u5F15\u6570\u306E\u4E0D\u4E00\u81F4: {1}) # 0: type, 1: list of type -compiler.misc.inferred.do.not.conform.to.bounds=\u63A8\u5B9A\u578B\u306F\u5BA3\u8A00\u3055\u308C\u305F\u5883\u754C\u306B\u9069\u5408\u3057\u307E\u305B\u3093\n\u63A8\u5B9A: {0}\n\u5883\u754C: {1} +compiler.misc.inferred.do.not.conform.to.upper.bounds=\u63A8\u8AD6\u578B\u304C\u4E0A\u9650\u306B\u9069\u5408\u3057\u307E\u305B\u3093\n\u63A8\u8AD6: {0}\n\u4E0A\u9650: {1} + +# 0: type, 1: list of type +compiler.misc.inferred.do.not.conform.to.lower.bounds=\u63A8\u8AD6\u578B\u304C\u4E0B\u9650\u306B\u9069\u5408\u3057\u307E\u305B\u3093\n\u63A8\u8AD6: {0}\n\u4E0B\u9650: {1} + +# 0: type, 1: list of type +compiler.misc.inferred.do.not.conform.to.eq.bounds=\u63A8\u8AD6\u578B\u304C\u7B49\u4FA1\u5236\u7D04\u306B\u9069\u5408\u3057\u307E\u305B\u3093\n\u63A8\u8AD6: {0}\n\u7B49\u4FA1\u5236\u7D04: {1} + +# 0: list of type +compiler.misc.cyclic.inference=\u63A8\u8AD6\u306E\u30EB\u30FC\u30D7\u306E\u305F\u3081\u3001\u63A8\u8AD6\u5909\u6570{0}\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093 # 0: symbol compiler.misc.diamond={0}<> @@ -1165,6 +1325,7 @@ # 0: type compiler.misc.diamond.non.generic=\u975E\u6C4E\u7528\u30AF\u30E9\u30B9{0}\u3067''<>''\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 +# 0: unused compiler.misc.diamond.and.explicit.params=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u660E\u793A\u7684\u306A\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u306F''<>''\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093 # 0: type, 1: list of type @@ -1172,14 +1333,18 @@ compiler.misc.arg.length.mismatch=\u5B9F\u5F15\u6570\u30EA\u30B9\u30C8\u3068\u4EEE\u5F15\u6570\u30EA\u30B9\u30C8\u306E\u9577\u3055\u304C\u7570\u306A\u308A\u307E\u3059 -# 0: type, 1: type -compiler.misc.no.conforming.assignment.exists=\u5B9F\u5F15\u6570{0}\u306F\u30E1\u30BD\u30C3\u30C9\u547C\u51FA\u5909\u63DB\u306B\u3088\u3063\u3066{1}\u306B\u5909\u63DB\u3067\u304D\u307E\u305B\u3093 - -# 0: type, 1: type -compiler.misc.varargs.argument.mismatch=\u5F15\u6570\u578B{0}\u306F\u53EF\u5909\u5F15\u6570\u8981\u7D20\u578B{1}\u306B\u9069\u5408\u3057\u307E\u305B\u3093 +# 0: message segment +compiler.misc.no.conforming.assignment.exists=\u5F15\u6570\u306E\u4E0D\u4E00\u81F4: {0} + +# 0: message segment +compiler.misc.varargs.argument.mismatch=\u53EF\u5909\u5F15\u6570\u306E\u4E0D\u4E00\u81F4: {0} ##### +# 0: type, 1: file name +compiler.warn.auxiliary.class.accessed.from.outside.of.its.source.file={1}\u306E\u88DC\u52A9\u30AF\u30E9\u30B9{0}\u306B\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u5916\u304B\u3089\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093 + + ## The first argument ({0}) is a "kindname". # 0: symbol kind, 1: symbol, 2: symbol compiler.err.abstract.cant.be.accessed.directly=\u62BD\u8C61{0}\u3067\u3042\u308B{1}({2}\u5185)\u306B\u76F4\u63A5\u30A2\u30AF\u30BB\u30B9\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 @@ -1188,10 +1353,17 @@ # 0: symbol kind, 1: symbol compiler.err.non-static.cant.be.ref=static\u3067\u306A\u3044{0} {1}\u3092static\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u304B\u3089\u53C2\u7167\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 +# 0: symbol kind, 1: symbol +compiler.misc.non-static.cant.be.ref=static\u3067\u306A\u3044{0} {1}\u3092static\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u304B\u3089\u53C2\u7167\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 + ## Both arguments ({0}, {1}) are "kindname"s. {0} is a comma-separated list ## of kindnames (the list should be identical to that provided in source. compiler.err.unexpected.type=\u4E88\u671F\u3057\u306A\u3044\u578B\n\u671F\u5F85\u5024: {0}\n\u691C\u51FA\u5024: {1} +compiler.err.unexpected.lambda=\u3053\u3053\u3067\u306F\u30E9\u30E0\u30C0\u5F0F\u306F\u4E88\u671F\u3055\u308C\u3066\u3044\u307E\u305B\u3093 + +compiler.err.unexpected.mref=\u3053\u3053\u3067\u306F\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306F\u4E88\u671F\u3055\u308C\u3066\u3044\u307E\u305B\u3093 + ## The first argument {0} is a "kindname" (e.g. 'constructor', 'field', etc.) ## The second argument {1} is the non-resolved symbol ## The third argument {2} is a list of type parameters (non-empty if {1} is a method) @@ -1216,12 +1388,20 @@ # 0: symbol kind, 1: name, 2: list of type, 3: list, 4: message segment compiler.err.cant.resolve.location.args.params=\u30B7\u30F3\u30DC\u30EB\u3092\u898B\u3064\u3051\u3089\u308C\u307E\u305B\u3093\n\u30B7\u30F3\u30DC\u30EB: {0} <{2}>{1}({3})\n\u5834\u6240: {4} +### Following are replicated/used for method reference diagnostics + +# 0: symbol kind, 1: name, 2: unused, 3: list of type, 4: message segment +compiler.misc.cant.resolve.location.args=\u30B7\u30F3\u30DC\u30EB\u3092\u898B\u3064\u3051\u3089\u308C\u307E\u305B\u3093\n\u30B7\u30F3\u30DC\u30EB: {0} {1}({3})\n\u5834\u6240: {4} + +# 0: symbol kind, 1: name, 2: list of type, 3: list, 4: message segment +compiler.misc.cant.resolve.location.args.params=\u30B7\u30F3\u30DC\u30EB\u3092\u898B\u3064\u3051\u3089\u308C\u307E\u305B\u3093\n\u30B7\u30F3\u30DC\u30EB: {0} <{2}>{1}({3})\n\u5834\u6240: {4} + ##a location subdiagnostic is composed as follows: ## The first argument {0} is the location "kindname" (e.g. 'constructor', 'field', etc.) ## The second argument {1} is the location name ## The third argument {2} is the location type (only when {1} is a variable name) -# 0: symbol kind, 1: symbol, 2: unused +# 0: symbol kind, 1: type or symbol, 2: unused compiler.misc.location={0} {1} # 0: symbol kind, 1: symbol, 2: type @@ -1236,7 +1416,7 @@ compiler.misc.kindname.constructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF -compiler.misc.kindname.enum=\u5217\u6319 +compiler.misc.kindname.enum=\u5217\u6319\u578B compiler.misc.kindname.interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 @@ -1256,6 +1436,10 @@ compiler.misc.kindname.package=\u30D1\u30C3\u30B1\u30FC\u30B8 +compiler.misc.kindname.static.init=static\u521D\u671F\u5316\u5B50 + +compiler.misc.kindname.instance.init=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u521D\u671F\u5316\u5B50 + ##### compiler.misc.no.args=\u5F15\u6570\u304C\u3042\u308A\u307E\u305B\u3093 @@ -1312,6 +1496,7 @@ # 0: symbol, 1: symbol, 2: symbol, 3: symbol compiler.misc.varargs.clash.with={1}\u306E{0}\u306F{3}\u306E{2}\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059 +# 0: unused compiler.misc.diamond.and.anon.class=\u533F\u540D\u5185\u90E8\u30AF\u30E9\u30B9\u3067\u306F''<>''\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093 # 0: symbol kind, 1: symbol, 2: symbol, 3: message segment @@ -1336,13 +1521,23 @@ compiler.warn.assert.as.identifier=\u30EA\u30EA\u30FC\u30B91.4\u304B\u3089''assert''\u306F\u30AD\u30FC\u30EF\u30FC\u30C9\u306A\u306E\u3067\u3001\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\n(''assert''\u3092\u30AD\u30FC\u30EF\u30FC\u30C9\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u306B\u306F\u3001-source 1.4\u4EE5\u964D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044) +compiler.warn.underscore.as.identifier=\u8B58\u5225\u5B50\u3068\u3057\u3066''_''\u304C\u4F7F\u7528\u3055\u308C\u307E\u3057\u305F\n(\u8B58\u5225\u5B50\u3068\u3057\u3066\u306E''_''\u306E\u4F7F\u7528\u306F\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u306A\u3044\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059) + compiler.err.enum.as.identifier=\u30EA\u30EA\u30FC\u30B95\u304B\u3089''enum''\u306F\u30AD\u30FC\u30EF\u30FC\u30C9\u306A\u306E\u3067\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\n(''enum''\u3092\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u306B\u306F-source 1.4\u4EE5\u524D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044) compiler.err.assert.as.identifier=\u30EA\u30EA\u30FC\u30B91.4\u304B\u3089''assert''\u306F\u30AD\u30FC\u30EF\u30FC\u30C9\u306A\u306E\u3067\u3001\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\n(''assert''\u3092\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u306B\u306F\u3001-source 1.3\u4EE5\u524D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044) # TODO 308: make a better error message -# compiler.err.this.as.identifier=\ -# as of release 8, ''this'' is allowed as the parameter name for the receiver type only, which has to be the first parameter +compiler.err.this.as.identifier=\u30EA\u30EA\u30FC\u30B98\u304B\u3089''this''\u306F\u53D7\u4FE1\u30BF\u30A4\u30D7\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u540D\u3068\u3057\u3066\u306E\u307F\u8A31\u53EF\u3055\u308C\u3001\u6700\u521D\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059 + +# TODO 308: make a better error message +compiler.err.cant.annotate.static.class=\u5305\u542B\u3059\u308Bstatic\u306E\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306F\u6CE8\u91C8\u4ED8\u3051\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 +# TODO 308: make a better error message +compiler.err.cant.annotate.nested.type=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30BF\u30A4\u30D7\u306F\u6CE8\u91C8\u4ED8\u3051\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 + +compiler.err.incorrect.receiver.type=\u53D7\u4FE1\u30BF\u30A4\u30D7\u304C\u3001\u5305\u542B\u3059\u308B\u30AF\u30E9\u30B9\u30FB\u30BF\u30A4\u30D7\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093 + +compiler.err.no.annotations.on.dot.class=\u6CE8\u91C8\u306F\u30AF\u30E9\u30B9\u30FB\u30EA\u30C6\u30E9\u30EB\u306E\u30BF\u30A4\u30D7\u3067\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093 # 0: string compiler.err.generics.not.supported.in.source=\u7DCF\u79F0\u578B\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(\u7DCF\u79F0\u578B\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 5\u4EE5\u964D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044) @@ -1353,9 +1548,8 @@ # 0: string compiler.err.annotations.not.supported.in.source=\u6CE8\u91C8\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(\u6CE8\u91C8\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 5\u4EE5\u964D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044) -#308 compiler.err.type.annotations.not.supported.in.source=\ -#308 type annotations are not supported in -source {0}\n\ -#308 (use -source 8 or higher to enable type annotations) +# 0: string +compiler.err.type.annotations.not.supported.in.source=\u30BF\u30A4\u30D7\u6CE8\u91C8\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(\u30BF\u30A4\u30D7\u6CE8\u91C8\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 8\u4EE5\u4E0A\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044) # 0: string compiler.err.foreach.not.supported.in.source=for-each\u30EB\u30FC\u30D7\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(for-each\u30EB\u30FC\u30D7\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 5\u4EE5\u964D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044) @@ -1375,6 +1569,47 @@ # 0: string compiler.err.string.switch.not.supported.in.source=switch\u5185\u306E\u6587\u5B57\u5217\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(switch\u5185\u306E\u6587\u5B57\u5217\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 7\u4EE5\u964D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044) +# 0: string +compiler.err.lambda.not.supported.in.source=\u30E9\u30E0\u30C0\u5F0F\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(\u30E9\u30E0\u30C0\u5F0F\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 8\u4EE5\u4E0A\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044) + +# 0: string +compiler.err.method.references.not.supported.in.source=\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 8\u4EE5\u4E0A\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044) + +# 0: string +compiler.err.default.methods.not.supported.in.source=\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E1\u30BD\u30C3\u30C9\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E1\u30BD\u30C3\u30C9\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 8\u4EE5\u4E0A\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044) + +# 0: string +compiler.err.intersection.types.in.cast.not.supported.in.source=\u30AD\u30E3\u30B9\u30C8\u5185\u306Eintersection\u578B\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E1\u30BD\u30C3\u30C9\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 8\u4EE5\u4E0A\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044) + +# 0: string +compiler.err.static.intf.methods.not.supported.in.source=static\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(static\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 8\u4EE5\u4E0A\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044) + +######################################## +# Diagnostics for verbose resolution +# used by Resolve (debug only) +######################################## + +# 0: number, 1: symbol, 2: unused +compiler.misc.applicable.method.found=#{0}\u500B\u306E\u4F7F\u7528\u53EF\u80FD\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {1} + +# 0: number, 1: symbol, 2: message segment +compiler.misc.applicable.method.found.1=#{0}\u500B\u306E\u4F7F\u7528\u53EF\u80FD\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {1}\n({2}) + +# 0: number, 1: symbol, 2: message segment +compiler.misc.not.applicable.method.found=#{0}\u500B\u306E\u4F7F\u7528\u3067\u304D\u306A\u3044\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {1}\n({2}) + +# 0: type +compiler.misc.partial.inst.sig=\u90E8\u5206\u7684\u306B\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3055\u308C\u307E\u3057\u305F: {0} + +# 0: name, 1: symbol, 2: number, 3: MethodResolutionPhase, 4: list of type or message segment, 5: list of type or message segment +compiler.note.verbose.resolve.multi=\u578B{1}\u306E\u30E1\u30BD\u30C3\u30C9{0}\u3092\u5019\u88DC{2}\u306B\u89E3\u6C7A\u3057\u3066\u3044\u307E\u3059\n\u30D5\u30A7\u30FC\u30BA: {3}\n\u5B9F\u969B\u306E\u578B: {4}\n\u578B\u5F15\u6570: {5}\n\u5019\u88DC: + +# 0: name, 1: symbol, 2: unused, 3: MethodResolutionPhase, 4: list of type or message segment, 5: list of type or message segment +compiler.note.verbose.resolve.multi.1=\u578B{1}\u306E\u30E1\u30BD\u30C3\u30C9{0}\u306E\u89E3\u6C7A\u306B\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059\n\u30D5\u30A7\u30FC\u30BA: {3}\n\u5B9F\u969B\u306E\u578B: {4}\n\u578B\u5F15\u6570: {5}\n\u5019\u88DC: + +# 0: symbol, 1: type, 2: type +compiler.note.deferred.method.inst=\u30E1\u30BD\u30C3\u30C9{0}\u306E\u9045\u5EF6\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\n\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3055\u308C\u305F\u30B7\u30B0\u30CD\u30C1\u30E3: {1}\n\u30BF\u30FC\u30B2\u30C3\u30C8\u578B: {2} + ######################################## # Diagnostics for where clause implementation # used by the RichDiagnosticFormatter. @@ -1397,26 +1632,32 @@ # where clause for captured type: contains upper ('extends {1}') and lower # ('super {2}') bound along with the wildcard that generated this captured type ({3}) # 0: type, 1: type, 2: type, 3: type -compiler.misc.where.captured={3}\u306E\u30AD\u30E3\u30D7\u30C1\u30E3\u304B\u3089\u306E{0} extends {1} super: {2} +compiler.misc.where.captured={0}\u306F{3}\u306E\u30AD\u30E3\u30D7\u30C1\u30E3\u304B\u3089{1}\u3092\u62E1\u5F35\u3057{2}\u3092\u30B9\u30FC\u30D1\u30FC\u3057\u307E\u3059 # compact where clause for captured type: contains upper ('extends {1}') along # with the wildcard that generated this captured type ({3}) # 0: type, 1: type, 2: unused, 3: type -compiler.misc.where.captured.1={3}\u306E\u30AD\u30E3\u30D7\u30C1\u30E3\u304B\u3089\u306E{0} extends {1} +compiler.misc.where.captured.1={0}\u306F{3}\u306E\u30AD\u30E3\u30D7\u30C1\u30E3\u304B\u3089{1}\u3092\u62E1\u5F35\u3057\u307E\u3059 # where clause for type variable: contains upper bound(s) ('extends {1}') along with # the kindname ({2}) and location ({3}) in which the typevar has been declared # 0: type, 1: list of type, 2: symbol kind, 3: symbol -compiler.misc.where.typevar={2} {3}\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B{0} extends {1} +compiler.misc.where.typevar={2} {3}\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B{0}\u306F{1}\u3092\u62E1\u5F35\u3057\u307E\u3059 # compact where clause for type variable: contains the kindname ({2}) and location ({3}) # in which the typevar has been declared +# 0: type, 1: list of type, 2: symbol kind, 3: symbol compiler.misc.where.typevar.1={2} {3}\u3067\u5BA3\u8A00\u3055\u308C\u305F{0} +# where clause for fresh type variable: contains upper bound(s) ('extends {1}'). +# Since a fresh type-variable is synthetic - there's no location/kindname here. +# 0: type, 1: list of type +compiler.misc.where.fresh.typevar={0}\u306F{1}\u3092\u62E1\u5F35\u3057\u307E\u3059 + # where clause for type variable: contains all the upper bound(s) ('extends {1}') # of this intersection type # 0: type, 1: list of type -compiler.misc.where.intersection={0} extends {1} +compiler.misc.where.intersection={0}\u306F{1}\u3092\u62E1\u5F35\u3057\u307E\u3059 ### Where clause headers ### compiler.misc.where.description.captured={0}\u304C\u65B0\u3057\u3044\u578B\u5909\u6570\u306E\u5834\u5408: @@ -1435,4 +1676,39 @@ compiler.misc.where.description.intersection.1={0}\u304Cintersection\u578B\u306E\u5834\u5408: - +### +# errors related to doc comments + +compiler.err.dc.bad.entity=HTML\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u304C\u4E0D\u6B63\u3067\u3059 + +compiler.err.dc.bad.gt=''>''\u306E\u4F7F\u7528\u304C\u4E0D\u6B63\u3067\u3059 + +compiler.err.dc.bad.inline.tag=\u30A4\u30F3\u30E9\u30A4\u30F3\u30FB\u30BF\u30B0\u306E\u4F7F\u7528\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093 + +compiler.err.dc.identifier.expected=\u8B58\u5225\u5B50\u304C\u5FC5\u8981\u3067\u3059 + +compiler.err.dc.malformed.html=HTML\u304C\u4E0D\u6B63\u3067\u3059 + +compiler.err.dc.missing.semicolon=\u30BB\u30DF\u30B3\u30ED\u30F3\u304C\u3042\u308A\u307E\u305B\u3093 + +compiler.err.dc.no.content=\u30B3\u30F3\u30C6\u30F3\u30C4\u306A\u3057 + +compiler.err.dc.no.tag.name='@'\u306E\u5F8C\u306B\u30BF\u30B0\u540D\u304C\u3042\u308A\u307E\u305B\u3093 + +compiler.err.dc.gt.expected=''>''\u304C\u5FC5\u8981\u3067\u3059 + +compiler.err.dc.ref.bad.parens=\u53C2\u7167\u306B'')''\u304C\u3042\u308A\u307E\u305B\u3093 + +compiler.err.dc.ref.syntax.error=\u53C2\u7167\u306B\u69CB\u6587\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059 + +compiler.err.dc.ref.unexpected.input=\u4E88\u671F\u3057\u306A\u3044\u30C6\u30AD\u30B9\u30C8\u3067\u3059 + +compiler.err.dc.unexpected.content=\u4E88\u671F\u3057\u306A\u3044\u30B3\u30F3\u30C6\u30F3\u30C4\u3067\u3059 + +compiler.err.dc.unterminated.inline.tag=\u30A4\u30F3\u30E9\u30A4\u30F3\u30FB\u30BF\u30B0\u304C\u7D42\u4E86\u3057\u3066\u3044\u307E\u305B\u3093 + +compiler.err.dc.unterminated.signature=\u30B7\u30B0\u30CD\u30C1\u30E3\u304C\u7D42\u4E86\u3057\u3066\u3044\u307E\u305B\u3093 + +compiler.err.dc.unterminated.string=\u6587\u5B57\u5217\u304C\u7D42\u4E86\u3057\u3066\u3044\u307E\u305B\u3093 + +
--- a/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Tue May 07 17:14:17 2013 -0700 @@ -65,8 +65,11 @@ compiler.err.already.annotated={0} {1}\u5DF2\u8FDB\u884C\u6CE8\u91CA -# 0: symbol, 1: symbol -compiler.err.already.defined=\u5DF2\u5728{1}\u4E2D\u5B9A\u4E49{0} +# 0: symbol kind, 1: symbol, 2: symbol kind, 3: symbol +compiler.err.already.defined=\u5DF2\u5728{2} {3}\u4E2D\u5B9A\u4E49\u4E86{0} {1} + +# 0: symbol kind, 1: symbol, 2: symbol kind, 3: symbol kind, 4: symbol +compiler.err.already.defined.in.clinit=\u5DF2\u5728{3} {4}\u7684{2}\u4E2D\u5B9A\u4E49\u4E86{0} {1} # 0: string compiler.err.already.defined.single.import=\u5DF2\u5728 single-type \u5BFC\u5165\u4E2D\u5B9A\u4E49{0} @@ -109,28 +112,84 @@ # 0: type compiler.err.array.req.but.found=\u9700\u8981\u6570\u7EC4, \u4F46\u627E\u5230{0} -compiler.err.assignment.from.super-bound=\u901A\u8FC7\u901A\u914D\u7B26 {0} \u5206\u914D - -compiler.err.assignment.to.extends-bound=\u5206\u914D\u7ED9\u901A\u914D\u7B26 {0} - compiler.err.attribute.value.must.be.constant=\u5C5E\u6027\u503C\u5FC5\u987B\u4E3A\u5E38\u91CF +# 0: statement type +compiler.err.bad.initializer={0}\u7684\u521D\u59CB\u5316\u7A0B\u5E8F\u9519\u8BEF + compiler.err.break.outside.switch.loop=\u5728 switch \u6216 loop \u5916\u90E8\u4E2D\u65AD # 0: name compiler.err.call.must.be.first.stmt.in.ctor=\u5BF9{0}\u7684\u8C03\u7528\u5FC5\u987B\u662F\u6784\u9020\u5668\u4E2D\u7684\u7B2C\u4E00\u4E2A\u8BED\u53E5 -compiler.err.cant.apply.symbol=\u65E0\u6CD5\u5C06{4} {5}\u4E2D\u7684{0} {1}\u5E94\u7528\u5230\u7ED9\u5B9A\u7C7B\u578B\n\u9700\u8981: {2}\n\u627E\u5230: {3} - # 0: symbol kind, 1: name, 2: list of type or message segment, 3: list of type or message segment, 4: symbol kind, 5: type, 6: message segment -compiler.err.cant.apply.symbol.1=\u65E0\u6CD5\u5C06{4} {5}\u4E2D\u7684{0} {1}\u5E94\u7528\u5230\u7ED9\u5B9A\u7C7B\u578B;\n\u9700\u8981: {2}\n\u627E\u5230: {3}\n\u539F\u56E0: {6} +compiler.err.cant.apply.symbol=\u65E0\u6CD5\u5C06{4} {5}\u4E2D\u7684{0} {1}\u5E94\u7528\u5230\u7ED9\u5B9A\u7C7B\u578B;\n\u9700\u8981: {2}\n\u627E\u5230: {3}\n\u539F\u56E0: {6} # 0: symbol kind, 1: name, 2: list of type compiler.err.cant.apply.symbols=\u5BF9\u4E8E{1}({2}), \u627E\u4E0D\u5230\u5408\u9002\u7684{0} +# 0: symbol kind, 1: name, 2: list of type or message segment, 3: list of type or message segment, 4: symbol kind, 5: type, 6: message segment +compiler.misc.cant.apply.symbol=\u65E0\u6CD5\u5C06 {4} {5}\u4E2D\u7684 {0} {1}\u5E94\u7528\u5230\u7ED9\u5B9A\u7C7B\u578B\n\u9700\u8981: {2}\n\u627E\u5230: {3}\n\u539F\u56E0: {6} + +# 0: symbol kind, 1: name, 2: list of type +compiler.misc.cant.apply.symbols=\u5BF9\u4E8E{1}({2}), \u627E\u4E0D\u5230\u5408\u9002\u7684{0} + +# 0: symbol kind, 1: symbol +compiler.misc.no.abstracts=\u5728 {0} {1} \u4E2D\u627E\u4E0D\u5230\u62BD\u8C61\u65B9\u6CD5 + +# 0: symbol kind, 1: symbol +compiler.misc.incompatible.abstracts=\u5728 {0} {1} \u4E2D\u627E\u5230\u591A\u4E2A\u975E\u8986\u76D6\u62BD\u8C61\u65B9\u6CD5 + +compiler.err.bad.functional.intf.anno=\u610F\u5916\u7684 @FunctionalInterface \u6CE8\u91CA + +# 0: message segment +compiler.err.bad.functional.intf.anno.1=\u610F\u5916\u7684 @FunctionalInterface \u6CE8\u91CA\n{0} + +# 0: symbol +compiler.misc.not.a.functional.intf={0} \u4E0D\u662F\u51FD\u6570\u63A5\u53E3 + +# 0: symbol, 1: message segment +compiler.misc.not.a.functional.intf.1={0} \u4E0D\u662F\u51FD\u6570\u63A5\u53E3\n{1} + +# 0: symbol, 1: symbol kind, 2: symbol +compiler.misc.invalid.generic.lambda.target=lambda \u8868\u8FBE\u5F0F\u7684\u51FD\u6570\u63CF\u8FF0\u7B26\u65E0\u6548\n{1} {2} \u4E2D\u7684\u65B9\u6CD5 {0} \u4E3A\u6CDB\u578B\u65B9\u6CD5 + +# 0: symbol kind, 1: symbol +compiler.misc.incompatible.descs.in.functional.intf=\u5728 {0} {1} \u4E2D\u627E\u5230\u4E0D\u517C\u5BB9\u7684\u51FD\u6570\u63CF\u8FF0\u7B26 + +# 0: name, 1: list of type, 2: type, 3: list of type +compiler.misc.descriptor=\u63CF\u8FF0\u7B26: {2} {0}({1}) + +# 0: name, 1: list of type, 2: type, 3: list of type +compiler.misc.descriptor.throws=\u63CF\u8FF0\u7B26: {2} {0}({1}) \u629B\u51FA{3} + +# 0: type +compiler.misc.no.suitable.functional.intf.inst=\u65E0\u6CD5\u63A8\u65AD{0}\u7684\u51FD\u6570\u63A5\u53E3\u63CF\u8FF0\u7B26 + +# 0: type +compiler.misc.secondary.bound.must.be.marker.intf=\u6B21\u7EA7\u9650\u5236\u8303\u56F4{0}\u5FC5\u987B\u4E3A\u6807\u8BB0\u63A5\u53E3 + +# 0: symbol kind, 1: message segment +compiler.err.invalid.mref={0} \u5F15\u7528\u65E0\u6548; {1} + +# 0: symbol kind, 1: message segment +compiler.misc.invalid.mref={0} \u5F15\u7528\u65E0\u6548; {1} + +compiler.misc.static.mref.with.targs=\u6709\u5173\u9759\u6001\u65B9\u6CD5\u5F15\u7528\u7684\u53C2\u6570\u5316\u9650\u5B9A\u7B26 + +compiler.misc.static.bound.mref=\u9759\u6001\u9650\u5236\u8303\u56F4\u65B9\u6CD5\u5F15\u7528 + # 0: symbol compiler.err.cant.assign.val.to.final.var=\u65E0\u6CD5\u4E3A\u6700\u7EC8\u53D8\u91CF{0}\u5206\u914D\u503C +# 0: symbol, 1: message segment +compiler.err.cant.ref.non.effectively.final.var=\u4ECE{1}\u5F15\u7528\u7684\u672C\u5730\u53D8\u91CF\u5FC5\u987B\u662F\u6700\u7EC8\u53D8\u91CF\u6216\u5B9E\u9645\u4E0A\u7684\u6700\u7EC8\u53D8\u91CF + + +compiler.misc.lambda=lambda \u8868\u8FBE\u5F0F + +compiler.misc.inner.cls=\u5185\u90E8\u7C7B + # 0: type compiler.err.cant.deref=\u65E0\u6CD5\u53D6\u6D88\u5F15\u7528{0} @@ -142,8 +201,6 @@ # 0: symbol compiler.err.cant.ref.before.ctor.called=\u65E0\u6CD5\u5728\u8C03\u7528\u8D85\u7C7B\u578B\u6784\u9020\u5668\u4E4B\u524D\u5F15\u7528{0} -compiler.err.cant.ret.val.from.meth.decl.void=\u5BF9\u4E8E\u7ED3\u679C\u7C7B\u578B\u4E3A\u7A7A\u7684\u65B9\u6CD5, \u65E0\u6CD5\u8FD4\u56DE\u503C - compiler.err.cant.select.static.class.from.param.type=\u65E0\u6CD5\u4ECE\u53C2\u6570\u5316\u7684\u7C7B\u578B\u4E2D\u9009\u62E9\u9759\u6001\u7C7B # 0: symbol, 1: string, 2: string @@ -154,6 +211,8 @@ # 0: symbol kind, 1: symbol compiler.err.clash.with.pkg.of.same.name={0} {1}\u4E0E\u5E26\u6709\u76F8\u540C\u540D\u79F0\u7684\u7A0B\u5E8F\u5305\u51B2\u7A81 +compiler.err.class.not.allowed=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528\u7C7B, \u63A5\u53E3\u6216\u679A\u4E3E\u58F0\u660E + compiler.err.const.expr.req=\u9700\u8981\u5E38\u91CF\u8868\u8FBE\u5F0F compiler.err.cont.outside.loop=continue \u5728 loop \u5916\u90E8 @@ -169,8 +228,6 @@ # 0: type compiler.err.no.superclass={0}\u4E0D\u5177\u6709\u8D85\u7C7B -compiler.err.wrong.target.for.polymorphic.signature.definition=MethodHandle API \u6784\u5EFA\u9700\u8981 -target 7 \u8FD0\u884C\u65F6\u6216\u66F4\u9AD8; \u5F53\u524D\u4E3A -target {0} - # 0: symbol, 1: type, 2: symbol, 3: type, 4: unused compiler.err.concrete.inheritance.conflict={1}\u4E2D\u7684\u65B9\u6CD5{0}\u548C{3}\u4E2D\u7684\u65B9\u6CD5{2}\u662F\u4F7F\u7528\u76F8\u540C\u7684\u7B7E\u540D\u7EE7\u627F\u7684 @@ -181,9 +238,48 @@ compiler.err.duplicate.annotation=\u6CE8\u91CA\u91CD\u590D +# 0: type +compiler.err.duplicate.annotation.invalid.repeated=\u65E0\u6CD5\u91CD\u590D\u6CE8\u91CA{0}\n\u5B83\u6CA1\u6709\u5B9A\u4E49\u6709\u6548\u7684\u5305\u542B\u6CE8\u91CA\u3002 + # 0: name, 1: type compiler.err.duplicate.annotation.member.value={1}\u4E2D\u7684\u6CE8\u91CA\u6210\u5458\u503C{0}\u91CD\u590D +# 0: type, 1: type +compiler.err.duplicate.annotation.missing.container=\u6CE8\u91CA\u91CD\u590D, {0}\u7684\u58F0\u660E\u6CA1\u6709\u6709\u6548\u7684{1}\u6CE8\u91CA + +# 0: type +compiler.err.invalid.repeatable.annotation=\u6CE8\u91CA\u91CD\u590D, \u4F7F\u7528\u65E0\u6548\u7684\u53EF\u91CD\u590D\u6CE8\u91CA\u5BF9{0}\u8FDB\u884C\u4E86\u6CE8\u91CA + +# 0: type +compiler.err.invalid.repeatable.annotation.no.value=\u6CE8\u91CA\u91CD\u590D, {0}\u4E0D\u662F\u6709\u6548\u7684\u53EF\u91CD\u590D\u7C7B\u578B, \u672A\u58F0\u660E\u4EFB\u4F55\u503C\u5143\u7D20\u65B9\u6CD5 + +# 0: type, 1: number +compiler.err.invalid.repeatable.annotation.multiple.values=\u6CE8\u91CA\u91CD\u590D, {0}\u4E0D\u662F\u6709\u6548\u7684\u53EF\u91CD\u590D\u7C7B\u578B, \u5DF2\u58F0\u660E {1} \u4E2A\u503C\u5143\u7D20\u65B9\u6CD5 + +# 0: type +compiler.err.invalid.repeatable.annotation.invalid.value=\u6CE8\u91CA\u91CD\u590D, {0}\u4E0D\u662F\u6709\u6548\u7684\u53EF\u91CD\u590D\u7C7B\u578B, \u503C\u5143\u7D20\u65E0\u6548, \u9700\u8981\u65B9\u6CD5 + +# 0: type, 1: type, 2: type +compiler.err.invalid.repeatable.annotation.value.return=\u6CE8\u91CA\u91CD\u590D, \u5305\u542B\u6CE8\u91CA{0}\u7684\u503C\u5143\u7D20\u5E94\u5177\u6709\u7C7B\u578B{2}, \u4F46\u627E\u5230\u7684\u662F{1} + +# 0: type, 1: symbol +compiler.err.invalid.repeatable.annotation.elem.nondefault=\u5305\u542B\u6CE8\u91CA{0}\u6CA1\u6709\u5143\u7D20 {1} \u7684\u9ED8\u8BA4\u503C + +# 0: symbol, 1: type, 2: symbol, 3: type +compiler.err.invalid.repeatable.annotation.retention=\u5305\u542B\u6CE8\u91CA {0} \u7684\u4FDD\u7559\u671F ({1}) \u77ED\u4E8E\u5DF2\u5305\u542B\u6CE8\u91CA {2} \u7684\u4FDD\u7559\u671F ({3}) + +# 0: symbol, 1: symbol +compiler.err.invalid.repeatable.annotation.not.documented=\u5305\u542B\u6CE8\u91CA\u7C7B\u578B {0} \u4E0D\u662F @Documented, \u800C\u91CD\u590D\u7684\u6CE8\u91CA\u7C7B\u578B {1} \u4E3A + +# 0: symbol, 1: symbol +compiler.err.invalid.repeatable.annotation.not.inherited=\u5305\u542B\u6CE8\u91CA\u7C7B\u578B {0} \u4E0D\u662F @Inherited, \u800C\u91CD\u590D\u7684\u6CE8\u91CA\u7C7B\u578B {1} \u4E3A + +# 0: symbol, 1: symbol +compiler.err.invalid.repeatable.annotation.incompatible.target=\u5BB9\u5668\u6CE8\u91CA {0} \u7684\u76EE\u6807\u4E0D\u662F\u91CD\u590D\u6CE8\u91CA {1} \u7684\u76EE\u6807\u5B50\u96C6 + +# 0: symbol +compiler.err.invalid.repeatable.annotation.repeated.and.container.present=\u5BB9\u5668 {0} \u4E0D\u5F97\u4E0E\u5176\u5305\u542B\u7684\u5143\u7D20\u540C\u65F6\u5B58\u5728 + # 0: name compiler.err.duplicate.class=\u7C7B\u91CD\u590D: {0} @@ -245,10 +341,10 @@ compiler.err.generic.throwable=\u6CDB\u578B\u7C7B\u4E0D\u80FD\u6269\u5C55 java.lang.Throwable # 0: symbol -compiler.err.icls.cant.have.static.decl=\u5185\u90E8\u7C7B{0}\u4E2D\u7684\u9759\u6001\u58F0\u660E\u975E\u6CD5\n\u4FEE\u9970\u7B26 \''static\'' \u4EC5\u5141\u8BB8\u5728\u5E38\u91CF\u53D8\u91CF\u58F0\u660E\u4E2D\u4F7F\u7528 +compiler.err.icls.cant.have.static.decl=\u5185\u90E8\u7C7B{0}\u4E2D\u7684\u9759\u6001\u58F0\u660E\u975E\u6CD5\n\u4FEE\u9970\u7B26 ''static'' \u4EC5\u5141\u8BB8\u5728\u5E38\u91CF\u53D8\u91CF\u58F0\u660E\u4E2D\u4F7F\u7528 # 0: string -compiler.err.illegal.char=\u975E\u6CD5\u5B57\u7B26: \\{0} +compiler.err.illegal.char=\u975E\u6CD5\u5B57\u7B26: ''{0}'' compiler.err.illegal.char.for.encoding=\u7F16\u7801{0}\u7684\u4E0D\u53EF\u6620\u5C04\u5B57\u7B26 @@ -280,11 +376,15 @@ compiler.err.illegal.underscore=\u975E\u6CD5\u4E0B\u5212\u7EBF +compiler.err.illegal.dot=\u975E\u6CD5 ''.'' + # 0: symbol compiler.err.illegal.qual.not.icls=\u975E\u6CD5\u9650\u5B9A\u7B26; {0}\u4E0D\u662F\u5185\u90E8\u7C7B compiler.err.illegal.start.of.expr=\u975E\u6CD5\u7684\u8868\u8FBE\u5F0F\u5F00\u59CB +compiler.err.illegal.start.of.stmt=\u975E\u6CD5\u7684\u8BED\u53E5\u5F00\u59CB + compiler.err.illegal.start.of.type=\u975E\u6CD5\u7684\u7C7B\u578B\u5F00\u59CB compiler.err.illegal.unicode.esc=\u975E\u6CD5\u7684 Unicode \u8F6C\u4E49 @@ -302,8 +402,6 @@ # 0: number compiler.err.int.number.too.large=\u8FC7\u5927\u7684\u6574\u6570: {0} -compiler.err.internal.error.cant.instantiate=\u5185\u90E8\u9519\u8BEF; \u65E0\u6CD5\u5C06\u4F4D\u4E8E{1}\u7684{0}\u5B9E\u4F8B\u5316\u4E3A ({2}) - compiler.err.intf.annotation.members.cant.have.params=@interface \u6210\u5458\u4E0D\u80FD\u5E26\u6709\u53C2\u6570 compiler.err.intf.annotation.cant.have.type.params=@interface \u4E0D\u80FD\u5E26\u6709\u7C7B\u578B\u53C2\u6570 @@ -315,7 +413,7 @@ compiler.err.intf.expected.here=\u6B64\u5904\u9700\u8981\u63A5\u53E3 -compiler.err.intf.meth.cant.have.body=\u63A5\u53E3\u65B9\u6CD5\u4E0D\u80FD\u5E26\u6709\u4E3B\u4F53 +compiler.err.intf.meth.cant.have.body=\u63A5\u53E3\u62BD\u8C61\u65B9\u6CD5\u4E0D\u80FD\u5E26\u6709\u4E3B\u4F53 compiler.err.invalid.annotation.member.type=\u6CE8\u91CA\u6210\u5458\u7684\u7C7B\u578B\u65E0\u6548 @@ -327,6 +425,8 @@ compiler.err.varargs.and.old.array.syntax=variable-arity \u53C2\u6570\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u4F20\u7EDF\u6570\u7EC4\u8BB0\u53F7 +compiler.err.variable.not.allowed=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528\u53D8\u91CF\u58F0\u660E + # 0: name compiler.err.label.already.in.use=\u6807\u7B7E{0}\u5DF2\u4F7F\u7528 @@ -337,6 +437,8 @@ compiler.err.cannot.create.array.with.type.arguments=\u65E0\u6CD5\u521B\u5EFA\u5177\u6709\u7C7B\u578B\u53D8\u91CF\u7684\u6570\u7EC4 +compiler.err.cannot.create.array.with.diamond=\u65E0\u6CD5\u521B\u5EFA\u5177\u6709 ''<>'' \u7684\u6570\u7EC4 + # # limits. We don't give the limits in the diagnostic because we expect # them to change, yet we want to use the same diagnostic. These are all @@ -360,7 +462,7 @@ compiler.err.limit.string=\u5E38\u91CF\u5B57\u7B26\u4E32\u8FC7\u957F -compiler.err.limit.string.overflow=\u5BF9\u4E8E\u5E38\u91CF\u6C60\u6765\u8BF4, \u5B57\u7B26\u4E32 \"{0}...\" \u7684 UTF8 \u8868\u793A\u8FC7\u957F +compiler.err.limit.string.overflow=\u5BF9\u4E8E\u5E38\u91CF\u6C60\u6765\u8BF4, \u5B57\u7B26\u4E32 "{0}..." \u7684 UTF8 \u8868\u793A\u8FC7\u957F compiler.err.malformed.fp.lit=\u6D6E\u70B9\u6587\u5B57\u7684\u683C\u5F0F\u9519\u8BEF @@ -370,7 +472,9 @@ compiler.err.missing.ret.stmt=\u7F3A\u5C11\u8FD4\u56DE\u8BED\u53E5 -compiler.err.missing.ret.val=\u7F3A\u5C11\u8FD4\u56DE\u503C +compiler.misc.missing.ret.val=\u7F3A\u5C11\u8FD4\u56DE\u503C + +compiler.misc.unexpected.ret.val=\u610F\u5916\u7684\u8FD4\u56DE\u503C # 0: set of modifier compiler.err.mod.not.allowed.here=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528\u4FEE\u9970\u7B26{0} @@ -398,6 +502,25 @@ # 0: type, 1: type compiler.err.neither.conditional.subtype=? \u7684\u4E0D\u517C\u5BB9\u7C7B\u578B: \u4E24\u8005\u90FD\u4E0D\u662F\u5BF9\u65B9\u7684\u5B50\u7C7B\u578B\n\u7B2C\u4E8C\u4E2A\u64CD\u4F5C\u6570: {0}\n\u7B2C\u4E09\u4E2A\u64CD\u4F5C\u6570: {1} +# 0: message segment +compiler.misc.incompatible.type.in.conditional=\u6761\u4EF6\u8868\u8FBE\u5F0F\u4E2D\u7684\u7C7B\u578B\u9519\u8BEF; {0} + +compiler.misc.conditional.target.cant.be.void=\u6761\u4EF6\u8868\u8FBE\u5F0F\u7684\u76EE\u6807\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A + +# 0: type +compiler.misc.incompatible.ret.type.in.lambda=lambda \u8868\u8FBE\u5F0F\u4E2D\u7684\u8FD4\u56DE\u7C7B\u578B\u9519\u8BEF\n{0} + +# 0: type +compiler.misc.incompatible.ret.type.in.mref=\u65B9\u6CD5\u5F15\u7528\u4E2D\u7684\u8FD4\u56DE\u7C7B\u578B\u9519\u8BEF\n{0} + +# 0: list of type +compiler.err.incompatible.thrown.types.in.lambda=lambda \u8868\u8FBE\u5F0F\u4E2D\u629B\u51FA\u7684\u7C7B\u578B{0}\u4E0D\u517C\u5BB9 + +# 0: list of type +compiler.err.incompatible.thrown.types.in.mref=\u65B9\u6CD5\u5F15\u7528\u4E2D\u629B\u51FA\u7684\u7C7B\u578B{0}\u4E0D\u517C\u5BB9 + +compiler.misc.incompatible.arg.types.in.lambda=lambda \u8868\u8FBE\u5F0F\u4E2D\u7684\u53C2\u6570\u7C7B\u578B\u4E0D\u517C\u5BB9 + compiler.err.new.not.allowed.in.annotation=\u6CE8\u91CA\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528 ''new'' compiler.err.no.annotation.member={1}\u4E2D\u6CA1\u6709\u6CE8\u91CA\u6210\u5458{0} @@ -414,6 +537,12 @@ compiler.err.not.def.access.class.intf.cant.access={1}\u4E2D\u7684{0}\u662F\u5728\u4E0D\u53EF\u8BBF\u95EE\u7684\u7C7B\u6216\u63A5\u53E3\u4E2D\u5B9A\u4E49\u7684 # 0: symbol, 1: symbol +compiler.misc.not.def.access.class.intf.cant.access={1}\u4E2D\u7684{0}\u662F\u5728\u4E0D\u53EF\u8BBF\u95EE\u7684\u7C7B\u6216\u63A5\u53E3\u4E2D\u5B9A\u4E49\u7684 + +# 0: symbol, 1: list of type, 2: type +compiler.misc.cant.access.inner.cls.constr=\u65E0\u6CD5\u8BBF\u95EE\u6784\u9020\u5668 {0}({1})\n\u4F5C\u7528\u57DF\u4E2D\u6CA1\u6709\u7C7B\u578B\u4E3A{2}\u7684\u5C01\u95ED\u5B9E\u4F8B + +# 0: symbol, 1: symbol compiler.err.not.def.public.cant.access={0}\u5728{1}\u4E2D\u4E0D\u662F\u516C\u5171\u7684; \u65E0\u6CD5\u4ECE\u5916\u90E8\u7A0B\u5E8F\u5305\u4E2D\u5BF9\u5176\u8FDB\u884C\u8BBF\u95EE # 0: name @@ -455,15 +584,13 @@ # 0: list of string compiler.err.proc.no.explicit.annotation.processing.requested=\u4EC5\u5F53\u663E\u5F0F\u8BF7\u6C42\u6CE8\u91CA\u5904\u7406\u65F6\u624D\u63A5\u53D7\u7C7B\u540D\u79F0 ''{0}'' -compiler.err.proc.no.service=\u627E\u4E0D\u5230\u670D\u52A1\u52A0\u8F7D\u5668\u7C7B\u3002\njava.util.ServiceLoader \u6216 sun.misc.Service \u5FC5\u987B\u53EF\u7528\u3002 +compiler.err.proc.no.service=ServiceLoader \u4E0D\u53EF\u7528, \u4F46\u5B83\u662F\u6CE8\u91CA\u5904\u7406\u6240\u5FC5\u9700\u7684\u3002 compiler.err.proc.processor.bad.option.name=\u5904\u7406\u7A0B\u5E8F ''{1}'' \u63D0\u4F9B\u7684\u9009\u9879\u540D\u79F0 ''{0}'' \u9519\u8BEF # 0: string compiler.err.proc.processor.cant.instantiate=\u65E0\u6CD5\u5B9E\u4F8B\u5316\u5904\u7406\u7A0B\u5E8F ''{0}'' \u7684\u5B9E\u4F8B -compiler.err.proc.processor.constructor.error=\u6784\u9020\u5904\u7406\u7A0B\u5E8F\u5BF9\u8C61{0}\u65F6\u629B\u51FA\u5F02\u5E38\u9519\u8BEF - # 0: string compiler.err.proc.processor.not.found=\u627E\u4E0D\u5230\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F ''{0}'' @@ -482,7 +609,10 @@ compiler.err.recursive.ctor.invocation=\u9012\u5F52\u6784\u9020\u5668\u8C03\u7528 # 0: name, 1: symbol kind, 2: symbol, 3: symbol, 4: symbol kind, 5: symbol, 6: symbol -compiler.err.ref.ambiguous=\u5BF9{0}\u7684\u5F15\u7528\u4E0D\u660E\u786E, {3}\u4E2D\u7684{1} {2}\u548C{6}\u4E2D\u7684{4} {5}\u90FD\u5339\u914D +compiler.err.ref.ambiguous=\u5BF9{0}\u7684\u5F15\u7528\u4E0D\u660E\u786E\n{3} \u4E2D\u7684{1} {2} \u548C {6} \u4E2D\u7684{4} {5} \u90FD\u5339\u914D + +# 0: name, 1: symbol kind, 2: symbol, 3: symbol, 4: symbol kind, 5: symbol, 6: symbol +compiler.misc.ref.ambiguous=\u5BF9{0}\u7684\u5F15\u7528\u4E0D\u660E\u786E\n{3} \u4E2D\u7684{1} {2} \u548C {6} \u4E2D\u7684{4} {5} \u90FD\u5339\u914D compiler.err.repeated.annotation.target=\u6CE8\u91CA\u76EE\u6807\u91CD\u590D @@ -536,6 +666,27 @@ # 0: type, 1: type, 2: string compiler.err.types.incompatible.diff.ret=\u7C7B\u578B{0}\u548C{1}\u4E0D\u517C\u5BB9; \u4E24\u8005\u90FD\u5B9A\u4E49\u4E86{2}, \u4F46\u5374\u5E26\u6709\u4E0D\u76F8\u5173\u7684\u8FD4\u56DE\u7C7B\u578B +# 0: kind, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol +compiler.err.types.incompatible.unrelated.defaults={0} {1}\u4ECE\u7C7B\u578B {4} \u548C {5} \u4E2D\u7EE7\u627F\u4E86{2}({3}) \u7684\u4E0D\u76F8\u5173\u9ED8\u8BA4\u503C + +# 0: kind, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol +compiler.err.types.incompatible.abstract.default={0} {1}\u4ECE\u7C7B\u578B {4} \u548C {5} \u4E2D\u7EE7\u627F\u4E86{2}({3}) \u7684\u62BD\u8C61\u548C\u9ED8\u8BA4\u503C + +# 0: name, 1: kind, 2: symbol +compiler.err.default.overrides.object.member={1} {2} \u4E2D\u7684\u9ED8\u8BA4\u65B9\u6CD5{0}\u8986\u76D6\u4E86 java.lang.Object \u7684\u6210\u5458 + +# 0: type +compiler.err.illegal.static.intf.meth.call=\u9759\u6001\u63A5\u53E3\u65B9\u6CD5\u8C03\u7528\u975E\u6CD5\n\u5E94\u5C06\u63A5\u6536\u65B9\u8868\u8FBE\u5F0F\u66FF\u6362\u4E3A\u7C7B\u578B\u9650\u5B9A\u7B26 ''{0}'' + +# 0: type, 1: message segment +compiler.err.illegal.default.super.call=\u9ED8\u8BA4\u8D85\u7EA7\u8C03\u7528\u4E2D\u7684\u7C7B\u578B\u9650\u5B9A\u7B26{0}\u9519\u8BEF\n{1} + +# 0: symbol, 1: type +compiler.misc.overridden.default=\u8986\u76D6\u4E86{1}\u4E2D\u7684\u65B9\u6CD5 {0} + +# 0: symbol, 1: symbol +compiler.misc.redundant.supertype=\u5197\u4F59\u63A5\u53E3 {0} \u5DF2\u7531 {1} \u6269\u5C55 + compiler.err.unclosed.char.lit=\u672A\u7ED3\u675F\u7684\u5B57\u7B26\u6587\u5B57 compiler.err.unclosed.comment=\u672A\u7ED3\u675F\u7684\u6CE8\u91CA @@ -550,19 +701,14 @@ # 0: name compiler.err.undef.label=\u672A\u5B9A\u4E49\u7684\u6807\u7B7E: {0} -compiler.err.undetermined.type=\u65E0\u6CD5\u63A8\u65AD{0}\u7684\u7C7B\u578B\u53C2\u6570 - -# 0: type, 1: message segment -compiler.err.undetermined.type.1=\u65E0\u6CD5\u63A8\u65AD{0}\u7684\u7C7B\u578B\u53C2\u6570;\n\u539F\u56E0: {1} - -# 0: list of type, 1: message segment -compiler.err.invalid.inferred.types={0}\u7684\u63A8\u65AD\u7C7B\u578B\u65E0\u6548; {1} - # 0: message segment, 1: unused compiler.err.cant.apply.diamond=\u65E0\u6CD5\u63A8\u65AD{0}\u7684\u7C7B\u578B\u53C2\u6570 -# 0: message segment, 1: message segment -compiler.err.cant.apply.diamond.1=\u65E0\u6CD5\u63A8\u65AD{0}\u7684\u7C7B\u578B\u53C2\u6570;\n\u539F\u56E0: {1} +# 0: message segment or type, 1: message segment +compiler.err.cant.apply.diamond.1=\u65E0\u6CD5\u63A8\u65AD{0}\u7684\u7C7B\u578B\u53C2\u6570\n\u539F\u56E0: {1} + +# 0: message segment or type, 1: message segment +compiler.misc.cant.apply.diamond.1=\u65E0\u6CD5\u63A8\u65AD{0}\u7684\u7C7B\u578B\u53C2\u6570\n\u539F\u56E0: {1} compiler.err.unreachable.stmt=\u65E0\u6CD5\u8BBF\u95EE\u7684\u8BED\u53E5 @@ -605,7 +751,7 @@ # 0: symbol compiler.misc.varargs.trustme.on.virtual.varargs=\u5B9E\u4F8B\u65B9\u6CD5 {0} \u4E0D\u662F\u6700\u7EC8\u7684\u3002 -# 0: type, 1: kind, 2: symbol +# 0: type, 1: symbol kind, 2: symbol compiler.misc.inaccessible.varargs.type=\u5F62\u5F0F varargs \u5143\u7D20\u7C7B\u578B{0}\u65E0\u6CD5\u4ECE {1} {2} \u8FDB\u884C\u8BBF\u95EE # In the following string, {1} will always be the detail message from @@ -620,7 +766,7 @@ ## All errors which do not refer to a particular line in the source code are ## preceded by this string. -compiler.err.error=\u9519\u8BEF:\u0020 +compiler.err.error=\u9519\u8BEF: # The following error messages do not refer to a line in the source code. compiler.err.cant.read.file=\u65E0\u6CD5\u8BFB\u53D6: {0} @@ -637,7 +783,7 @@ compiler.misc.fatal.err.cant.locate.ctor=\u81F4\u547D\u9519\u8BEF: \u627E\u4E0D\u5230{0}\u7684\u6784\u9020\u5668 -compiler.misc.fatal.err.cant.close.loader=\u81F4\u547D\u9519\u8BEF: \u65E0\u6CD5\u5173\u95ED\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F\u7684\u7C7B\u52A0\u8F7D\u5668 +compiler.misc.fatal.err.cant.close=\u81F4\u547D\u9519\u8BEF: \u65E0\u6CD5\u5173\u95ED\u7F16\u8BD1\u5668\u8D44\u6E90 ##### @@ -659,7 +805,10 @@ ## The following string will appear before all messages keyed as: ## "compiler.note". -compiler.note.note=\u6CE8:\u0020 + +compiler.note.potential.lambda.found=\u53EF\u5C06\u6B64\u533F\u540D\u5185\u90E8\u7C7B\u521B\u5EFA\u8F6C\u6362\u4E3A lambda \u8868\u8FBE\u5F0F\u3002 + +compiler.note.note=\u6CE8: # 0: file name compiler.note.deprecated.filename={0}\u4F7F\u7528\u6216\u8986\u76D6\u4E86\u5DF2\u8FC7\u65F6\u7684 API\u3002 @@ -773,12 +922,12 @@ ## ## All warning messages are preceded by the following string. -compiler.warn.warning=\u8B66\u544A:\u0020 +compiler.warn.warning=\u8B66\u544A: ## Warning messages may also include the following prefix to identify a ## lint option # 0: option name -compiler.warn.lintOption=[{0}]\u0020 +compiler.warn.lintOption=[{0}] # 0: symbol compiler.warn.constant.SVUID=serialVersionUID \u5728\u7C7B{0}\u4E2D\u5FC5\u987B\u662F\u5E38\u91CF @@ -1046,6 +1195,8 @@ compiler.misc.bad.signature=\u9519\u8BEF\u7684\u7B7E\u540D: {0} +compiler.misc.bad.type.annotation.value=\u9519\u8BEF\u7684\u7C7B\u578B\u6CE8\u91CA\u76EE\u6807\u7C7B\u578B\u503C: {0} + compiler.misc.class.file.wrong.class=\u7C7B\u6587\u4EF6\u5305\u542B\u9519\u8BEF\u7684\u7C7B: {0} compiler.misc.class.file.not.found=\u627E\u4E0D\u5230{0}\u7684\u7C7B\u6587\u4EF6 @@ -1077,24 +1228,17 @@ ##### -# 0: message segment, 1: type, 2: type -compiler.err.prob.found.req={0}\n\u9700\u8981: {2}\n\u627E\u5230: {1} +# 0: message segment +compiler.err.prob.found.req=\u4E0D\u517C\u5BB9\u7684\u7C7B\u578B: {0} # 0: message segment, 1: type, 2: type compiler.warn.prob.found.req={0}\n\u9700\u8981: {2}\n\u627E\u5230: {1} -compiler.err.prob.found.req.1={0} {3}\n\u9700\u8981: {2}\n\u627E\u5230: {1} - -## The following are all possible strings for the first argument ({0}) of the -## above strings. -compiler.misc.incompatible.types=\u4E0D\u517C\u5BB9\u7684\u7C7B\u578B - -# 0: message segment -compiler.misc.incompatible.types.1=\u4E0D\u517C\u5BB9\u7684\u7C7B\u578B; {0} - -compiler.misc.inconvertible.types=\u4E0D\u53EF\u8F6C\u6362\u7684\u7C7B\u578B - -compiler.misc.possible.loss.of.precision=\u53EF\u80FD\u635F\u5931\u7CBE\u5EA6 +# 0: type, 1: type +compiler.misc.inconvertible.types={0}\u65E0\u6CD5\u8F6C\u6362\u4E3A{1} + +# 0: type, 1: type +compiler.misc.possible.loss.of.precision=\u4ECE{0}\u8F6C\u6362\u5230{1}\u53EF\u80FD\u4F1A\u6709\u635F\u5931 compiler.misc.unchecked.assign=\u672A\u7ECF\u68C0\u67E5\u7684\u8F6C\u6362 @@ -1104,16 +1248,13 @@ # assigned array cannot dynamically check its stores compiler.misc.unchecked.cast.to.type=\u672A\u7ECF\u68C0\u67E5\u7684\u8F6C\u6362 -compiler.misc.assignment.from.super-bound=\u4ECE super-bound \u7C7B\u578B{0}\u8FDB\u884C\u5206\u914D - -compiler.misc.assignment.to.extends-bound=\u5230 extends-bound \u7C7B\u578B{0}\u7684\u5206\u914D - # compiler.err.star.expected=\ # ''*'' expected # compiler.err.no.elem.type=\ # \[\*\] cannot have a type -compiler.misc.try.not.applicable.to.type=try-with-resources \u4E0D\u9002\u7528\u4E8E\u53D8\u91CF\u7C7B\u578B +# 0: type +compiler.misc.try.not.applicable.to.type=try-with-resources \u4E0D\u9002\u7528\u4E8E\u53D8\u91CF\u7C7B\u578B\n({0}) ##### @@ -1139,25 +1280,44 @@ ## The following are all possible strings for the last argument of all those ## diagnostics whose key ends in ".1" -compiler.misc.undetermined.type=\u672A\u786E\u5B9A\u7684\u7C7B\u578B - -compiler.misc.type.variable.has.undetermined.type=\u7C7B\u578B\u53D8\u91CF{0}\u5E26\u6709\u672A\u786E\u5B9A\u7684\u7C7B\u578B # 0: type, 1: list of type compiler.misc.no.unique.maximal.instance.exists=\u5BF9\u4E8E\u4E0A\u9650\u4E3A{1}\u7684\u7C7B\u578B\u53D8\u91CF{0}, \u4E0D\u5B58\u5728\u552F\u4E00\u6700\u5927\u5B9E\u4F8B compiler.misc.no.unique.minimal.instance.exists=\u5BF9\u4E8E\u4E0B\u9650\u4E3A{1}\u7684\u7C7B\u578B\u53D8\u91CF{0}, \u4E0D\u5B58\u5728\u552F\u4E00\u6700\u5C0F\u5B9E\u4F8B -# 0: list of type, 1: type, 2: type -compiler.misc.infer.no.conforming.instance.exists=\u4E0D\u5B58\u5728\u7C7B\u578B\u53D8\u91CF{0}\u7684\u5B9E\u4F8B, \u4EE5\u4F7F{1}\u4E0E{2}\u4E00\u81F4 +# 0: type, 1: list of type +compiler.misc.incompatible.upper.bounds=\u63A8\u8BBA\u53D8\u91CF {0} \u5177\u6709\u4E0D\u517C\u5BB9\u7684\u4E0A\u9650 {1} + +# 0: type, 1: list of type, 2: list of type +compiler.misc.incompatible.eq.upper.bounds=\u63A8\u8BBA\u53D8\u91CF {0} \u5177\u6709\u4E0D\u517C\u5BB9\u7684\u9650\u5236\u8303\u56F4\n\u7B49\u5F0F\u7EA6\u675F\u6761\u4EF6: {1}\n\u4E0A\u9650: {2} + +# 0: type, 1: list of type, 2: list of type +compiler.misc.incompatible.eq.lower.bounds=\u63A8\u8BBA\u53D8\u91CF{0}\u5177\u6709\u4E0D\u517C\u5BB9\u7684\u9650\u5236\u8303\u56F4\n\u7B49\u5F0F\u7EA6\u675F\u6761\u4EF6: {1}\n\u4E0B\u9650: {2} # 0: list of type, 1: type, 2: type -compiler.misc.infer.no.conforming.assignment.exists=\u4E0D\u5B58\u5728\u7C7B\u578B\u53D8\u91CF{0}\u7684\u5B9E\u4F8B, \u4EE5\u4F7F\u53C2\u6570\u7C7B\u578B{1}\u4E0E\u5F62\u5F0F\u53C2\u6570\u7C7B\u578B{2}\u4E00\u81F4 - -compiler.misc.infer.arg.length.mismatch=\u65E0\u6CD5\u4ECE\u53C2\u6570\u8FDB\u884C\u5B9E\u4F8B\u5316, \u56E0\u4E3A\u5B9E\u9645\u53C2\u6570\u5217\u8868\u548C\u5F62\u5F0F\u53C2\u6570\u5217\u8868\u957F\u5EA6\u4E0D\u540C +compiler.misc.infer.no.conforming.instance.exists=\u4E0D\u5B58\u5728\u7C7B\u578B\u53D8\u91CF{0}\u7684\u5B9E\u4F8B, \u4EE5\u4F7F{1}\u4E0E{2}\u4E00\u81F4 + +# 0: list of type, 1: message segment +compiler.misc.infer.no.conforming.assignment.exists=\u65E0\u6CD5\u63A8\u65AD\u7C7B\u578B\u53D8\u91CF {0}\n(\u53C2\u6570\u4E0D\u5339\u914D; {1}) + +# 0: list of type +compiler.misc.infer.arg.length.mismatch=\u65E0\u6CD5\u63A8\u65AD\u7C7B\u578B\u53D8\u91CF {0}\n(\u5B9E\u9645\u53C2\u6570\u5217\u8868\u548C\u5F62\u5F0F\u53C2\u6570\u5217\u8868\u957F\u5EA6\u4E0D\u540C) + +# 0: list of type, 1: message segment +compiler.misc.infer.varargs.argument.mismatch=\u65E0\u6CD5\u63A8\u65AD\u7C7B\u578B\u53D8\u91CF {0}\n(varargs \u4E0D\u5339\u914D; {1}) # 0: type, 1: list of type -compiler.misc.inferred.do.not.conform.to.bounds=\u63A8\u65AD\u7C7B\u578B\u4E0D\u7B26\u5408\u58F0\u660E\u7684\u8303\u56F4\n\u63A8\u65AD: {0}\n\u8303\u56F4: {1} +compiler.misc.inferred.do.not.conform.to.upper.bounds=\u63A8\u65AD\u7C7B\u578B\u4E0D\u7B26\u5408\u4E0A\u9650\n\u63A8\u65AD: {0}\n\u4E0A\u9650: {1} + +# 0: type, 1: list of type +compiler.misc.inferred.do.not.conform.to.lower.bounds=\u63A8\u65AD\u7C7B\u578B\u4E0D\u7B26\u5408\u4E0B\u9650\n\u63A8\u65AD: {0}\n\u4E0B\u9650: {1} + +# 0: type, 1: list of type +compiler.misc.inferred.do.not.conform.to.eq.bounds=\u63A8\u65AD\u7C7B\u578B\u4E0D\u7B26\u5408\u7B49\u5F0F\u7EA6\u675F\u6761\u4EF6\n\u63A8\u65AD: {0}\n\u7B49\u5F0F\u7EA6\u675F\u6761\u4EF6: {1} + +# 0: list of type +compiler.misc.cyclic.inference=\u7531\u4E8E\u63A8\u8BBA\u5FAA\u73AF, \u65E0\u6CD5\u5B9E\u4F8B\u5316\u63A8\u8BBA\u53D8\u91CF{0} # 0: symbol compiler.misc.diamond={0}<> @@ -1165,6 +1325,7 @@ # 0: type compiler.misc.diamond.non.generic=\u65E0\u6CD5\u5C06 ''<>'' \u4E0E\u975E\u6CDB\u578B\u7C7B{0}\u4E00\u8D77\u4F7F\u7528 +# 0: unused compiler.misc.diamond.and.explicit.params=\u4E0D\u80FD\u5C06 ''<>'' \u4E0E\u6784\u9020\u5668\u7684\u663E\u5F0F\u7C7B\u578B\u53C2\u6570\u4E00\u8D77\u4F7F\u7528 # 0: type, 1: list of type @@ -1172,14 +1333,18 @@ compiler.misc.arg.length.mismatch=\u5B9E\u9645\u53C2\u6570\u5217\u8868\u548C\u5F62\u5F0F\u53C2\u6570\u5217\u8868\u957F\u5EA6\u4E0D\u540C -# 0: type, 1: type -compiler.misc.no.conforming.assignment.exists=\u65E0\u6CD5\u901A\u8FC7\u65B9\u6CD5\u8C03\u7528\u8F6C\u6362\u5C06\u5B9E\u9645\u53C2\u6570{0}\u8F6C\u6362\u4E3A{1} - -# 0: type, 1: type -compiler.misc.varargs.argument.mismatch=\u53C2\u6570\u7C7B\u578B{0}\u4E0D\u7B26\u5408 vararg \u5143\u7D20\u7C7B\u578B{1} +# 0: message segment +compiler.misc.no.conforming.assignment.exists=\u53C2\u6570\u4E0D\u5339\u914D; {0} + +# 0: message segment +compiler.misc.varargs.argument.mismatch=varargs \u4E0D\u5339\u914D; {0} ##### +# 0: type, 1: file name +compiler.warn.auxiliary.class.accessed.from.outside.of.its.source.file={1} \u4E2D\u7684\u8F85\u52A9\u7C7B{0}\u4E0D\u5E94\u4ECE\u5176\u81EA\u8EAB\u7684\u6E90\u6587\u4EF6\u4EE5\u5916\u8BBF\u95EE + + ## The first argument ({0}) is a "kindname". # 0: symbol kind, 1: symbol, 2: symbol compiler.err.abstract.cant.be.accessed.directly=\u65E0\u6CD5\u76F4\u63A5\u8BBF\u95EE{2}\u4E2D\u7684\u62BD\u8C61{0} {1} @@ -1188,10 +1353,17 @@ # 0: symbol kind, 1: symbol compiler.err.non-static.cant.be.ref=\u65E0\u6CD5\u4ECE\u9759\u6001\u4E0A\u4E0B\u6587\u4E2D\u5F15\u7528\u975E\u9759\u6001 {0} {1} +# 0: symbol kind, 1: symbol +compiler.misc.non-static.cant.be.ref=\u65E0\u6CD5\u4ECE\u9759\u6001\u4E0A\u4E0B\u6587\u4E2D\u5F15\u7528\u975E\u9759\u6001 {0} {1} + ## Both arguments ({0}, {1}) are "kindname"s. {0} is a comma-separated list ## of kindnames (the list should be identical to that provided in source. compiler.err.unexpected.type=\u610F\u5916\u7684\u7C7B\u578B\n\u9700\u8981: {0}\n\u627E\u5230: {1} +compiler.err.unexpected.lambda=\u6B64\u5904\u4E0D\u5E94\u4E3A lambda \u8868\u8FBE\u5F0F + +compiler.err.unexpected.mref=\u6B64\u5904\u4E0D\u5E94\u4E3A\u65B9\u6CD5\u5F15\u7528 + ## The first argument {0} is a "kindname" (e.g. 'constructor', 'field', etc.) ## The second argument {1} is the non-resolved symbol ## The third argument {2} is a list of type parameters (non-empty if {1} is a method) @@ -1216,12 +1388,20 @@ # 0: symbol kind, 1: name, 2: list of type, 3: list, 4: message segment compiler.err.cant.resolve.location.args.params=\u627E\u4E0D\u5230\u7B26\u53F7\n\u7B26\u53F7: {0} <{2}>{1}({3})\n\u4F4D\u7F6E: {4} +### Following are replicated/used for method reference diagnostics + +# 0: symbol kind, 1: name, 2: unused, 3: list of type, 4: message segment +compiler.misc.cant.resolve.location.args=\u627E\u4E0D\u5230\u7B26\u53F7\n\u7B26\u53F7: {0} {1}({3})\n\u4F4D\u7F6E: {4} + +# 0: symbol kind, 1: name, 2: list of type, 3: list, 4: message segment +compiler.misc.cant.resolve.location.args.params=\u627E\u4E0D\u5230\u7B26\u53F7\n\u7B26\u53F7: {0} <{2}>{1}({3})\n\u4F4D\u7F6E: {4} + ##a location subdiagnostic is composed as follows: ## The first argument {0} is the location "kindname" (e.g. 'constructor', 'field', etc.) ## The second argument {1} is the location name ## The third argument {2} is the location type (only when {1} is a variable name) -# 0: symbol kind, 1: symbol, 2: unused +# 0: symbol kind, 1: type or symbol, 2: unused compiler.misc.location={0} {1} # 0: symbol kind, 1: symbol, 2: type @@ -1256,6 +1436,10 @@ compiler.misc.kindname.package=\u7A0B\u5E8F\u5305 +compiler.misc.kindname.static.init=\u9759\u6001\u521D\u59CB\u5316\u7A0B\u5E8F + +compiler.misc.kindname.instance.init=\u5B9E\u4F8B\u521D\u59CB\u5316\u7A0B\u5E8F + ##### compiler.misc.no.args=\u6CA1\u6709\u53C2\u6570 @@ -1312,6 +1496,7 @@ # 0: symbol, 1: symbol, 2: symbol, 3: symbol compiler.misc.varargs.clash.with={1}\u4E2D\u7684{0}\u8986\u76D6\u4E86{3}\u4E2D\u7684{2} +# 0: unused compiler.misc.diamond.and.anon.class=\u65E0\u6CD5\u5C06 ''<>'' \u4E0E\u533F\u540D\u5185\u90E8\u7C7B\u4E00\u8D77\u4F7F\u7528 # 0: symbol kind, 1: symbol, 2: symbol, 3: message segment @@ -1336,13 +1521,23 @@ compiler.warn.assert.as.identifier=\u4ECE\u53D1\u884C\u7248 1.4 \u5F00\u59CB, ''assert'' \u662F\u4E00\u4E2A\u5173\u952E\u5B57, \u4F46\u4E0D\u80FD\u7528\u4F5C\u6807\u8BC6\u7B26\n(\u8BF7\u4F7F\u7528 -source 1.4 \u6216\u66F4\u9AD8\u7248\u672C\u4EE5\u5C06 ''assert'' \u7528\u4F5C\u5173\u952E\u5B57) +compiler.warn.underscore.as.identifier=''_'' \u5DF2\u7528\u4F5C\u6807\u8BC6\u7B26\n(\u4EE5\u540E\u7684\u53D1\u884C\u7248\u53EF\u80FD\u4E0D\u652F\u6301\u5C06 ''_'' \u7528\u4F5C\u6807\u8BC6\u7B26) + compiler.err.enum.as.identifier=\u4ECE\u53D1\u884C\u7248 5 \u5F00\u59CB, ''enum'' \u4E3A\u5173\u952E\u5B57, \u800C\u4E0D\u7528\u4F5C\u6807\u8BC6\u7B26\n(\u8BF7\u4F7F\u7528 -source 1.4 \u6216\u66F4\u4F4E\u7248\u672C\u4EE5\u5C06 ''enum'' \u7528\u4F5C\u6807\u8BC6\u7B26) compiler.err.assert.as.identifier=\u4ECE\u53D1\u884C\u7248 1.4 \u5F00\u59CB, ''assert'' \u662F\u4E00\u4E2A\u5173\u952E\u5B57, \u4F46\u4E0D\u80FD\u7528\u4F5C\u6807\u8BC6\u7B26\n(\u8BF7\u4F7F\u7528 -source 1.3 \u6216\u66F4\u4F4E\u7248\u672C\u4EE5\u5C06 ''assert'' \u7528\u4F5C\u6807\u8BC6\u7B26) # TODO 308: make a better error message -# compiler.err.this.as.identifier=\ -# as of release 8, ''this'' is allowed as the parameter name for the receiver type only, which has to be the first parameter +compiler.err.this.as.identifier=\u4ECE\u53D1\u884C\u7248 8 \u5F00\u59CB, ''this'' \u53EA\u80FD\u4F5C\u4E3A\u63A5\u6536\u65B9\u7C7B\u578B\u7684\u53C2\u6570\u540D, \u8BE5\u53C2\u6570\u5FC5\u987B\u4E3A\u7B2C\u4E00\u4E2A\u53C2\u6570 + +# TODO 308: make a better error message +compiler.err.cant.annotate.static.class=\u65E0\u6CD5\u5BF9\u5C01\u95ED\u9759\u6001\u5D4C\u5957\u7C7B\u8FDB\u884C\u6CE8\u91CA +# TODO 308: make a better error message +compiler.err.cant.annotate.nested.type=\u65E0\u6CD5\u5BF9\u5D4C\u5957\u7C7B\u578B\u8FDB\u884C\u6CE8\u91CA + +compiler.err.incorrect.receiver.type=\u63A5\u6536\u65B9\u7C7B\u578B\u4E0E\u5C01\u95ED\u7C7B\u7C7B\u578B\u4E0D\u5339\u914D + +compiler.err.no.annotations.on.dot.class=\u7C7B\u6587\u5B57\u7C7B\u578B\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u4EFB\u4F55\u6CE8\u91CA # 0: string compiler.err.generics.not.supported.in.source=-source {0} \u4E2D\u4E0D\u652F\u6301\u6CDB\u578B\n(\u8BF7\u4F7F\u7528 -source 5 \u6216\u66F4\u9AD8\u7248\u672C\u4EE5\u542F\u7528\u6CDB\u578B) @@ -1353,9 +1548,8 @@ # 0: string compiler.err.annotations.not.supported.in.source=-source {0} \u4E2D\u4E0D\u652F\u6301\u6CE8\u91CA\n(\u8BF7\u4F7F\u7528 -source 5 \u6216\u66F4\u9AD8\u7248\u672C\u4EE5\u542F\u7528\u6CE8\u91CA) -#308 compiler.err.type.annotations.not.supported.in.source=\ -#308 type annotations are not supported in -source {0}\n\ -#308 (use -source 8 or higher to enable type annotations) +# 0: string +compiler.err.type.annotations.not.supported.in.source=-source {0} \u4E2D\u4E0D\u652F\u6301\u7C7B\u578B\u6CE8\u91CA\n(\u8BF7\u4F7F\u7528 -source 8 \u6216\u66F4\u9AD8\u7248\u672C\u4EE5\u542F\u7528\u7C7B\u578B\u6CE8\u91CA) # 0: string compiler.err.foreach.not.supported.in.source=-source {0} \u4E2D\u4E0D\u652F\u6301 for-each \u5FAA\u73AF\n(\u8BF7\u4F7F\u7528 -source 5 \u6216\u66F4\u9AD8\u7248\u672C\u4EE5\u542F\u7528 for-each \u5FAA\u73AF) @@ -1375,6 +1569,47 @@ # 0: string compiler.err.string.switch.not.supported.in.source=-source {0} \u4E2D\u4E0D\u652F\u6301 switch \u4E2D\u5B58\u5728\u5B57\u7B26\u4E32\n(\u8BF7\u4F7F\u7528 -source 7 \u6216\u66F4\u9AD8\u7248\u672C\u4EE5\u5141\u8BB8 switch \u4E2D\u5B58\u5728\u5B57\u7B26\u4E32) +# 0: string +compiler.err.lambda.not.supported.in.source=-source {0} \u4E2D\u4E0D\u652F\u6301 lambda \u8868\u8FBE\u5F0F\n(\u8BF7\u4F7F\u7528 -source 8 \u6216\u66F4\u9AD8\u7248\u672C\u4EE5\u542F\u7528 lambda \u8868\u8FBE\u5F0F) + +# 0: string +compiler.err.method.references.not.supported.in.source=-source {0} \u4E2D\u4E0D\u652F\u6301\u65B9\u6CD5\u5F15\u7528\n(\u8BF7\u4F7F\u7528 -source 8 \u6216\u66F4\u9AD8\u7248\u672C\u4EE5\u542F\u7528\u65B9\u6CD5\u5F15\u7528) + +# 0: string +compiler.err.default.methods.not.supported.in.source=-source {0} \u4E2D\u4E0D\u652F\u6301\u9ED8\u8BA4\u65B9\u6CD5\n(\u8BF7\u4F7F\u7528 -source 8 \u6216\u66F4\u9AD8\u7248\u672C\u4EE5\u542F\u7528\u9ED8\u8BA4\u65B9\u6CD5) + +# 0: string +compiler.err.intersection.types.in.cast.not.supported.in.source=-source {0} \u4E2D\u4E0D\u652F\u6301\u8F6C\u6362\u4E2D\u7684\u4EA4\u53C9\u7C7B\u578B\n(\u8BF7\u4F7F\u7528 -source 8 \u6216\u66F4\u9AD8\u7248\u672C\u4EE5\u542F\u7528\u9ED8\u8BA4\u65B9\u6CD5) + +# 0: string +compiler.err.static.intf.methods.not.supported.in.source=-source {0} \u4E2D\u4E0D\u652F\u6301\u9759\u6001\u63A5\u53E3\u65B9\u6CD5\n(\u8BF7\u4F7F\u7528 -source 8 \u6216\u66F4\u9AD8\u7248\u672C\u4EE5\u542F\u7528\u9759\u6001\u63A5\u53E3\u65B9\u6CD5) + +######################################## +# Diagnostics for verbose resolution +# used by Resolve (debug only) +######################################## + +# 0: number, 1: symbol, 2: unused +compiler.misc.applicable.method.found=\u627E\u5230\u7B2C {0} \u4E2A\u9002\u7528\u65B9\u6CD5: {1} + +# 0: number, 1: symbol, 2: message segment +compiler.misc.applicable.method.found.1=\u627E\u5230\u7B2C {0} \u4E2A\u9002\u7528\u65B9\u6CD5: {1}\n({2}) + +# 0: number, 1: symbol, 2: message segment +compiler.misc.not.applicable.method.found=\u627E\u5230\u7B2C {0} \u4E2A\u4E0D\u9002\u7528\u7684\u65B9\u6CD5: {1}\n({2}) + +# 0: type +compiler.misc.partial.inst.sig=\u90E8\u5206\u5B9E\u4F8B\u5316\u4E3A: {0} + +# 0: name, 1: symbol, 2: number, 3: MethodResolutionPhase, 4: list of type or message segment, 5: list of type or message segment +compiler.note.verbose.resolve.multi=\u5C06\u7C7B\u578B {1} \u7684\u65B9\u6CD5 {0} \u89E3\u6790\u4E3A\u5019\u9009\u9879 {2}\n\u9636\u6BB5: {3}\n\u5177\u6709\u5B9E\u9645\u503C: {4}\n\u5177\u6709\u7C7B\u578B\u53C2\u6570: {5}\n\u5019\u9009\u9879: + +# 0: name, 1: symbol, 2: unused, 3: MethodResolutionPhase, 4: list of type or message segment, 5: list of type or message segment +compiler.note.verbose.resolve.multi.1=\u7C7B\u578B {1} \u7684\u65B9\u6CD5 {0} \u89E3\u6790\u9519\u8BEF\n\u9636\u6BB5: {3}\n\u5177\u6709\u5B9E\u9645\u503C: {4}\n\u5177\u6709\u7C7B\u578B\u53C2\u6570: {5}\n\u5019\u9009\u9879: + +# 0: symbol, 1: type, 2: type +compiler.note.deferred.method.inst=\u65B9\u6CD5 {0} \u7684\u5EF6\u8FDF\u5B9E\u4F8B\u5316\n\u5B9E\u4F8B\u5316\u7B7E\u540D: {1}\n\u76EE\u6807\u7C7B\u578B: {2} + ######################################## # Diagnostics for where clause implementation # used by the RichDiagnosticFormatter. @@ -1411,8 +1646,14 @@ # compact where clause for type variable: contains the kindname ({2}) and location ({3}) # in which the typevar has been declared +# 0: type, 1: list of type, 2: symbol kind, 3: symbol compiler.misc.where.typevar.1={0}\u5DF2\u5728{2} {3}\u4E2D\u58F0\u660E +# where clause for fresh type variable: contains upper bound(s) ('extends {1}'). +# Since a fresh type-variable is synthetic - there's no location/kindname here. +# 0: type, 1: list of type +compiler.misc.where.fresh.typevar={0}\u6269\u5C55{1} + # where clause for type variable: contains all the upper bound(s) ('extends {1}') # of this intersection type # 0: type, 1: list of type @@ -1435,4 +1676,39 @@ compiler.misc.where.description.intersection.1=\u5176\u4E2D, {0}\u662F\u4EA4\u53C9\u7C7B\u578B: - +### +# errors related to doc comments + +compiler.err.dc.bad.entity=HTML \u5B9E\u4F53\u9519\u8BEF + +compiler.err.dc.bad.gt=''>'' \u7684\u7528\u6CD5\u9519\u8BEF + +compiler.err.dc.bad.inline.tag=\u5185\u5D4C\u6807\u8BB0\u7684\u7528\u6CD5\u4E0D\u6B63\u786E + +compiler.err.dc.identifier.expected=\u9700\u8981\u6807\u8BC6\u7B26 + +compiler.err.dc.malformed.html=\u683C\u5F0F\u9519\u8BEF\u7684 HTML + +compiler.err.dc.missing.semicolon=\u7F3A\u5C11\u5206\u53F7 + +compiler.err.dc.no.content=\u65E0\u5185\u5BB9 + +compiler.err.dc.no.tag.name='@' \u540E\u6CA1\u6709\u6807\u8BB0\u540D + +compiler.err.dc.gt.expected=\u9700\u8981 ''>'' + +compiler.err.dc.ref.bad.parens=\u5F15\u7528\u4E2D\u7F3A\u5C11 '')'' + +compiler.err.dc.ref.syntax.error=\u5F15\u7528\u4E2D\u51FA\u73B0\u8BED\u6CD5\u9519\u8BEF + +compiler.err.dc.ref.unexpected.input=\u610F\u5916\u7684\u6587\u672C + +compiler.err.dc.unexpected.content=\u610F\u5916\u7684\u5185\u5BB9 + +compiler.err.dc.unterminated.inline.tag=\u672A\u7EC8\u6B62\u7684\u5185\u5D4C\u6807\u8BB0 + +compiler.err.dc.unterminated.signature=\u672A\u7EC8\u6B62\u7684\u7B7E\u540D + +compiler.err.dc.unterminated.string=\u672A\u7EC8\u6B62\u7684\u5B57\u7B26\u4E32 + +
--- a/src/share/classes/com/sun/tools/javac/resources/javac.properties Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/resources/javac.properties Tue May 07 17:14:17 2013 -0700 @@ -71,6 +71,8 @@ Pass <flag> directly to the runtime system javac.opt.encoding=\ Specify character encoding used by source files +javac.opt.profile=\ + Check that API used is available in the specified profile javac.opt.target=\ Generate class files for specific VM version javac.opt.source=\ @@ -103,6 +105,8 @@ <directory> javac.opt.arg.encoding=\ <encoding> +javac.opt.arg.profile=\ + <profile> javac.opt.arg.release=\ <release> javac.opt.arg.number=\ @@ -181,6 +185,8 @@ key in annotation processor option ''{0}'' is not a dot-separated sequence of identifiers javac.err.invalid.flag=\ invalid flag: {0} +javac.err.invalid.profile=\ + invalid profile: {0} javac.err.invalid.target=\ invalid target release: {0} javac.err.no.source.files=\ @@ -197,6 +203,8 @@ source release {0} requires target release {1} javac.warn.target.default.source.conflict=\ target release {0} conflicts with default source release {1} +javac.warn.profile.target.conflict=\ + profile {0} is not valid for target release {1} javac.err.dir.not.found=\ directory not found: {0} javac.err.file.not.found=\
--- a/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2012, 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 @@ -30,7 +30,7 @@ javac.opt.g.lines.vars.source=\u3044\u304F\u3064\u304B\u306E\u30C7\u30D0\u30C3\u30B0\u60C5\u5831\u306E\u307F\u3092\u751F\u6210\u3059\u308B javac.opt.nowarn=\u8B66\u544A\u3092\u767A\u751F\u3055\u305B\u306A\u3044 javac.opt.verbose=\u30B3\u30F3\u30D1\u30A4\u30E9\u306E\u52D5\u4F5C\u306B\u3064\u3044\u3066\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B -javac.opt.deprecation=\u63A8\u5968\u3055\u308C\u306A\u3044API\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u30BD\u30FC\u30B9\u306E\u4F4D\u7F6E\u3092\u51FA\u529B\u3059\u308B +javac.opt.deprecation=\u975E\u63A8\u5968\u306EAPI\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u30BD\u30FC\u30B9\u306E\u4F4D\u7F6E\u3092\u51FA\u529B\u3059\u308B javac.opt.classpath=\u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304A\u3088\u3073\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B javac.opt.sourcepath=\u5165\u529B\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B javac.opt.bootclasspath=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u4F4D\u7F6E\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B @@ -40,9 +40,11 @@ javac.opt.extdirs=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u307F\u62E1\u5F35\u6A5F\u80FD\u306E\u4F4D\u7F6E\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B javac.opt.processorpath=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B javac.opt.processor=\u5B9F\u884C\u3059\u308B\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u306E\u540D\u524D\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u691C\u51FA\u51E6\u7406\u3092\u30D0\u30A4\u30D1\u30B9 +javac.opt.parameters=\u30E1\u30BD\u30C3\u30C9\u30FB\u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u30EA\u30D5\u30EC\u30AF\u30B7\u30E7\u30F3\u7528\u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u3092\u751F\u6210\u3057\u307E\u3059 javac.opt.proc.none.only=\u6CE8\u91C8\u51E6\u7406\u3084\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u5B9F\u884C\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u5236\u5FA1\u3057\u307E\u3059\u3002 javac.opt.d=\u751F\u6210\u3055\u308C\u305F\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u683C\u7D0D\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B javac.opt.sourceDest=\u751F\u6210\u3055\u308C\u305F\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u683C\u7D0D\u3059\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B +javac.opt.headerDest=\u751F\u6210\u3055\u308C\u305F\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30D8\u30C3\u30C0\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u683C\u7D0D\u3059\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B javac.opt.J=<flag>\u3092\u5B9F\u884C\u30B7\u30B9\u30C6\u30E0\u306B\u76F4\u63A5\u6E21\u3059 javac.opt.encoding=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u4F7F\u7528\u3059\u308B\u6587\u5B57\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3092\u6307\u5B9A\u3059\u308B javac.opt.target=\u7279\u5B9A\u306EVM\u30D0\u30FC\u30B8\u30E7\u30F3\u7528\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u751F\u6210\u3059\u308B @@ -61,6 +63,8 @@ javac.opt.arg.encoding=<encoding> javac.opt.arg.release=<release> javac.opt.arg.number=<number> +javac.opt.plugin=\u5B9F\u884C\u3055\u308C\u308B\u30D7\u30E9\u30B0\u30A4\u30F3\u306E\u540D\u524D\u3068\u30AA\u30D7\u30B7\u30E7\u30F3\u5F15\u6570 +javac.opt.arg.plugin="name args" ## extended options @@ -80,6 +84,9 @@ javac.opt.arg.file=<filename> javac.opt.Xlint=\u63A8\u5968\u306E\u8B66\u544A\u3092\u6709\u52B9\u306B\u3059\u308B javac.opt.Xlint.suboptlist=\u7279\u5B9A\u306E\u8B66\u544A\u3092\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3059\u308B +javac.opt.Xdoclint=javadoc\u30B3\u30E1\u30F3\u30C8\u306E\u554F\u984C\u306B\u95A2\u3059\u308B\u63A8\u5968\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3059\u308B +javac.opt.Xdoclint.subopts = (all|[-]<group>)[/<access>] +javac.opt.Xdoclint.custom=\n javadoc\u30B3\u30E1\u30F3\u30C8\u306E\u554F\u984C\u306B\u95A2\u3059\u308B\u7279\u5B9A\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3057\u307E\u3059\u3002\n \u3053\u3053\u3067\u3001<group>\u306Faccessibility\u3001html\u3001reference\u307E\u305F\u306Fsyntax\u306E\u3044\u305A\u308C\u304B\u3067\u3001\n <access>\u306Fpublic\u3001protected\u3001package\u307E\u305F\u306Fprivate\u306E\u3044\u305A\u308C\u304B\u3067\u3059\u3002 javac.opt.Xstdout=\u6A19\u6E96\u51FA\u529B\u3092\u30EA\u30C0\u30A4\u30EC\u30AF\u30C8\u3059\u308B javac.opt.X=\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u6982\u8981\u3092\u51FA\u529B\u3059\u308B javac.opt.help=\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u6982\u8981\u3092\u51FA\u529B\u3059\u308B @@ -107,6 +114,7 @@ javac.err.file.not.found=\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0} javac.err.file.not.directory=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u306F\u3042\u308A\u307E\u305B\u3093: {0} javac.err.file.not.file=\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u3042\u308A\u307E\u305B\u3093: {0} +javac.msg.plugin.not.found=\u30D7\u30E9\u30B0\u30A4\u30F3\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0} ## messages javac.msg.usage.header=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <source files>\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059\u3002 @@ -117,11 +125,13 @@ javac.msg.bug=\u30B3\u30F3\u30D1\u30A4\u30E9\u3067\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F({0})\u3002Bug Parade\u306B\u540C\u3058\u30D0\u30B0\u304C\u767B\u9332\u3055\u308C\u3066\u3044\u306A\u3044\u3053\u3068\u3092\u3054\u78BA\u8A8D\u306E\u4E0A\u3001Java Developer Connection(http://java.sun.com/webapps/bugreport)\u3067\u30D0\u30B0\u306E\u767B\u9332\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002\u30EC\u30DD\u30FC\u30C8\u306B\u306F\u3001\u305D\u306E\u30D7\u30ED\u30B0\u30E9\u30E0\u3068\u4E0B\u8A18\u306E\u8A3A\u65AD\u5185\u5BB9\u3092\u542B\u3081\u3066\u304F\u3060\u3055\u3044\u3002\u3054\u5354\u529B\u3042\u308A\u304C\u3068\u3046\u3054\u3056\u3044\u307E\u3059\u3002 -javac.msg.io=\n\n\u5165\u51FA\u529B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n +javac.msg.io=\n\n\u5165\u51FA\u529B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n + +javac.msg.proc.annotation.uncaught.exception=\n\n\u6CE8\u91C8\u51E6\u7406\u3067\u6355\u6349\u3055\u308C\u306A\u3044\u4F8B\u5916\u304C\u30B9\u30ED\u30FC\u3055\u308C\u307E\u3057\u305F\u3002\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n -javac.msg.proc.annotation.uncaught.exception=\n\n\u6CE8\u91C8\u51E6\u7406\u3067\u6355\u6349\u3055\u308C\u306A\u3044\u4F8B\u5916\u304C\u30B9\u30ED\u30FC\u3055\u308C\u307E\u3057\u305F\u3002\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n +javac.msg.plugin.uncaught.exception=\n\n\u30D7\u30E9\u30B0\u30A4\u30F3\u3067\u6355\u6349\u3055\u308C\u306A\u3044\u4F8B\u5916\u304C\u30B9\u30ED\u30FC\u3055\u308C\u307E\u3057\u305F\u3002\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n -javac.msg.resource=\n\n\u30B7\u30B9\u30C6\u30E0\u30FB\u30EA\u30BD\u30FC\u30B9\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059\u3002\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n +javac.msg.resource=\n\n\u30B7\u30B9\u30C6\u30E0\u30FB\u30EA\u30BD\u30FC\u30B9\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059\u3002\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n javac.version={0} {1} javac.fullVersion={0}\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"{1}"
--- a/src/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2012, 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 @@ -40,9 +40,11 @@ javac.opt.extdirs=\u8986\u76D6\u6240\u5B89\u88C5\u6269\u5C55\u7684\u4F4D\u7F6E javac.opt.processorpath=\u6307\u5B9A\u67E5\u627E\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F\u7684\u4F4D\u7F6E javac.opt.processor=\u8981\u8FD0\u884C\u7684\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F\u7684\u540D\u79F0; \u7ED5\u8FC7\u9ED8\u8BA4\u7684\u641C\u7D22\u8FDB\u7A0B +javac.opt.parameters=\u751F\u6210\u5143\u6570\u636E\u4EE5\u7528\u4E8E\u65B9\u6CD5\u53C2\u6570\u7684\u53CD\u5C04 javac.opt.proc.none.only=\u63A7\u5236\u662F\u5426\u6267\u884C\u6CE8\u91CA\u5904\u7406\u548C/\u6216\u7F16\u8BD1\u3002 javac.opt.d=\u6307\u5B9A\u653E\u7F6E\u751F\u6210\u7684\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E javac.opt.sourceDest=\u6307\u5B9A\u653E\u7F6E\u751F\u6210\u7684\u6E90\u6587\u4EF6\u7684\u4F4D\u7F6E +javac.opt.headerDest=\u6307\u5B9A\u653E\u7F6E\u751F\u6210\u7684\u672C\u673A\u6807\u5934\u6587\u4EF6\u7684\u4F4D\u7F6E javac.opt.J=\u76F4\u63A5\u5C06 <\u6807\u8BB0> \u4F20\u9012\u7ED9\u8FD0\u884C\u65F6\u7CFB\u7EDF javac.opt.encoding=\u6307\u5B9A\u6E90\u6587\u4EF6\u4F7F\u7528\u7684\u5B57\u7B26\u7F16\u7801 javac.opt.target=\u751F\u6210\u7279\u5B9A VM \u7248\u672C\u7684\u7C7B\u6587\u4EF6 @@ -61,6 +63,8 @@ javac.opt.arg.encoding=<\u7F16\u7801> javac.opt.arg.release=<\u53D1\u884C\u7248> javac.opt.arg.number=<\u7F16\u53F7> +javac.opt.plugin=\u8981\u8FD0\u884C\u7684\u63D2\u4EF6\u7684\u540D\u79F0\u548C\u53EF\u9009\u53C2\u6570 +javac.opt.arg.plugin="\u540D\u79F0\u53C2\u6570" ## extended options @@ -80,6 +84,9 @@ javac.opt.arg.file=<\u6587\u4EF6\u540D> javac.opt.Xlint=\u542F\u7528\u5EFA\u8BAE\u7684\u8B66\u544A javac.opt.Xlint.suboptlist=\u542F\u7528\u6216\u7981\u7528\u7279\u5B9A\u7684\u8B66\u544A +javac.opt.Xdoclint=\u4E3A javadoc \u6CE8\u91CA\u4E2D\u7684\u95EE\u9898\u542F\u7528\u5EFA\u8BAE\u7684\u68C0\u67E5 +javac.opt.Xdoclint.subopts = (all|[-]<group>)[/<access>] +javac.opt.Xdoclint.custom=\n \u4E3A javadoc \u6CE8\u91CA\u4E2D\u7684\u95EE\u9898\u542F\u7528\u6216\u7981\u7528\u7279\u5B9A\u68C0\u67E5,\n \u5176\u4E2D <group> \u4E3A\u53EF\u8BBF\u95EE\u6027, html, \u5F15\u7528\u6216\u8BED\u6CD5\u4E4B\u4E00,\n <access> \u4E3A public, protected, package \u6216 private \u4E4B\u4E00\u3002 javac.opt.Xstdout=\u91CD\u5B9A\u5411\u6807\u51C6\u8F93\u51FA javac.opt.X=\u8F93\u51FA\u975E\u6807\u51C6\u9009\u9879\u7684\u63D0\u8981 javac.opt.help=\u8F93\u51FA\u6807\u51C6\u9009\u9879\u7684\u63D0\u8981 @@ -107,6 +114,7 @@ javac.err.file.not.found=\u627E\u4E0D\u5230\u6587\u4EF6: {0} javac.err.file.not.directory=\u4E0D\u662F\u76EE\u5F55: {0} javac.err.file.not.file=\u4E0D\u662F\u6587\u4EF6: {0} +javac.msg.plugin.not.found=\u627E\u4E0D\u5230\u63D2\u4EF6: {0} ## messages javac.msg.usage.header=\u7528\u6CD5: {0} <options> <source files>\n\u5176\u4E2D, \u53EF\u80FD\u7684\u9009\u9879\u5305\u62EC: @@ -121,6 +129,8 @@ javac.msg.proc.annotation.uncaught.exception=\n\n\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F\u629B\u51FA\u672A\u6355\u83B7\u7684\u5F02\u5E38\u9519\u8BEF\u3002\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605\u4EE5\u4E0B\u5806\u6808\u8DDF\u8E2A\u3002\n +javac.msg.plugin.uncaught.exception=\n\n\u63D2\u4EF6\u629B\u51FA\u672A\u6355\u83B7\u7684\u5F02\u5E38\u9519\u8BEF\u3002\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605\u4EE5\u4E0B\u5806\u6808\u8DDF\u8E2A\u3002\n + javac.msg.resource=\n\n\u7CFB\u7EDF\u8D44\u6E90\u4E0D\u8DB3\u3002\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605\u4EE5\u4E0B\u5806\u6808\u8DDF\u8E2A\u3002\n javac.version={0} {1}
--- a/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java Tue May 07 17:14:17 2013 -0700 @@ -34,11 +34,11 @@ import com.sun.tools.javac.code.Symtab; import com.sun.tools.javac.code.Type; import com.sun.tools.javac.code.Types; -import com.sun.tools.javac.jvm.ClassReader; import com.sun.tools.javac.jvm.ClassWriter; import com.sun.tools.javac.jvm.Pool; import com.sun.tools.javac.processing.JavacProcessingEnvironment; import com.sun.tools.javac.util.List; +import com.sun.tools.javac.util.Names; import com.sun.tools.javac.util.Pair; import java.io.File; @@ -47,6 +47,7 @@ import java.util.EnumSet; import java.util.Enumeration; import java.util.HashSet; +import java.util.Map; import java.util.ResourceBundle; import java.util.Set; @@ -85,7 +86,10 @@ * * @author Peter von der Ah\u00e9 */ -@SupportedOptions({"com.sun.tools.javac.sym.Jar","com.sun.tools.javac.sym.Dest"}) +@SupportedOptions({ + "com.sun.tools.javac.sym.Jar", + "com.sun.tools.javac.sym.Dest", + "com.sun.tools.javac.sym.Profiles"}) @SupportedAnnotationTypes("*") public class CreateSymbols extends AbstractProcessor { @@ -106,6 +110,7 @@ processingEnv.getMessager() .printMessage(Diagnostic.Kind.ERROR, e.getLocalizedMessage()); } catch (Throwable t) { + t.printStackTrace(); Throwable cause = t.getCause(); if (cause == null) cause = t; @@ -121,12 +126,17 @@ Set<String> documented = new HashSet<String>(); Set<PackageSymbol> packages = ((JavacProcessingEnvironment)processingEnv).getSpecifiedPackages(); - String jarName = processingEnv.getOptions().get("com.sun.tools.javac.sym.Jar"); + Map<String,String> pOptions = processingEnv.getOptions(); + String jarName = pOptions.get("com.sun.tools.javac.sym.Jar"); if (jarName == null) throw new RuntimeException("Must use -Acom.sun.tools.javac.sym.Jar=LOCATION_OF_JAR"); - String destName = processingEnv.getOptions().get("com.sun.tools.javac.sym.Dest"); + String destName = pOptions.get("com.sun.tools.javac.sym.Dest"); if (destName == null) throw new RuntimeException("Must use -Acom.sun.tools.javac.sym.Dest=LOCATION_OF_JAR"); + String profileSpec=pOptions.get("com.sun.tools.javac.sym.Profiles"); + if (profileSpec == null) + throw new RuntimeException("Must use -Acom.sun.tools.javac.sym.Profiles=PROFILES_SPEC"); + Profiles profiles = Profiles.read(new File(profileSpec)); for (PackageSymbol psym : packages) { String name = psym.getQualifiedName().toString(); @@ -166,12 +176,19 @@ tool.getTask(null, fm, null, options, null, null); com.sun.tools.javac.main.JavaCompiler compiler = com.sun.tools.javac.main.JavaCompiler.instance(task.getContext()); - ClassReader reader = ClassReader.instance(task.getContext()); ClassWriter writer = ClassWriter.instance(task.getContext()); Symtab syms = Symtab.instance(task.getContext()); - Attribute.Compound proprietary = + Names names = Names.instance(task.getContext()); + Attribute.Compound proprietaryAnno = new Attribute.Compound(syms.proprietaryType, List.<Pair<Symbol.MethodSymbol,Attribute>>nil()); + Attribute.Compound[] profileAnnos = new Attribute.Compound[profiles.getProfileCount() + 1]; + Symbol.MethodSymbol profileValue = (MethodSymbol) syms.profileType.tsym.members().lookup(names.value).sym; + for (int i = 1; i < profileAnnos.length; i++) { + profileAnnos[i] = new Attribute.Compound(syms.profileType, + List.<Pair<Symbol.MethodSymbol, Attribute>>of( + new Pair<Symbol.MethodSymbol, Attribute>(profileValue, new Attribute.Constant(syms.intType, i)))); + } Type.moreInfo = true; Types types = Types.instance(task.getContext()); @@ -208,8 +225,11 @@ } ClassSymbol cs = (ClassSymbol) sym; if (addLegacyAnnotation) { - cs.annotations.prepend(List.of(proprietary)); + cs.annotations.prepend(List.of(proprietaryAnno)); } + int p = profiles.getProfile(cs.fullname.toString().replace(".", "/")); + if (0 < p && p < profileAnnos.length) + cs.annotations.prepend(List.of(profileAnnos[p])); writeClass(pool, cs, writer); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/javac/sym/Profiles.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,297 @@ +/* + * Copyright (c) 2006, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.javac.sym; + +import java.io.BufferedInputStream; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.nio.charset.Charset; +import java.nio.file.Files; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.TreeMap; +import java.util.TreeSet; + +import com.sun.tools.javac.util.Assert; + +/** + * Provide details about profile contents. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own + * risk. This code and its internal interfaces are subject to change + * or deletion without notice.</b></p> + */ +public abstract class Profiles { + // for debugging + public static void main(String[] args) throws IOException { + Profiles p = Profiles.read(new File(args[0])); + if (args.length >= 2) { + Map<Integer,Set<String>> lists = new TreeMap<Integer,Set<String>>(); + for (int i = 1; i <= 4; i++) + lists.put(i, new TreeSet<String>()); + + File rt_jar_lst = new File(args[1]); + for (String line: Files.readAllLines(rt_jar_lst.toPath(), Charset.defaultCharset())) { + if (line.endsWith(".class")) { + String type = line.substring(0, line.length() - 6); + int profile = p.getProfile(type); + for (int i = profile; i <= 4; i++) + lists.get(i).add(type); + } + } + + for (int i = 1; i <= 4; i++) { + BufferedWriter out = new BufferedWriter(new FileWriter(i + ".txt")); + try { + for (String type: lists.get(i)) { + out.write(type); + out.newLine(); + } + } finally { + out.close(); + } + } + } + } + + public static Profiles read(File file) throws IOException { + BufferedInputStream in = new BufferedInputStream(new FileInputStream(file)); + try { + Properties p = new Properties(); + p.load(in); + if (p.containsKey("java/lang/Object")) + return new SimpleProfiles(p); + else + return new MakefileProfiles(p); + } finally { + in.close(); + } + } + + public abstract int getProfileCount(); + + public abstract int getProfile(String typeName); + + public abstract Set<String> getPackages(int profile); + + private static class MakefileProfiles extends Profiles { + static class Package { + final Package parent; + final String name; + + Map<String, Package> subpackages = new TreeMap<String, Package>(); + + int profile; + Map<String, Integer> includedTypes = new TreeMap<String,Integer>(); + Map<String, Integer> excludedTypes = new TreeMap<String,Integer>(); + + Package(Package parent, String name) { + this.parent = parent; + this.name = name; + } + + int getProfile() { + return (parent == null) ? profile : Math.max(parent.getProfile(), profile); + } + + int getProfile(String simpleTypeName) { + Integer i; + if ((i = includedTypes.get(simpleTypeName)) != null) + return i; + if ((i = includedTypes.get("*")) != null) + return i; + if ((i = excludedTypes.get(simpleTypeName)) != null) + return i + 1; + if ((i = excludedTypes.get("*")) != null) + return i + 1; + return getProfile(); + } + + String getName() { + return (parent == null) ? name : (parent.getName() + "/" + name); + } + + void getPackages(int profile, Set<String> results) { + int prf = getProfile(); + if (prf != 0 && profile >= prf) + results.add(getName()); + for (Package pkg: subpackages.values()) + pkg.getPackages(profile, results); + } + } + + final static Map<String, Package> packages = new TreeMap<String, Package>(); + + final int maxProfile = 4; // Three compact profiles plus full JRE + + MakefileProfiles(Properties p) { + for (int profile = 1; profile <= maxProfile; profile++) { + String prefix = (profile < maxProfile ? "PROFILE_" + profile : "FULL_JRE"); + String inclPackages = p.getProperty(prefix + "_RTJAR_INCLUDE_PACKAGES"); + if (inclPackages == null) + break; + for (String pkg: inclPackages.substring(1).trim().split("\\s+")) { + if (pkg.endsWith("/")) + pkg = pkg.substring(0, pkg.length() - 1); + includePackage(profile, pkg); + } + String inclTypes = p.getProperty(prefix + "_RTJAR_INCLUDE_TYPES"); + if (inclTypes != null) { + for (String type: inclTypes.replace("$$", "$").split("\\s+")) { + if (type.endsWith(".class")) + includeType(profile, type.substring(0, type.length() - 6)); + } + } + String exclTypes = p.getProperty(prefix + "_RTJAR_EXCLUDE_TYPES"); + if (exclTypes != null) { + for (String type: exclTypes.replace("$$", "$").split("\\s+")) { + if (type.endsWith(".class")) + excludeType(profile, type.substring(0, type.length() - 6)); + } + } + } + } + + @Override + public int getProfileCount() { + return maxProfile; + } + + @Override + public int getProfile(String typeName) { + int sep = typeName.lastIndexOf("/"); + String packageName = typeName.substring(0, sep); + String simpleName = typeName.substring(sep + 1); + + Package p = getPackage(packageName); + return p.getProfile(simpleName); + } + + @Override + public Set<String> getPackages(int profile) { + Set<String> results = new TreeSet<String>(); + for (Package p: packages.values()) + p.getPackages(profile, results); + return results; + } + + private void includePackage(int profile, String packageName) { +// System.err.println("include package " + packageName); + Package p = getPackage(packageName); + Assert.check(p.profile == 0); + p.profile = profile; + } + + private void includeType(int profile, String typeName) { +// System.err.println("include type " + typeName); + int sep = typeName.lastIndexOf("/"); + String packageName = typeName.substring(0, sep); + String simpleName = typeName.substring(sep + 1); + + Package p = getPackage(packageName); + Assert.check(!p.includedTypes.containsKey(simpleName)); + p.includedTypes.put(simpleName, profile); + } + + private void excludeType(int profile, String typeName) { +// System.err.println("exclude type " + typeName); + int sep = typeName.lastIndexOf("/"); + String packageName = typeName.substring(0, sep); + String simpleName = typeName.substring(sep + 1); + + Package p = getPackage(packageName); + Assert.check(!p.excludedTypes.containsKey(simpleName)); + p.excludedTypes.put(simpleName, profile); + } + + private Package getPackage(String packageName) { + int sep = packageName.lastIndexOf("/"); + Package parent; + Map<String, Package> parentSubpackages; + String simpleName; + if (sep == -1) { + parent = null; + parentSubpackages = packages; + simpleName = packageName; + } else { + parent = getPackage(packageName.substring(0, sep)); + parentSubpackages = parent.subpackages; + simpleName = packageName.substring(sep + 1); + } + + Package p = parentSubpackages.get(simpleName); + if (p == null) { + parentSubpackages.put(simpleName, p = new Package(parent, simpleName)); + } + return p; + } + } + + private static class SimpleProfiles extends Profiles { + private final Map<String, Integer> map; + private final int profileCount; + + SimpleProfiles(Properties p) { + int max = 0; + map = new HashMap<String, Integer>(); + for (Map.Entry<Object,Object> e: p.entrySet()) { + String typeName = (String) e.getKey(); + int profile = Integer.valueOf((String) e.getValue()); + map.put(typeName, profile); + max = Math.max(max, profile); + } + profileCount = max; + } + + @Override + public int getProfileCount() { + return profileCount; + } + + @Override + public int getProfile(String typeName) { + return map.get(typeName); + } + + @Override + public Set<String> getPackages(int profile) { + Set<String> results = new TreeSet<String>(); + for (Map.Entry<String,Integer> e: map.entrySet()) { + String tn = e.getKey(); + int prf = e.getValue(); + int sep = tn.lastIndexOf("/"); + if (sep > 0 && profile >= prf) + results.add(tn); + } + return results; + } + } +}
--- a/src/share/classes/com/sun/tools/javac/tree/DCTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/tree/DCTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -119,7 +119,7 @@ } - public static abstract class DCBlockTag extends DCTree implements InlineTagTree { + public static abstract class DCBlockTag extends DCTree implements BlockTagTree { public String getTagName() { return getKind().tagName; } @@ -169,7 +169,7 @@ } } - public static class DCAuthor extends DCInlineTag implements AuthorTree { + public static class DCAuthor extends DCBlockTag implements AuthorTree { public final List<DCTree> name; DCAuthor(List<DCTree> name) { @@ -640,7 +640,7 @@ } } - public static class DCSince extends DCInlineTag implements SinceTree { + public static class DCSince extends DCBlockTag implements SinceTree { public final List<DCTree> body; DCSince(List<DCTree> body) {
--- a/src/share/classes/com/sun/tools/javac/tree/JCTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/tree/JCTree.java Tue May 07 17:14:17 2013 -0700 @@ -1903,6 +1903,7 @@ public Symbol sym; public Type varargsElement; public PolyKind refPolyKind; + public boolean ownerAccessible; /** * Javac-dependent classification for member references, based
--- a/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java Tue May 07 17:14:17 2013 -0700 @@ -236,6 +236,7 @@ switch(tree.getTag()) { case TYPEAPPLY: return ((JCTypeApply)tree).getTypeArguments().isEmpty(); case NEWCLASS: return isDiamond(((JCNewClass)tree).clazz); + case ANNOTATED_TYPE: return isDiamond(((JCAnnotatedType)tree).underlyingType); default: return false; } } @@ -249,23 +250,6 @@ } } - /** Return true if a a tree corresponds to a poly expression. */ - public static boolean isPoly(JCTree tree, JCTree origin) { - switch (tree.getTag()) { - case APPLY: - case NEWCLASS: - case CONDEXPR: - return !origin.hasTag(TYPECAST); - case LAMBDA: - case REFERENCE: - return true; - case PARENS: - return isPoly(((JCParens)tree).expr, origin); - default: - return false; - } - } - /** set 'polyKind' on given tree */ public static void setPolyKind(JCTree tree, PolyKind pkind) { switch (tree.getTag()) { @@ -336,6 +320,8 @@ case TYPEAPPLY: case TYPEARRAY: return true; + case ANNOTATED_TYPE: + return isStaticSelector(((JCAnnotatedType)base).underlyingType, names); default: return false; }
--- a/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java Tue May 07 17:14:17 2013 -0700 @@ -45,6 +45,7 @@ import com.sun.tools.javac.code.Type; import com.sun.tools.javac.code.Type.CapturedType; import com.sun.tools.javac.file.BaseFileObject; +import com.sun.tools.javac.jvm.Profile; import com.sun.tools.javac.tree.JCTree.*; import com.sun.tools.javac.tree.Pretty; import static com.sun.tools.javac.util.JCDiagnostic.DiagnosticType.*; @@ -197,6 +198,9 @@ else if (arg instanceof JavaFileObject) { return ((JavaFileObject)arg).getName(); } + else if (arg instanceof Profile) { + return ((Profile)arg).name; + } else if (arg instanceof Formattable) { return ((Formattable)arg).toString(l, messages); }
--- a/src/share/classes/com/sun/tools/javac/util/ArrayUtils.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/util/ArrayUtils.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -84,4 +84,5 @@ return result; } } + }
--- a/src/share/classes/com/sun/tools/javac/util/BaseFileManager.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/util/BaseFileManager.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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 @@ -112,9 +112,8 @@ protected ClassLoader getClassLoader(URL[] urls) { ClassLoader thisClassLoader = getClass().getClassLoader(); - // Bug: 6558476 - // Ideally, ClassLoader should be Closeable, but before JDK7 it is not. - // On older versions, try the following, to get a closeable classloader. + // Allow the following to specify a closeable classloader + // other than URLClassLoader. // 1: Allow client to specify the class to use via hidden option if (classLoaderClass != null) { @@ -128,19 +127,6 @@ // ignore errors loading user-provided class loader, fall through } } - - // 2: If URLClassLoader implements Closeable, use that. - if (Closeable.class.isAssignableFrom(URLClassLoader.class)) - return new URLClassLoader(urls, thisClassLoader); - - // 3: Try using private reflection-based CloseableURLClassLoader - try { - return new CloseableURLClassLoader(urls, thisClassLoader); - } catch (Throwable t) { - // ignore errors loading workaround class loader, fall through - } - - // 4: If all else fails, use plain old standard URLClassLoader return new URLClassLoader(urls, thisClassLoader); }
--- a/src/share/classes/com/sun/tools/javac/util/CloseableURLClassLoader.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,108 +0,0 @@ -/* - * Copyright (c) 2007, 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. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * 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 com.sun.tools.javac.util; - -import java.io.Closeable; -import java.io.IOException; -import java.lang.reflect.Field; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; -import java.util.jar.JarFile; - -/** - * A URLClassLoader that also implements Closeable. - * Reflection is used to access internal data structures in the URLClassLoader, - * since no public API exists for this purpose. Therefore this code is somewhat - * fragile. Caveat emptor. - * @throws Error if the internal data structures are not as expected. - * - * <p><b>This is NOT part of any supported API. - * If you write code that depends on this, you do so at your own risk. - * This code and its internal interfaces are subject to change or - * deletion without notice.</b> - */ -public class CloseableURLClassLoader - extends URLClassLoader implements Closeable { - public CloseableURLClassLoader(URL[] urls, ClassLoader parent) throws Error { - super(urls, parent); - try { - getLoaders(); //proactive check that URLClassLoader is as expected - } catch (Throwable t) { - throw new Error("cannot create CloseableURLClassLoader", t); - } - } - - /** - * Close any jar files that may have been opened by the class loader. - * Reflection is used to access the jar files in the URLClassLoader's - * internal data structures. - * @throws java.io.IOException if the jar files cannot be found for any - * reson, or if closing the jar file itself causes an IOException. - */ - @Override - public void close() throws IOException { - try { - for (Object l: getLoaders()) { - if (l.getClass().getName().equals("sun.misc.URLClassPath$JarLoader")) { - Field jarField = l.getClass().getDeclaredField("jar"); - JarFile jar = (JarFile) getField(l, jarField); - if (jar != null) { - //System.err.println("CloseableURLClassLoader: closing " + jar); - jar.close(); - } - } - } - } catch (Throwable t) { - IOException e = new IOException("cannot close class loader"); - e.initCause(t); - throw e; - } - } - - private ArrayList<?> getLoaders() - throws NoSuchFieldException, IllegalArgumentException, IllegalAccessException - { - Field ucpField = URLClassLoader.class.getDeclaredField("ucp"); - Object urlClassPath = getField(this, ucpField); - if (urlClassPath == null) - throw new AssertionError("urlClassPath not set in URLClassLoader"); - Field loadersField = urlClassPath.getClass().getDeclaredField("loaders"); - return (ArrayList<?>) getField(urlClassPath, loadersField); - } - - private Object getField(Object o, Field f) - throws IllegalArgumentException, IllegalAccessException { - boolean prev = f.isAccessible(); - try { - f.setAccessible(true); - return f.get(o); - } finally { - f.setAccessible(prev); - } - } - -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/javac/util/GraphUtils.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,145 @@ +/* + * Copyright (c) 1999, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.javac.util; + +/** <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice.</b> + */ +public class GraphUtils { + + /** + * This class is a basic abstract class for representing a node. + * A node is associated with a given data. + */ + public static abstract class Node<D> { + public final D data; + + public Node(D data) { + this.data = data; + } + + public abstract Iterable<? extends Node<D>> getDependencies(); + + public abstract String printDependency(Node<D> to); + + @Override + public String toString() { + return data.toString(); + } + } + + /** + * This class specialized Node, by adding elements that are required in order + * to perform Tarjan computation of strongly connected components. + */ + public static abstract class TarjanNode<D> extends Node<D> implements Comparable<TarjanNode<D>> { + int index = -1; + int lowlink; + boolean active; + + public TarjanNode(D data) { + super(data); + } + + public abstract Iterable<? extends TarjanNode<D>> getDependencies(); + + public int compareTo(TarjanNode<D> o) { + return (index < o.index) ? -1 : (index == o.index) ? 0 : 1; + } + } + + /** + * Tarjan's algorithm to determine strongly connected components of a + * directed graph in linear time. Works on TarjanNode. + */ + public static <D, N extends TarjanNode<D>> List<? extends List<? extends N>> tarjan(Iterable<? extends N> nodes) { + ListBuffer<List<N>> cycles = ListBuffer.lb(); + ListBuffer<N> stack = ListBuffer.lb(); + int index = 0; + for (N node: nodes) { + if (node.index == -1) { + index += tarjan(node, index, stack, cycles); + } + } + return cycles.toList(); + } + + private static <D, N extends TarjanNode<D>> int tarjan(N v, int index, ListBuffer<N> stack, ListBuffer<List<N>> cycles) { + v.index = index; + v.lowlink = index; + index++; + stack.prepend(v); + v.active = true; + for (TarjanNode<D> nd: v.getDependencies()) { + @SuppressWarnings("unchecked") + N n = (N)nd; + if (n.index == -1) { + tarjan(n, index, stack, cycles); + v.lowlink = Math.min(v.lowlink, n.lowlink); + } else if (stack.contains(n)) { + v.lowlink = Math.min(v.lowlink, n.index); + } + } + if (v.lowlink == v.index) { + N n; + ListBuffer<N> cycle = ListBuffer.lb(); + do { + n = stack.remove(); + n.active = false; + cycle.add(n); + } while (n != v); + cycles.add(cycle.toList()); + } + return index; + } + + /** + * Debugging: dot representation of a set of connected nodes. The resulting + * dot representation will use {@code Node.toString} to display node labels + * and {@code Node.printDependency} to display edge labels. The resulting + * representation is also customizable with a graph name and a header. + */ + public static <D> String toDot(Iterable<? extends TarjanNode<D>> nodes, String name, String header) { + StringBuilder buf = new StringBuilder(); + buf.append(String.format("digraph %s {\n", name)); + buf.append(String.format("label = \"%s\";\n", header)); + //dump nodes + for (TarjanNode<D> n : nodes) { + buf.append(String.format("%s [label = \"%s\"];\n", n.hashCode(), n.toString())); + } + //dump arcs + for (TarjanNode<D> from : nodes) { + for (TarjanNode<D> to : from.getDependencies()) { + buf.append(String.format("%s -> %s [label = \" %s \"];\n", + from.hashCode(), to.hashCode(), from.printDependency(to))); + } + } + buf.append("}\n"); + return buf.toString(); + } +}
--- a/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java Tue May 07 17:14:17 2013 -0700 @@ -347,7 +347,8 @@ MANDATORY, RESOLVE_ERROR, SYNTAX, - RECOVERABLE + RECOVERABLE, + NON_DEFERRABLE, } private final DiagnosticType type; @@ -484,6 +485,10 @@ return getIntEndPosition(); } + public DiagnosticPosition getDiagnosticPosition() { + return position; + } + /** * Get the line number within the source referred to by this diagnostic. * @return the line number within the source referred to by this diagnostic
--- a/src/share/classes/com/sun/tools/javac/util/List.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/util/List.java Tue May 07 17:14:17 2013 -0700 @@ -96,6 +96,26 @@ return res.reverse(); } + public List<A> intersect(List<A> that) { + ListBuffer<A> buf = ListBuffer.lb(); + for (A el : this) { + if (that.contains(el)) { + buf.append(el); + } + } + return buf.toList(); + } + + public List<A> diff(List<A> that) { + ListBuffer<A> buf = ListBuffer.lb(); + for (A el : this) { + if (!that.contains(el)) { + buf.append(el); + } + } + return buf.toList(); + } + /** Construct a list consisting of given element. */ public static <A> List<A> of(A x1) {
--- a/src/share/classes/com/sun/tools/javac/util/Log.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/util/Log.java Tue May 07 17:14:17 2013 -0700 @@ -136,10 +136,12 @@ } public void report(JCDiagnostic diag) { - if (filter == null || filter.accepts(diag)) + if (!diag.isFlagSet(JCDiagnostic.DiagnosticFlag.NON_DEFERRABLE) && + (filter == null || filter.accepts(diag))) { deferred.add(diag); - else + } else { prev.report(diag); + } } public Queue<JCDiagnostic> getDiagnostics() {
--- a/src/share/classes/com/sun/tools/javac/util/Names.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/util/Names.java Tue May 07 17:14:17 2013 -0700 @@ -86,6 +86,7 @@ public final Name clone; public final Name close; public final Name compareTo; + public final Name deserializeLambda; public final Name desiredAssertionStatus; public final Name equals; public final Name error; @@ -196,6 +197,7 @@ //lambda-related public final Name lambda; public final Name metaFactory; + public final Name altMetaFactory; public final Name.Table table; @@ -242,6 +244,7 @@ clone = fromString("clone"); close = fromString("close"); compareTo = fromString("compareTo"); + deserializeLambda = fromString("$deserializeLambda$"); desiredAssertionStatus = fromString("desiredAssertionStatus"); equals = fromString("equals"); error = fromString("<error>"); @@ -350,8 +353,9 @@ package_info = fromString("package-info"); //lambda-related - lambda = fromString("lambda"); + lambda = fromString("lambda$"); metaFactory = fromString("metaFactory"); + altMetaFactory = fromString("altMetaFactory"); } protected Name.Table createTable(Options options) {
--- a/src/share/classes/com/sun/tools/javac/util/Pair.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/util/Pair.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -25,6 +25,8 @@ package com.sun.tools.javac.util; +import java.util.Objects; + /** A generic class for pairs. * * <p><b>This is NOT part of any supported API. @@ -46,15 +48,11 @@ return "Pair[" + fst + "," + snd + "]"; } - private static boolean equals(Object x, Object y) { - return (x == null && y == null) || (x != null && x.equals(y)); - } - public boolean equals(Object other) { return other instanceof Pair<?,?> && - equals(fst, ((Pair<?,?>)other).fst) && - equals(snd, ((Pair<?,?>)other).snd); + Objects.equals(fst, ((Pair<?,?>)other).fst) && + Objects.equals(snd, ((Pair<?,?>)other).snd); } public int hashCode() {
--- a/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java Tue May 07 17:14:17 2013 -0700 @@ -24,6 +24,7 @@ */ package com.sun.tools.javac.util; +import java.util.EnumMap; import java.util.EnumSet; import java.util.HashMap; import java.util.LinkedHashMap; @@ -96,7 +97,7 @@ this.diags = JCDiagnostic.Factory.instance(context); this.types = Types.instance(context); this.messages = JavacMessages.instance(context); - whereClauses = new LinkedHashMap<WhereClauseKind, Map<Type, JCDiagnostic>>(); + whereClauses = new EnumMap<WhereClauseKind, Map<Type, JCDiagnostic>>(WhereClauseKind.class); configuration = new RichConfiguration(Options.instance(context), formatter); for (WhereClauseKind kind : WhereClauseKind.values()) whereClauses.put(kind, new LinkedHashMap<Type, JCDiagnostic>()); @@ -394,6 +395,9 @@ @Override public String visitClassSymbol(ClassSymbol s, Locale locale) { + if (s.type.isCompound()) { + return visit(s.type, locale); + } String name = nameSimplifier.simplify(s); if (name.length() == 0 || !getConfiguration().isEnabled(RichFormatterFeature.SIMPLE_NAMES)) { @@ -508,6 +512,16 @@ visit(supertype); visit(interfaces); } + } else if (t.tsym.name.isEmpty()) { + //anon class + ClassType norm = (ClassType) t.tsym.type; + if (norm != null) { + if (norm.interfaces_field != null && norm.interfaces_field.nonEmpty()) { + visit(norm.interfaces_field.head); + } else { + visit(norm.supertype_field); + } + } } nameSimplifier.addUsage(t.tsym); visit(t.getTypeArguments()); @@ -561,7 +575,7 @@ // <editor-fold defaultstate="collapsed" desc="symbol scanner"> /** * Preprocess a given symbol looking for (i) additional info (where clauses) to be - * asdded to the main diagnostic (ii) names to be compacted + * added to the main diagnostic (ii) names to be compacted */ protected void preprocessSymbol(Symbol s) { symbolPreprocessor.visit(s, null); @@ -572,7 +586,11 @@ @Override public Void visitClassSymbol(ClassSymbol s, Void ignored) { - nameSimplifier.addUsage(s); + if (s.type.isCompound()) { + typePreprocessor.visit(s.type); + } else { + nameSimplifier.addUsage(s); + } return null; }
--- a/src/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java Tue May 07 17:14:17 2013 -0700 @@ -61,6 +61,10 @@ return type.tsym.getQualifiedName().toString(); } + public com.sun.javadoc.Type getElementType() { + return null; + } + public String simpleTypeName() { return type.tsym.name.toString(); }
--- a/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java Tue May 07 17:14:17 2013 -0700 @@ -108,6 +108,10 @@ this.tsym = sym; } + public com.sun.javadoc.Type getElementType() { + return null; + } + /** * Returns the flags in terms of javac's flags */
--- a/src/share/classes/com/sun/tools/javadoc/DocEnv.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javadoc/DocEnv.java Tue May 07 17:14:17 2013 -0700 @@ -801,13 +801,17 @@ doclintOpts.add(opt == null ? DocLint.XMSGS_OPTION : DocLint.XMSGS_CUSTOM_PREFIX + opt); } - if (doclintOpts.size() == 1 + if (doclintOpts.isEmpty()) { + doclintOpts.add(DocLint.XMSGS_OPTION); + } else if (doclintOpts.size() == 1 && doclintOpts.get(0).equals(DocLint.XMSGS_CUSTOM_PREFIX + "none")) { return; } JavacTask t = BasicJavacTask.instance(context); doclint = new DocLint(); + // standard doclet normally generates H1, H2 + doclintOpts.add(DocLint.XIMPLICIT_HEADERS + "2"); doclint.init(t, doclintOpts.toArray(new String[doclintOpts.size()]), false); }
--- a/src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java Tue May 07 17:14:17 2013 -0700 @@ -199,22 +199,15 @@ return result; } - public AnnotationDesc[] receiverAnnotations() { - // TODO: change how receiver annotations are output! + /** + * Get the receiver type of this executable element. + * + * @return the receiver type of this executable element. + * @since 1.8 + */ + public com.sun.javadoc.Type receiverType() { Type recvtype = sym.type.asMethodType().recvtype; - if (recvtype == null) { - return new AnnotationDesc[0]; - } - if (recvtype.getKind() != TypeKind.ANNOTATED) { - return new AnnotationDesc[0]; - } - List<? extends Compound> typeAnnos = ((com.sun.tools.javac.code.Type.AnnotatedType)recvtype).typeAnnotations; - AnnotationDesc result[] = new AnnotationDesc[typeAnnos.length()]; - int i = 0; - for (Attribute.Compound a : typeAnnos) { - result[i++] = new AnnotationDescImpl(env, a); - } - return result; + return (recvtype != null) ? TypeMaker.getType(env, recvtype, false, true) : null; } /**
--- a/src/share/classes/com/sun/tools/javadoc/PrimitiveType.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javadoc/PrimitiveType.java Tue May 07 17:14:17 2013 -0700 @@ -63,6 +63,10 @@ return name; } + public com.sun.javadoc.Type getElementType() { + return null; + } + /** * Return qualified name of type excluding any dimension information. *<p>
--- a/src/share/classes/com/sun/tools/javadoc/TypeMaker.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javadoc/TypeMaker.java Tue May 07 17:14:17 2013 -0700 @@ -65,11 +65,11 @@ t = env.types.erasure(t); } if (considerAnnotations - && t.getKind() == TypeKind.ANNOTATED) { + && t.isAnnotated()) { return new AnnotatedTypeImpl(env, (com.sun.tools.javac.code.Type.AnnotatedType) t); } - if (t.getKind() == TypeKind.ANNOTATED) { + if (t.isAnnotated()) { Type.AnnotatedType at = (Type.AnnotatedType) t; return new AnnotatedTypeImpl(env, at); } @@ -147,7 +147,7 @@ */ static String getTypeString(DocEnv env, Type t, boolean full) { // TODO: should annotations be included here? - if (t.getKind() == TypeKind.ANNOTATED) { + if (t.isAnnotated()) { Type.AnnotatedType at = (Type.AnnotatedType)t; t = at.underlyingType; } @@ -222,6 +222,10 @@ private com.sun.javadoc.Type skipArraysCache = null; + public com.sun.javadoc.Type getElementType() { + return TypeMaker.getType(env, env.types.elemtype(arrayType)); + } + private com.sun.javadoc.Type skipArrays() { if (skipArraysCache == null) { Type t;
--- a/src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java Tue May 07 17:14:17 2013 -0700 @@ -127,7 +127,7 @@ final Type upperBound = v.getUpperBound(); Name boundname = upperBound.tsym.getQualifiedName(); if (boundname == boundname.table.names.java_lang_Object - && upperBound.getKind() != TypeKind.ANNOTATED) { + && !upperBound.isAnnotated()) { return List.nil(); } else { return env.types.getBounds(v); @@ -139,7 +139,7 @@ * Return an empty array if there are none. */ public AnnotationDesc[] annotations() { - if (type.getKind() != TypeKind.ANNOTATED) { + if (!type.isAnnotated()) { return new AnnotationDesc[0]; } List<TypeCompound> tas = ((com.sun.tools.javac.code.Type.AnnotatedType) type).typeAnnotations;
--- a/src/share/classes/com/sun/tools/javadoc/api/JavadocTool.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javadoc/api/JavadocTool.java Tue May 07 17:14:17 2013 -0700 @@ -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 @@ -139,12 +139,13 @@ @Override public int run(InputStream in, OutputStream out, OutputStream err, String... arguments) { - PrintWriter err_pw = new PrintWriter(err, true); - PrintWriter out_pw = new PrintWriter(out); + PrintWriter err_pw = new PrintWriter(err == null ? System.err : err, true); + PrintWriter out_pw = new PrintWriter(out == null ? System.out : out); try { String standardDocletName = "com.sun.tools.doclets.standard.Standard"; + ClassLoader cl = getClass().getClassLoader(); return com.sun.tools.javadoc.Main.execute( - "javadoc", err_pw, err_pw, out_pw, standardDocletName, arguments); + "javadoc", err_pw, err_pw, out_pw, standardDocletName, cl, arguments); } finally { err_pw.flush(); out_pw.flush();
--- a/src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2012, 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 @@ -37,7 +37,6 @@ main.incompatible.access.flags=-public\u3001-private\u3001-package\u307E\u305F\u306F-protected\u306E\u3046\u3061\u306E2\u3064\u4EE5\u4E0A\u3092\u6307\u5B9A\u3057\u307E\u3057\u305F\u3002 main.cant.read={0}\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093 main.Loading_source_files_for_package=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306E\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u8FBC\u3093\u3067\u3044\u307E\u3059... -main.Loading_source_file_for_class=\u30AF\u30E9\u30B9{0}\u306E\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u8FBC\u3093\u3067\u3044\u307E\u3059... main.Loading_source_file=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB{0}\u3092\u8AAD\u307F\u8FBC\u3093\u3067\u3044\u307E\u3059... main.Building_tree=Javadoc\u60C5\u5831\u3092\u69CB\u7BC9\u3057\u3066\u3044\u307E\u3059... main.no_source_files_for_package=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306E\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308A\u307E\u305B\u3093 @@ -67,13 +66,12 @@ tag.see.can_not_find_member=\u30BF\u30B0{0}: {2}\u3067{1}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093 tag.see.no_close_bracket_on_url=\u30BF\u30B0{0}: \u9589\u3058\u30BF\u30B0''>''\u304C\u3042\u308A\u307E\u305B\u3093: "{1}" tag.see.no_close_quote=\u30BF\u30B0{0}: \u9589\u3058\u5F15\u7528\u7B26\u304C\u3042\u308A\u307E\u305B\u3093: "{1}" -tag.see.class_not_found=@see\u30BF\u30B0\u7528\u306E\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: "{1}" tag.see.class_not_specified=\u30BF\u30B0{0}: \u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093: "{1}" tag.see.illegal_character=\u30BF\u30B0{0}: "{2}"\u306B\u4E0D\u6B63\u306A\u6587\u5B57"{1}"\u304C\u3042\u308A\u307E\u3059 tag.see.malformed_see_tag=\u30BF\u30B0{0}: \u66F8\u5F0F\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093: "{1}" -tag.throws.exception_not_found={0}\u30BF\u30B0\u3001\u30AF\u30E9\u30B9{1}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002 tag.End_delimiter_missing_for_possible_SeeTag=\u30B3\u30E1\u30F3\u30C8\u6587\u5B57\u5217"{0}"\u3067\u3001\u6709\u52B9\u306Asee\u30BF\u30B0\u306B\u7D42\u7AEF\u30C7\u30EA\u30DF\u30BF}\u304C\u3042\u308A\u307E\u305B\u3093 tag.Improper_Use_Of_Link_Tag=\u30A4\u30F3\u30E9\u30A4\u30F3\u30FB\u30BF\u30B0"{0}"\u306B\u7D42\u4E86\u6587\u5B57''}''\u304C\u3042\u308A\u307E\u305B\u3093 +tag.serialField.illegal_character=@serialField\u30BF\u30B0\u306B\u4E0D\u6B63\u306A\u6587\u5B57{0}\u304C\u3042\u308A\u307E\u3059: {1}\u3002 javadoc.File_Read_Error=\u30D5\u30A1\u30A4\u30EB{0}\u306E\u8AAD\u8FBC\u307F\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F javadoc.Body_missing_from_html_file=HTML\u306Bbody\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093 javadoc.End_body_missing_from_html_file=HTML\u30D5\u30A1\u30A4\u30EB\u306Bbody\u306E\u9589\u3058\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093 @@ -81,4 +79,8 @@ javadoc.class_not_found=\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002 javadoc.error=\u30A8\u30E9\u30FC javadoc.warning=\u8B66\u544A -tag.serialField.illegal_character=@serialField\u30BF\u30B0\u306B\u4E0D\u6B63\u306A\u6587\u5B57{0}\u304C\u3042\u308A\u307E\u3059: {1}\u3002 + +javadoc.error.msg={0}: \u30A8\u30E9\u30FC - {1} +javadoc.warning.msg={0}: \u8B66\u544A - {1} +javadoc.note.msg = {1} +javadoc.note.pos.msg= {0}: {1}
--- a/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2012, 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 @@ -37,7 +37,6 @@ main.incompatible.access.flags=\u6307\u5B9A\u4E86\u591A\u4E2A -public, -private, -package \u6216 -protected\u3002 main.cant.read=\u65E0\u6CD5\u8BFB\u53D6{0} main.Loading_source_files_for_package=\u6B63\u5728\u52A0\u8F7D\u7A0B\u5E8F\u5305{0}\u7684\u6E90\u6587\u4EF6... -main.Loading_source_file_for_class=\u6B63\u5728\u52A0\u8F7D\u7C7B{0}\u7684\u6E90\u6587\u4EF6... main.Loading_source_file=\u6B63\u5728\u52A0\u8F7D\u6E90\u6587\u4EF6{0}... main.Building_tree=\u6B63\u5728\u6784\u9020 Javadoc \u4FE1\u606F... main.no_source_files_for_package=\u6CA1\u6709\u7A0B\u5E8F\u5305{0}\u7684\u6E90\u6587\u4EF6 @@ -67,13 +66,12 @@ tag.see.can_not_find_member=\u6807\u8BB0{0}: \u5728{2}\u4E2D\u627E\u4E0D\u5230{1} tag.see.no_close_bracket_on_url=\u6807\u8BB0{0}: \u7F3A\u5C11\u6700\u540E\u7684 ''>'': "{1}" tag.see.no_close_quote=\u6807\u8BB0{0}: \u65E0\u53F3\u5F15\u53F7: "{1}" -tag.see.class_not_found=\u627E\u4E0D\u5230 @see \u6807\u8BB0\u7684\u7C7B{0}: "{1}" tag.see.class_not_specified=\u6807\u8BB0{0}: \u672A\u6307\u5B9A\u7C7B: "{1}" tag.see.illegal_character=\u6807\u8BB0{0}: "{2}" \u4E2D\u7684 "{1}" \u4E3A\u975E\u6CD5\u5B57\u7B26 tag.see.malformed_see_tag=\u6807\u8BB0{0}: \u683C\u5F0F\u9519\u8BEF: "{1}" -tag.throws.exception_not_found=\u6807\u8BB0{0}: \u627E\u4E0D\u5230\u7C7B{1}\u3002 tag.End_delimiter_missing_for_possible_SeeTag=\u6CE8\u91CA\u5B57\u7B26\u4E32\u4E2D\u53EF\u80FD\u51FA\u73B0\u7684 See \u6807\u8BB0\u7F3A\u5C11\u7ED3\u675F\u5206\u9694\u7B26 }: "{0}" tag.Improper_Use_Of_Link_Tag=\u5185\u5D4C\u6807\u8BB0\u7F3A\u5C11\u7ED3\u675F ''}'' \u5B57\u7B26: "{0}" +tag.serialField.illegal_character=@serialField \u6807\u8BB0\u4E2D\u7684\u975E\u6CD5\u5B57\u7B26 {0}: {1}\u3002 javadoc.File_Read_Error=\u8BFB\u53D6\u6587\u4EF6{0}\u65F6\u51FA\u9519 javadoc.Body_missing_from_html_file=HTML \u6587\u4EF6\u4E2D\u7F3A\u5C11\u4E3B\u4F53\u6807\u8BB0 javadoc.End_body_missing_from_html_file=HTML \u6587\u4EF6\u4E2D\u7F3A\u5C11\u4E3B\u4F53\u7ED3\u675F\u6807\u8BB0 @@ -81,4 +79,8 @@ javadoc.class_not_found=\u627E\u4E0D\u5230\u7C7B{0}\u3002 javadoc.error=\u9519\u8BEF javadoc.warning=\u8B66\u544A -tag.serialField.illegal_character=@serialField \u6807\u8BB0\u4E2D\u7684\u975E\u6CD5\u5B57\u7B26 {0}: {1}\u3002 + +javadoc.error.msg={0}: \u9519\u8BEF - {1} +javadoc.warning.msg={0}: \u8B66\u544A - {1} +javadoc.note.msg = {1} +javadoc.note.pos.msg= {0}: {1}
--- a/src/share/classes/com/sun/tools/javah/Util.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javah/Util.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 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 @@ -144,10 +144,6 @@ throw new Exit(15); } - private void fatal(String msg) throws Exit { - fatal(msg, null); - } - private void fatal(String msg, Exception e) throws Exit { dl.report(createDiagnostic(Diagnostic.Kind.ERROR, "", msg)); throw new Exit(10, e);
--- a/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, 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 @@ -33,10 +33,10 @@ old.jni.mixed=\u30AA\u30D7\u30B7\u30E7\u30F3-jni\u3068-old\u3092\u540C\u6642\u306B\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002 old.llni.mixed=\u30AA\u30D7\u30B7\u30E7\u30F3-old\u3068-llni\u3092\u540C\u6642\u306B\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002 old.not.supported=\u3053\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u306Ejavah\u3067\u306F\u30AA\u30D7\u30B7\u30E7\u30F3-old\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 -invalid.method.signature=\u7121\u52B9\u306A\u30E1\u30BD\u30C3\u30C9\u30FB\u30B7\u30B0\u30CB\u30C1\u30E3: {0} +invalid.method.signature=\u7121\u52B9\u306A\u30E1\u30BD\u30C3\u30C9\u30FB\u30B7\u30B0\u30CD\u30C1\u30E3: {0} jni.llni.mixed=\u30AA\u30D7\u30B7\u30E7\u30F3-jni\u3068-llni\u3092\u540C\u6642\u306B\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002 jni.no.stubs=JNI\u306F\u30B9\u30BF\u30D6\u3092\u5FC5\u8981\u3068\u3057\u307E\u305B\u3093\u3002JNI\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002 -jni.sigerror={0}\u306E\u7F72\u540D\u3092\u5224\u5B9A\u3067\u304D\u307E\u305B\u3093 +jni.sigerror={0}\u306E\u30B7\u30B0\u30CD\u30C1\u30E3\u3092\u5224\u5225\u3067\u304D\u307E\u305B\u3093 dir.file.mixed=\u30AA\u30D7\u30B7\u30E7\u30F3-d\u3068-o\u3092\u540C\u6642\u306B\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002 no.classes.specified=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002 no.outputfile.specified=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002 @@ -51,7 +51,7 @@ # usage=\u4F7F\u7528\u65B9\u6CD5: javah [options] <classes>\n\n[options]\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059\u3002\n\n\t-help \u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u3066\u7D42\u4E86\u3059\u308B\n\t-classpath <path> \u30AF\u30E9\u30B9\u3092\u30ED\u30FC\u30C9\u3059\u308B\u30D1\u30B9\n\t-bootclasspath <path> \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u3092\u30ED\u30FC\u30C9\u3059\u308B\u30D1\u30B9\n\t-d<dir> \u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n\t-o <file> \u51FA\u529B\u30D5\u30A1\u30A4\u30EB(-d\u304B-o\u306E\u3069\u3061\u3089\u304B\u4E00\u65B9\u3092\u4F7F\u7528\u3059\u308B)\n\t-jni JNI\u5F62\u5F0F\u306E\u30D8\u30C3\u30C0\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u751F\u6210\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8)\n\t-version \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u8868\u793A\u3059\u308B\n\t-verbose \u8A73\u7D30\u306A\u51FA\u529B\u3092\u884C\u3046\n\t-force \u5E38\u306B\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u3092\u66F8\u304D\u8FBC\u3080\n\n<classes> \u306F\u5B8C\u5168\u6307\u5B9A\u306E\u540D\u524D\u3067\u6307\u5B9A\u3057\u307E\u3059\n(java.lang.Object\u306A\u3069)\u3002\n -main.usage=\u4F7F\u7528\u65B9\u6CD5: \n\ javah [options] <classes>\n[options]\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059\u3002 +main.usage=\u4F7F\u7528\u65B9\u6CD5: \n javah [options] <classes>\n[options]\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059\u3002 main.opt.o=\ -o <file> \u51FA\u529B\u30D5\u30A1\u30A4\u30EB(-d\u304B-o\u306E\u3069\u3061\u3089\u304B\u4E00\u65B9\u3092\u4F7F\u7528\u3059\u308B) main.opt.d=\ -d <dir> \u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA main.opt.v=\ -v -verbose \u8A73\u7D30\u306A\u51FA\u529B\u3092\u884C\u3046
--- a/src/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, 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 @@ -51,7 +51,7 @@ # usage=\u7528\u6CD5: javah [options] <classes>\n\n\u5176\u4E2D, [options] \u5305\u62EC:\n\n\t-help \u8F93\u51FA\u6B64\u5E2E\u52A9\u6D88\u606F\u5E76\u9000\u51FA\n\t-classpath <path> \u4ECE\u4E2D\u52A0\u8F7D\u7C7B\u7684\u8DEF\u5F84\n\t-bootclasspath <path> \u4ECE\u4E2D\u52A0\u8F7D\u5F15\u5BFC\u7C7B\u7684\u8DEF\u5F84\n\t-d <dir> \u8F93\u51FA\u76EE\u5F55\n\t-o <file> \u8F93\u51FA\u6587\u4EF6 (\u53EA\u80FD\u4F7F\u7528 -d \u6216 -o \u4E4B\u4E00)\n\t-jni \u751F\u6210 JNI \u6837\u5F0F\u7684\u6807\u5934\u6587\u4EF6 (\u9ED8\u8BA4\u503C)\n\t-version \u8F93\u51FA\u7248\u672C\u4FE1\u606F\n\t-verbose \u542F\u7528\u8BE6\u7EC6\u8F93\u51FA\n\t-force \u59CB\u7EC8\u5199\u5165\u8F93\u51FA\u6587\u4EF6\n\n<classes> \u662F\u4F7F\u7528\u5176\u5168\u9650\u5B9A\u540D\u79F0\u6307\u5B9A\u7684,\n(\u4F8B\u5982 java.lang.Object)\u3002\n -main.usage=\u7528\u6CD5: \n\ javah [options] <classes>\n\u5176\u4E2D, [options] \u5305\u62EC: +main.usage=\u7528\u6CD5: \n javah [options] <classes>\n\u5176\u4E2D, [options] \u5305\u62EC: main.opt.o=\ -o <file> \u8F93\u51FA\u6587\u4EF6 (\u53EA\u80FD\u4F7F\u7528 -d \u6216 -o \u4E4B\u4E00) main.opt.d=\ -d <dir> \u8F93\u51FA\u76EE\u5F55 main.opt.v=\ -v -verbose \u542F\u7528\u8BE6\u7EC6\u8F93\u51FA
--- a/src/share/classes/com/sun/tools/javap/AnnotationWriter.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javap/AnnotationWriter.java Tue May 07 17:14:17 2013 -0700 @@ -91,12 +91,13 @@ print(pos.type); switch (pos.type) { - // type cast - case CAST: // instanceof case INSTANCEOF: // new expression case NEW: + // constructor/method reference receiver + case CONSTRUCTOR_REFERENCE: + case METHOD_REFERENCE: if (showOffsets) { print(", offset="); print(pos.offset); @@ -162,9 +163,12 @@ print(", param_index="); print(pos.parameter_index); break; + // type cast + case CAST: // method/constructor/reference type argument case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT: case METHOD_INVOCATION_TYPE_ARGUMENT: + case CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT: case METHOD_REFERENCE_TYPE_ARGUMENT: if (showOffsets) { print(", offset="); @@ -177,11 +181,6 @@ case METHOD_RETURN: case FIELD: break; - // lambda formal parameter - case LAMBDA_FORMAL_PARAMETER: - print(", param_index="); - print(pos.parameter_index); - break; case UNKNOWN: throw new AssertionError("AnnotationWriter: UNKNOWN target type should never occur!"); default:
--- a/src/share/classes/com/sun/tools/javap/AttributeWriter.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javap/AttributeWriter.java Tue May 07 17:14:17 2013 -0700 @@ -507,12 +507,14 @@ println(header); for (MethodParameters_attribute.Entry entry : attr.method_parameter_table) { + String namestr = + entry.name_index != 0 ? + constantWriter.stringValue(entry.name_index) : "<no name>"; String flagstr = - (0 != (entry.flags & ACC_FINAL) ? " final" : "") + - (0 != (entry.flags & ACC_SYNTHETIC) ? " synthetic" : ""); - println(String.format(format, - constantWriter.stringValue(entry.name_index), - flagstr)); + (0 != (entry.flags & ACC_FINAL) ? "final " : "") + + (0 != (entry.flags & ACC_MANDATED) ? "mandated " : "") + + (0 != (entry.flags & ACC_SYNTHETIC) ? "synthetic" : ""); + println(String.format(format, namestr, flagstr)); } indent(-1); return null;
--- a/src/share/classes/com/sun/tools/javap/ClassWriter.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javap/ClassWriter.java Tue May 07 17:14:17 2013 -0700 @@ -382,8 +382,8 @@ indent(+1); - if (options.showInternalSignatures) - println("Signature: " + getValue(f.descriptor)); + if (options.showDescriptors) + println("descriptor: " + getValue(f.descriptor)); if (options.verbose && !options.compat) writeList("flags: ", flags.getFieldFlags(), "\n"); @@ -478,8 +478,8 @@ indent(+1); - if (options.showInternalSignatures) { - println("Signature: " + getValue(m.descriptor)); + if (options.showDescriptors) { + println("descriptor: " + getValue(m.descriptor)); } if (options.verbose && !options.compat) { @@ -523,7 +523,7 @@ setPendingNewline( options.showDisassembled || options.showAllAttrs || - options.showInternalSignatures || + options.showDescriptors || options.showLineAndLocalVariableTables || options.verbose); }
--- a/src/share/classes/com/sun/tools/javap/JavapTask.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javap/JavapTask.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 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 @@ -140,6 +140,7 @@ new Option(false, "-v", "-verbose", "-all") { void process(JavapTask task, String opt, String arg) { task.options.verbose = true; + task.options.showDescriptors = true; task.options.showFlags = true; task.options.showAllAttrs = true; } @@ -190,7 +191,7 @@ new Option(false, "-s") { void process(JavapTask task, String opt, String arg) { - task.options.showInternalSignatures = true; + task.options.showDescriptors = true; } }, @@ -362,7 +363,8 @@ } try { - handleOptions(options, false); + if (options != null) + handleOptions(options, false); } catch (BadArgs e) { throw new IllegalArgumentException(e.getMessage()); }
--- a/src/share/classes/com/sun/tools/javap/Options.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javap/Options.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 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 @@ -81,7 +81,7 @@ public Set<String> accessOptions = new HashSet<String>(); public Set<InstructionDetailWriter.Kind> details = EnumSet.noneOf(InstructionDetailWriter.Kind.class); public boolean showDisassembled; - public boolean showInternalSignatures; + public boolean showDescriptors; public boolean showAllAttrs; public boolean showConstants; public boolean sysInfo;
--- a/src/share/classes/com/sun/tools/javap/StackMapWriter.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javap/StackMapWriter.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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 @@ -269,7 +269,7 @@ } - class StackMap { + static class StackMap { StackMap(verification_type_info[] locals, verification_type_info[] stack) { this.locals = locals; this.stack = stack; @@ -279,7 +279,7 @@ private final verification_type_info[] stack; } - class CustomVerificationTypeInfo extends verification_type_info { + static class CustomVerificationTypeInfo extends verification_type_info { public CustomVerificationTypeInfo(String text) { super(-1); this.text = text;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/jdeps/Analyzer.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,238 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.jdeps; + +import com.sun.tools.classfile.Dependency.Location; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.TreeMap; +import java.util.TreeSet; + +/** + * Dependency Analyzer. + */ +public class Analyzer { + /** + * Type of the dependency analysis. Appropriate level of data + * will be stored. + */ + public enum Type { + SUMMARY, + PACKAGE, + CLASS, + VERBOSE + }; + + private final Type type; + private final List<ArchiveDeps> results = new ArrayList<ArchiveDeps>(); + private final Map<String, Archive> map = new HashMap<String, Archive>(); + private final Archive NOT_FOUND + = new Archive(JdepsTask.getMessage("artifact.not.found")); + + /** + * Constructs an Analyzer instance. + * + * @param type Type of the dependency analysis + */ + public Analyzer(Type type) { + this.type = type; + } + + /** + * Performs the dependency analysis on the given archives. + */ + public void run(List<Archive> archives) { + for (Archive archive : archives) { + ArchiveDeps deps; + if (type == Type.CLASS || type == Type.VERBOSE) { + deps = new ClassVisitor(archive); + } else { + deps = new PackageVisitor(archive); + } + archive.visit(deps); + results.add(deps); + } + + // set the required dependencies + for (ArchiveDeps result: results) { + for (Set<String> set : result.deps.values()) { + for (String target : set) { + Archive source = getArchive(target); + if (result.archive != source) { + if (!result.requiredArchives.contains(source)) { + result.requiredArchives.add(source); + } + // either a profile name or the archive name + String tname = result.getTargetProfile(target); + if (tname.isEmpty()) { + tname = PlatformClassPath.contains(source) + ? "JDK internal API (" + source.getFileName() + ")" + : source.toString(); + } + if (!result.targetNames.contains(tname)) { + result.targetNames.add(tname); + } + } + } + } + } + } + + public interface Visitor { + /** + * Visits a recorded dependency from origin to target which can be + * a fully-qualified classname, a package name, a profile or + * archive name depending on the Analyzer's type. + */ + void visit(String origin, String target, String profile); + /** + * Visits the source archive to its destination archive of + * a recorded dependency. + */ + void visit(Archive source, Archive dest); + } + + public void visitSummary(Visitor v) { + for (ArchiveDeps r : results) { + for (Archive a : r.requiredArchives) { + v.visit(r.archive, a); + } + for (String name : r.targetNames) { + v.visit(r.archive.getFileName(), name, name); + } + } + } + + public void visit(Visitor v) { + for (ArchiveDeps r: results) { + for (Archive a : r.requiredArchives) { + v.visit(r.archive, a); + } + for (String origin : r.deps.keySet()) { + for (String target : r.deps.get(origin)) { + // filter intra-dependency unless in verbose mode + if (type == Type.VERBOSE || getArchive(origin) != getArchive(target)) { + v.visit(origin, target, r.getTargetProfile(target)); + } + } + } + } + } + + public Archive getArchive(String name) { + return map.containsKey(name) ? map.get(name) : NOT_FOUND; + } + + /** + * Returns the file name of the archive for non-JRE class or + * internal JRE classes. It returns empty string for SE API. + */ + public String getArchiveName(String target, String profile) { + Archive source = getArchive(target); + String name = source.getFileName(); + if (PlatformClassPath.contains(source)) + return profile.isEmpty() ? "JDK internal API (" + name + ")" : ""; + return name; + } + + private abstract class ArchiveDeps implements Archive.Visitor { + final Archive archive; + final Set<Archive> requiredArchives; + final SortedSet<String> targetNames; + final SortedMap<String, SortedSet<String>> deps; + + ArchiveDeps(Archive archive) { + this.archive = archive; + this.requiredArchives = new HashSet<Archive>(); + this.targetNames = new TreeSet<String>(); + this.deps = new TreeMap<String, SortedSet<String>>(); + } + + void add(String loc) { + Archive a = map.get(loc); + if (a == null) { + map.put(loc, archive); + } else if (a != archive) { + // duplicated class warning? + } + } + + void add(String origin, String target) { + SortedSet<String> set = deps.get(origin); + if (set == null) { + set = new TreeSet<String>(); + deps.put(origin, set); + } + if (!set.contains(target)) { + set.add(target); + } + } + + public abstract void visit(Location o, Location t); + public abstract String getTargetProfile(String target); + + } + + private class ClassVisitor extends ArchiveDeps { + ClassVisitor(Archive archive) { + super(archive); + } + public void visit(Location l) { + add(l.getClassName()); + } + public void visit(Location o, Location t) { + add(o.getClassName(), t.getClassName()); + } + public String getTargetProfile(String target) { + int i = target.lastIndexOf('.'); + return (i > 0) ? Profiles.getProfileName(target.substring(0, i)) : ""; + } + } + + private class PackageVisitor extends ArchiveDeps { + PackageVisitor(Archive archive) { + super(archive); + } + public void visit(Location o, Location t) { + add(packageOf(o), packageOf(t)); + } + public void visit(Location l) { + add(packageOf(l)); + } + private String packageOf(Location loc) { + String pkg = loc.getPackageName(); + return pkg.isEmpty() ? "<unnamed>" : pkg; + } + public String getTargetProfile(String target) { + return Profiles.getProfileName(target); + } + } +}
--- a/src/share/classes/com/sun/tools/jdeps/Archive.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/jdeps/Archive.java Tue May 07 17:14:17 2013 -0700 @@ -24,43 +24,32 @@ */ package com.sun.tools.jdeps; -import com.sun.tools.classfile.Dependency; import com.sun.tools.classfile.Dependency.Location; import java.io.File; -import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import java.util.SortedMap; -import java.util.SortedSet; -import java.util.TreeMap; -import java.util.TreeSet; /** * Represents the source of the class files. */ public class Archive { - private static Map<String,Archive> archiveForClass = new HashMap<String,Archive>(); - public static Archive find(Location loc) { - return archiveForClass.get(loc.getName()); - } - private final File file; private final String filename; - private final DependencyRecorder recorder; private final ClassFileReader reader; + private final Map<Location, Set<Location>> deps + = new HashMap<Location, Set<Location>>(); + public Archive(String name) { this.file = null; this.filename = name; - this.recorder = new DependencyRecorder(); this.reader = null; } public Archive(File f, ClassFileReader reader) { this.file = f; this.filename = f.getName(); - this.recorder = new DependencyRecorder(); this.reader = reader; } @@ -72,102 +61,37 @@ return filename; } - public void addClass(String classFileName) { - Archive a = archiveForClass.get(classFileName); - assert(a == null || a == this); // ## issue warning? - if (!archiveForClass.containsKey(classFileName)) { - archiveForClass.put(classFileName, this); + public void addClass(Location origin) { + Set<Location> set = deps.get(origin); + if (set == null) { + set = new HashSet<Location>(); + deps.put(origin, set); } } - - public void addDependency(Dependency d) { - recorder.addDependency(d); + public void addClass(Location origin, Location target) { + Set<Location> set = deps.get(origin); + if (set == null) { + set = new HashSet<Location>(); + deps.put(origin, set); + } + set.add(target); } - /** - * Returns a sorted map of a class to its dependencies. - */ - public SortedMap<Location, SortedSet<Location>> getDependencies() { - DependencyRecorder.Filter filter = new DependencyRecorder.Filter() { - public boolean accept(Location origin, Location target) { - return (archiveForClass.get(origin.getName()) != - archiveForClass.get(target.getName())); - }}; - - SortedMap<Location, SortedSet<Location>> result = - new TreeMap<Location, SortedSet<Location>>(locationComparator); - for (Map.Entry<Location, Set<Location>> e : recorder.dependencies().entrySet()) { - Location o = e.getKey(); - for (Location t : e.getValue()) { - if (filter.accept(o, t)) { - SortedSet<Location> odeps = result.get(o); - if (odeps == null) { - odeps = new TreeSet<Location>(locationComparator); - result.put(o, odeps); - } - odeps.add(t); - } + public void visit(Visitor v) { + for (Map.Entry<Location,Set<Location>> e: deps.entrySet()) { + v.visit(e.getKey()); + for (Location target : e.getValue()) { + v.visit(e.getKey(), target); } } - return result; - } - - /** - * Returns the set of archives this archive requires. - */ - public Set<Archive> getRequiredArchives() { - SortedSet<Archive> deps = new TreeSet<Archive>(new Comparator<Archive>() { - public int compare(Archive a1, Archive a2) { - return a1.toString().compareTo(a2.toString()); - } - }); - - for (Map.Entry<Location, Set<Location>> e : recorder.dependencies().entrySet()) { - Location o = e.getKey(); - Archive origin = Archive.find(o); - for (Location t : e.getValue()) { - Archive target = Archive.find(t); - assert(origin != null && target != null); - if (origin != target) { - if (!deps.contains(target)) { - deps.add(target); - } - } - } - } - return deps; } public String toString() { return file != null ? file.getPath() : filename; } - private static class DependencyRecorder { - static interface Filter { - boolean accept(Location origin, Location target); - } - - public void addDependency(Dependency d) { - Set<Location> odeps = map.get(d.getOrigin()); - if (odeps == null) { - odeps = new HashSet<Location>(); - map.put(d.getOrigin(), odeps); - } - odeps.add(d.getTarget()); - } - - public Map<Location, Set<Location>> dependencies() { - return map; - } - - private final Map<Location, Set<Location>> map = - new HashMap<Location, Set<Location>>(); + interface Visitor { + void visit(Location loc); + void visit(Location origin, Location target); } - - private static Comparator<Location> locationComparator = - new Comparator<Location>() { - public int compare(Location o1, Location o2) { - return o1.toString().compareTo(o2.toString()); - } - }; }
--- a/src/share/classes/com/sun/tools/jdeps/ClassFileReader.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/jdeps/ClassFileReader.java Tue May 07 17:14:17 2013 -0700 @@ -59,6 +59,13 @@ } } + /** + * Returns a ClassFileReader instance of a given JarFile. + */ + public static ClassFileReader newInstance(Path path, JarFile jf) throws IOException { + return new JarFileReader(path, jf); + } + protected final Path path; protected final String baseFileName; private ClassFileReader(Path path) { @@ -228,8 +235,11 @@ private static class JarFileReader extends ClassFileReader { final JarFile jarfile; JarFileReader(Path path) throws IOException { + this(path, new JarFile(path.toFile())); + } + JarFileReader(Path path, JarFile jf) throws IOException { super(path); - this.jarfile = new JarFile(path.toFile()); + this.jarfile = jf; } public ClassFile getClassFile(String name) throws IOException {
--- a/src/share/classes/com/sun/tools/jdeps/JdepsTask.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/jdeps/JdepsTask.java Tue May 07 17:14:17 2013 -0700 @@ -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 @@ -29,7 +29,6 @@ import com.sun.tools.classfile.Dependencies; import com.sun.tools.classfile.Dependencies.ClassFileError; import com.sun.tools.classfile.Dependency; -import com.sun.tools.classfile.Dependency.Location; import java.io.*; import java.text.MessageFormat; import java.util.*; @@ -39,10 +38,10 @@ * Implementation for the jdeps tool for static class dependency analysis. */ class JdepsTask { - class BadArgs extends Exception { + static class BadArgs extends Exception { static final long serialVersionUID = 8765093759964640721L; BadArgs(String key, Object... args) { - super(JdepsTask.this.getMessage(key, args)); + super(JdepsTask.getMessage(key, args)); this.key = key; this.args = args; } @@ -105,25 +104,22 @@ new Option(false, "-s", "--summary") { void process(JdepsTask task, String opt, String arg) { task.options.showSummary = true; - task.options.verbose = Options.Verbose.SUMMARY; + task.options.verbose = Analyzer.Type.SUMMARY; } }, new Option(false, "-v", "--verbose") { void process(JdepsTask task, String opt, String arg) { - task.options.verbose = Options.Verbose.VERBOSE; + task.options.verbose = Analyzer.Type.VERBOSE; } }, new Option(true, "-V", "--verbose-level") { void process(JdepsTask task, String opt, String arg) throws BadArgs { - switch (arg) { - case "package": - task.options.verbose = Options.Verbose.PACKAGE; - break; - case "class": - task.options.verbose = Options.Verbose.CLASS; - break; - default: - throw task.new BadArgs("err.invalid.arg.for.option", opt); + if ("package".equals(arg)) { + task.options.verbose = Analyzer.Type.PACKAGE; + } else if ("class".equals(arg)) { + task.options.verbose = Analyzer.Type.CLASS; + } else { + throw new BadArgs("err.invalid.arg.for.option", opt); } } }, @@ -143,8 +139,11 @@ } }, new Option(false, "-P", "--profile") { - void process(JdepsTask task, String opt, String arg) { + void process(JdepsTask task, String opt, String arg) throws BadArgs { task.options.showProfile = true; + if (Profiles.getProfileCount() == 0) { + throw new BadArgs("err.option.unsupported", opt, getMessage("err.profiles.msg")); + } } }, new Option(false, "-R", "--recursive") { @@ -157,7 +156,7 @@ try { task.options.depth = Integer.parseInt(arg); } catch (NumberFormatException e) { - throw task.new BadArgs("err.invalid.arg.for.option", opt); + throw new BadArgs("err.invalid.arg.for.option", opt); } } }, @@ -171,7 +170,6 @@ task.options.fullVersion = true; } }, - }; private static final String PROGNAME = "jdeps"; @@ -216,7 +214,7 @@ showHelp(); return EXIT_CMDERR; } - if (options.showSummary && options.verbose != Options.Verbose.SUMMARY) { + if (options.showSummary && options.verbose != Analyzer.Type.SUMMARY) { showHelp(); return EXIT_CMDERR; } @@ -236,26 +234,14 @@ } private final List<Archive> sourceLocations = new ArrayList<Archive>(); - private final Archive NOT_FOUND = new Archive(getMessage("artifact.not.found")); private boolean run() throws IOException { findDependencies(); - switch (options.verbose) { - case VERBOSE: - case CLASS: - printClassDeps(log); - break; - case PACKAGE: - printPackageDeps(log); - break; - case SUMMARY: - for (Archive origin : sourceLocations) { - for (Archive target : origin.getRequiredArchives()) { - log.format("%-30s -> %s%n", origin, target); - } - } - break; - default: - throw new InternalError("Should not reach here"); + Analyzer analyzer = new Analyzer(options.verbose); + analyzer.run(sourceLocations); + if (options.verbose == Analyzer.Type.SUMMARY) { + printSummary(log, analyzer); + } else { + printDependencies(log, analyzer); } return true; } @@ -331,7 +317,7 @@ } catch (ConstantPoolException e) { throw new ClassFileError(e); } - a.addClass(classFileName); + if (!doneClasses.contains(classFileName)) { doneClasses.add(classFileName); } @@ -341,7 +327,7 @@ if (!doneClasses.contains(cn) && !deque.contains(cn)) { deque.add(cn); } - a.addDependency(d); + a.addClass(d.getOrigin(), d.getTarget()); } } } @@ -367,19 +353,20 @@ } catch (ConstantPoolException e) { throw new ClassFileError(e); } - a.addClass(classFileName); if (!doneClasses.contains(classFileName)) { // if name is a fully-qualified class name specified // from command-line, this class might already be parsed doneClasses.add(classFileName); - if (depth > 0) { - for (Dependency d : finder.findDependencies(cf)) { - if (filter.accepts(d)) { - String cn = d.getTarget().getName(); - if (!doneClasses.contains(cn) && !deque.contains(cn)) { - deque.add(cn); - } - a.addDependency(d); + for (Dependency d : finder.findDependencies(cf)) { + if (depth == 0) { + // ignore the dependency + a.addClass(d.getOrigin()); + break; + } else if (filter.accepts(d)) { + a.addClass(d.getOrigin(), d.getTarget()); + String cn = d.getTarget().getName(); + if (!doneClasses.contains(cn) && !deque.contains(cn)) { + deque.add(cn); } } } @@ -388,7 +375,7 @@ } } if (cf == null) { - NOT_FOUND.addClass(name); + doneClasses.add(name); } } unresolved = deque; @@ -396,96 +383,42 @@ } while (!unresolved.isEmpty() && depth-- > 0); } - private void printPackageDeps(PrintWriter out) { - for (Archive source : sourceLocations) { - SortedMap<Location, SortedSet<Location>> deps = source.getDependencies(); - if (deps.isEmpty()) - continue; - - for (Archive target : source.getRequiredArchives()) { - out.format("%s -> %s%n", source, target); - } - - Map<String, Archive> pkgs = new TreeMap<String, Archive>(); - SortedMap<String, Archive> targets = new TreeMap<String, Archive>(); - String pkg = ""; - for (Map.Entry<Location, SortedSet<Location>> e : deps.entrySet()) { - String cn = e.getKey().getClassName(); - String p = packageOf(e.getKey()); - Archive origin = Archive.find(e.getKey()); - assert origin != null; - if (!pkgs.containsKey(p)) { - pkgs.put(p, origin); - } else if (pkgs.get(p) != origin) { - warning("warn.split.package", p, origin, pkgs.get(p)); - } - - if (!p.equals(pkg)) { - printTargets(out, targets); - pkg = p; - targets.clear(); - out.format(" %s (%s)%n", p, origin.getFileName()); - } - - for (Location t : e.getValue()) { - p = packageOf(t); - Archive target = Archive.find(t); - if (!targets.containsKey(p)) { - targets.put(p, target); - } + private void printSummary(final PrintWriter out, final Analyzer analyzer) { + Analyzer.Visitor visitor = new Analyzer.Visitor() { + public void visit(String origin, String target, String profile) { + if (options.showProfile) { + out.format("%-30s -> %s%n", origin, target); } } - printTargets(out, targets); - out.println(); - } + public void visit(Archive origin, Archive target) { + if (!options.showProfile) { + out.format("%-30s -> %s%n", origin, target); + } + } + }; + analyzer.visitSummary(visitor); } - private void printTargets(PrintWriter out, Map<String, Archive> targets) { - for (Map.Entry<String, Archive> t : targets.entrySet()) { - String pn = t.getKey(); - out.format(" -> %-40s %s%n", pn, getPackageInfo(pn, t.getValue())); - } - } - - private String getPackageInfo(String pn, Archive source) { - if (PlatformClassPath.contains(source)) { - String name = PlatformClassPath.getProfileName(pn); - if (name.isEmpty()) { - return "JDK internal API (" + source.getFileName() + ")"; + private void printDependencies(final PrintWriter out, final Analyzer analyzer) { + Analyzer.Visitor visitor = new Analyzer.Visitor() { + private String pkg = ""; + public void visit(String origin, String target, String profile) { + if (!origin.equals(pkg)) { + pkg = origin; + out.format(" %s (%s)%n", origin, analyzer.getArchive(origin).getFileName()); + } + out.format(" -> %-50s %s%n", target, + (options.showProfile && !profile.isEmpty()) + ? profile + : analyzer.getArchiveName(target, profile)); } - return options.showProfile ? name : ""; - } - return source.getFileName(); - } - - private static String packageOf(Location loc) { - String pkg = loc.getPackageName(); - return pkg.isEmpty() ? "<unnamed>" : pkg; + public void visit(Archive origin, Archive target) { + out.format("%s -> %s%n", origin, target); + } + }; + analyzer.visit(visitor); } - private void printClassDeps(PrintWriter out) { - for (Archive source : sourceLocations) { - SortedMap<Location, SortedSet<Location>> deps = source.getDependencies(); - if (deps.isEmpty()) - continue; - - for (Archive target : source.getRequiredArchives()) { - out.format("%s -> %s%n", source, target); - } - out.format("%s%n", source); - for (Map.Entry<Location, SortedSet<Location>> e : deps.entrySet()) { - String cn = e.getKey().getClassName(); - Archive origin = Archive.find(e.getKey()); - out.format(" %s (%s)%n", cn, origin.getFileName()); - for (Location t : e.getValue()) { - cn = t.getClassName(); - Archive target = Archive.find(t); - out.format(" -> %-60s %s%n", cn, getPackageInfo(t.getPackageName(), target)); - } - } - out.println(); - } - } public void handleOptions(String[] args) throws BadArgs { // process options for (int i=0; i < args.length; i++) { @@ -570,7 +503,7 @@ } } - public String getMessage(String key, Object... args) { + static String getMessage(String key, Object... args) { try { return MessageFormat.format(ResourceBundleHelper.bundle.getString(key), args); } catch (MissingResourceException e) { @@ -579,24 +512,16 @@ } private static class Options { - enum Verbose { - CLASS, - PACKAGE, - SUMMARY, - VERBOSE - }; - boolean help; boolean version; boolean fullVersion; - boolean showFlags; boolean showProfile; boolean showSummary; boolean wildcard; String regex; String classpath = ""; int depth = 1; - Verbose verbose = Verbose.PACKAGE; + Analyzer.Type verbose = Analyzer.Type.PACKAGE; Set<String> packageNames = new HashSet<String>(); }
--- a/src/share/classes/com/sun/tools/jdeps/PlatformClassPath.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/jdeps/PlatformClassPath.java Tue May 07 17:14:17 2013 -0700 @@ -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 @@ -37,34 +37,6 @@ * ClassPath for Java SE and JDK */ class PlatformClassPath { - /* - * Profiles for Java SE - * - * This is a temporary workaround until a common API is defined for langtools - * to determine which profile a given classname belongs to. The list of - * packages and profile names are hardcoded in jdk.properties and - * split packages are not supported. - */ - static class Profile { - final String name; - final Set<String> packages; - - Profile(String name) { - this.name = name; - this.packages = new HashSet<String>(); - } - } - - private final static String JAVAFX = "javafx"; - private final static Map<String,Profile> map = getProfilePackages(); - static String getProfileName(String packageName) { - Profile profile = map.get(packageName); - if (packageName.startsWith(JAVAFX + ".")) { - profile = map.get(JAVAFX); - } - return profile != null ? profile.name : ""; - } - private final static List<Archive> javaHomeArchives = init(); static List<Archive> getArchives() { return javaHomeArchives; @@ -77,7 +49,6 @@ private static List<Archive> init() { List<Archive> result = new ArrayList<Archive>(); String javaHome = System.getProperty("java.home"); - List<File> files = new ArrayList<File>(); File jre = new File(javaHome, "jre"); File lib = new File(javaHome, "lib"); @@ -100,13 +71,6 @@ } catch (IOException e) { throw new RuntimeException(e); } - - // add a JavaFX profile if there is jfxrt.jar - for (Archive archive : result) { - if (archive.getFileName().equals("jfxrt.jar")) { - map.put(JAVAFX, new Profile("jfxrt.jar")); - } - } return result; } @@ -140,30 +104,4 @@ }); return result; } - - private static Map<String,Profile> getProfilePackages() { - Map<String,Profile> map = new HashMap<String,Profile>(); - - // read the properties as a ResourceBundle as the build compiles - // the properties file into Java class. Another alternative is - // to load it as Properties and fix the build to exclude this file. - ResourceBundle profileBundle = - ResourceBundle.getBundle("com.sun.tools.jdeps.resources.jdk"); - - int i=1; - String key; - while (profileBundle.containsKey((key = "profile." + i + ".name"))) { - Profile profile = new Profile(profileBundle.getString(key)); - String n = profileBundle.getString("profile." + i + ".packages"); - String[] pkgs = n.split("\\s+"); - for (String p : pkgs) { - if (p.isEmpty()) continue; - assert(map.containsKey(p) == false); - profile.packages.add(p); - map.put(p, profile); - } - i++; - } - return map; - } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/tools/jdeps/Profiles.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,241 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 com.sun.tools.jdeps; + +import com.sun.tools.classfile.Annotation; +import com.sun.tools.classfile.Annotation.*; +import com.sun.tools.classfile.Attribute; +import com.sun.tools.classfile.ClassFile; +import com.sun.tools.classfile.ConstantPool; +import com.sun.tools.classfile.ConstantPool.*; +import com.sun.tools.classfile.ConstantPoolException; +import com.sun.tools.classfile.RuntimeAnnotations_attribute; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.*; +import java.util.jar.JarFile; + +/** + * Build the profile information from ct.sym if exists. + */ +class Profiles { + private static final Map<String,Profile> map = initProfiles(); + /** + * Returns the name of the profile for the given package name. + * It returns an empty string if the given package is not in any profile. + */ + public static String getProfileName(String pn) { + Profile profile = map.get(pn); + return (profile != null && profile.packages.contains(pn)) + ? profile.name : ""; + } + + public static int getProfileCount() { + return new HashSet<Profile>(map.values()).size(); + } + + private static Map<String,Profile> initProfiles() { + List<Profile> profiles = new ArrayList<Profile>(); + try { + String profilesProps = System.getProperty("jdeps.profiles"); + if (profilesProps != null) { + // for testing for JDK development build where ct.sym doesn't exist + initProfilesFromProperties(profiles, profilesProps); + } else { + Path home = Paths.get(System.getProperty("java.home")); + if (home.endsWith("jre")) { + home = home.getParent(); + } + Path ctsym = home.resolve("lib").resolve("ct.sym"); + if (ctsym.toFile().exists()) { + // add a default Full JRE + profiles.add(0, new Profile("Full JRE", 0)); + // parse ct.sym and load information about profiles + try (JarFile jf = new JarFile(ctsym.toFile())) { + ClassFileReader reader = ClassFileReader.newInstance(ctsym, jf); + for (ClassFile cf : reader.getClassFiles()) { + findProfile(profiles, cf); + } + } + + // merge the last Profile with the "Full JRE" + if (profiles.size() > 1) { + Profile fullJRE = profiles.get(0); + Profile p = profiles.remove(profiles.size() - 1); + for (String pn : fullJRE.packages) { + // The last profile contains the packages determined from ct.sym. + // Move classes annotated profile==0 or no attribute that are + // added in the fullJRE profile to either supported or proprietary + // packages appropriately + if (p.proprietaryPkgs.contains(pn)) { + p.proprietaryPkgs.add(pn); + } else { + p.packages.add(pn); + } + } + fullJRE.packages.clear(); + fullJRE.proprietaryPkgs.clear(); + fullJRE.packages.addAll(p.packages); + fullJRE.proprietaryPkgs.addAll(p.proprietaryPkgs); + } + } + } + } catch (IOException | ConstantPoolException e) { + throw new Error(e); + } + HashMap<String,Profile> map = new HashMap<String,Profile>(); + for (Profile profile : profiles) { + // Inner classes are not annotated with the profile annotation + // packages may be in one profile but also appear in the Full JRE + // Full JRE is always the first element in profiles list and + // so the map will contain the appropriate Profile + for (String pn : profile.packages) { + map.put(pn, profile); + } + for (String pn : profile.proprietaryPkgs) { + map.put(pn, profile); + } + } + return map; + } + + private static final String PROFILE_ANNOTATION = "Ljdk/Profile+Annotation;"; + private static final String PROPRIETARY_ANNOTATION = "Lsun/Proprietary+Annotation;"; + private static Profile findProfile(List<Profile> profiles, ClassFile cf) + throws ConstantPoolException + { + RuntimeAnnotations_attribute attr = (RuntimeAnnotations_attribute) + cf.attributes.get(Attribute.RuntimeInvisibleAnnotations); + int index = 0; + boolean proprietary = false; + if (attr != null) { + for (int i = 0; i < attr.annotations.length; i++) { + Annotation ann = attr.annotations[i]; + String annType = cf.constant_pool.getUTF8Value(ann.type_index); + if (PROFILE_ANNOTATION.equals(annType)) { + for (int j = 0; j < ann.num_element_value_pairs; j++) { + Annotation.element_value_pair pair = ann.element_value_pairs[j]; + Primitive_element_value ev = (Primitive_element_value)pair.value; + CONSTANT_Integer_info info = (CONSTANT_Integer_info) + cf.constant_pool.get(ev.const_value_index); + index = info.value; + break; + } + } else if (PROPRIETARY_ANNOTATION.equals(annType)) { + proprietary = true; + } + } + if (index >= profiles.size()) { + Profile p = null; + for (int i = profiles.size(); i <= index; i++) { + p = new Profile(i); + profiles.add(p); + } + } + } + + Profile p = profiles.get(index); + String name = cf.getName(); + int i = name.lastIndexOf('/'); + name = (i > 0) ? name.substring(0, i).replace('/','.') : ""; + if (proprietary) { + p.proprietaryPkgs.add(name); + } else { + p.packages.add(name); + } + return p; + } + + private static void initProfilesFromProperties(List<Profile> profiles, String path) + throws IOException + { + Properties props = new Properties(); + try (FileReader reader = new FileReader(path)) { + props.load(reader); + } + int i=1; + String key; + while (props.containsKey((key = "profile." + i + ".name"))) { + Profile profile = new Profile(props.getProperty(key), i); + profiles.add(profile); + String n = props.getProperty("profile." + i + ".packages"); + String[] pkgs = n.split("\\s+"); + for (String p : pkgs) { + if (p.isEmpty()) continue; + profile.packages.add(p); + } + i++; + } + } + + private static class Profile { + final String name; + final int profile; + final Set<String> packages; + final Set<String> proprietaryPkgs; + Profile(int profile) { + this("compact" + profile, profile); + } + Profile(String name, int profile) { + this.name = name; + this.profile = profile; + this.packages = new HashSet<String>(); + this.proprietaryPkgs = new HashSet<String>(); + } + public String toString() { + return name; + } + } + + // for debugging + public static void main(String[] args) { + if (args.length == 0) { + Profile[] profiles = new Profile[getProfileCount()]; + for (Profile p : map.values()) { + // move the zeroth profile to the last + int index = p.profile == 0 ? profiles.length-1 : p.profile-1; + profiles[index] = p; + } + for (Profile p : profiles) { + String profileName = p.name; + SortedSet<String> set = new TreeSet<String>(p.packages); + for (String s : set) { + // filter out the inner classes that are not annotated with + // the profile annotation + if (map.get(s) == p) { + System.out.format("%-10s %s%n", profileName, s); + profileName = ""; + } + } + } + } + for (String pn : args) { + System.out.format("%s in %s%n", pn, getProfileName(pn)); + } + } +}
--- a/src/share/classes/com/sun/tools/jdeps/resources/jdeps.properties Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/jdeps/resources/jdeps.properties Tue May 07 17:14:17 2013 -0700 @@ -51,6 +51,8 @@ err.internal.error=internal error: {0} {1} {2} err.invalid.arg.for.option=invalid argument for option: {0} err.option.after.class=option must be specified before classes: {0} +err.option.unsupported={0} not supported: {1} +err.profiles.msg=No profile information warn.invalid.arg=Invalid classname or pathname not exist: {0} warn.split.package=package {0} defined in {1} {2}
--- a/src/share/classes/com/sun/tools/jdeps/resources/jdk.properties Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,262 +0,0 @@ -# This properties file does not need localization. - -profile.1.name = compact1 -profile.1.packages = \ - java.io \ - java.lang \ - java.lang.annotation \ - java.lang.invoke \ - java.lang.ref \ - java.lang.reflect \ - java.math \ - java.net \ - java.nio \ - java.nio.channels \ - java.nio.channels.spi \ - java.nio.charset \ - java.nio.charset.spi \ - java.nio.file \ - java.nio.file.attribute \ - java.nio.file.spi \ - java.security \ - java.security.cert \ - java.security.interfaces \ - java.security.spec \ - java.text \ - java.text.spi \ - java.util \ - java.util.concurrent \ - java.util.concurrent.atomic \ - java.util.concurrent.locks \ - java.util.jar \ - java.util.logging \ - java.util.regex \ - java.util.spi \ - java.util.zip \ - javax.crypto \ - javax.crypto.interfaces \ - javax.crypto.spec \ - javax.security.auth \ - javax.security.auth.callback \ - javax.security.auth.login \ - javax.security.auth.spi \ - javax.security.auth.x500 \ - javax.net \ - javax.net.ssl \ - javax.security.cert \ - \ - com.sun.net.ssl \ - com.sun.nio.file \ - com.sun.nio.sctp \ - com.sun.security.auth \ - com.sun.security.auth.login - -profile.2.name = compact2 -profile.2.packages = \ - java.sql \ - javax.sql \ - javax.xml \ - javax.xml.datatype \ - javax.xml.namespace \ - javax.xml.parsers \ - javax.xml.stream \ - javax.xml.stream.events \ - javax.xml.stream.util \ - javax.xml.transform \ - javax.xml.transform.dom \ - javax.xml.transform.sax \ - javax.xml.transform.stax \ - javax.xml.transform.stream \ - javax.xml.validation \ - javax.xml.xpath \ - org.w3c.dom \ - org.w3c.dom.bootstrap \ - org.w3c.dom.events \ - org.w3c.dom.ls \ - org.xml.sax \ - org.xml.sax.ext \ - org.xml.sax.helpers \ - java.rmi \ - java.rmi.activation \ - java.rmi.dgc \ - java.rmi.registry \ - java.rmi.server \ - javax.rmi.ssl \ - javax.transaction \ - javax.transaction.xa \ - \ - com.sun.net.httpserver \ - com.sun.net.httpserver.spi - -profile.3.name = compact3 -profile.3.packages = \ - java.lang.instrument \ - java.lang.management \ - java.security.acl \ - java.util.prefs \ - javax.management \ - javax.management.loading \ - javax.management.modelmbean \ - javax.management.monitor \ - javax.management.openmbean \ - javax.management.relation \ - javax.management.remote \ - javax.management.remote.rmi \ - javax.management.timer \ - javax.naming \ - javax.naming.directory \ - javax.naming.event \ - javax.naming.ldap \ - javax.naming.spi \ - javax.sql.rowset \ - javax.sql.rowset.serial \ - javax.sql.rowset.spi \ - javax.security.auth.kerberos \ - javax.security.sasl \ - javax.script \ - javax.smartcardio \ - javax.xml.crypto \ - javax.xml.crypto.dom \ - javax.xml.crypto.dsig \ - javax.xml.crypto.dsig.dom \ - javax.xml.crypto.dsig.keyinfo \ - javax.xml.crypto.dsig.spec \ - javax.annotation.processing \ - javax.lang.model \ - javax.lang.model.element \ - javax.lang.model.type \ - javax.lang.model.util \ - javax.tools \ - javax.tools.annotation \ - org.ietf.jgss \ - \ - com.sun.management \ - com.sun.security.auth.callback \ - com.sun.security.auth.module \ - com.sun.security.jgss - -profile.4.name = Full JRE -profile.4.packages = \ - java.applet \ - java.awt \ - java.awt.color \ - java.awt.datatransfer \ - java.awt.dnd \ - java.awt.dnd.peer \ - java.awt.event \ - java.awt.font \ - java.awt.geom \ - java.awt.im \ - java.awt.im.spi \ - java.awt.image \ - java.awt.image.renderable \ - java.awt.peer \ - java.awt.print \ - java.beans \ - java.beans.beancontext \ - javax.accessibility \ - javax.imageio \ - javax.imageio.event \ - javax.imageio.metadata \ - javax.imageio.plugins.bmp \ - javax.imageio.plugins.jpeg \ - javax.imageio.spi \ - javax.imageio.stream \ - javax.print \ - javax.print.attribute \ - javax.print.attribute.standard \ - javax.print.event \ - javax.sound.midi \ - javax.sound.midi.spi \ - javax.sound.sampled \ - javax.sound.sampled.spi \ - javax.swing \ - javax.swing.border \ - javax.swing.colorchooser \ - javax.swing.event \ - javax.swing.filechooser \ - javax.swing.plaf \ - javax.swing.plaf.basic \ - javax.swing.plaf.metal \ - javax.swing.plaf.multi \ - javax.swing.plaf.nimbus \ - javax.swing.plaf.synth \ - javax.swing.table \ - javax.swing.text \ - javax.swing.text.html \ - javax.swing.text.html.parser \ - javax.swing.text.rtf \ - javax.swing.tree \ - javax.swing.undo \ - javax.activation \ - javax.jws \ - javax.jws.soap \ - javax.rmi \ - javax.rmi.CORBA \ - javax.xml.bind \ - javax.xml.bind.annotation \ - javax.xml.bind.annotation.adapters \ - javax.xml.bind.attachment \ - javax.xml.bind.helpers \ - javax.xml.bind.util \ - javax.xml.soap \ - javax.xml.ws \ - javax.xml.ws.handler \ - javax.xml.ws.handler.soap \ - javax.xml.ws.http \ - javax.xml.ws.soap \ - javax.xml.ws.spi \ - javax.xml.ws.spi.http \ - javax.xml.ws.wsaddressing \ - javax.annotation \ - org.omg.CORBA \ - org.omg.CORBA.DynAnyPackage \ - org.omg.CORBA.ORBPackage \ - org.omg.CORBA.TypeCodePackage \ - org.omg.CORBA.portable \ - org.omg.CORBA_2_3 \ - org.omg.CORBA_2_3.portable \ - org.omg.CosNaming \ - org.omg.CosNaming.NamingContextExtPackage \ - org.omg.CosNaming.NamingContextPackage \ - org.omg.Dynamic \ - org.omg.DynamicAny \ - org.omg.DynamicAny.DynAnyFactoryPackage \ - org.omg.DynamicAny.DynAnyPackage \ - org.omg.IOP \ - org.omg.IOP.CodecFactoryPackage \ - org.omg.IOP.CodecPackage \ - org.omg.Messaging \ - org.omg.PortableInterceptor \ - org.omg.PortableInterceptor.ORBInitInfoPackage \ - org.omg.PortableServer \ - org.omg.PortableServer.CurrentPackage \ - org.omg.PortableServer.POAManagerPackage \ - org.omg.PortableServer.POAPackage \ - org.omg.PortableServer.ServantLocatorPackage \ - org.omg.PortableServer.portable \ - org.omg.SendingContext \ - org.omg.stub.java.rmi \ - org.omg.stub.javax.management.remote.rmi - -# Remaining JDK supported API -profile.5.name = JDK tools -profile.5.packages = \ - com.sun.jdi \ - com.sun.jdi.connect \ - com.sun.jdi.connect.spi \ - com.sun.jdi.event \ - com.sun.jdi.request \ - com.sun.javadoc \ - com.sun.tools.doclets \ - com.sun.tools.doctree \ - com.sun.source.tree \ - com.sun.source.util \ - com.sun.tools.attach \ - com.sun.tools.attach.spi \ - com.sun.tools.jconsole \ - com.sun.tools.javac \ - com.sun.tools.javah \ - com.sun.tools.javap \ - com.sun.tools.javadoc \ - com.sun.servicetag
--- a/src/share/classes/com/sun/tools/sjavac/Main.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/sjavac/Main.java Tue May 07 17:14:17 2013 -0700 @@ -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 @@ -26,18 +26,13 @@ package com.sun.tools.sjavac; import java.io.File; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import com.sun.tools.sjavac.server.JavacServer; import java.io.IOException; import java.io.PrintStream; import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import com.sun.tools.sjavac.server.JavacServer; /** * The main class of the smart javac wrapper tool. @@ -268,12 +263,12 @@ // Find all class files allowable for linking. // And pickup knowledge of all modules found here. // This cannot currently filter classes inside jar files. - Map<String,Source> classes_to_link_to = new HashMap<String,Source>(); +// Map<String,Source> classes_to_link_to = new HashMap<String,Source>(); // findFiles(args, "-classpath", Util.set(".class"), classes_to_link_to, modules, current_module, true); // Find all module sources allowable for linking. - Map<String,Source> modules_to_link_to = new HashMap<String,Source>(); - // findFiles(args, "-modulepath", Util.set(".class"), modules_to_link_to, modules, current_module, true); +// Map<String,Source> modules_to_link_to = new HashMap<String,Source>(); +// findFiles(args, "-modulepath", Util.set(".class"), modules_to_link_to, modules, current_module, true); // Add the set of sources to the build database. javac_state.now().collectPackagesSourcesAndArtifacts(modules); @@ -443,7 +438,7 @@ out[source_path+1] = out[source_path+1]+File.pathSeparatorChar+args[i+1]; i++; } - } else if (args[i].equals("-classpath")) { + } else if (args[i].equals("-classpath") || args[i].equals("-cp")) { if (class_path == -1) { class_path = j; out[j] = args[i]; @@ -663,6 +658,7 @@ o.equals("-d") || o.equals("-sourcepath") || o.equals("-classpath") || + o.equals("-cp") || o.equals("-bootclasspath") || o.equals("-src"); } @@ -934,13 +930,13 @@ if (roots.contains(root)) { throw new ProblemException("\""+r+"\" has already been used for "+option); } - if (roots.equals(bin_dir)) { + if (root.equals(bin_dir)) { throw new ProblemException("\""+r+"\" cannot be used both for "+option+" and -d"); } - if (roots.equals(gensrc_dir)) { + if (root.equals(gensrc_dir)) { throw new ProblemException("\""+r+"\" cannot be used both for "+option+" and -s"); } - if (roots.equals(header_dir)) { + if (root.equals(header_dir)) { throw new ProblemException("\""+r+"\" cannot be used both for "+option+" and -h"); } roots.add(root); @@ -953,7 +949,8 @@ if (args[i].equals("-src") || args[i].equals("-sourcepath") || args[i].equals("-modulepath") || - args[i].equals("-classpath")) + args[i].equals("-classpath") || + args[i].equals("-cp")) { // Reset the includes,excludes and excludefiles after they have been used. includes = new LinkedList<String>();
--- a/src/share/classes/com/sun/tools/sjavac/comp/Dependencies.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/sjavac/comp/Dependencies.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -108,14 +108,11 @@ return new_deps; } - class CompareNames implements Comparator<Name> { + static class CompareNames implements Comparator<Name> { public int compare(Name a, Name b) { return a.toString().compareTo(b.toString()); } - public boolean equals(Object obj) { - return super.equals(obj); - } } /**
--- a/src/share/classes/javax/annotation/processing/AbstractProcessor.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/javax/annotation/processing/AbstractProcessor.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -28,6 +28,7 @@ import java.util.Set; import java.util.HashSet; import java.util.Collections; +import java.util.Objects; import javax.lang.model.element.*; import javax.lang.model.SourceVersion; import javax.tools.Diagnostic; @@ -146,8 +147,7 @@ public synchronized void init(ProcessingEnvironment processingEnv) { if (initialized) throw new IllegalStateException("Cannot call init more than once."); - if (processingEnv == null) - throw new NullPointerException("Tool provided null ProcessingEnvironment"); + Objects.requireNonNull(processingEnv, "Tool provided null ProcessingEnvironment"); this.processingEnv = processingEnv; initialized = true;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/javax/lang/model/AnnotatedConstruct.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,190 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 javax.lang.model; + +import java.lang.annotation.*; +import java.util.List; +import javax.lang.model.element.*; +import javax.lang.model.type.*; + +/** + * Represents a construct that can be annotated. + * + * A construct is either an {@linkplain + * javax.lang.model.element.Element element} or a {@linkplain + * javax.lang.model.type.TypeMirror type}. Annotations on an element + * are on a <em>declaration</em>, whereas annotations on a type are on + * a specific <em>use</em> of a type name. + * + * The terms <em>directly present</em> and <em>present</em> are used + * throughout this interface to describe precisely which annotations + * are returned by methods: + * + * <p>An annotation <i>A</i> is <em>directly present</em> on a + * construct <i>E</i> if <i>E</i> is annotated, and: + * + * <ul> + * + * <li> for an invocation of {@code getAnnotation(Class<T>)} or + * {@code getAnnotationMirrors()}, <i>E</i>'s annotations contain <i>A</i>. + * + * <li> for an invocation of getAnnotationsByType(Class<T>), + * <i>E</i>'s annotations either contain <i>A</i> or, if the type of + * <i>A</i> is repeatable, contain exactly one annotation whose value + * element contains <i>A</i> and whose type is the containing + * annotation type of <i>A</i>'s type. + * + * </ul> + * + * <p>An annotation A is <em>present</em> on a construct E if either: + * + * <ul> + * <li> <i>A</i> is <em>directly present</em> on <i>E</i>; or + * + * <li> <i>A</i> is not <em>directly present</em> on <i>E</i>, and + * <i>E</i> is an element representing a class, and <i>A</i>'s type + * is inheritable, and <i>A</i> is <em>present</em> on the element + * representing the superclass of <i>E</i>. + * + * </ul> + * + * @since 1.8 + * @jls 9.6 Annotation Types + * @jls 9.6.3.3 @Inherited + */ +public interface AnnotatedConstruct { + /** + * Returns the annotations that are <em>directly present</em> on + * this construct. + * + * @return the annotations <em>directly present</em> on this + * construct; an empty list if there are none + */ + List<? extends AnnotationMirror> getAnnotationMirrors(); + + /** + * Returns this construct's annotation of the + * specified type if such an annotation is <em>present</em>, else {@code + * null}. + * + * <p> The annotation returned by this method could contain an element + * whose value is of type {@code Class}. + * This value cannot be returned directly: information necessary to + * locate and load a class (such as the class loader to use) is + * not available, and the class might not be loadable at all. + * Attempting to read a {@code Class} object by invoking the relevant + * method on the returned annotation + * will result in a {@link MirroredTypeException}, + * from which the corresponding {@link TypeMirror} may be extracted. + * Similarly, attempting to read a {@code Class[]}-valued element + * will result in a {@link MirroredTypesException}. + * + * <blockquote> + * <i>Note:</i> This method is unlike others in this and related + * interfaces. It operates on runtime reflective information — + * representations of annotation types currently loaded into the + * VM — rather than on the representations defined by and used + * throughout these interfaces. Consequently, calling methods on + * the returned annotation object can throw many of the exceptions + * that can be thrown when calling methods on an annotation object + * returned by core reflection. This method is intended for + * callers that are written to operate on a known, fixed set of + * annotation types. + * </blockquote> + * + * @param <A> the annotation type + * @param annotationType the {@code Class} object corresponding to + * the annotation type + * @return this element's or type use's annotation for the + * specified annotation type if present on this element, else + * {@code null} + * + * @see #getAnnotationMirrors() + * @see java.lang.reflect.AnnotatedElement#getAnnotation + * @see EnumConstantNotPresentException + * @see AnnotationTypeMismatchException + * @see IncompleteAnnotationException + * @see MirroredTypeException + * @see MirroredTypesException + * @jls 9.6.1 Annotation Type Elements + */ + <A extends Annotation> A getAnnotation(Class<A> annotationType); + + /** + * Returns annotations that are <em>present</em> on this construct. + * + * If there are no annotations <em>present</em> on this construct, + * the return value is an array of length 0. + * + * The difference between this method and {@link #getAnnotation(Class)} + * is that this method detects if its argument is a <em>repeatable + * annotation type</em>, and if so, attempts to find one or more + * annotations of that type by "looking through" a container annotation. + * + * <p> The annotations returned by this method could contain an element + * whose value is of type {@code Class}. + * This value cannot be returned directly: information necessary to + * locate and load a class (such as the class loader to use) is + * not available, and the class might not be loadable at all. + * Attempting to read a {@code Class} object by invoking the relevant + * method on the returned annotation + * will result in a {@link MirroredTypeException}, + * from which the corresponding {@link TypeMirror} may be extracted. + * Similarly, attempting to read a {@code Class[]}-valued element + * will result in a {@link MirroredTypesException}. + * + * <blockquote> + * <i>Note:</i> This method is unlike others in this and related + * interfaces. It operates on runtime reflective information — + * representations of annotation types currently loaded into the + * VM — rather than on the representations defined by and used + * throughout these interfaces. Consequently, calling methods on + * the returned annotation object can throw many of the exceptions + * that can be thrown when calling methods on an annotation object + * returned by core reflection. This method is intended for + * callers that are written to operate on a known, fixed set of + * annotation types. + * </blockquote> + * + * @param <A> the annotation type + * @param annotationType the {@code Class} object corresponding to + * the annotation type + * @return this element's annotations for the specified annotation + * type if present on this element, else an empty array + * + * @see #getAnnotationMirrors() + * @see #getAnnotation(java.lang.Class) + * @see java.lang.reflect.AnnotatedElement#getAnnotationsByType + * @see EnumConstantNotPresentException + * @see AnnotationTypeMismatchException + * @see IncompleteAnnotationException + * @see MirroredTypeException + * @see MirroredTypesException + * @jls 9.6 Annotation Types + * @jls 9.6.1 Annotation Type Elements + */ + <A extends Annotation> A[] getAnnotationsByType(Class<A> annotationType); +}
--- a/src/share/classes/javax/lang/model/element/Element.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/javax/lang/model/element/Element.java Tue May 07 17:14:17 2013 -0700 @@ -60,8 +60,7 @@ * @see TypeMirror * @since 1.6 */ -public interface Element { - +public interface Element extends javax.lang.model.AnnotatedConstruct { /** * Returns the type defined by this element. * @@ -89,116 +88,6 @@ ElementKind getKind(); /** - * Returns the annotations that are directly present on this element. - * - * <p> To get inherited annotations as well, use - * {@link Elements#getAllAnnotationMirrors(Element) getAllAnnotationMirrors}. - * - * @see ElementFilter - * - * @return the annotations directly present on this element; - * an empty list if there are none - */ - List<? extends AnnotationMirror> getAnnotationMirrors(); - - /** - * Returns this element's annotation for the specified type if - * such an annotation is present, else {@code null}. The - * annotation may be either inherited or directly present on this - * element. - * - * <p> The annotation returned by this method could contain an element - * whose value is of type {@code Class}. - * This value cannot be returned directly: information necessary to - * locate and load a class (such as the class loader to use) is - * not available, and the class might not be loadable at all. - * Attempting to read a {@code Class} object by invoking the relevant - * method on the returned annotation - * will result in a {@link MirroredTypeException}, - * from which the corresponding {@link TypeMirror} may be extracted. - * Similarly, attempting to read a {@code Class[]}-valued element - * will result in a {@link MirroredTypesException}. - * - * <blockquote> - * <i>Note:</i> This method is unlike others in this and related - * interfaces. It operates on runtime reflective information — - * representations of annotation types currently loaded into the - * VM — rather than on the representations defined by and used - * throughout these interfaces. Consequently, calling methods on - * the returned annotation object can throw many of the exceptions - * that can be thrown when calling methods on an annotation object - * returned by core reflection. This method is intended for - * callers that are written to operate on a known, fixed set of - * annotation types. - * </blockquote> - * - * @param <A> the annotation type - * @param annotationType the {@code Class} object corresponding to - * the annotation type - * @return this element's annotation for the specified annotation - * type if present on this element, else {@code null} - * - * @see #getAnnotationMirrors() - * @see java.lang.reflect.AnnotatedElement#getAnnotation - * @see EnumConstantNotPresentException - * @see AnnotationTypeMismatchException - * @see IncompleteAnnotationException - * @see MirroredTypeException - * @see MirroredTypesException - */ - <A extends Annotation> A getAnnotation(Class<A> annotationType); - - /** - * Returns an array of all of this element's annotation for the - * specified type if such annotations are present, else an empty - * array. The annotation may be either inherited or directly - * present on this element. This method will look through a container - * annotation (if present) if the supplied annotation type is - * repeatable. - * - * <p> The annotations returned by this method could contain an element - * whose value is of type {@code Class}. - * This value cannot be returned directly: information necessary to - * locate and load a class (such as the class loader to use) is - * not available, and the class might not be loadable at all. - * Attempting to read a {@code Class} object by invoking the relevant - * method on the returned annotation - * will result in a {@link MirroredTypeException}, - * from which the corresponding {@link TypeMirror} may be extracted. - * Similarly, attempting to read a {@code Class[]}-valued element - * will result in a {@link MirroredTypesException}. - * - * <blockquote> - * <i>Note:</i> This method is unlike others in this and related - * interfaces. It operates on runtime reflective information — - * representations of annotation types currently loaded into the - * VM — rather than on the representations defined by and used - * throughout these interfaces. Consequently, calling methods on - * the returned annotation object can throw many of the exceptions - * that can be thrown when calling methods on an annotation object - * returned by core reflection. This method is intended for - * callers that are written to operate on a known, fixed set of - * annotation types. - * </blockquote> - * - * @param <A> the annotation type - * @param annotationType the {@code Class} object corresponding to - * the annotation type - * @return this element's annotations for the specified annotation - * type if present on this element, else an empty array - * - * @see #getAnnotationMirrors() - * @see #getAnnotation(java.lang.Class) - * @see java.lang.reflect.AnnotatedElement#getAnnotations - * @see EnumConstantNotPresentException - * @see AnnotationTypeMismatchException - * @see IncompleteAnnotationException - * @see MirroredTypeException - * @see MirroredTypesException - */ - <A extends Annotation> A[] getAnnotations(Class<A> annotationType); - - /** * Returns the modifiers of this element, excluding annotations. * Implicit modifiers, such as the {@code public} and {@code static} * modifiers of interface members, are included. @@ -322,6 +211,19 @@ */ int hashCode(); + + /** + * {@inheritDoc} + * + * <p> To get inherited annotations as well, use {@link + * Elements#getAllAnnotationMirrors(Element) + * getAllAnnotationMirrors}. + * + * @see ElementFilter + * @since 1.6 + */ + @Override + List<? extends AnnotationMirror> getAnnotationMirrors(); /** * Applies a visitor to this element. *
--- a/src/share/classes/javax/lang/model/element/ExecutableElement.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/javax/lang/model/element/ExecutableElement.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -69,6 +69,25 @@ List<? extends VariableElement> getParameters(); /** + * Returns the receiver type of this executable, + * or {@link javax.lang.model.type.NoType NoType} with + * kind {@link javax.lang.model.type.TypeKind#NONE NONE} + * if the executable has no receiver type. + * + * An executable which is an instance method, or a constructor of an + * inner class, has a receiver type derived from the {@linkplain + * #getEnclosingElement declaring type}. + * + * An executable which is a static method, or a constructor of a + * non-inner class, or an initializer (static or instance), has no + * receiver type. + * + * @return the receiver type of this executable + * @since 1.8 + */ + TypeMirror getReceiverType(); + + /** * Returns {@code true} if this method or constructor accepts a variable * number of arguments and returns {@code false} otherwise. *
--- a/src/share/classes/javax/lang/model/element/Modifier.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/javax/lang/model/element/Modifier.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -53,6 +53,11 @@ /** The modifier {@code protected} */ PROTECTED, /** The modifier {@code private} */ PRIVATE, /** The modifier {@code abstract} */ ABSTRACT, + /** + * The modifier {@code default} + * @since 1.8 + */ + DEFAULT, /** The modifier {@code static} */ STATIC, /** The modifier {@code final} */ FINAL, /** The modifier {@code transient} */ TRANSIENT,
--- a/src/share/classes/javax/lang/model/element/TypeElement.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/javax/lang/model/element/TypeElement.java Tue May 07 17:14:17 2013 -0700 @@ -111,7 +111,6 @@ */ Name getQualifiedName(); - /** * Returns the simple name of this type element. * @@ -152,7 +151,6 @@ */ List<? extends TypeParameterElement> getTypeParameters(); - /** * Returns the package of a top-level type and returns the * immediately lexically enclosing element for a {@linkplain
--- a/src/share/classes/javax/lang/model/type/AnnotatedType.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -/* - * 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * 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 javax.lang.model.type; - -import java.util.List; - -import javax.lang.model.element.AnnotationMirror; - -/** - * Represents an annotated type. - * - * As of the {@link javax.lang.model.SourceVersion#RELEASE_8 - * RELEASE_8} source version, annotated types can appear for all - * type uses. - * - * @author Werner Dietl - * @since 1.8 - */ -public interface AnnotatedType extends TypeMirror, - DeclaredType, TypeVariable, WildcardType, - PrimitiveType, ArrayType { - - List<? extends AnnotationMirror> getAnnotations(); - TypeMirror getUnderlyingType(); -}
--- a/src/share/classes/javax/lang/model/type/ExecutableType.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/javax/lang/model/type/ExecutableType.java Tue May 07 17:14:17 2013 -0700 @@ -30,7 +30,6 @@ import javax.lang.model.element.ExecutableElement; - /** * Represents the type of an executable. An <i>executable</i> * is a method, constructor, or initializer. @@ -78,10 +77,21 @@ List<? extends TypeMirror> getParameterTypes(); /** - * Returns the type of this executable's receiver parameter. + * Returns the receiver type of this executable, + * or {@link javax.lang.model.type.NoType NoType} with + * kind {@link javax.lang.model.type.TypeKind#NONE NONE} + * if the executable has no receiver type. * - * @return the type of this executable's receiver parameter - * TODO: null if none specified or always a valid value? + * An executable which is an instance method, or a constructor of an + * inner class, has a receiver type derived from the {@linkplain + * ExecutableElement#getEnclosingElement declaring type}. + * + * An executable which is a static method, or a constructor of a + * non-inner class, or an initializer (static or instance), has no + * receiver type. + * + * @return the receiver type of this executable + * @since 1.8 */ TypeMirror getReceiverType();
--- a/src/share/classes/javax/lang/model/type/TypeKind.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/javax/lang/model/type/TypeKind.java Tue May 07 17:14:17 2013 -0700 @@ -157,14 +157,7 @@ * * @since 1.8 */ - INTERSECTION, - - /** - * An annotated type. - * - * @since 1.8 - */ - ANNOTATED; + INTERSECTION; /** * Returns {@code true} if this kind corresponds to a primitive
--- a/src/share/classes/javax/lang/model/type/TypeMirror.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/javax/lang/model/type/TypeMirror.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -25,6 +25,8 @@ package javax.lang.model.type; +import java.lang.annotation.Annotation; +import java.util.List; import javax.lang.model.element.*; import javax.lang.model.util.Types; @@ -55,7 +57,7 @@ * @see Types * @since 1.6 */ -public interface TypeMirror { +public interface TypeMirror extends javax.lang.model.AnnotatedConstruct { /** * Returns the {@code kind} of this type.
--- a/src/share/classes/javax/lang/model/type/TypeVisitor.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/javax/lang/model/type/TypeVisitor.java Tue May 07 17:14:17 2013 -0700 @@ -194,14 +194,4 @@ * @since 1.8 */ R visitIntersection(IntersectionType t, P p); - - /** - * Visits an annotated type. - * - * @param t the type to visit - * @param p a visitor-specified parameter - * @return a visitor-specified result - * @since 1.8 - */ - R visitAnnotated(AnnotatedType t, P p); }
--- a/src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java Tue May 07 17:14:17 2013 -0700 @@ -134,23 +134,6 @@ } /** - * Visits an {@code AnnotatedType} element by calling {@code - * visit} on the underlying type. - - * @param t {@inheritDoc} - * @param p {@inheritDoc} - * @return the result of calling {@code visit} on the underlying type - * - * @since 1.8 - * - * TODO: should xxxVisitor8 subclasses override this and call - * the defaultAction? - */ - public R visitAnnotated(AnnotatedType t, P p) { - return visit(t.getUnderlyingType(), p); - } - - /** * {@inheritDoc} * * <p> The default implementation of this method in {@code
--- a/src/share/classes/javax/lang/model/util/Elements.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/javax/lang/model/util/Elements.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -249,4 +249,14 @@ * @param cs the character sequence to return as a name */ Name getName(CharSequence cs); + + /** + * Returns {@code true} if the type element is a functional interface, {@code false} otherwise. + * + * @param type the type element being examined + * @return {@code true} if the element is a functional interface, {@code false} otherwise + * @jls 9.8 Functional Interfaces + * @since 1.8 + */ + boolean isFunctionalInterface(TypeElement type); }
--- a/src/share/classes/javax/lang/model/util/Types.java Wed Feb 13 15:38:52 2013 +0000 +++ b/src/share/classes/javax/lang/model/util/Types.java Tue May 07 17:14:17 2013 -0700 @@ -59,6 +59,13 @@ /** * Tests whether two {@code TypeMirror} objects represent the same type. * + * <p>Since annotations are only meta-data associated with a type, + * the set of annotations on either argument is <em>not</em> taken + * into account when computing whether or not two {@code + * TypeMirror} objects are the same type. In particular, two + * {@code TypeMirror} objects can have different annotations and + * still be considered the same. + * * <p>Caveat: if either of the arguments to this method represents a * wildcard, this method will return false. As a consequence, a wildcard * is not the same type as itself. This might be surprising at first, @@ -301,116 +308,4 @@ * for the given type */ TypeMirror asMemberOf(DeclaredType containing, Element element); - - /** - * Returns the annotations targeting the type. - * - * @param type the targeted type - * @return the type annotations targeting the type - */ - List<? extends AnnotationMirror> typeAnnotationsOf(TypeMirror type); - - /** - * Returns the type's annotation for the specified type if - * such an annotation is present, else {@code null}. The - * annotation has to be directly present on this - * element. - * - * <p> The annotation returned by this method could contain an element - * whose value is of type {@code Class}. - * This value cannot be returned directly: information necessary to - * locate and load a class (such as the class loader to use) is - * not available, and the class might not be loadable at all. - * Attempting to read a {@code Class} object by invoking the relevant - * method on the returned annotation - * will result in a {@link MirroredTypeException}, - * from which the corresponding {@link TypeMirror} may be extracted. - * Similarly, attempting to read a {@code Class[]}-valued element - * will result in a {@link MirroredTypesException}. - * - * <blockquote> - * <i>Note:</i> This method is unlike others in this and related - * interfaces. It operates on runtime reflective information — - * representations of annotation types currently loaded into the - * VM — rather than on the representations defined by and used - * throughout these interfaces. Consequently, calling methods on - * the returned annotation object can throw many of the exceptions - * that can be thrown when calling methods on an annotation object - * returned by core reflection. This method is intended for - * callers that are written to operate on a known, fixed set of - * annotation types. - * </blockquote> - * - * @param <A> the annotation type - * @param type the targeted type - * @param annotationType the {@code Class} object corresponding to - * the annotation type - * @return the type's annotation for the specified annotation - * type if present on the type, else {@code null} - * - * @see Element#getAnnotationMirrors() - * @see EnumConstantNotPresentException - * @see AnnotationTypeMismatchException - * @see IncompleteAnnotationException - * @see MirroredTypeException - * @see MirroredTypesException - */ - <A extends Annotation> A typeAnnotationOf(TypeMirror type, Class<A> annotationType); - - /** - * Returns the annotations targeting the method receiver type. - * - * @param type the targeted type - * @return the receiver type of the executable type - */ - TypeMirror receiverTypeOf(ExecutableType type); - - /** - * Returns the type's annotation for the specified executable type - * receiver if such an annotation is present, else {@code null}. The - * annotation has to be directly present on this - * element. - * - * <p> The annotation returned by this method could contain an element - * whose value is of type {@code Class}. - * This value cannot be returned directly: information necessary to - * locate and load a class (such as the class loader to use) is - * not available, and the class might not be loadable at all. - * Attempting to read a {@code Class} object by invoking the relevant - * method on the returned annotation - * will result in a {@link MirroredTypeException}, - * from which the corresponding {@link TypeMirror} may be extracted. - * Similarly, attempting to read a {@code Class[]}-valued element - * will result in a {@link MirroredTypesException}. - * - * <blockquote> - * <i>Note:</i> This method is unlike others in this and related - * interfaces. It operates on runtime reflective information — - * representations of annotation types currently loaded into the - * VM — rather than on the representations defined by and used - * throughout these interfaces. Consequently, calling methods on - * the returned annotation object can throw many of the exceptions - * that can be thrown when calling methods on an annotation object - * returned by core reflection. This method is intended for - * callers that are written to operate on a known, fixed set of - * annotation types. - * </blockquote> - * - * @param <A> the annotation type - * @param type the method type - * @param annotationType the {@code Class} object corresponding to - * the annotation type - * @return the type's annotation for the specified annotation - * type if present on the type, else {@code null} - * - * @see Element#getAnnotationMirrors() - * @see EnumConstantNotPresentException - * @see AnnotationTypeMismatchException - * @see IncompleteAnnotationException - * @see MirroredTypeException - * @see MirroredTypesException - */ - // TODO: no longer needed? - // <A extends Annotation> A receiverTypeAnnotationOf(ExecutableType type, Class<A> annotationType); - }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/jdk/Supported.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,53 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 jdk; + +import java.lang.annotation.*; + +/** + * Indicates whether or not a JDK specific type or package is a + * supported part of the JDK. + * + * This annotation should only be applied to types and packages + * <em>outside</em> of the Java SE namespaces of {@code java.*} and + * {@code javax.*} packages. For example, certain portions of {@code + * com.sun.*} are official parts of the JDK meant to be generally + * usable while other portions of {@code com.sun.*} are not. This + * annotation type allows those portions to be easily and + * programmaticly distinguished. + * + * @since 1.8 + */ +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE, ElementType.PACKAGE}) +@Supported +public @interface Supported { + /** + * Whether or not this package or type is a supported part of the JDK. + */ + boolean value() default true; +}
--- a/test/com/sun/javadoc/T6735320/T6735320.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/com/sun/javadoc/T6735320/T6735320.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -47,8 +47,8 @@ public static void main(String... args) { T6735320 tester = new T6735320(); - if (tester.runJavadoc(ARGS) != 0) { - throw new AssertionError("non-zero return code from javadoc"); + if (tester.runJavadoc(ARGS) == 0) { + throw new AssertionError("zero return code from javadoc"); } if (tester.getErrorOutput().contains("StringIndexOutOfBoundsException")) { throw new AssertionError("javadoc threw StringIndexOutOfBoundsException");
--- a/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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
--- a/test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testDocFiles/TestDocFiles.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,67 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8008949 + * @summary verify that doc-files get copied + * @library ../lib/ + * @build JavadocTester + * @build TestDocFiles + * @run main TestDocFiles + */ + +public class TestDocFiles extends JavadocTester { + + private static final String BUG_ID = "8008949"; + private static final String[][] TEST = { + {"tmp" + FS + "pkg" + FS + "doc-files" + FS + "test.txt", "test file"}}; + + private static final String[] ARGS = + new String[] { + "-d", "tmp", "-sourcepath", SRC_DIR, "pkg"}; + + /** + * The entry point of the test. + * @param args the array of command line arguments. + */ + public static void main(String[] args) { + TestDocFiles tester = new TestDocFiles(); + run(tester, ARGS, TEST, NO_TEST); + tester.printSummary(); + } + + /** + * {@inheritDoc} + */ + public String getBugId() { + return BUG_ID; + } + + /** + * {@inheritDoc} + */ + public String getBugName() { + return getClass().getName(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testDocFiles/pkg/Test.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2002, 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 pkg; + +public class Test { } +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testDocFiles/pkg/doc-files/test.txt Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,2 @@ +this is a test file +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testJavaFX/C.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,103 @@ +/* + * 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 + * 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. + */ + +/** + * @expert Expert tag text + */ + +public class C { + + /** + * @propertySetter Property + * @propertyDescription PropertyDescription + */ + public void CC() {} + + /** + * @propertyGetter Property + * @expert Expert tag text + * + */ + public void B() {} + + /** + * Method A documentation + * @treatAsPrivate + */ + public void A() {} + + /** + * Field i + * @defaultValue 1.0 + */ + public int i; + + + /** + * Defines the direction/speed at which the {@code Timeline} is expected to + * be played. + * @defaultValue 11 + */ + private DoubleProperty rate; + + public final void setRate(double value) {} + + public final double getRate() {} + + public final DoubleProperty rateProperty() {} + + private BooleanProperty paused; + + public final void setPaused(boolean value) {} + + public final double isPaused() {} + + /** + * Defines if paused + * @defaultValue false + */ + public final BooleanProperty pausedProperty() {} + + class DoubleProperty {} + + class BooleanProperty {} + + public final BooleanProperty setTestMethodProperty() {} + + private class Inner { + private BooleanProperty testMethodProperty() {} + + /** + * Defines the direction/speed at which the {@code Timeline} is expected to + * be played. + * @defaultValue 11 + */ + private DoubleProperty rate; + + public final void setRate(double value) {} + + public final double getRate() {} + + public final DoubleProperty rateProperty() {} + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testJavaFX/D.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,28 @@ +/* + * 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 + * 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. + */ + +/** + * @expert Expert tag text + */ + +public class D extends C {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testJavaFX/TestJavaFX.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,109 @@ +/* + * 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 + * 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. + */ + +/* + * @test + * @bug 7112427 + * @summary Test of the JavaFX doclet features. + * @author jvalenta + * @library ../lib/ + * @build JavadocTester TestJavaFX + * @run main TestJavaFX + */ + +public class TestJavaFX extends JavadocTester { + + private static final String BUG_ID = "7112427"; + + private static final String[][] TEST = + new String[][] { + {"./" + BUG_ID + "/C.html", + "<dt><span class=\"strong\">See Also:</span></dt><dd><a href=\"C.html#getRate()\"><code>getRate()</code></a>, " + NL + + "<a href=\"C.html#setRate(double)\"><code>setRate(double)</code></a></dd>"}, + {"./" + BUG_ID + "/C.html", + "<pre>public final void setRate(double value)</pre>" + NL + + "<div class=\"block\">Sets the value of the property rate.</div>" + NL + + "<dl><dt><span class=\"strong\">Property description:</span></dt>" }, + {"./" + BUG_ID + "/C.html", + "<pre>public final double getRate()</pre>" + NL + + "<div class=\"block\">Gets the value of the property rate.</div>" + NL + + "<dl><dt><span class=\"strong\">Property description:</span></dt>" }, + {"./" + BUG_ID + "/C.html", + "<td class=\"colLast\"><code><strong><a href=\"C.html#rateProperty\">rate</a></strong></code>" + NL + + "<div class=\"block\">Defines the direction/speed at which the <code>Timeline</code> is expected to"}, + {"./" + BUG_ID + "/C.html", + "<sub id=\"expert\">Expert tag text</sub>"}, + {"./" + BUG_ID + "/C.html", + "<span class=\"strong\">Default value:</span>"}, + {"./" + BUG_ID + "/C.html", + "<P>Sets the value of the property <CODE>Property</CODE>"}, + {"./" + BUG_ID + "/C.html", + "<P>Gets the value of the property <CODE>Property</CODE>"}, + {"./" + BUG_ID + "/C.html", + "<span class=\"strong\">Property description:</span>"}, + {"./" + BUG_ID + "/C.html", + "<td class=\"colLast\"><code><strong><a href=\"C.html#setTestMethodProperty()\">setTestMethodProperty</a></strong>()</code> </td>" }, + {"./" + BUG_ID + "/C.html", + "<h4>isPaused</h4>" + NL + + "<pre>public final double isPaused()</pre>" + NL + + "<div class=\"block\">Gets the value of the property paused.</div>" }, + {"./" + BUG_ID + "/D.html", + "<h3>Properties inherited from class <a href=\"C.html\" title=\"class in <Unnamed>\">C</a></h3>" + NL + + "<code><a href=\"C.html#pausedProperty\">paused</a>, <a href=\"C.html#rateProperty\">rate</a></code></li>" }, + }; + private static final String[][] NO_TEST = + new String[][] { + {"./" + BUG_ID + "/C.html", + "A()"}, + }; + + + private static final String[] ARGS = new String[] { + "-d", BUG_ID, "-sourcepath", SRC_DIR, "-private", "-javafx", + SRC_DIR + FS + "C.java", SRC_DIR + FS + "D.java" + }; + + /** + * The entry point of the test. + * @param args the array of command line arguments. + */ + public static void main(String[] args) { + TestJavaFX tester = new TestJavaFX(); + run(tester, ARGS, TEST, NO_TEST); + tester.printSummary(); + } + + /** + * {@inheritDoc} + */ + public String getBugId() { + return BUG_ID; + } + + /** + * {@inheritDoc} + */ + public String getBugName() { + return getClass().getName(); + } +}
--- a/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java Tue May 07 17:14:17 2013 -0700 @@ -63,7 +63,7 @@ "<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>"} + "reference.</dd>" + NL + "</dl>"} }; private static final String[][] NEGATED_TEST = { {BUG_ID + FS + "pkg" + FS + "A.html",
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testProfiles/TestProfiles.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,190 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8006124 8009684 + * @summary Test javadoc support for profiles. + * @author Bhavesh Patel + * @library ../lib/ + * @build JavadocTester TestProfiles + * @run main TestProfiles + */ +public class TestProfiles extends JavadocTester { + + //Test information. + private static final String BUG_ID = "8006124-8009684"; + private static final String PROFILE_BUG_ID = BUG_ID + "-1"; + private static final String PACKAGE_BUG_ID = BUG_ID + "-2"; + //Javadoc arguments. + private static final String[] ARGS1 = new String[]{ + "-d", PROFILE_BUG_ID, "-sourcepath", SRC_DIR, "-Xprofilespath", SRC_DIR + FS + + "profile-rtjar-includes.txt", "pkg1", "pkg2", "pkg3", "pkg4", "pkg5" + }; + private static final String[] ARGS2 = new String[]{ + "-d", PACKAGE_BUG_ID, "-sourcepath", SRC_DIR, "pkg1", "pkg2", "pkg3", "pkg4", "pkg5" + }; + //Input for string tests for profiles. + private static final String[][] PROFILES_TEST = { + // Tests for profile-overview-frame.html listing all profiles. + {PROFILE_BUG_ID + FS + "profile-overview-frame.html", + "<span><a href=\"overview-frame.html\" " + + "target=\"packageListFrame\">All Packages</a></span>" + }, + {PROFILE_BUG_ID + FS + "profile-overview-frame.html", + "<li><a href=\"compact1-frame.html\" target=\"packageListFrame\">" + + "compact1</a></li>" + }, + // Tests for profileName-frame.html listing all packages in a profile. + {PROFILE_BUG_ID + FS + "compact2-frame.html", + "<span><a href=\"overview-frame.html\" target=\"packageListFrame\">" + + "All Packages</a></span><span><a href=\"profile-overview-frame.html\" " + + "target=\"packageListFrame\">All Profiles</a></span>" + }, + {PROFILE_BUG_ID + FS + "compact2-frame.html", + "<li><a href=\"pkg4/compact2-package-frame.html\" " + + "target=\"packageFrame\">pkg4</a></li>" + }, + // Test for profileName-package-frame.html listing all types in a + // package of a profile. + {PROFILE_BUG_ID + FS + "pkg2" + FS + "compact2-package-frame.html", + "<a href=\"../compact2-summary.html\" target=\"classFrame\">" + + "compact2</a> - <a href=\"../pkg2/compact2-package-summary.html\" " + + "target=\"classFrame\">pkg2</a>" + }, + // Tests for profileName-summary.html listing the summary for a profile. + {PROFILE_BUG_ID + FS + "compact2-summary.html", + "<li><a href=\"compact1-summary.html\">Prev Profile</a></li>" + NL + + "<li><a href=\"compact3-summary.html\">Next Profile</a></li>" + }, + {PROFILE_BUG_ID + FS + "compact2-summary.html", + "<h1 title=\"Profile\" class=\"title\">Profile compact2</h1>" + }, + {PROFILE_BUG_ID + FS + "compact2-summary.html", + "<h3><a href=\"pkg2/compact2-package-summary.html\" " + + "target=\"classFrame\">pkg2</a></h3>" + }, + // Tests for profileName-package-summary.html listing the summary for a + // package in a profile. + {PROFILE_BUG_ID + FS + "pkg5" + FS + "compact3-package-summary.html", + "<li><a href=\"../pkg4/compact3-package-summary.html\">Prev Package" + + "</a></li>" + }, + {PROFILE_BUG_ID + FS + "pkg5" + FS + "compact3-package-summary.html", + "<div class=\"subTitle\">compact3</div>" + }, + //Test for "overview-frame.html" showing the "All Profiles" link. + {PROFILE_BUG_ID + FS + "overview-frame.html", + "<span><a href=\"profile-overview-frame.html\" " + + "target=\"packageListFrame\">All Profiles</a></span>" + }, + //Test for "className.html" showing the profile information for the type. + {PROFILE_BUG_ID + FS + "pkg2" + FS + "Class1Pkg2.html", + "<div class=\"subTitle\">compact1, compact2, compact3</div>" + }, + {PROFILE_BUG_ID + FS + "index.html", + "<frame src=\"overview-frame.html\" name=\"packageListFrame\" " + + "title=\"All Packages\">" + } + }; + private static final String[][] PROFILES_NEGATED_TEST = { + {PROFILE_BUG_ID + FS + "pkg3" + FS + "Class2Pkg3.html", + "<div class=\"subTitle\">compact1" + }, + {PROFILE_BUG_ID + FS + "pkg3" + FS + "Interface1Pkg3.html", + "<div class=\"subTitle\">compact1" + }, + {PROFILE_BUG_ID + FS + "pkg4" + FS + "compact2-package-frame.html", + "<li><a href=\"Anno1Pkg4.html\" title=\"annotation in pkg4\" " + + "target=\"classFrame\">Anno1Pkg4</a></li>" + } + }; + private static final String[][] PACKAGES_TEST = { + {PACKAGE_BUG_ID + FS + "overview-frame.html", + "<h2 title=\"Packages\">Packages</h2>" + }, + {PACKAGE_BUG_ID + FS + "pkg4" + FS + "package-frame.html", + "<h1 class=\"bar\"><a href=\"../pkg4/package-summary.html\" " + + "target=\"classFrame\">pkg4</a></h1>" + }, + {PACKAGE_BUG_ID + FS + "pkg4" + FS + "package-summary.html", + "<div class=\"header\">" + NL + "<h1 title=\"Package\" " + + "class=\"title\">Package pkg4</h1>" + NL + "</div>" + } + }; + private static final String[][] PACKAGES_NEGATED_TEST = { + {PACKAGE_BUG_ID + FS + "profile-overview-frame.html", + "<span><a href=\"overview-frame.html\" " + + "target=\"packageListFrame\">All Packages</a></span>" + }, + {PACKAGE_BUG_ID + FS + "compact2-frame.html", + "<span><a href=\"overview-frame.html\" target=\"packageListFrame\">" + + "All Packages</a></span><span><a href=\"profile-overview-frame.html\" " + + "target=\"packageListFrame\">All Profiles</a></span>" + }, + {PACKAGE_BUG_ID + FS + "pkg2" + FS + "compact2-package-frame.html", + "<a href=\"../compact2-summary.html\" target=\"classFrame\">" + + "compact2</a> - <a href=\"../pkg2/compact2-package-summary.html\" " + + "target=\"classFrame\">pkg2</a>" + }, + {PACKAGE_BUG_ID + FS + "compact2-summary.html", + "<h1 title=\"Profile\" class=\"title\">Profile compact2</h1>" + }, + {PACKAGE_BUG_ID + FS + "pkg5" + FS + "compact3-package-summary.html", + "<div class=\"subTitle\">compact3</div>" + }, + {PACKAGE_BUG_ID + FS + "overview-frame.html", + "<span><a href=\"profile-overview-frame.html\" " + + "target=\"packageListFrame\">All Profiles</a></span>" + }, + {PACKAGE_BUG_ID + FS + "pkg2" + FS + "Class1Pkg2.html", + "<div class=\"subTitle\">compact1, compact2, compact3</div>" + } + }; + + /** + * The entry point of the test. + * + * @param args the array of command line arguments. + */ + public static void main(String[] args) { + TestProfiles tester = new TestProfiles(); + run(tester, ARGS1, PROFILES_TEST, PROFILES_NEGATED_TEST); + run(tester, ARGS2, PACKAGES_TEST, PACKAGES_NEGATED_TEST); + tester.printSummary(); + } + + /** + * {@inheritDoc} + */ + public String getBugId() { + return BUG_ID; + } + + /** + * {@inheritDoc} + */ + public String getBugName() { + return getClass().getName(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testProfiles/pkg1/Class1Pkg1.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,32 @@ +/* + * 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; + +/** + * A test class. + * + * @author Bhavesh Patel + */ +public class Class1Pkg1 { +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testProfiles/pkg1/Class2Pkg1.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,32 @@ +/* + * 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; + +/** + * A test class. + * + * @author Bhavesh Patel + */ +public class Class2Pkg1 { +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testProfiles/pkg1/Class3Pkg1.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,32 @@ +/* + * 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; + +/** + * A test class. + * + * @author Bhavesh Patel + */ +public class Class3Pkg1 { +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testProfiles/pkg1/Interface1Pkg1.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,48 @@ +/* + * 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; + +/** + * A sample interface. + * + * @author Bhavesh Patel + */ +public interface Interface1Pkg1 { + + /** + * A test method. + * + * @param a blah. + * @param b blah. + */ + void method1(int a, int b); + + /** + * Another test method. + * + * @param c blah. + */ + void method2(int c); + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testProfiles/pkg2/Anno1Pkg2.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,40 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 pkg2; + +import java.lang.annotation.*; + +/** + * Test Annotation class. + * + * @author Bhavesh Patel + */ +public @interface Anno1Pkg2 { + /** + * Comment. + */ + String[] value(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testProfiles/pkg2/Anno2Pkg2.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,35 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 pkg2; + +import java.lang.annotation.*; + +/* + * A sample interface. + */ +public @interface Anno2Pkg2 { + boolean value() default true; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testProfiles/pkg2/Class1Pkg2.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,51 @@ +/* + * 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 pkg2; + +/** + * Another test class. + * + * @author Bhavesh Patel + */ +public class Class1Pkg2 { + + /** + * A sample enum. + */ + public static enum ModalExclusionType { + /** + * Test comment. + */ + NO_EXCLUDE, + /** + * Another comment. + */ + APPLICATION_EXCLUDE + }; + + /** + * A string constant. + */ + public static final String CONSTANT1 = "C2"; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testProfiles/pkg3/Class1Pkg3.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,32 @@ +/* + * 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 pkg3; + +/** + * A test class. + * + * @author Bhavesh Patel + */ +public class Class1Pkg3 { +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testProfiles/pkg3/Class2Pkg3.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,32 @@ +/* + * 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 pkg3; + +/** + * A test class. + * + * @author Bhavesh Patel + */ +public class Class2Pkg3 { +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testProfiles/pkg3/Interface1Pkg3.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,48 @@ +/* + * 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 pkg3; + +/** + * A sample interface. + * + * @author Bhavesh Patel + */ +public interface Interface1Pkg3 { + + /** + * A test method. + * + * @param a blah. + * @param b blah. + */ + void method1(int a, int b); + + /** + * Another test method. + * + * @param c blah. + */ + void method2(int c); + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testProfiles/pkg4/Anno1Pkg4.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,40 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 pkg4; + +import java.lang.annotation.*; + +/** + * Test Annotation class. + * + * @author Bhavesh Patel + */ +public @interface Anno1Pkg4 { + /** + * Comment. + */ + String[] value(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testProfiles/pkg4/Class1Pkg4.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,32 @@ +/* + * 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 pkg4; + +/** + * Another test class. + * + * @author Bhavesh Patel + */ +public class Class1Pkg4 { +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testProfiles/pkg5/Class1Pkg5.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,32 @@ +/* + * 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 pkg5; + +/** + * A test class. + * + * @author Bhavesh Patel + */ +public class Class1Pkg5 { +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testProfiles/pkg5/Interface1Pkg5.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,40 @@ +/* + * 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 pkg5; + +/** + * A sample interface. + * + * @author Bhavesh Patel + */ +public interface Interface1Pkg5 { + + /** + * A test method. + * + * @param a blah. + * @param b blah. + */ + void method1(int a, int b); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testProfiles/profile-rtjar-includes.txt Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,42 @@ +PROFILE_1_RTJAR_INCLUDE_PACKAGES := \ + pkg2 + +PROFILE_1_RTJAR_INCLUDE_TYPES := \ + pkg3/Class1Pkg3.class + +PROFILE_1_RTJAR_EXCLUDE_TYPES := + +PROFILE_1_INCLUDE_METAINF_SERVICES := + + +PROFILE_2_RTJAR_INCLUDE_PACKAGES := \ + pkg4 + +PROFILE_2_RTJAR_INCLUDE_TYPES := + +PROFILE_2_RTJAR_EXCLUDE_TYPES := \ + pkg4/Anno1Pkg4.class + +PROFILE_2_INCLUDE_METAINF_SERVICES := + + +PROFILE_3_RTJAR_INCLUDE_PACKAGES := \ + pkg5 + +PROFILE_3_RTJAR_INCLUDE_TYPES := + +PROFILE_3_RTJAR_EXCLUDE_TYPES := + +PROFILE_3_INCLUDE_METAINF_SERVICES := + + +PROFILE_4_RTJAR_INCLUDE_PACKAGES := \ + pkg1 + +PROFILE_4_RTJAR_INCLUDE_TYPES := + +PROFILE_4_RTJAR_EXCLUDE_TYPES := + +PROFILE_4_INCLUDE_METAINF_SERVICES := + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,421 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8005091 8009686 + * @summary Make sure that type annotations are displayed correctly + * @author Bhavesh Patel + * @library ../lib/ + * @build JavadocTester TestTypeAnnotations + * @run main TestTypeAnnotations + */ + +public class TestTypeAnnotations extends JavadocTester { + + //Test information. + private static final String BUG_ID = "8005091-8009686"; + + //Javadoc arguments. + private static final String[] ARGS = new String[] { + "-d", BUG_ID, "-sourcepath", SRC_DIR, "-private", "typeannos" + }; + + //Input for string search tests. + private static final String[][] NEGATED_TEST = NO_TEST; + private static final String[][] TEST = { + // Test for type annotations on Class Extends (ClassExtends.java). + /* @ignore 8012173 + {BUG_ID + FS + "typeannos" + FS + "MyClass.html", + "extends <a href=\"../typeannos/ClassExtA.html\" title=\"annotation " + + "in typeannos\">@ClassExtA</a> <a href=\"../typeannos/ParameterizedClass.html\" " + + "title=\"class in typeannos\">ParameterizedClass</a><<a href=\"" + + "../typeannos/ClassExtB.html\" title=\"annotation in typeannos\">" + + "@ClassExtB</a> java.lang.String>" + }, + */ + /* @ignore 8012173 + {BUG_ID + FS + "typeannos" + FS + "MyClass.html", + "implements <a href=\"../typeannos/ClassExtB.html\" title=\"" + + "annotation in typeannos\">@ClassExtB</a> java.lang.CharSequence, " + + "<a href=\"../typeannos/ClassExtA.html\" title=\"annotation in " + + "typeannos\">@ClassExtA</a> <a href=\"../typeannos/ParameterizedInterface.html\" " + + "title=\"interface in typeannos\">ParameterizedInterface</a><" + + "<a href=\"../typeannos/ClassExtB.html\" title=\"annotation in " + + "typeannos\">@ClassExtB</a> java.lang.String></pre>" + }, + */ + /* @ignore 8012173 + {BUG_ID + FS + "typeannos" + FS + "MyInterface.html", + "extends <a href=\"../typeannos/ClassExtA.html\" title=\"annotation " + + "in typeannos\">@ClassExtA</a> <a href=\"../typeannos/" + + "ParameterizedInterface.html\" title=\"interface in typeannos\">" + + "ParameterizedInterface</a><<a href=\"../typeannos/ClassExtA.html\" " + + "title=\"annotation in typeannos\">@ClassExtA</a> java.lang.String>, " + + "<a href=\"../typeannos/ClassExtB.html\" title=\"annotation in " + + "typeannos\">@ClassExtB</a> java.lang.CharSequence</pre>" + }, + */ + + // Test for type annotations on Class Parameters (ClassParameters.java). + {BUG_ID + FS + "typeannos" + FS + "ExtendsBound.html", + "class <span class=\"strong\">ExtendsBound<K extends <a " + + "href=\"../typeannos/ClassParamA.html\" title=\"annotation in " + + "typeannos\">@ClassParamA</a> java.lang.String></span>" + }, + /* @ignore 8012173 + {BUG_ID + FS + "typeannos" + FS + "ExtendsGeneric.html", + "<pre> class <span class=\"strong\">ExtendsGeneric<K extends " + + "<a href=\"../typeannos/ClassParamA.html\" title=\"annotation in " + + "typeannos\">@ClassParamA</a> <a href=\"../typeannos/Unannotated.html\" " + + "title=\"class in typeannos\">Unannotated</a><<a href=\"" + + "../typeannos/ClassParamB.html\" title=\"annotation in typeannos\">" + + "@ClassParamB</a> java.lang.String>></span>" + }, + */ + {BUG_ID + FS + "typeannos" + FS + "TwoBounds.html", + "<pre> class <span class=\"strong\">TwoBounds<K extends <a href=\"" + + "../typeannos/ClassParamA.html\" title=\"annotation in typeannos\">" + + "@ClassParamA</a> java.lang.String,V extends <a href=\"../typeannos/" + + "ClassParamB.html\" title=\"annotation in typeannos\">@ClassParamB" + + "</a> java.lang.String></span>" + }, + {BUG_ID + FS + "typeannos" + FS + "Complex1.html", + "class <span class=\"strong\">Complex1<K extends <a href=\"../" + + "typeannos/ClassParamA.html\" title=\"annotation in typeannos\">" + + "@ClassParamA</a> java.lang.String & java.lang.Runnable></span>" + }, + {BUG_ID + FS + "typeannos" + FS + "Complex2.html", + "class <span class=\"strong\">Complex2<K extends java.lang." + + "String & <a href=\"../typeannos/ClassParamB.html\" title=\"" + + "annotation in typeannos\">@ClassParamB</a> java.lang.Runnable></span>" + }, + {BUG_ID + FS + "typeannos" + FS + "ComplexBoth.html", + "class <span class=\"strong\">ComplexBoth<K extends <a href=\"" + + "../typeannos/ClassParamA.html\" title=\"annotation in typeannos\"" + + ">@ClassParamA</a> java.lang.String & <a href=\"../typeannos/" + + "ClassParamA.html\" title=\"annotation in typeannos\">@ClassParamA" + + "</a> java.lang.Runnable></span>" + }, + + // Test for type annotations on fields (Fields.java). + /* @ignore 8012173 + {BUG_ID + FS + "typeannos" + FS + "DefaultScope.html", + "<pre><a href=\"../typeannos/Parameterized.html\" title=\"class in " + + "typeannos\">Parameterized</a><<a href=\"../typeannos/FldA.html\" " + + "title=\"annotation in typeannos\">@FldA</a> java.lang.String,<a " + + "href=\"../typeannos/FldB.html\" title=\"annotation in typeannos\">" + + "@FldB</a> java.lang.String> bothTypeArgs</pre>" + }, + */ + {BUG_ID + FS + "typeannos" + FS + "DefaultScope.html", + "<pre><a href=\"../typeannos/FldA.html\" title=\"annotation in " + + "typeannos\">@FldA</a> java.lang.String <a href=\"../typeannos/" + + "FldB.html\" title=\"annotation in typeannos\">@FldB</a> [] " + + "array1Deep</pre>" + }, + {BUG_ID + FS + "typeannos" + FS + "DefaultScope.html", + "<pre>java.lang.String[] <a href=\"../typeannos/FldB.html\" " + + "title=\"annotation in typeannos\">@FldB</a> [] array2SecondOld</pre>" + }, + {BUG_ID + FS + "typeannos" + FS + "DefaultScope.html", + "<pre><a href=\"../typeannos/FldD.html\" title=\"annotation in " + + "typeannos\">@FldD</a> java.lang.String <a href=\"../typeannos/" + + "FldC.html\" title=\"annotation in typeannos\">@FldC</a> <a href=\"" + + "../typeannos/FldA.html\" title=\"annotation in typeannos\">@FldA" + + "</a> [] <a href=\"../typeannos/FldC.html\" title=\"annotation in " + + "typeannos\">@FldC</a> <a href=\"../typeannos/FldB.html\" title=\"" + + "annotation in typeannos\">@FldB</a> [] array2Deep</pre>" + }, + /* @ignore 8012173 + {BUG_ID + FS + "typeannos" + FS + "ModifiedScoped.html", + "<pre>public final <a href=\"../typeannos/Parameterized.html\" " + + "title=\"class in typeannos\">Parameterized</a><<a href=\"../" + + "typeannos/FldA.html\" title=\"annotation in typeannos\">@FldA</a> " + + "<a href=\"../typeannos/Parameterized.html\" title=\"class in " + + "typeannos\">Parameterized</a><<a href=\"../typeannos/FldA.html\" " + + "title=\"annotation in typeannos\">@FldA</a> java.lang.String,<a " + + "href=\"../typeannos/FldB.html\" title=\"annotation in typeannos\">" + + "@FldB</a> java.lang.String>,<a href=\"../typeannos/FldB.html\" " + + "title=\"annotation in typeannos\">@FldB</a> java.lang.String> " + + "nestedParameterized</pre>" + }, + */ + {BUG_ID + FS + "typeannos" + FS + "ModifiedScoped.html", + "<pre>public final <a href=\"../typeannos/FldA.html\" " + + "title=\"annotation in typeannos\">@FldA</a> java.lang.String[][] " + + "array2</pre>" + }, + + // Test for type annotations on method return types (MethodReturnType.java). + {BUG_ID + FS + "typeannos" + FS + "MtdDefaultScope.html", + "<pre>public <T> <a href=\"../typeannos/MRtnA.html\" " + + "title=\"annotation in typeannos\">@MRtnA</a> java.lang.String" + + " method()</pre>" + }, + {BUG_ID + FS + "typeannos" + FS + "MtdDefaultScope.html", + "<pre><a href=\"../typeannos/MRtnA.html\" title=\"annotation in " + + "typeannos\">@MRtnA</a> java.lang.String <a href=\"../typeannos/" + + "MRtnA.html\" title=\"annotation in typeannos\">@MRtnA</a> [] <a " + + "href=\"../typeannos/MRtnB.html\" title=\"annotation in typeannos\">" + + "@MRtnB</a> [] array2Deep()</pre>" + }, + {BUG_ID + FS + "typeannos" + FS + "MtdDefaultScope.html", + "<pre><a href=\"../typeannos/MRtnA.html\" title=\"annotation in " + + "typeannos\">@MRtnA</a> java.lang.String[][] array2()</pre>" + }, + /* @ignore 8012173 + {BUG_ID + FS + "typeannos" + FS + "MtdModifiedScoped.html", + "<pre>public final <a href=\"../typeannos/MtdParameterized.html\" " + + "title=\"class in typeannos\">MtdParameterized</a><<a href=\"../" + + "typeannos/MRtnA.html\" title=\"annotation in typeannos\">@MRtnA</a> " + + "<a href=\"../typeannos/MtdParameterized.html\" title=\"class in " + + "typeannos\">MtdParameterized</a><<a href=\"../typeannos/MRtnA." + + "html\" title=\"annotation in typeannos\">@MRtnA</a> java.lang." + + "String,<a href=\"../typeannos/MRtnB.html\" title=\"annotation in " + + "typeannos\">@MRtnB</a> java.lang.String>,<a href=\"../typeannos/" + + "MRtnB.html\" title=\"annotation in typeannos\">@MRtnB</a> java." + + "lang.String> nestedMtdParameterized()</pre>" + }, + */ + + // Test for type annotations on method type parameters (MethodTypeParameters.java). + {BUG_ID + FS + "typeannos" + FS + "UnscopedUnmodified.html", + "<pre><K extends <a href=\"../typeannos/MTyParamA.html\" title=\"" + + "annotation in typeannos\">@MTyParamA</a> java.lang.String>" + + " void methodExtends()</pre>" + }, + /* @ignore 8012173 + {BUG_ID + FS + "typeannos" + FS + "UnscopedUnmodified.html", + "<pre><K extends <a href=\"../typeannos/MTyParamA.html\" title=\"" + + "annotation in typeannos\">@MTyParamA</a> <a href=\"../typeannos/" + + "MtdTyParameterized.html\" title=\"class in typeannos\">" + + "MtdTyParameterized</a><<a href=\"../typeannos/MTyParamB.html\" " + + "title=\"annotation in typeannos\">@MTyParamB</a> java.lang.String" + + ">> void nestedExtends()</pre>" + }, + */ + {BUG_ID + FS + "typeannos" + FS + "PublicModifiedMethods.html", + "<pre>public final <K extends <a href=\"../typeannos/" + + "MTyParamA.html\" title=\"annotation in typeannos\">@MTyParamA</a> " + + "java.lang.String> void methodExtends()</pre>" + }, + /* @ignore 8012173 + {BUG_ID + FS + "typeannos" + FS + "PublicModifiedMethods.html", + "<pre>public final <K extends <a href=\"../typeannos/" + + "MTyParamA.html\" title=\"annotation in typeannos\">@MTyParamA</a> " + + "java.lang.String,V extends <a href=\"../typeannos/MTyParamA.html\" " + + "title=\"annotation in typeannos\">@MTyParamA</a> <a href=\"../" + + "typeannos/MtdTyParameterized.html\" title=\"class in typeannos\">" + + "MtdTyParameterized</a><<a href=\"../typeannos/MTyParamB.html\" " + + "title=\"annotation in typeannos\">@MTyParamB</a> java.lang.String" + + ">> void dual()</pre>" + }, + */ + + // Test for type annotations on parameters (Parameters.java). + {BUG_ID + FS + "typeannos" + FS + "Parameters.html", + "<pre>void unannotated(<a href=\"../typeannos/" + + "ParaParameterized.html\" title=\"class in typeannos\">" + + "ParaParameterized</a><java.lang.String,java.lang.String>" + + " a)</pre>" + }, + /* @ignore 8012173 + {BUG_ID + FS + "typeannos" + FS + "Parameters.html", + "<pre>void nestedParaParameterized(<a href=\"../typeannos/" + + "ParaParameterized.html\" title=\"class in typeannos\">" + + "ParaParameterized</a><<a href=\"../typeannos/ParamA.html\" " + + "title=\"annotation in typeannos\">@ParamA</a> <a href=\"../" + + "typeannos/ParaParameterized.html\" title=\"class in typeannos\">" + + "ParaParameterized</a><<a href=\"../typeannos/ParamA.html\" " + + "title=\"annotation in typeannos\">@ParamA</a> java.lang.String," + + "<a href=\"../typeannos/ParamB.html\" title=\"annotation in " + + "typeannos\">@ParamB</a> java.lang.String>,<a href=\"../" + + "typeannos/ParamB.html\" title=\"annotation in typeannos\">@ParamB" + + "</a> java.lang.String> a)</pre>" + }, + */ + {BUG_ID + FS + "typeannos" + FS + "Parameters.html", + "<pre>void array2Deep(<a href=\"../typeannos/ParamA.html\" " + + "title=\"annotation in typeannos\">@ParamA</a> java.lang.String " + + "<a href=\"../typeannos/ParamA.html\" title=\"annotation in " + + "typeannos\">@ParamA</a> [] <a href=\"../typeannos/ParamB.html\" " + + "title=\"annotation in typeannos\">@ParamB</a> [] a)</pre>" + }, + + // Test for type annotations on throws (Throws.java). + {BUG_ID + FS + "typeannos" + FS + "ThrDefaultUnmodified.html", + "<pre>void oneException()" + NL + + " throws <a href=\"../typeannos/ThrA.html\" title=\"" + + "annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>" + }, + {BUG_ID + FS + "typeannos" + FS + "ThrDefaultUnmodified.html", + "<pre>void twoExceptions()" + NL + + " throws <a href=\"../typeannos/ThrA.html\" title=\"" + + "annotation in typeannos\">@ThrA</a> java.lang.RuntimeException," + NL + + " <a href=\"../typeannos/ThrA.html\" title=\"" + + "annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>" + }, + {BUG_ID + FS + "typeannos" + FS + "ThrPublicModified.html", + "<pre>public final void oneException(java.lang.String a)" + NL + + " throws <a href=\"../typeannos/ThrA.html\" " + + "title=\"annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>" + }, + {BUG_ID + FS + "typeannos" + FS + "ThrPublicModified.html", + "<pre>public final void twoExceptions(java.lang.String a)" + NL + + " throws <a href=\"../typeannos/ThrA.html\" " + + "title=\"annotation in typeannos\">@ThrA</a> java.lang.RuntimeException," + NL + + " <a href=\"../typeannos/ThrA.html\" " + + "title=\"annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>" + }, + {BUG_ID + FS + "typeannos" + FS + "ThrWithValue.html", + "<pre>void oneException()" + NL + + " throws <a href=\"../typeannos/ThrB.html\" title=\"" + + "annotation in typeannos\">@ThrB</a>(<a href=\"../typeannos/" + + "ThrB.html#value()\">value</a>=\"m\") java.lang.Exception</pre>" + }, + {BUG_ID + FS + "typeannos" + FS + "ThrWithValue.html", + "<pre>void twoExceptions()" + NL + + " throws <a href=\"../typeannos/ThrB.html\" title=\"" + + "annotation in typeannos\">@ThrB</a>(<a href=\"../typeannos/" + + "ThrB.html#value()\">value</a>=\"m\") java.lang.RuntimeException," + NL + + " <a href=\"../typeannos/ThrA.html\" title=\"" + + "annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>" + }, + + // Test for type annotations on type parameters (TypeParameters.java). + {BUG_ID + FS + "typeannos" + FS + "TestMethods.html", + "<pre><K,V extends <a href=\"../typeannos/TyParaA.html\" title=\"" + + "annotation in typeannos\">@TyParaA</a> java.lang.String> " + + "void secondAnnotated()</pre>" + }, + + // Test for type annotations on wildcard type (Wildcards.java). + {BUG_ID + FS + "typeannos" + FS + "BoundTest.html", + "<pre>void wcExtends(<a href=\"../typeannos/MyList.html\" " + + "title=\"class in typeannos\">MyList</a><? extends <a href=\"" + + "../typeannos/WldA.html\" title=\"annotation in typeannos\">@WldA" + + "</a> java.lang.String> l)</pre>" + }, + {BUG_ID + FS + "typeannos" + FS + "BoundTest.html", + "<pre><a href=\"../typeannos/MyList.html\" title=\"class in " + + "typeannos\">MyList</a><? super <a href=\"../typeannos/WldA.html\" " + + "title=\"annotation in typeannos\">@WldA</a> java.lang.String>" + + " returnWcSuper()</pre>" + }, + {BUG_ID + FS + "typeannos" + FS + "BoundWithValue.html", + "<pre>void wcSuper(<a href=\"../typeannos/MyList.html\" title=\"" + + "class in typeannos\">MyList</a><? super <a href=\"../typeannos/" + + "WldB.html\" title=\"annotation in typeannos\">@WldB</a>(<a href=\"" + + "../typeannos/WldB.html#value()\">value</a>=\"m\") java.lang." + + "String> l)</pre>" + }, + {BUG_ID + FS + "typeannos" + FS + "BoundWithValue.html", + "<pre><a href=\"../typeannos/MyList.html\" title=\"class in " + + "typeannos\">MyList</a><? extends <a href=\"../typeannos/WldB." + + "html\" title=\"annotation in typeannos\">@WldB</a>(<a href=\"../" + + "typeannos/WldB.html#value()\">value</a>=\"m\") java.lang.String" + + "> returnWcExtends()</pre>" + }, + + // Test for receiver annotations (Receivers.java). + {BUG_ID + FS + "typeannos" + FS + "DefaultUnmodified.html", + "<pre>void withException(<a href=\"../typeannos/RcvrA.html\" " + + "title=\"annotation in typeannos\">@RcvrA</a> " + + "DefaultUnmodified this)" + NL + " throws java." + + "lang.Exception</pre>" + }, + {BUG_ID + FS + "typeannos" + FS + "DefaultUnmodified.html", + "<pre>java.lang.String nonVoid(<a href=\"../typeannos/RcvrA." + + "html\" title=\"annotation in typeannos\">@RcvrA</a> <a href=\"../" + + "typeannos/RcvrB.html\" title=\"annotation in typeannos\">@RcvrB" + + "</a>(<a href=\"../typeannos/RcvrB.html#value()\">value</a>=\"m\")" + + " DefaultUnmodified this)</pre>" + }, + {BUG_ID + FS + "typeannos" + FS + "DefaultUnmodified.html", + "<pre><T extends java.lang.Runnable> void accept(" + + "<a href=\"../typeannos/RcvrA.html\" title=\"annotation in " + + "typeannos\">@RcvrA</a> DefaultUnmodified this," + NL + + " T r)" + NL + + " throws java.lang.Exception</pre>" + }, + {BUG_ID + FS + "typeannos" + FS + "PublicModified.html", + "<pre>public final java.lang.String nonVoid(<a href=\"" + + "../typeannos/RcvrA.html\" title=\"annotation in typeannos\">" + + "@RcvrA</a> PublicModified this)</pre>" + }, + {BUG_ID + FS + "typeannos" + FS + "PublicModified.html", + "<pre>public final <T extends java.lang.Runnable> " + + "void accept(<a href=\"../typeannos/RcvrA.html\" title=\"" + + "annotation in typeannos\">@RcvrA</a> PublicModified this," + NL + + " T r)" + NL + + " throws java.lang.Exception</pre>" + }, + {BUG_ID + FS + "typeannos" + FS + "WithValue.html", + "<pre><T extends java.lang.Runnable> void accept(" + + "<a href=\"../typeannos/RcvrB.html\" title=\"annotation in " + + "typeannos\">@RcvrB</a>(<a href=\"../typeannos/RcvrB.html#value()\">" + + "value</a>=\"m\") WithValue this," + NL + + " T r)" + NL + + " throws java.lang.Exception</pre>" + }, + {BUG_ID + FS + "typeannos" + FS + "WithFinal.html", + "<pre>java.lang.String nonVoid(<a href=\"../typeannos/RcvrB." + + "html\" title=\"annotation in typeannos\">@RcvrB</a>(<a href=\"../" + + "typeannos/RcvrB.html#value()\">value</a>=\"m\") WithFinal" + + " this)</pre>" + }, + {BUG_ID + FS + "typeannos" + FS + "WithBody.html", + "<pre>void field(<a href=\"../typeannos/RcvrA.html\" title=\"" + + "annotation in typeannos\">@RcvrA</a> WithBody this)</pre>" + }, + {BUG_ID + FS + "typeannos" + FS + "Generic2.html", + "<pre>void test2(<a href=\"../typeannos/RcvrA.html\" title=\"" + + "annotation in typeannos\">@RcvrA</a> Generic2<X> this)</pre>" + } + }; + + /** + * The entry point of the test. + * @param args the array of command line arguments. + */ + public static void main(String[] args) { + TestTypeAnnotations tester = new TestTypeAnnotations(); + run(tester, ARGS, TEST, NEGATED_TEST); + tester.printSummary(); + } + + /** + * {@inheritDoc} + */ + public String getBugId() { + return BUG_ID; + } + + /** + * {@inheritDoc} + */ + public String getBugName() { + return getClass().getName(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testTypeAnnotations/typeannos/ClassExtends.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,45 @@ +/* + * 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 typeannos; + +import java.lang.annotation.*; + +/* + * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations. + */ +abstract class MyClass extends @ClassExtA ParameterizedClass<@ClassExtB String> + implements @ClassExtB CharSequence, @ClassExtA ParameterizedInterface<@ClassExtB String> { } + +interface MyInterface extends @ClassExtA ParameterizedInterface<@ClassExtA String>, + @ClassExtB CharSequence { } + +class ParameterizedClass<K> {} +interface ParameterizedInterface<K> {} + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface ClassExtA {} +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface ClassExtB {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testTypeAnnotations/typeannos/ClassParameters.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,60 @@ +/* + * 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 typeannos; + +import java.lang.annotation.*; + +/* + * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations. + */ +class Unannotated<K> { } + +class ExtendsBound<K extends @ClassParamA String> { } +class ExtendsGeneric<K extends @ClassParamA Unannotated<@ClassParamB String>> { } +class TwoBounds<K extends @ClassParamA String, V extends @ClassParamB String> { } + +class Complex1<K extends @ClassParamA String&Runnable> { } +class Complex2<K extends String & @ClassParamB Runnable> { } +class ComplexBoth<K extends @ClassParamA String & @ClassParamA Runnable> { } + +class ClassParamOuter { + void inner() { + class LUnannotated<K> { } + + class LExtendsBound<K extends @ClassParamA String> { } + class LExtendsGeneric<K extends @ClassParamA LUnannotated<@ClassParamB String>> { } + class LTwoBounds<K extends @ClassParamA String, V extends @ClassParamB String> { } + + class LComplex1<K extends @ClassParamA String&Runnable> { } + class LComplex2<K extends String & @ClassParamB Runnable> { } + class LComplexBoth<K extends @ClassParamA String & @ClassParamA Runnable> { } + } +} + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface ClassParamA { } +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface ClassParamB { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testTypeAnnotations/typeannos/Fields.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,82 @@ +/* + * 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 typeannos; + +import java.lang.annotation.*; + +/* + * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations. + */ +class DefaultScope { + Parameterized<String, String> unannotated; + Parameterized<@FldA String, String> firstTypeArg; + Parameterized<String, @FldA String> secondTypeArg; + Parameterized<@FldA String, @FldB String> bothTypeArgs; + + Parameterized<@FldA Parameterized<@FldA String, @FldB String>, @FldB String> + nestedParameterized; + + @FldA String [] array1; + @FldA String @FldB [] array1Deep; + @FldA String [] [] array2; + @FldD String @FldC @FldA [] @FldC @FldB [] array2Deep; + String @FldA [] [] array2First; + String [] @FldB [] array2Second; + + // Old-style array syntax + String array2FirstOld @FldA []; + String array2SecondOld [] @FldB []; +} + +class ModifiedScoped { + public final Parameterized<String, String> unannotated = null; + public final Parameterized<@FldA String, String> firstTypeArg = null; + public final Parameterized<String, @FldA String> secondTypeArg = null; + public final Parameterized<@FldA String, @FldB String> bothTypeArgs = null; + + public final Parameterized<@FldA Parameterized<@FldA String, @FldB String>, @FldB String> + nestedParameterized = null; + + public final @FldA String [] array1 = null; + public final @FldA String @FldB [] array1Deep = null; + public final @FldA String [] [] array2 = null; + public final @FldA String @FldA [] @FldB [] array2Deep = null; + public final String @FldA [] [] array2First = null; + public final String [] @FldB [] array2Second = null; +} + +class Parameterized<K, V> { } + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface FldA { } +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface FldB { } +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface FldC { } +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface FldD { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testTypeAnnotations/typeannos/MethodReturnType.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,78 @@ +/* + * 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 typeannos; + +import java.lang.annotation.*; + +/* + * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations. + */ +class MtdDefaultScope { + MtdParameterized<String, String> unannotated() { return null; } + MtdParameterized<@MRtnA String, String> firstTypeArg() { return null; } + MtdParameterized<String, @MRtnA String> secondTypeArg() { return null; } + MtdParameterized<@MRtnA String, @MRtnB String> bothTypeArgs() { return null; } + + MtdParameterized<@MRtnA MtdParameterized<@MRtnA String, @MRtnB String>, @MRtnB String> + nestedMtdParameterized() { return null; } + + public <T> @MRtnA String method() { return null; } + + @MRtnA String [] array1() { return null; } + @MRtnA String @MRtnB [] array1Deep() { return null; } + @MRtnA String [] [] array2() { return null; } + @MRtnA String @MRtnA [] @MRtnB [] array2Deep() { return null; } + String @MRtnA [] [] array2First() { return null; } + String [] @MRtnB [] array2Second() { return null; } + + // Old-style array syntax + String array2FirstOld() @MRtnA [] { return null; } + String array2SecondOld() [] @MRtnB [] { return null; } +} + +class MtdModifiedScoped { + public final MtdParameterized<String, String> unannotated() { return null; } + public final MtdParameterized<@MRtnA String, String> firstTypeArg() { return null; } + public final MtdParameterized<String, @MRtnA String> secondTypeArg() { return null; } + public final MtdParameterized<@MRtnA String, @MRtnB String> bothTypeArgs() { return null; } + + public final MtdParameterized<@MRtnA MtdParameterized<@MRtnA String, @MRtnB String>, @MRtnB String> + nestedMtdParameterized() { return null; } + + public final @MRtnA String [] array1() { return null; } + public final @MRtnA String @MRtnB [] array1Deep() { return null; } + public final @MRtnA String [] [] array2() { return null; } + public final @MRtnA String @MRtnA [] @MRtnB [] array2Deep() { return null; } + public final String @MRtnA [] [] array2First() { return null; } + public final String [] @MRtnB [] array2Second() { return null; } +} + +class MtdParameterized<K, V> { } + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface MRtnA { } +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface MRtnB { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testTypeAnnotations/typeannos/MethodTypeParameters.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,52 @@ +/* + * 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 typeannos; + +import java.lang.annotation.*; + +/* + * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations. + */ +class UnscopedUnmodified { + <K extends @MTyParamA String> void methodExtends() {} + <K extends @MTyParamA MtdTyParameterized<@MTyParamB String>> void nestedExtends() {} + <K extends @MTyParamA String, V extends @MTyParamA MtdTyParameterized<@MTyParamB String>> void dual() {} + <K extends String, V extends MtdTyParameterized<@MTyParamB String>> void dualOneAnno() {} +} + +class PublicModifiedMethods { + public final <K extends @MTyParamA String> void methodExtends() {} + public final <K extends @MTyParamA MtdTyParameterized<@MTyParamB String>> void nestedExtends() {} + public final <K extends @MTyParamA String, V extends @MTyParamA MtdTyParameterized<@MTyParamB String>> void dual() {} + public final <K extends String, V extends MtdTyParameterized<@MTyParamB String>> void dualOneAnno() {} +} + +class MtdTyParameterized<K> { } + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface MTyParamA { } +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface MTyParamB { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testTypeAnnotations/typeannos/Parameters.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,54 @@ +/* + * 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 typeannos; + +import java.lang.annotation.*; + +/* + * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations. + */ +class Parameters { + void unannotated(ParaParameterized<String, String> a) {} + void firstTypeArg(ParaParameterized<@ParamA String, String> a) {} + void secondTypeArg(ParaParameterized<String, @ParamA String> a) {} + void bothTypeArgs(ParaParameterized<@ParamA String, @ParamB String> both) {} + + void nestedParaParameterized(ParaParameterized<@ParamA ParaParameterized<@ParamA String, @ParamB String>, @ParamB String> a) {} + + void array1(@ParamA String [] a) {} + void array1Deep(@ParamA String @ParamB [] a) {} + void array2(@ParamA String [] [] a) {} + void array2Deep(@ParamA String @ParamA [] @ParamB [] a) {} + void array2First(String @ParamA [] [] a) {} + void array2Second(String [] @ParamB [] a) {} +} + +class ParaParameterized<K, V> { } + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface ParamA { } +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface ParamB { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testTypeAnnotations/typeannos/Receivers.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,131 @@ +/* + * 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 typeannos; + +import java.lang.annotation.*; + +/* + * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations. + */ +class DefaultUnmodified { + void plain(@RcvrA DefaultUnmodified this) { } + <T> void generic(@RcvrA DefaultUnmodified this) { } + void withException(@RcvrA DefaultUnmodified this) throws Exception { } + String nonVoid(@RcvrA @RcvrB("m") DefaultUnmodified this) { return null; } + <T extends Runnable> void accept(@RcvrA DefaultUnmodified this, T r) throws Exception { } +} + +class PublicModified { + public final void plain(@RcvrA PublicModified this) { } + public final <T> void generic(@RcvrA PublicModified this) { } + public final void withException(@RcvrA PublicModified this) throws Exception { } + public final String nonVoid(@RcvrA PublicModified this) { return null; } + public final <T extends Runnable> void accept(@RcvrA PublicModified this, T r) throws Exception { } +} + +class WithValue { + void plain(@RcvrB("m") WithValue this) { } + <T> void generic(@RcvrB("m") WithValue this) { } + void withException(@RcvrB("m") WithValue this) throws Exception { } + String nonVoid(@RcvrB("m") WithValue this) { return null; } + <T extends Runnable> void accept(@RcvrB("m") WithValue this, T r) throws Exception { } +} + +class WithFinal { + void plain(final @RcvrB("m") WithFinal this) { } + <T> void generic(final @RcvrB("m") WithFinal this) { } + void withException(final @RcvrB("m") WithFinal this) throws Exception { } + String nonVoid(final @RcvrB("m") WithFinal this) { return null; } + <T extends Runnable> void accept(final @RcvrB("m") WithFinal this, T r) throws Exception { } +} + +class WithBody { + Object f; + + void field(@RcvrA WithBody this) { + this.f = null; + } + void meth(@RcvrA WithBody this) { + this.toString(); + } +} + +class Generic1<X> { + void test1(Generic1<X> this) {} + void test2(@RcvrA Generic1<X> this) {} + void test3(Generic1<@RcvrA X> this) {} + void test4(@RcvrA Generic1<@RcvrA X> this) {} +} + +class Generic2<@RcvrA X> { + void test1(Generic2<X> this) {} + void test2(@RcvrA Generic2<X> this) {} + void test3(Generic2<@RcvrA X> this) {} + void test4(@RcvrA Generic2<@RcvrA X> this) {} +} + +class Generic3<X extends @RcvrA Object> { + void test1(Generic3<X> this) {} + void test2(@RcvrA Generic3<X> this) {} + void test3(Generic3<@RcvrA X> this) {} + void test4(@RcvrA Generic3<@RcvrA X> this) {} +} + +class Generic4<X extends @RcvrA Object> { + <Y> void test1(Generic4<X> this) {} + <Y> void test2(@RcvrA Generic4<X> this) {} + <Y> void test3(Generic4<@RcvrA X> this) {} + <Y> void test4(@RcvrA Generic4<@RcvrA X> this) {} +} + +class Outer { + class Inner { + void none(Outer.Inner this) {} + void outer(@RcvrA Outer.Inner this) {} + void inner(Outer. @RcvrB("i") Inner this) {} + void both(@RcvrA Outer.@RcvrB("i") Inner this) {} + + void innerOnlyNone(Inner this) {} + void innerOnly(@RcvrA Inner this) {} + } +} + +class GenericOuter<S, T> { + class GenericInner<U, V> { + void none(GenericOuter<S, T>.GenericInner<U, V> this) {} + void outer(@RcvrA GenericOuter<S, T>.GenericInner<U, V> this) {} + void inner(GenericOuter<S, T>. @RcvrB("i") GenericInner<U, V> this) {} + void both(@RcvrA GenericOuter<S, T>.@RcvrB("i") GenericInner<U, V> this) {} + + void innerOnlyNone(GenericInner<U, V> this) {} + void innerOnly(@RcvrA GenericInner<U, V> this) {} + } +} + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface RcvrA {} +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface RcvrB { String value(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testTypeAnnotations/typeannos/Throws.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,51 @@ +/* + * 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 typeannos; + +import java.lang.annotation.*; + +/* + * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations. + */ +class ThrDefaultUnmodified { + void oneException() throws @ThrA Exception {} + void twoExceptions() throws @ThrA RuntimeException, @ThrA Exception {} +} + +class ThrPublicModified { + public final void oneException(String a) throws @ThrA Exception {} + public final void twoExceptions(String a) throws @ThrA RuntimeException, @ThrA Exception {} +} + +class ThrWithValue { + void oneException() throws @ThrB("m") Exception {} + void twoExceptions() throws @ThrB(value="m") RuntimeException, @ThrA Exception {} +} + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface ThrA {} +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface ThrB { String value(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testTypeAnnotations/typeannos/TypeParameters.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,60 @@ +/* + * 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 typeannos; + +import java.lang.annotation.*; + +/* + * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations. + */ +class TypUnannotated<K> { } +class OneAnnotated<@TyParaA K> { } +class TwoAnnotated<@TyParaA K, @TyParaA V> { } +class SecondAnnotated<K, @TyParaA V extends String> { } + +class TestMethods { + <K> void unannotated() { } + <@TyParaA K> void oneAnnotated() { } + <@TyParaA K, @TyParaB("m") V> void twoAnnotated() { } + <K, @TyParaA V extends @TyParaA String> void secondAnnotated() { } +} + +class UnannotatedB<K> { } +class OneAnnotatedB<@TyParaB("m") K> { } +class TwoAnnotatedB<@TyParaB("m") K, @TyParaB("m") V> { } +class SecondAnnotatedB<K, @TyParaB("m") V extends @TyParaB("m") String> { } + +class OneAnnotatedC<@TyParaC K> { } +class TwoAnnotatedC<@TyParaC K, @TyParaC V> { } +class SecondAnnotatedC<K, @TyParaC V extends String> { } + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface TyParaA { } +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface TyParaB { String value(); } +@Target(ElementType.TYPE_USE) +@Documented +@interface TyParaC { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testTypeAnnotations/typeannos/Varargs.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,42 @@ +/* + * 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 typeannos; + +import java.lang.annotation.*; + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface VarArgA {} + +/* + * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations. + */ +class Varargs { + + // Handle annotations on a varargs element type + void varargPlain(Object @VarArgA... objs) { + } + + void varargGeneric(Class<?> @VarArgA ... clz) { + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/testTypeAnnotations/typeannos/Wildcards.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,74 @@ +/* + * 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 typeannos; + +import java.lang.annotation.*; + +/* + * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations. + */ +class BoundTest { + void wcExtends(MyList<? extends @WldA String> l) { } + void wcSuper(MyList<? super @WldA String> l) { } + + MyList<? extends @WldA String> returnWcExtends() { return null; } + MyList<? super @WldA String> returnWcSuper() { return null; } + MyList<? extends @WldA MyList<? super @WldB("m") String>> complex() { return null; } +} + +class BoundWithValue { + void wcExtends(MyList<? extends @WldB("m") String> l) { } + void wcSuper(MyList<? super @WldB(value="m") String> l) { } + + MyList<? extends @WldB("m") String> returnWcExtends() { return null; } + MyList<? super @WldB(value="m") String> returnWcSuper() { return null; } + MyList<? extends @WldB("m") MyList<? super @WldB("m") String>> complex() { return null; } +} + +class SelfTest { + void wcExtends(MyList<@WldA ?> l) { } + void wcSuper(MyList<@WldA ?> l) { } + + MyList<@WldA ?> returnWcExtends() { return null; } + MyList<@WldA ?> returnWcSuper() { return null; } + MyList<@WldA ? extends @WldA MyList<@WldB("m") ?>> complex() { return null; } +} + +class SelfWithValue { + void wcExtends(MyList<@WldB("m") ?> l) { } + void wcSuper(MyList<@WldB(value="m") ?> l) { } + + MyList<@WldB("m") ?> returnWcExtends() { return null; } + MyList<@WldB(value="m") ?> returnWcSuper() { return null; } + MyList<@WldB("m") ? extends MyList<@WldB("m") ? super String>> complex() { return null; } +} + +class MyList<K> { } + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface WldA { } +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@Documented +@interface WldB { String value(); }
--- a/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 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
--- a/test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/apt/Basics/CheckAptIsRemovedTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,96 @@ +/* + * 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. + */ + +/* + * @test + * @bug 4908512 5024825 4957203 4993280 4996963 6174696 6177059 7041249 + * @summary Make sure apt is removed and doesn't come back + * @library /tools/javac/lib + * @build ToolBox + * @run main CheckAptIsRemovedTest + */ + +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +//original test: test/tools/apt/Basics/apt.sh +public class CheckAptIsRemovedTest { + //I think this class can be let with the imports only and that should be enough for as test's purpose + private static final String NullAPFSrc = + "import com.sun.mirror.apt.*;\n" + + "import com.sun.mirror.declaration.*;\n" + + "import com.sun.mirror.type.*;\n" + + "import com.sun.mirror.util.*;\n" + + "import java.util.Collection;\n" + + "import java.util.Set;\n\n" + + + "public class NullAPF implements AnnotationProcessorFactory {\n" + + " static class NullAP implements AnnotationProcessor {\n" + + " NullAP(AnnotationProcessorEnvironment ape) {}\n" + + " public void process() {return;}\n" + + " }\n\n" + + + " static Collection<String> supportedTypes;\n\n" + + " static {\n" + + " String types[] = {\"*\"};\n" + + " supportedTypes = java.util.Arrays.asList(types);\n" + + " }\n\n" + + + " public Collection<String> supportedOptions() {\n" + + " return java.util.Collections.emptySet();\n" + + " }\n\n" + + + " public Collection<String> supportedAnnotationTypes() {\n" + + " return supportedTypes;\n" + + " }\n\n" + + + " public AnnotationProcessor getProcessorFor(" + + " Set<AnnotationTypeDeclaration> atds,\n" + + " AnnotationProcessorEnvironment env) {\n" + + " return new NullAP(env);\n" + + " }\n" + + "}"; + + public static void main(String[] args) throws Exception { + String testJDK = System.getProperty("test.jdk"); + Path aptLin = Paths.get(testJDK, "bin", "apt"); + Path aptWin = Paths.get(testJDK, "bin", "apt.exe"); + +// if [ -f "${TESTJAVA}/bin/apt" -o -f "${TESTJAVA}/bin/apt.exe" ];then + if (Files.exists(aptLin) || Files.exists(aptWin)) { + throw new AssertionError("apt executable should not exist"); + } + +// JAVAC="${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} -source 1.5 -sourcepath ${TESTSRC} -classpath ${TESTJAVA}/lib/tools.jar -d . " +// $JAVAC ${TESTSRC}/NullAPF.java + Path classpath = Paths.get(testJDK, "lib", "tools.jar"); + ToolBox.JavaToolArgs javacArgs = + new ToolBox.JavaToolArgs(ToolBox.Expect.FAIL) + .setOptions("-source", "1.5", "-sourcepath", ".", + "-classpath", classpath.toString()) + .setSources(NullAPFSrc); + ToolBox.javac(javacArgs); + } + +}
--- a/test/tools/apt/Basics/NullAPF.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2004, 2007, 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. - */ - - -import com.sun.mirror.apt.*; -import com.sun.mirror.declaration.*; -import com.sun.mirror.type.*; -import com.sun.mirror.util.*; - -import java.util.Collection; -import java.util.Set; - -public class NullAPF implements AnnotationProcessorFactory { - static class NullAP implements AnnotationProcessor { - NullAP(AnnotationProcessorEnvironment ape) { - } - - public void process() { - return; - } - } - - static Collection<String> supportedTypes; - - static { - String types[] = {"*"}; - supportedTypes = java.util.Arrays.asList(types); - } - - /* - * Processor doesn't examine any options. - */ - public Collection<String> supportedOptions() { - return java.util.Collections.emptySet(); - } - - /* - * All annotation types are supported. - */ - public Collection<String> supportedAnnotationTypes() { - return supportedTypes; - } - - /* - * Return the same processor independent of what annotations are - * present, if any. - */ - public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atds, - AnnotationProcessorEnvironment env) { - return new NullAP(env); - } -}
--- a/test/tools/apt/Basics/apt.sh Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 2004, 2012, 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. -# - -# @test -# @bug 4908512 5024825 4957203 4993280 4996963 6174696 6177059 7041249 -# @run shell ../verifyVariables.sh -# @run shell apt.sh -# @summary Make sure apt is removed and doesn't come back -# @author Joseph D. Darcy - -OS=`uname -s`; -case "${OS}" in - CYGWIN* ) - DIFFOPTS="--strip-trailing-cr" - ;; - - * ) - ;; -esac - -# Verify apt executable does not exist -if [ -f "${TESTJAVA}/bin/apt" -o -f "${TESTJAVA}/bin/apt.exe" ];then - echo "apt executable should not exist." - exit 1 -fi - -# Construct path to javac executable -JAVAC="${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} -source 1.5 -sourcepath ${TESTSRC} -classpath ${TESTJAVA}/lib/tools.jar -d . " - -$JAVAC ${TESTSRC}/NullAPF.java -RESULT=$? - -case "${RESULT}" in - 0 ) - echo "Compilation of apt-using source passed improperly." - exit 1 - ;; - - * ) - ;; -esac
--- a/test/tools/apt/verifyVariables.sh Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 1999, 2002, 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. -# - -if [ "${TESTJAVA}" = "" ] -then - echo "TESTJAVA not set. Test cannot execute. Failed." - exit 1 -fi - -if [ "${TESTSRC}" = "" ] -then - echo "TESTSRC not set. Test cannot execute. Failed." - exit 1 -fi - - -if [ "${TESTCLASSES}" = "" ] -then - echo "TESTCLASSES not set. Test cannot execute. Failed." - exit 1 -fi - -exit 0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/doclint/EmptyPreTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,44 @@ +/* + * 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 + * 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. + */ + +/* + * @test + * @bug 8010317 + * @summary DocLint incorrectly reports some <pre> tags as empty + * @build DocLintTester + * @run main DocLintTester -Xmsgs:html EmptyPreTest.java + */ + +public class EmptyPreTest { + /** <pre> {@code xyzzy} </pre> */ + public void m1() { } + + /** <pre> {@docRoot} </pre> */ + public void m2() { } + + /** <pre> {@link java.lang.String} </pre> */ + public void m3() { } + + /** <pre> {@value} </pre> */ + public static final int v1 = 1; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/doclint/EndWithIdentifierTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,32 @@ +/* + * @test /nodynamiccopyright/ + * @bug 8007096 + * @summary DocLint parsing problems with some comments + * @build DocLintTester + * @run main DocLintTester -Xmsgs:-html EndWithIdentifierTest.java + * @run main DocLintTester -Xmsgs -ref EndWithIdentifierTest.out EndWithIdentifierTest.java + * @author jlahoda + */ + +/**@deprecated*/ +public class EndWithIdentifierTest { + + /**{@link*/ + private void unfinishedInlineTagName() {} + + /**@see List*/ + private void endsWithIdentifier() {} + + /**&*/ + private void entityName() {} + + /**<a*/ + private void tag() {} + + /**</a*/ + private void tagEnd() {} + + /**<a name*/ + private void attribute() {} +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/doclint/EndWithIdentifierTest.out Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,20 @@ +EndWithIdentifierTest.java:14: error: syntax error in reference + /**{@link*/ + ^ +EndWithIdentifierTest.java:17: error: reference not found + /**@see List*/ + ^ +EndWithIdentifierTest.java:20: error: semicolon missing + /**&*/ + ^ +EndWithIdentifierTest.java:23: error: malformed HTML + /**<a*/ + ^ +EndWithIdentifierTest.java:26: error: malformed HTML + /**</a*/ + ^ +EndWithIdentifierTest.java:29: error: malformed HTML + /**<a name*/ + ^ +6 errors +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/doclint/ParaTagTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,55 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8007566 + * @summary DocLint too aggressive with not allowed here: <p> + * @build DocLintTester + * @run main DocLintTester -Xmsgs ParaTagTest.java + */ + +/** + * First line. + * <p> Para c1.</p> + * <p> Para c2. + * <p> Para c3.</p> + */ +public class ParaTagTest { + /** + * m1 <code>code </code>. + * <p> Para m1. + * <p> Para m2. + */ + public void m() {} + + /** + * m2. + * <p> Para z1. + * <p> Para z2. + * <pre> + * Preformat 1. + * </pre> + */ + public void z() {} +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/doclint/UnfinishedInlineTagTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,17 @@ +/* + * @test /nodynamiccopyright/ + * @bug 8007096 + * @summary DocLint parsing problems with some comments + * @build DocLintTester + * @run main DocLintTester -Xmsgs:-html UnfinishedInlineTagTest.java + * @run main DocLintTester -Xmsgs -ref UnfinishedInlineTagTest.out UnfinishedInlineTagTest.java + * @author jlahoda + */ + +import java.util.List; + +/**{@link List + */ +public class UnfinishedInlineTagTest { +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/doclint/UnfinishedInlineTagTest.out Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,5 @@ +UnfinishedInlineTagTest.java:14: error: unterminated inline tag + */ +^ +1 error +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/4846262/CheckEBCDICLocaleTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,96 @@ +/* + * 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. + */ + +/* + * @test + * @bug 4846262 + * @summary check that javac operates correctly in EBCDIC locale + * @library /tools/javac/lib + * @build ToolBox + * @run main CheckEBCDICLocaleTest + */ + +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.Arrays; + +public class CheckEBCDICLocaleTest { + + private static final String TestSrc = + "public class Test {\n" + + " public void test() {\n" + + " abcdefg\n" + + " }\n" + + "}"; + + private static final String TestOutTemplate = + "output%1$sTest.java:3: error: not a statement\n" + + " abcdefg\n" + + " ^\n" + + "output%1$sTest.java:3: error: ';' expected\n" + + " abcdefg\n" + + " ^\n" + + "2 errors\n"; + + public static void main(String[] args) throws Exception { + new CheckEBCDICLocaleTest().test(); + } + + public void test() throws Exception { + String native2asciiBinary = Paths.get( + System.getProperty("test.jdk"),"bin", "native2ascii").toString(); + + ToolBox.createJavaFileFromSource(TestSrc); + Files.createDirectory(Paths.get("output")); + + ToolBox.AnyToolArgs nativeCmdParams = + new ToolBox.AnyToolArgs() + .appendArgs(native2asciiBinary) + .appendArgs(ToolBox.testToolVMOpts) + .appendArgs("-reverse", "-encoding", "IBM1047", "Test.java", + "output/Test.java"); + ToolBox.executeCommand(nativeCmdParams); + + ToolBox.AnyToolArgs javacParams = + new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL) + .appendArgs(ToolBox.javacBinary) + .appendArgs(ToolBox.testToolVMOpts) + .appendArgs("-J-Duser.language=en", + "-J-Duser.region=US", "-J-Dfile.encoding=IBM1047", + "output/Test.java") + .setErrOutput(new File("Test.tmp")); + ToolBox.executeCommand(javacParams); + + nativeCmdParams = new ToolBox.AnyToolArgs() + .appendArgs(native2asciiBinary) + .appendArgs(ToolBox.testToolVMOpts) + .appendArgs("-encoding", "IBM1047", "Test.tmp", "Test.out"); + ToolBox.executeCommand(nativeCmdParams); + + String goldenFile = String.format(TestOutTemplate, File.separator); + ToolBox.compareLines(Paths.get("Test.out"), + Arrays.asList(goldenFile.split("\n")), null, true); + } + +}
--- a/test/tools/javac/4846262/Test.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -/* /nodynamiccopyright/ */ -public class Test { - public void test() { - abcdefg - } -}
--- a/test/tools/javac/4846262/Test.out Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -Test.java:4: error: not a statement - abcdefg - ^ -Test.java:4: error: ';' expected - abcdefg - ^ -2 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/6302184/HiddenOptionsShouldUseGivenEncodingTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,49 @@ +/* + * 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. + */ + +/* + * @test + * @bug 6302184 6350124 6357979 + * @summary javac hidden options that generate source should use the given + * encoding, if available + * @library /tools/javac/lib + * @build ToolBox + * @run compile -encoding iso-8859-1 -XD-printsource T6302184.java + * @run main HiddenOptionsShouldUseGivenEncodingTest + */ + +import java.nio.file.Path; +import java.nio.file.Paths; + +//original test: test/tools/javac/6302184/T6302184.sh +public class HiddenOptionsShouldUseGivenEncodingTest { + + public static void main(String[] args) throws Exception { +//"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -cp ${TC} -encoding iso-8859-1 -XD-printsource ${TS}${FS}T6302184.java 2>&1 +//diff ${DIFFOPTS} -c ${TC}${FS}T6302184.java ${TS}${FS}T6302184.out + Path path1 = Paths.get(System.getProperty("test.classes"), "T6302184.java"); + Path path2 = Paths.get(System.getProperty("test.src"), "T6302184.out"); + ToolBox.compareLines(path1, path2, "iso-8859-1"); + } + +}
--- a/test/tools/javac/6302184/T6302184.sh Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,71 +0,0 @@ -#! /bin/sh -f - -# -# Copyright (c) 2005, 2009, 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. -# - -# -# @test -# @bug 6302184 6350124 6357979 -# @summary javac hidden options that generate source should use the given encoding, if available -# @run shell T6302184.sh - -TS=${TESTSRC-.} -TC=${TESTCLASSES-.} - -if [ "${TESTJAVA}" = "" ] -then - echo "TESTJAVA not set. Test cannot execute. Failed." - exit 1 -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin ) - FS="/" - ;; - CYGWIN* ) - FS="/" - DIFFOPTS="--strip-trailing-cr" - ;; - Windows* ) - FS="\\" - ;; - * ) - echo "Unrecognized system!" - exit 1; - ;; -esac - -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -cp ${TC} -encoding iso-8859-1 -XD-printsource ${TS}${FS}T6302184.java 2>&1 -diff ${DIFFOPTS} -c ${TC}${FS}T6302184.java ${TS}${FS}T6302184.out -result=$? - - -if [ $result -eq 0 ] -then - echo "Passed" -else - echo "Failed" -fi -exit $result
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/6563143/EqualsHashCodeWarningTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,71 @@ +/* + * @test /nodynamiccopyright/ + * @bug 6563143 8008436 8009138 + * @summary javac should issue a warning for overriding equals without hashCode + * @summary javac should not issue a warning for overriding equals without hasCode + * @summary javac, equals-hashCode warning tuning + * if hashCode has been overriden by a superclass + * @compile/ref=EqualsHashCodeWarningTest.out -Xlint:overrides -XDrawDiagnostics EqualsHashCodeWarningTest.java + */ + +import java.util.Comparator; + +public class EqualsHashCodeWarningTest { + @Override + public boolean equals(Object o) { + return o == this; + } + + @Override + public int hashCode() { + return 0; + } + + public Comparator m() { + return new Comparator() { + @Override + public boolean equals(Object o) {return true;} + + @Override + public int compare(Object o1, Object o2) { + return 0; + } + }; + } +} + +class SubClass extends EqualsHashCodeWarningTest { + @Override + public boolean equals(Object o) { + return true; + } +} + +@SuppressWarnings("overrides") +class DontWarnMe { + @Override + public boolean equals(Object o) { + return true; + } +} + +class DoWarnMe { + @Override + public boolean equals(Object o) { + return o == this; + } +} + +abstract class IamAbstractGetMeOutOfHere { + public boolean equals(Object o){return true;} +} + +interface I { + public boolean equals(Object o); +} + +enum E { + A, B +} + +@interface anno {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/6563143/EqualsHashCodeWarningTest.out Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,2 @@ +EqualsHashCodeWarningTest.java:52:1: compiler.warn.override.equals.but.not.hashcode: DoWarnMe +1 warning
--- a/test/tools/javac/6758789/T6758789b.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/6758789/T6758789b.out Tue May 07 17:14:17 2013 -0700 @@ -1,4 +1,4 @@ -T6758789b.java:16:11: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6758789a.Foo, T6758789a.Foo<X> +T6758789b.java:16:11: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6758789a.Foo, T6758789a.Foo<java.lang.Object> T6758789b.java:16:10: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, T6758789a.Foo<X>, T6758789a.Foo, kindname.class, T6758789a - compiler.err.warnings.and.werror 1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,107 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +/* + * @test + * @bug 7166455 + * @summary javac doesn't set ACC_STRICT bit on <clinit> for strictfp class + * @run main CheckACC_STRICTFlagOnclinitTest + */ + +import java.util.ArrayList; +import java.util.List; +import java.io.File; +import java.io.IOException; +import com.sun.tools.classfile.ClassFile; +import com.sun.tools.classfile.ConstantPoolException; +import com.sun.tools.classfile.Descriptor; +import com.sun.tools.classfile.Descriptor.InvalidDescriptor; +import com.sun.tools.classfile.Method; + +import static com.sun.tools.classfile.AccessFlags.ACC_STRICT; + +public strictfp class CheckACC_STRICTFlagOnclinitTest { + private static final String AssertionErrorMessage = + "All methods should have the ACC_STRICT access flag " + + "please check output"; + private static final String offendingMethodErrorMessage = + "Method %s of class %s doesn't have the ACC_STRICT access flag"; + + static { + class Foo { + class Bar { + void m11() {} + } + void m1() {} + } + } + void m2() { + class Any { + void m21() {} + } + } + + private List<String> errors = new ArrayList<>(); + + public static void main(String[] args) + throws IOException, ConstantPoolException, InvalidDescriptor { + new CheckACC_STRICTFlagOnclinitTest().run(); + } + + private void run() + throws IOException, ConstantPoolException, InvalidDescriptor { + String testClasses = System.getProperty("test.classes"); + check(testClasses, + "CheckACC_STRICTFlagOnclinitTest.class", + "CheckACC_STRICTFlagOnclinitTest$1Foo.class", + "CheckACC_STRICTFlagOnclinitTest$1Foo$Bar.class", + "CheckACC_STRICTFlagOnclinitTest$1Any.class"); + if (errors.size() > 0) { + for (String error: errors) { + System.err.println(error); + } + throw new AssertionError(AssertionErrorMessage); + } + } + + void check(String dir, String... fileNames) + throws + IOException, + ConstantPoolException, + Descriptor.InvalidDescriptor { + for (String fileName : fileNames) { + ClassFile classFileToCheck = ClassFile.read(new File(dir, fileName)); + + for (Method method : classFileToCheck.methods) { + if ((method.access_flags.flags & ACC_STRICT) == 0) { + errors.add(String.format(offendingMethodErrorMessage, + method.getName(classFileToCheck.constant_pool), + classFileToCheck.getName())); + } + } + } + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/7167125/DiffResultAfterSameOperationInnerClasses.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2002, 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. + */ + +/* + * @test + * @bug 7167125 + * @summary Two variables after the same operation in a inner class return + * different results + * @run main DiffResultAfterSameOperationInnerClasses + */ + +public class DiffResultAfterSameOperationInnerClasses { + public int i = 1; + private int j = 1; + public String s1 = "Hi, "; + private String s2 = "Hi, "; + public int arr1[] = new int[]{1}; + public int arr2[] = new int[]{1}; + + public static void main(String[] args) { + DiffResultAfterSameOperationInnerClasses theTest = + new DiffResultAfterSameOperationInnerClasses(); + InnerClass inner = theTest.new InnerClass(); + if (!inner.test1()) { + throw new AssertionError("Different results after same calculation"); + } + + theTest.resetVars(); + if (!inner.test2()) { + throw new AssertionError("Different results after same calculation"); + } + } + + void resetVars() { + i = 1; + j = 1; + s1 = "Hi, "; + s2 = "Hi, "; + arr1[0] = 1; + arr2[0] = 1; + } + + class InnerClass { + public boolean test1() { + i += i += 1; + j += j += 1; + + arr1[0] += arr1[0] += 1; + arr2[0] += arr2[0] += 1; + + s1 += s1 += "dude"; + s2 += s2 += "dude"; + + return (i == j && i == 3 && + arr1[0] == arr2[0] && arr2[0] == 3 && + s1.equals(s2) && s1.endsWith("Hi, Hi, dude")); + } + + public boolean test2() { + (i) += (i) += 1; + (j) += (j) += 1; + + (arr1[0])+= (arr1[0]) += 1; + (arr2[0])+= (arr2[0]) += 1; + + (s1) += (s1) += "dude"; + (s2) += (s2) += "dude"; + + return (i == j && i == 3 && + arr1[0] == arr2[0] && arr2[0] == 3 && + s1.equals(s2) && s1.endsWith("Hi, Hi, dude")); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/7199823/InnerClassCannotBeVerified.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,110 @@ +/* + * 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 + * 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. + */ + +/* + * @test + * @bug 7199823 + * @summary javac generates inner class that can't be verified + * @run main InnerClassCannotBeVerified + */ + +import java.util.Arrays; +import javax.tools.JavaFileObject; +import java.net.URI; +import javax.tools.SimpleJavaFileObject; +import javax.tools.ToolProvider; +import javax.tools.JavaCompiler; +import com.sun.source.util.JavacTask; +import com.sun.tools.classfile.ClassFile; +import com.sun.tools.classfile.ConstantPoolException; +import java.io.File; +import java.io.IOException; + +public class InnerClassCannotBeVerified { + + private static final String errorMessage = + "Compile error while compiling the following source:\n"; + + public static void main(String... args) throws Exception { + new InnerClassCannotBeVerified().run(); + } + + void run() throws Exception { + JavaCompiler comp = ToolProvider.getSystemJavaCompiler(); + JavaSource source = new JavaSource(); + JavacTask ct = (JavacTask)comp.getTask(null, null, null, + null, null, Arrays.asList(source)); + try { + if (!ct.call()) { + throw new AssertionError(errorMessage + + source.getCharContent(true)); + } + } catch (Throwable ex) { + throw new AssertionError(errorMessage + + source.getCharContent(true)); + } + check(); + } + + private void check() throws IOException, ConstantPoolException { + File file = new File("Test$1.class"); + ClassFile classFile = ClassFile.read(file); + boolean inheritsFromObject = + classFile.getSuperclassName().equals("java/lang/Object"); + boolean implementsNoInterface = classFile.interfaces.length == 0; + boolean noMethods = classFile.methods.length == 0; + if (!(inheritsFromObject && + implementsNoInterface && + noMethods)) { + throw new AssertionError("The inner classes reused as " + + "access constructor tag for this code must be empty"); + } + } + + class JavaSource extends SimpleJavaFileObject { + + String internalSource = + "public class Test {\n" + + " private static class Foo {}\n" + + " public static void main(String[] args){ \n" + + " new Foo();\n" + + " if(false) {\n" + + " new Runnable() {\n" + + " @Override\n" + + " public void run() {\n" + + " System.out.println();\n" + + " }\n" + + " }.run();\n" + + " }\n" + + " }\n" + + "}"; + public JavaSource() { + super(URI.create("Test.java"), JavaFileObject.Kind.SOURCE); + } + + @Override + public CharSequence getCharContent(boolean ignoreEncodingErrors) { + return internalSource; + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/8005931/CheckACC_STRICTFlagOnPkgAccessClassTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,130 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +/* + * @test + * @bug 8005931 + * @summary javac doesn't set ACC_STRICT for classes with package access + * @run main CheckACC_STRICTFlagOnPkgAccessClassTest + */ + +import java.io.File; +import java.io.IOException; +import java.net.URI; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import javax.tools.JavaCompiler; +import javax.tools.JavaFileObject; +import javax.tools.SimpleJavaFileObject; +import javax.tools.ToolProvider; +import com.sun.source.util.JavacTask; +import com.sun.tools.classfile.ClassFile; +import com.sun.tools.classfile.ConstantPoolException; +import com.sun.tools.classfile.Descriptor; +import com.sun.tools.classfile.Descriptor.InvalidDescriptor; +import com.sun.tools.classfile.Method; + +import static com.sun.tools.classfile.AccessFlags.ACC_STRICT; + +public class CheckACC_STRICTFlagOnPkgAccessClassTest { + + private static final String AssertionErrorMessage = + "All methods should have the ACC_STRICT access flag " + + "please check output"; + private static final String CompilationErrorMessage = + "Error thrown when compiling the following source:\n"; + private static final String offendingMethodErrorMessage = + "Method %s of class %s doesn't have the ACC_STRICT access flag"; + + JavaSource source = new JavaSource(); + + private List<String> errors = new ArrayList<>(); + + public static void main(String[] args) + throws IOException, ConstantPoolException, InvalidDescriptor { + JavaCompiler comp = ToolProvider.getSystemJavaCompiler(); + new CheckACC_STRICTFlagOnPkgAccessClassTest().run(comp); + } + + private void run(JavaCompiler comp) + throws IOException, ConstantPoolException, InvalidDescriptor { + compile(comp); + check(); + if (errors.size() > 0) { + for (String error: errors) { + System.err.println(error); + } + throw new AssertionError(AssertionErrorMessage); + } + } + + private void compile(JavaCompiler comp) { + JavacTask ct = (JavacTask)comp.getTask(null, null, null, null, null, + Arrays.asList(source)); + try { + if (!ct.call()) { + throw new AssertionError(CompilationErrorMessage + + source.getCharContent(true)); + } + } catch (Throwable ex) { + throw new AssertionError(CompilationErrorMessage + + source.getCharContent(true)); + } + } + + void check() + throws + IOException, + ConstantPoolException, + Descriptor.InvalidDescriptor { + ClassFile classFileToCheck = ClassFile.read(new File("Test.class")); + + for (Method method : classFileToCheck.methods) { + if ((method.access_flags.flags & ACC_STRICT) == 0) { + errors.add(String.format(offendingMethodErrorMessage, + method.getName(classFileToCheck.constant_pool), + classFileToCheck.getName())); + } + } + } + + class JavaSource extends SimpleJavaFileObject { + + String source = "strictfp class Test {" + + " Test(){}" + + " void m(){}" + + "}"; + + public JavaSource() { + super(URI.create("Test.java"), JavaFileObject.Kind.SOURCE); + } + + @Override + public CharSequence getCharContent(boolean ignoreEncodingErrors) { + return source; + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/8009170/RedundantByteCodeInArrayTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,71 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8009170 + * @summary Regression: javac generates redundant bytecode in assignop involving + * arrays + * @run main RedundantByteCodeInArrayTest + */ + +import java.io.File; +import java.io.IOException; + +import com.sun.tools.classfile.Attribute; +import com.sun.tools.classfile.ClassFile; +import com.sun.tools.classfile.Code_attribute; +import com.sun.tools.classfile.Code_attribute.InvalidIndex; +import com.sun.tools.classfile.ConstantPool; +import com.sun.tools.classfile.ConstantPoolException; +import com.sun.tools.classfile.Descriptor.InvalidDescriptor; +import com.sun.tools.classfile.Method; + +public class RedundantByteCodeInArrayTest { + public static void main(String[] args) + throws IOException, ConstantPoolException, InvalidDescriptor, InvalidIndex { + new RedundantByteCodeInArrayTest() + .checkClassFile(new File(System.getProperty("test.classes", "."), + RedundantByteCodeInArrayTest.class.getName() + ".class")); + } + + void arrMethod(int[] array, int p, int inc) { + array[p] += inc; + } + + void checkClassFile(File file) + throws IOException, ConstantPoolException, InvalidDescriptor, InvalidIndex { + ClassFile classFile = ClassFile.read(file); + ConstantPool constantPool = classFile.constant_pool; + + //lets get all the methods in the class file. + for (Method method : classFile.methods) { + if (method.getName(constantPool).equals("arrMethod")) { + Code_attribute code = (Code_attribute) method.attributes + .get(Attribute.Code); + if (code.max_locals > 4) + throw new AssertionError("Too many locals for method arrMethod"); + } + } + } +}
--- a/test/tools/javac/ClassFileModifiers/MemberModifiers.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/ClassFileModifiers/MemberModifiers.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -26,7 +26,7 @@ * @bug 4249112 4785453 * @summary Verify that implicit member modifiers are set correctly. * - * @compile/ref=MemberModifiers.out -source 1.4 -target 1.4.2 -Xlint:-options -XDdumpmodifiers=cfm MemberModifiers.java + * @compile/ref=MemberModifiers.out -source 1.4 -target 1.5 -Xlint:-options -XDdumpmodifiers=cfm MemberModifiers.java */ // Currently, we check only that members of final classes are not final.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/ClassPathTest/ClassPathTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,178 @@ +/* + * 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. + */ + +/* + * @test + * @bug 4241229 4785453 + * @summary Test -classpath option and classpath defaults. + * @library /tools/javac/lib + * @build ToolBox + * @run main ClassPathTest + */ + +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + +//original test: test/tools/javac/ClassPathTest/ClassPathTest.sh +public class ClassPathTest { + + private static final String ClassPathTest1Src = + "import pkg.*;\n" + + "public class ClassPathTest1 {\n" + + " ClassPathTestAux1 x;\n" + + "}"; + + private static final String ClassPathTest2Src = + "import pkg.*;\n" + + "public class ClassPathTest2 {\n" + + " ClassPathTestAux2 x;\n" + + "}"; + + private static final String ClassPathTest3Src = + "import pkg.*;\n" + + "public class ClassPathTest3 {\n" + + " ClassPathTestAux3 x;\n" + + "}"; + + private static final String fooPkgClassPathTestAux1Src = + "package pkg;\n" + + "public class ClassPathTestAux1 {}"; + + private static final String barPkgClassPathTestAux2Src = + "package pkg;\n" + + "public class ClassPathTestAux2 {}"; + + private static final String pkgClassPathTestAux3Src = + "package pkg;\n" + + "public class ClassPathTestAux3 {}"; + + ProcessBuilder pb = null; + + public static void main(String[] args) throws Exception { + new ClassPathTest().test(); + } + + public void test() throws Exception { + createOutputDirAndSourceFiles(); + checkCompileCommands(); + } + + void createOutputDirAndSourceFiles() throws Exception { + //dirs and files creation + ToolBox.createJavaFileFromSource(ClassPathTest1Src); + ToolBox.createJavaFileFromSource(ClassPathTest2Src); + ToolBox.createJavaFileFromSource(ClassPathTest3Src); + ToolBox.createJavaFileFromSource(Paths.get("foo"), + fooPkgClassPathTestAux1Src); + ToolBox.createJavaFileFromSource(Paths.get("bar"), + barPkgClassPathTestAux2Src); + ToolBox.createJavaFileFromSource(pkgClassPathTestAux3Src); + } + + void checkCompileCommands() throws Exception { +// Without the -cp . parameter the command will fail seems like when called +// from the command line, the current dir is added to the classpath +// automatically but this is not happening when called using ProcessBuilder + +// testJavac success ClassPathTest3.java + List<String> mainArgs = new ArrayList<>(); + mainArgs.add(ToolBox.javacBinary.toString()); + if (ToolBox.testToolVMOpts != null) { + mainArgs.addAll(ToolBox.testToolVMOpts); + } + + List<String> commonArgs = new ArrayList<>(); + commonArgs.addAll(mainArgs); + commonArgs.addAll(Arrays.asList("-cp", ".")); + + ToolBox.AnyToolArgs successParams = new ToolBox.AnyToolArgs() + .appendArgs(commonArgs) + .appendArgs("ClassPathTest3.java"); + ToolBox.executeCommand(successParams); + +// testJavac failure ClassPathTest1.java + ToolBox.AnyToolArgs failParams = + new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL) + .appendArgs(commonArgs) + .appendArgs("ClassPathTest1.java"); + ToolBox.executeCommand(failParams); + +// This is done inside the executeCommand method +// CLASSPATH=bar; export CLASSPATH + + Map<String, String> extVars = new TreeMap<>(); + extVars.put("CLASSPATH", "bar"); + +// testJavac success ClassPathTest2.java + successParams = new ToolBox.AnyToolArgs() + .appendArgs(mainArgs) + .appendArgs("ClassPathTest2.java") + .set(extVars); + ToolBox.executeCommand(successParams); + +// testJavac failure ClassPathTest1.java + failParams = new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL) + .appendArgs(mainArgs) + .appendArgs("ClassPathTest1.java") + .set(extVars); + ToolBox.executeCommand(failParams); + +// testJavac failure ClassPathTest3.java + failParams = new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL) + .appendArgs(mainArgs) + .appendArgs("ClassPathTest3.java") + .set(extVars); + ToolBox.executeCommand(failParams); + +// testJavac success -classpath foo ClassPathTest1.java + + commonArgs.clear(); + commonArgs.addAll(mainArgs); + commonArgs.addAll(Arrays.asList("-cp", "foo")); + + successParams = new ToolBox.AnyToolArgs() + .appendArgs(commonArgs) + .appendArgs("ClassPathTest1.java") + .set(extVars); + ToolBox.executeCommand(successParams); + +// testJavac failure -classpath foo ClassPathTest2.java + failParams = new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL) + .appendArgs(commonArgs) + .appendArgs("ClassPathTest2.java") + .set(extVars); + ToolBox.executeCommand(failParams); + +// testJavac failure -classpath foo ClassPathTest3.java + failParams = new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL) + .appendArgs(commonArgs) + .appendArgs("ClassPathTest3.java") + .set(extVars); + ToolBox.executeCommand(failParams); + } + +}
--- a/test/tools/javac/ClassPathTest/ClassPathTest.sh Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,134 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 1999, 2011, 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. -# - - -# @test -# @bug 4241229 4785453 -# @summary Test -classpath option and classpath defaults. -# @author maddox -# -# @run shell/timeout=180 ClassPathTest.sh - -# TODO: Should test sourcepath and classpath separately. - -if [ "${TESTSRC}" = "" ] -then - echo "TESTSRC not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTSRC=${TESTSRC}" -if [ "${TESTJAVA}" = "" ] -then - echo "TESTJAVA not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTJAVA=${TESTJAVA}" -if [ "${TESTCLASSES}" = "" ] -then - echo "TESTCLASSES not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTCLASSES=${TESTCLASSES}" -echo "CLASSPATH=${CLASSPATH}" - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin | CYGWIN* ) - FS="/" - ;; - Windows* ) - FS="\\" - ;; - * ) - echo "Unrecognized system!" - exit 1; - ;; -esac - -javac="${TESTJAVA}${FS}bin${FS}javac" - -cleanup() { - rm -f *.class pkg${FS}*.class foo${FS}pkg${FS}*.class bar${FS}pkg${FS}*.class - cp -rf $TESTSRC${FS}* . -} - -fail() { - echo "FAIL: $1" - failed="yes" -} - -# report expectedResult $? -report() { - if test "$1" = "success" -a "$2" = 0; then - echo "PASS: succeeded as expected" - elif test "$1" = "failure" -a "$2" != 0; then - echo "PASS: failed as expected" - elif test "$1" = "success" -a "$2" != 0; then - fail "test failed unexpectedly" - elif test "$1" = "failure" -a "$2" = 0; then - fail "test succeeded unexpectedly" - else - fail "internal error" - fi -} - -# testJavac expectedResult javacArgs... -testJavac() { - expectedResult="$1"; shift - cleanup - echo $javac ${TESTTOOLVMOPTS} "$@" - "$javac" ${TESTTOOLVMOPTS} "$@" - report $expectedResult $? -} - -unset CLASSPATH - -# classpath should default to current directory - -testJavac success ClassPathTest3.java -testJavac failure ClassPathTest1.java - -# if CLASSPATH is set, it should be honored - -CLASSPATH=bar; export CLASSPATH - -testJavac success ClassPathTest2.java -testJavac failure ClassPathTest1.java -testJavac failure ClassPathTest3.java - -# -classpath option should override default - -testJavac success -classpath foo ClassPathTest1.java -testJavac failure -classpath foo ClassPathTest2.java -testJavac failure -classpath foo ClassPathTest3.java - -if test -n "$failed"; then - echo "Some tests failed" - exit 1 -else - echo PASS: all tests gave expected results - exit 0 -fi
--- a/test/tools/javac/ClassPathTest/ClassPathTest1.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -/* - * Copyright (c) 1999, 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. - */ - -import pkg.*; - -public class ClassPathTest1 { - ClassPathTestAux1 x; - -}
--- a/test/tools/javac/ClassPathTest/ClassPathTest2.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -/* - * Copyright (c) 1999, 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. - */ - -import pkg.*; - -public class ClassPathTest2 { - ClassPathTestAux2 x; - -}
--- a/test/tools/javac/ClassPathTest/ClassPathTest3.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -/* - * Copyright (c) 1999, 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. - */ - -import pkg.*; - -public class ClassPathTest3 { - ClassPathTestAux3 x; - -}
--- a/test/tools/javac/ClassPathTest/bar/pkg/ClassPathTestAux2.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -/* - * Copyright (c) 1999, 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 pkg; - -public class ClassPathTestAux2 {}
--- a/test/tools/javac/ClassPathTest/foo/pkg/ClassPathTestAux1.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -/* - * Copyright (c) 1999, 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 pkg; - -public class ClassPathTestAux1 {}
--- a/test/tools/javac/ClassPathTest/pkg/ClassPathTestAux3.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -/* - * Copyright (c) 1999, 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 pkg; - -public class ClassPathTestAux3 {}
--- a/test/tools/javac/Diagnostics/6799605/T6799605.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/Diagnostics/6799605/T6799605.out Tue May 07 17:14:17 2013 -0700 @@ -1,4 +1,4 @@ -T6799605.java:17:9: compiler.err.cant.apply.symbols: kindname.method, m, T6799605<compiler.misc.type.captureof: 1, ?>,{(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>), (compiler.misc.inferred.do.not.conform.to.upper.bounds: compiler.misc.type.captureof: 1, ?, T6799605<compiler.misc.type.captureof: 1, ?>)),(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>,T6799605<T>), (compiler.misc.infer.arg.length.mismatch: T)),(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>,T6799605<T>,T6799605<T>), (compiler.misc.infer.arg.length.mismatch: T))} +T6799605.java:17:9: compiler.err.cant.apply.symbols: kindname.method, m, T6799605<compiler.misc.type.captureof: 1, ?>,{(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>), (compiler.misc.incompatible.eq.upper.bounds: T, compiler.misc.type.captureof: 1, ?, T6799605<T>)),(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>,T6799605<T>), (compiler.misc.infer.arg.length.mismatch: T)),(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>,T6799605<T>,T6799605<T>), (compiler.misc.infer.arg.length.mismatch: T))} T6799605.java:18:9: compiler.err.cant.apply.symbols: kindname.method, m, T6799605<compiler.misc.type.captureof: 1, ?>,T6799605<compiler.misc.type.captureof: 2, ?>,{(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>), (compiler.misc.infer.arg.length.mismatch: T)),(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>,T6799605<T>), (compiler.misc.inferred.do.not.conform.to.eq.bounds: compiler.misc.type.captureof: 2, ?, compiler.misc.type.captureof: 2, ?,compiler.misc.type.captureof: 1, ?)),(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>,T6799605<T>,T6799605<T>), (compiler.misc.infer.arg.length.mismatch: T))} T6799605.java:19:9: compiler.err.cant.apply.symbols: kindname.method, m, T6799605<compiler.misc.type.captureof: 1, ?>,T6799605<compiler.misc.type.captureof: 2, ?>,T6799605<compiler.misc.type.captureof: 3, ?>,{(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>), (compiler.misc.infer.arg.length.mismatch: T)),(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>,T6799605<T>), (compiler.misc.infer.arg.length.mismatch: T)),(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>,T6799605<T>,T6799605<T>), (compiler.misc.inferred.do.not.conform.to.eq.bounds: compiler.misc.type.captureof: 3, ?, compiler.misc.type.captureof: 3, ?,compiler.misc.type.captureof: 2, ?,compiler.misc.type.captureof: 1, ?))} 3 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/Diagnostics/8010387/T8010387.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,17 @@ +/** + * @test /nodynamiccopyright/ + * @bug 8010387 + * @summary rich diagnostic sometimes contain wrong type variable numbering + * @compile/fail/ref=T8010387.out -XDrawDiagnostics -XDdiags=disambiguateTvars,where T8010387.java + */ +abstract class T8010387<X> { + + interface F<X> { } + + <P> void test() { + m(new F<P>() { }); + } + + + abstract <T> T8010387<?> m(F<? extends X> fx); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/Diagnostics/8010387/T8010387.out Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,3 @@ +T8010387.java:12:9: compiler.err.cant.apply.symbol: kindname.method, m, T8010387.F<? extends X>, compiler.misc.anonymous.class: T8010387.F<P>, kindname.class, T8010387<X>, (compiler.misc.infer.no.conforming.assignment.exists: T, (compiler.misc.inconvertible.types: compiler.misc.anonymous.class: T8010387.F<P>, T8010387.F<? extends X>)) +- compiler.misc.where.description.typevar.1: X,P,T,{(compiler.misc.where.typevar: X, java.lang.Object, kindname.class, T8010387),(compiler.misc.where.typevar: P, java.lang.Object, kindname.method, <P>test()),(compiler.misc.where.typevar: T, java.lang.Object, kindname.method, <T>m(T8010387.F<? extends X>))} +1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/ExtDirs/ExtDirTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,176 @@ +/* + * 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. + */ + +/* + * @test + * @bug 4204897 4256097 4785453 4863609 + * @summary Test that '.jar' files in -extdirs are found. + * @library /tools/javac/lib + * @build ToolBox + * @run main ExtDirTest + */ + +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.List; + +//original test: test/tools/javac/ExtDirs/ExtDirs.sh +public class ExtDirTest { + + private static final String ExtDirTestClass1Src = + "package pkg1;\n" + + "\n" + + "public class ExtDirTestClass1 {}"; + + private static final String ExtDirTestClass2Src = + "package pkg2;\n" + + "\n" + + "public class ExtDirTestClass2 {}"; + + private static final String ExtDirTest_1Src = + "import pkg1.*;\n" + + "\n" + + "public class ExtDirTest_1 {\n" + + " ExtDirTestClass1 x;\n" + + "}"; + + private static final String ExtDirTest_2Src = + "import pkg1.*;\n" + + "import pkg2.*;\n" + + "\n" + + "public class ExtDirTest_2 {\n" + + " ExtDirTestClass1 x;\n" + + " ExtDirTestClass2 y;\n" + + "}"; + + private static final String ExtDirTest_3Src = + "import pkg1.*;\n" + + "import pkg2.*;\n" + + "\n" + + "public class ExtDirTest_3 {\n" + + " ExtDirTestClass1 x;\n" + + " ExtDirTestClass2 y;\n" + + "}"; + + private static final String jar1Manifest = + "Manifest-Version: 1.0\n" + + "\n" + + "Name: pkg1/ExtDirTestClass1.class\n" + + "Digest-Algorithms: SHA MD5 \n" + + "SHA-Digest: 9HEcO9LJmND3cvOlq/AbUsbD9S0=\n" + + "MD5-Digest: hffPBwfqcUcnEdNv4PXu1Q==\n" + + "\n" + + "Name: pkg1/ExtDirTestClass1.java\n" + + "Digest-Algorithms: SHA MD5 \n" + + "SHA-Digest: 2FQVe6w3n2Ma1ACYpe8a988EBU8=\n" + + "MD5-Digest: /Ivr4zVI9MSM26NmqWtZpQ==\n"; + + private static final String jar2Manifest = + "Manifest-Version: 1.0\n" + + "\n" + + "Name: pkg2/ExtDirTestClass2.class\n" + + "Digest-Algorithms: SHA MD5 \n" + + "SHA-Digest: elbPaqWf8hjj1+ZkkdW3PGTsilo=\n" + + "MD5-Digest: 57Nn0e2t1yEQfu/4kSw8yg==\n" + + "\n" + + "Name: pkg2/ExtDirTestClass2.java\n" + + "Digest-Algorithms: SHA MD5 \n" + + "SHA-Digest: ILJOhwHg5US+yuw1Sc1d+Avu628=\n" + + "MD5-Digest: j8wnz8wneEcuJ/gjXBBQNA==\n"; + + List<String> ouputDirParam = Arrays.asList("-d", "."); + + public static void main(String args[]) throws Exception { + new ExtDirTest().run(); + } + + void run() throws Exception { + createJars(); + compileWithExtDirs(); + } + + void createJars() throws Exception { + +// for i in 1 2 3; do +// if test ! -d ext${i}; then mkdir ext${i}; fi +// cp ${TESTSRC}${FS}ext${i}${FS}*.jar ext${i} +// done + sun.tools.jar.Main jarGenerator = + new sun.tools.jar.Main(System.out, System.err, "jar"); + + ToolBox.JavaToolArgs javacParams = + new ToolBox.JavaToolArgs() + .setOptions(ouputDirParam) + .setSources(ExtDirTestClass1Src); + ToolBox.javac(javacParams); + + ToolBox.writeFile(Paths.get("pkg1", "MANIFEST.MF"), jar1Manifest); + jarGenerator.run(new String[] {"cfm", "pkg1.jar", "pkg1/MANIFEST.MF", + "pkg1/ExtDirTestClass1.class"}); + + javacParams.setSources(ExtDirTestClass2Src); + ToolBox.javac(javacParams); + + ToolBox.writeFile(Paths.get("pkg2", "MANIFEST.MF"), jar2Manifest); + jarGenerator.run(new String[] {"cfm", "pkg2.jar", "pkg2/MANIFEST.MF", + "pkg2/ExtDirTestClass2.class"}); + + ToolBox.copyFile(Paths.get("ext1", "pkg1.jar"), Paths.get("pkg1.jar")); + ToolBox.copyFile(Paths.get("ext2", "pkg2.jar"), Paths.get("pkg2.jar")); + ToolBox.copyFile(Paths.get("ext3", "pkg1.jar"), Paths.get("pkg1.jar")); + ToolBox.copyFile(Paths.get("ext3", "pkg2.jar"), Paths.get("pkg2.jar")); + + Files.delete(Paths.get("pkg1.jar")); + Files.delete(Paths.get("pkg2.jar")); + + Files.delete(Paths.get("pkg1", "ExtDirTestClass1.class")); + Files.delete(Paths.get("pkg1", "MANIFEST.MF")); + Files.delete(Paths.get("pkg1")); + Files.delete(Paths.get("pkg2", "ExtDirTestClass2.class")); + Files.delete(Paths.get("pkg2", "MANIFEST.MF")); + Files.delete(Paths.get("pkg2")); + } + + void compileWithExtDirs() throws Exception { + +//"$javac" ${TESTTOOLVMOPTS} -d . -extdirs ext1 "${TESTSRC}${FS}ExtDirTest_1.java" + ToolBox.JavaToolArgs params = + new ToolBox.JavaToolArgs() + .setOptions("-d", ".", "-extdirs", "ext1") + .setSources(ExtDirTest_1Src); + ToolBox.javac(params); + +//"$javac" ${TESTTOOLVMOPTS} -d . -extdirs ext1${PS}ext2 "${TESTSRC}${FS}ExtDirTest_2.java" + params.setOptions("-d", ".", "-extdirs", "ext1" + File.pathSeparator + "ext2") + .setSources(ExtDirTest_2Src); + ToolBox.javac(params); + +//"$javac" ${TESTTOOLVMOPTS} -d . -extdirs ext3 "${TESTSRC}${FS}ExtDirTest_3.java" + params.setOptions("-d", ".", "-extdirs", "ext3") + .setSources(ExtDirTest_3Src); + ToolBox.javac(params); + } + +}
--- a/test/tools/javac/ExtDirs/ExtDirTest_1.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -/* - * Copyright (c) 1999, 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. - */ - -import pkg1.*; - -public class ExtDirTest_1 { - ExtDirTestClass1 x; -}
--- a/test/tools/javac/ExtDirs/ExtDirTest_2.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -/* - * Copyright (c) 1999, 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. - */ - -import pkg1.*; -import pkg2.*; - -public class ExtDirTest_2 { - ExtDirTestClass1 x; - ExtDirTestClass2 y; -}
--- a/test/tools/javac/ExtDirs/ExtDirTest_3.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -/* - * Copyright (c) 1999, 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. - */ - -import pkg1.*; -import pkg2.*; - -public class ExtDirTest_3 { - ExtDirTestClass1 x; - ExtDirTestClass2 y; -}
--- a/test/tools/javac/ExtDirs/ExtDirs.sh Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,100 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 1999, 2011, 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. -# - - -# @test -# @bug 4204897 4256097 4785453 4863609 -# @summary Test that '.jar' files in -extdirs are found. -# @author maddox -# -# @run shell/timeout=180 ExtDirs.sh - -if [ "${TESTSRC}" = "" ] -then - echo "TESTSRC not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTSRC=${TESTSRC}" -if [ "${TESTJAVA}" = "" ] -then - echo "TESTJAVA not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTJAVA=${TESTJAVA}" -if [ "${TESTCLASSES}" = "" ] -then - echo "TESTCLASSES not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTCLASSES=${TESTCLASSES}" -echo "CLASSPATH=${CLASSPATH}" - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin ) - PS=":" - FS="/" - ;; - CYGWIN* ) - PS=";" # native PS, not Cygwin PS - FS="/" - ;; - Windows* ) - PS=";" - FS="\\" - ;; - * ) - echo "Unrecognized system!" - exit 1; - ;; -esac - -fail() { - echo 'FAIL: unexpected result encountered' - exit 1 -} - -javac="${TESTJAVA}${FS}bin${FS}javac" - -for i in 1 2 3; do - if test ! -d ext${i}; then mkdir ext${i}; fi - cp ${TESTSRC}${FS}ext${i}${FS}*.jar ext${i} -done - -echo "Test 1" -"$javac" ${TESTTOOLVMOPTS} -d . -extdirs ext1 "${TESTSRC}${FS}ExtDirTest_1.java" -if [ $? -ne 0 ] ; then fail ; fi - -echo "Test 2" -"$javac" ${TESTTOOLVMOPTS} -d . -extdirs ext1${PS}ext2 "${TESTSRC}${FS}ExtDirTest_2.java" -if [ $? -ne 0 ] ; then fail ; fi - -echo "Test 3" -"$javac" ${TESTTOOLVMOPTS} -d . -extdirs ext3 "${TESTSRC}${FS}ExtDirTest_3.java" -if [ $? -ne 0 ] ; then fail ; fi - -echo PASS: all tests gave expected results -exit 0
--- a/test/tools/javac/MethodParameters.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,344 +0,0 @@ -/* - * Copyright (c) 2012, 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. - */ - -/* - * @test - * @bug 8004727 - * @summary javac should generate method parameters correctly. - */ -// key: opt.arg.parameters -import com.sun.tools.classfile.*; -import com.sun.tools.javac.file.JavacFileManager; -import com.sun.tools.javac.main.Main; -import com.sun.tools.javac.util.Context; -import com.sun.tools.javac.util.Name; -import com.sun.tools.javac.util.Names; -import java.io.*; -import javax.lang.model.element.*; -import java.util.*; - -public class MethodParameters { - - static final String Foo_name = "Foo"; - static final String Foo_contents = - "public class Foo {\n" + - " Foo() {}\n" + - " void foo0() {}\n" + - " void foo2(int j, int k) {}\n" + - "}"; - static final String Bar_name = "Bar"; - static final String Bar_contents = - "public class Bar {\n" + - " Bar(int i) {}" + - " Foo foo() { return new Foo(); }\n" + - "}"; - static final String Baz_name = "Baz"; - static final String Baz_contents = - "public class Baz {\n" + - " int baz;" + - " Baz(int i) {}" + - "}"; - static final String Qux_name = "Qux"; - static final String Qux_contents = - "public class Qux extends Baz {\n" + - " Qux(int i) { super(i); }" + - "}"; - static final File classesdir = new File("methodparameters"); - - public static void main(String... args) throws Exception { - new MethodParameters().run(); - } - - void run() throws Exception { - classesdir.mkdir(); - final File Foo_java = - writeFile(classesdir, Foo_name + ".java", Foo_contents); - final File Bar_java = - writeFile(classesdir, Bar_name + ".java", Bar_contents); - final File Baz_java = - writeFile(classesdir, Baz_name + ".java", Baz_contents); - System.err.println("Test compile with -parameter"); - compile("-parameters", "-d", classesdir.getPath(), Foo_java.getPath()); - // First test: make sure javac doesn't choke to death on - // MethodParameter attributes - System.err.println("Test compile with classfile containing MethodParameter attributes"); - compile("-parameters", "-d", classesdir.getPath(), - "-cp", classesdir.getPath(), Bar_java.getPath()); - System.err.println("Examine class foo"); - checkFoo(); - checkBar(); - System.err.println("Test debug information conflict"); - compile("-g", "-parameters", "-d", classesdir.getPath(), - "-cp", classesdir.getPath(), Baz_java.getPath()); - System.err.println("Introducing debug information conflict"); - Baz_java.delete(); - modifyBaz(false); - System.err.println("Checking language model"); - inspectBaz(); - System.err.println("Permuting attributes"); - modifyBaz(true); - System.err.println("Checking language model"); - inspectBaz(); - - if(0 != errors) - throw new Exception("MethodParameters test failed with " + - errors + " errors"); - } - - void inspectBaz() throws Exception { - final File Qux_java = - writeFile(classesdir, Qux_name + ".java", Qux_contents); - final String[] args = { "-XDsave-parameter-names", "-d", - classesdir.getPath(), - "-cp", classesdir.getPath(), - Qux_java.getPath() }; - final StringWriter sw = new StringWriter(); - final PrintWriter pw = new PrintWriter(sw); - - // We need to be able to crack open javac and look at its data - // structures. We'll rig up a compiler instance, but keep its - // Context, thus allowing us to get at the ClassReader. - Context context = new Context(); - Main comp = new Main("javac", pw); - JavacFileManager.preRegister(context); - - // Compile Qux, which uses Baz. - comp.compile(args, context); - pw.close(); - final String out = sw.toString(); - if (out.length() > 0) - System.err.println(out); - - // Now get the class reader, construct a name for Baz, and load it. - com.sun.tools.javac.jvm.ClassReader cr = - com.sun.tools.javac.jvm.ClassReader.instance(context); - Name name = Names.instance(context).fromString(Baz_name); - - // Now walk down the language model and check the name of the - // parameter. - final Element baz = cr.loadClass(name); - for (Element e : baz.getEnclosedElements()) { - if (e instanceof ExecutableElement) { - final ExecutableElement ee = (ExecutableElement) e; - final List<? extends VariableElement> params = - ee.getParameters(); - if (1 != params.size()) - throw new Exception("Classfile Baz badly formed: wrong number of methods"); - final VariableElement param = params.get(0); - if (!param.getSimpleName().contentEquals("baz")) { - errors++; - System.err.println("javac did not correctly resolve the metadata conflict, parameter's name reads as " + param.getSimpleName()); - } else - System.err.println("javac did correctly resolve the metadata conflict"); - } - } - } - - void modifyBaz(boolean flip) throws Exception { - final File Baz_class = new File(classesdir, Baz_name + ".class"); - final ClassFile baz = ClassFile.read(Baz_class); - final int ind = baz.constant_pool.getUTF8Index("baz"); - MethodParameters_attribute mpattr = null; - int mpind = 0; - Code_attribute cattr = null; - int cind = 0; - - // Find the indexes of the MethodParameters and the Code attributes - if (baz.methods.length != 1) - throw new Exception("Classfile Baz badly formed: wrong number of methods"); - if (!baz.methods[0].getName(baz.constant_pool).equals("<init>")) - throw new Exception("Classfile Baz badly formed: method has name " + - baz.methods[0].getName(baz.constant_pool)); - for (int i = 0; i < baz.methods[0].attributes.attrs.length; i++) { - if (baz.methods[0].attributes.attrs[i] instanceof - MethodParameters_attribute) { - mpattr = (MethodParameters_attribute) - baz.methods[0].attributes.attrs[i]; - mpind = i; - } else if (baz.methods[0].attributes.attrs[i] instanceof - Code_attribute) { - cattr = (Code_attribute) baz.methods[0].attributes.attrs[i]; - cind = i; - } - } - if (null == mpattr) - throw new Exception("Classfile Baz badly formed: no method parameters info"); - if (null == cattr) - throw new Exception("Classfile Baz badly formed: no local variable table"); - - int flags = mpattr.method_parameter_table[0].flags; - - // Alter the MethodParameters attribute, changing the name of - // the parameter from i to baz. This requires Black Magic... - // - // The (well-designed) classfile library (correctly) does not - // allow us to mess around with the attribute data structures, - // or arbitrarily generate new ones. - // - // Instead, we install a new subclass of Attribute that - // hijacks the Visitor pattern and outputs the sequence of - // bytes that we want. This only works in this particular - // instance, because we know we'll only every see one kind of - // visitor. - // - // If anyone ever changes the makeup of the Baz class, or - // tries to install some kind of visitor that gets run prior - // to serialization, this will break. - baz.methods[0].attributes.attrs[mpind] = - new Attribute(mpattr.attribute_name_index, - mpattr.attribute_length) { - public <R, D> R accept(Visitor<R, D> visitor, D data) { - if (data instanceof ByteArrayOutputStream) { - ByteArrayOutputStream out = - (ByteArrayOutputStream) data; - out.write(1); - out.write((ind >> 8) & 0xff); - out.write(ind & 0xff); - out.write((flags >> 24) & 0xff); - out.write((flags >> 16) & 0xff); - out.write((flags >> 8) & 0xff); - out.write(flags & 0xff); - } else - throw new RuntimeException("Output stream is of type " + data.getClass() + ", which is not handled by this test. Update the test and it should work."); - return null; - } - }; - - // Flip the code and method attributes. This is for checking - // that order doesn't matter. - if (flip) { - baz.methods[0].attributes.attrs[mpind] = cattr; - baz.methods[0].attributes.attrs[cind] = mpattr; - } - - new ClassWriter().write(baz, Baz_class); - } - - // Run a bunch of structural tests on foo to make sure it looks right. - void checkFoo() throws Exception { - final File Foo_class = new File(classesdir, Foo_name + ".class"); - final ClassFile foo = ClassFile.read(Foo_class); - for (int i = 0; i < foo.methods.length; i++) { - System.err.println("Examine method Foo." + foo.methods[i].getName(foo.constant_pool)); - if (foo.methods[i].getName(foo.constant_pool).equals("foo2")) { - for (int j = 0; j < foo.methods[i].attributes.attrs.length; j++) - if (foo.methods[i].attributes.attrs[j] instanceof - MethodParameters_attribute) { - MethodParameters_attribute mp = - (MethodParameters_attribute) - foo.methods[i].attributes.attrs[j]; - System.err.println("Foo.foo2 should have 2 parameters: j and k"); - if (2 != mp.method_parameter_table_length) - error("expected 2 method parameter entries in foo2, got " + - mp.method_parameter_table_length); - else if (!foo.constant_pool.getUTF8Value(mp.method_parameter_table[0].name_index).equals("j")) - error("expected first parameter to foo2 to be \"j\", got \"" + - foo.constant_pool.getUTF8Value(mp.method_parameter_table[0].name_index) + - "\" instead"); - else if (!foo.constant_pool.getUTF8Value(mp.method_parameter_table[1].name_index).equals("k")) - error("expected first parameter to foo2 to be \"k\", got \"" + - foo.constant_pool.getUTF8Value(mp.method_parameter_table[1].name_index) + - "\" instead"); - } - } - else if (foo.methods[i].getName(foo.constant_pool).equals("<init>")) { - for (int j = 0; j < foo.methods[i].attributes.attrs.length; j++) { - if (foo.methods[i].attributes.attrs[j] instanceof - MethodParameters_attribute) - error("Zero-argument constructor shouldn't have MethodParameters"); - } - } - else if (foo.methods[i].getName(foo.constant_pool).equals("foo0")) { - for (int j = 0; j < foo.methods[i].attributes.attrs.length; j++) - if (foo.methods[i].attributes.attrs[j] instanceof - MethodParameters_attribute) - error("Zero-argument method shouldn't have MethodParameters"); - } - else - error("Unknown method " + foo.methods[i].getName(foo.constant_pool) + " showed up in class Foo"); - } - } - - // Run a bunch of structural tests on Bar to make sure it looks right. - void checkBar() throws Exception { - final File Bar_class = new File(classesdir, Bar_name + ".class"); - final ClassFile bar = ClassFile.read(Bar_class); - for (int i = 0; i < bar.methods.length; i++) { - System.err.println("Examine method Bar." + bar.methods[i].getName(bar.constant_pool)); - if (bar.methods[i].getName(bar.constant_pool).equals("<init>")) { - for (int j = 0; j < bar.methods[i].attributes.attrs.length; j++) - if (bar.methods[i].attributes.attrs[j] instanceof - MethodParameters_attribute) { - MethodParameters_attribute mp = - (MethodParameters_attribute) - bar.methods[i].attributes.attrs[j]; - System.err.println("Bar constructor should have 1 parameter: i"); - if (1 != mp.method_parameter_table_length) - error("expected 1 method parameter entries in constructor, got " + - mp.method_parameter_table_length); - else if (!bar.constant_pool.getUTF8Value(mp.method_parameter_table[0].name_index).equals("i")) - error("expected first parameter to foo2 to be \"i\", got \"" + - bar.constant_pool.getUTF8Value(mp.method_parameter_table[0].name_index) + - "\" instead"); - } - } - else if (bar.methods[i].getName(bar.constant_pool).equals("foo")) { - for (int j = 0; j < bar.methods[i].attributes.attrs.length; j++) { - if (bar.methods[i].attributes.attrs[j] instanceof - MethodParameters_attribute) - error("Zero-argument constructor shouldn't have MethodParameters"); - } - } - } - } - - String compile(String... args) throws Exception { - System.err.println("compile: " + Arrays.asList(args)); - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw); - int rc = com.sun.tools.javac.Main.compile(args, pw); - pw.close(); - String out = sw.toString(); - if (out.length() > 0) - System.err.println(out); - if (rc != 0) - error("compilation failed, rc=" + rc); - return out; - } - - File writeFile(File dir, String path, String body) throws IOException { - File f = new File(dir, path); - f.getParentFile().mkdirs(); - FileWriter out = new FileWriter(f); - out.write(body); - out.close(); - return f; - } - - void error(String msg) { - System.err.println("Error: " + msg); - errors++; - } - - int errors; -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/MethodParameters/AnnotationTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,54 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8006582 + * @summary javac should generate method parameters correctly. + * @build Tester + * @compile -parameters AnnotationTest.java + * @run main Tester AnnotationTest + */ + +import java.lang.annotation.*; + +/** Test that annotations do not interfere with recording of parameter names */ +class AnnotationTest { + + @Repeatable(Annos.class) + @interface Anno { + Class f() default int.class; + } + + @interface Annos { Anno[] value(); String foo() default "hello"; } + + interface I { + int m(@Anno @Anno int i, @Anno int ji); + } + + public AnnotationTest(@Anno @Anno I i, @Anno int ji) { } + public @Anno String foo(@Anno @Anno I i, int ji) { return null; } +} + + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/MethodParameters/AnonymousClass.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,104 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8006582 + * @summary javac should generate method parameters correctly. + * @build Tester + * @compile -parameters AnonymousClass.java + * @run main Tester AnonymousClass + */ + +class AnonymousClass { + + interface I<T> { + T m(); + T m(T x, T yx); + } + + private class Inner implements I<String> { + public Inner() { } + public Inner(String arg, String barg) { } + public String m() { return "0"; } + public String m(String s, String ts) { return "0"; } + } + + public static class Sinner implements I<Long> { + public Sinner() { } + public Sinner(Long arg, Long barg) { } + public Long m() { return 0L; } + public Long m(Long s, Long ts) { return s + ts; } + } + + /** Inner class in constructor context */ + public AnonymousClass(final Long a, Long ba) { + new I<Long>() { + public Long m() { return null; } + public Long m(Long i, Long ji) { return i + ji; } + }.m(a, ba); + new Inner() { + public String m() { return null; } + public String m(String i, String ji) { return i + ji; } + }.m(a.toString(), ba.toString()); + new Inner(a.toString(), ba.toString()) { + public String m() { return null; } + public String m(String i, String ji) { return i + ji; } + }.m(a.toString(), ba.toString()); + new Sinner() { + public Long m() { return null; } + public Long m(Long i, Long ji) { return i + ji; } + }.m(a, ba); + new Sinner(a, ba) { + public Long m() { return null; } + public Long m(Long i, Long ji) { return i + ji; } + }.m(a, ba); + } + + /** Inner class in method context */ + public void foo(final Long a, Long ba) { + new I<Long>() { + public Long m() { return null; } + public Long m(Long i, Long ji) { return i + ji; } + }.m(a, ba); + new Inner() { + public String m() { return null; } + public String m(String i, String ji) { return i + ji; } + }.m(a.toString(), ba.toString()); + new Inner(a.toString(), ba.toString()) { + public String m() { return null; } + public String m(String i, String ji) { return i + ji; } + }.m(a.toString(), ba.toString()); + new Sinner() { + public Long m() { return null; } + public Long m(Long i, Long ji) { return i + ji; } + }.m(a, ba); + new Sinner(a, ba) { + public Long m() { return null; } + public Long m(Long i, Long ji) { return i + ji; } + }.m(a, ba); + } +} + + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/MethodParameters/AttributeVisitor.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,59 @@ +/* + * 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. + */ + +import com.sun.tools.classfile.*; + +/** + * Trivial {@code Attribute.Visitor} implementation, to make it easy to + * write visitors for specific attributes. + */ +class AttributeVisitor<R, P> implements Attribute.Visitor<R, P> { + public R visitBootstrapMethods(BootstrapMethods_attribute attr, P p) { return null; } + public R visitDefault(DefaultAttribute attr, P p) { return null; } + public R visitAnnotationDefault(AnnotationDefault_attribute attr, P p) { return null; } + public R visitCharacterRangeTable(CharacterRangeTable_attribute attr, P p) { return null; } + public R visitCode(Code_attribute attr, P p) { return null; } + public R visitCompilationID(CompilationID_attribute attr, P p) { return null; } + public R visitConstantValue(ConstantValue_attribute attr, P p) { return null; } + public R visitDeprecated(Deprecated_attribute attr, P p) { return null; } + public R visitEnclosingMethod(EnclosingMethod_attribute attr, P p) { return null; } + public R visitExceptions(Exceptions_attribute attr, P p) { return null; } + public R visitInnerClasses(InnerClasses_attribute attr, P p) { return null; } + public R visitLineNumberTable(LineNumberTable_attribute attr, P p) { return null; } + public R visitLocalVariableTable(LocalVariableTable_attribute attr, P p) { return null; } + public R visitLocalVariableTypeTable(LocalVariableTypeTable_attribute attr, P p) { return null; } + public R visitMethodParameters(MethodParameters_attribute attr, P p) { return null; } + public R visitRuntimeVisibleAnnotations(RuntimeVisibleAnnotations_attribute attr, P p) { return null; } + public R visitRuntimeInvisibleAnnotations(RuntimeInvisibleAnnotations_attribute attr, P p) { return null; } + public R visitRuntimeVisibleParameterAnnotations(RuntimeVisibleParameterAnnotations_attribute attr, P p) { return null; } + public R visitRuntimeInvisibleParameterAnnotations(RuntimeInvisibleParameterAnnotations_attribute attr, P p) { return null; } + public R visitRuntimeVisibleTypeAnnotations(RuntimeVisibleTypeAnnotations_attribute attr, P p) { return null; } + public R visitRuntimeInvisibleTypeAnnotations(RuntimeInvisibleTypeAnnotations_attribute attr, P p) { return null; } + public R visitSignature(Signature_attribute attr, P p) { return null; } + public R visitSourceDebugExtension(SourceDebugExtension_attribute attr, P p) { return null; } + public R visitSourceFile(SourceFile_attribute attr, P p) { return null; } + public R visitSourceID(SourceID_attribute attr, P p) { return null; } + public R visitStackMap(StackMap_attribute attr, P p) { return null; } + public R visitStackMapTable(StackMapTable_attribute attr, P p) { return null; } + public R visitSynthetic(Synthetic_attribute attr, P p) { return null; } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/MethodParameters/ClassFileVisitor.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,387 @@ +/* + * 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. + */ + +import com.sun.tools.classfile.*; +import java.io.*; +import javax.lang.model.element.*; +import java.util.*; + +/** + * The {@code ClassFileVisitor} reads a class file using the + * {@code com.sun.tools.classfile} library. It iterates over the methods + * in a class, and checks MethodParameters attributes against JLS + * requirements, as well as assumptions about the javac implementations. + * <p> + * It enforces the following rules: + * <ul> + * <li>All non-synthetic methods with arguments must have the + * MethodParameters attribute. </li> + * <li>At most one MethodParameters attribute per method.</li> + * <li>An empty MethodParameters attribute is not allowed (i.e. no + * attribute for methods taking no parameters).</li> + * <li>The number of recorded parameter names much equal the number + * of parameters, including any implicit or synthetic parameters generated + * by the compiler.</li> + * <li>Although the spec allow recording parameters with no name, the javac + * implementation is assumed to record a name for all parameters. That is, + * the Methodparameters attribute must record a non-zero, valid constant + * pool index for each parameter.</li> + * <li>Check presence, expected names (e.g. this$N, $enum$name, ...) and flags + * (e.g. ACC_SYNTHETIC, ACC_MANDATED) for compiler generated parameters.</li> + * <li>Names of explicit parameters must reflect the names in the Java source. + * This is checked by assuming a design pattern where any name is permitted + * for the first explicit parameter. For subsequent parameters the following + * rule is checked: <i>param[n] == ++param[n-1].charAt(0) + param[n-1]</i> + * </ul> + */ +class ClassFileVisitor extends Tester.Visitor { + + Tester tester; + + public String cname; + public boolean isEnum; + public boolean isInterface; + public boolean isInner; + public boolean isPublic; + public boolean isStatic; + public boolean isAnon; + public ClassFile classFile; + + + public ClassFileVisitor(Tester tester) { + super(tester); + } + + public void error(String msg) { + super.error("classfile: " + msg); + } + + public void warn(String msg) { + super.warn("classfile: " + msg); + } + + /** + * Read the class and determine some key characteristics, like if it's + * an enum, or inner class, etc. + */ + void visitClass(final String cname, final File cfile, final StringBuilder sb) + throws Exception { + this.cname = cname; + classFile = ClassFile.read(cfile); + isEnum = classFile.access_flags.is(AccessFlags.ACC_ENUM); + isInterface = classFile.access_flags.is(AccessFlags.ACC_INTERFACE); + isPublic = classFile.access_flags.is(AccessFlags.ACC_PUBLIC); + isInner = false; + isStatic = true; + isAnon = false; + + Attribute attr = classFile.getAttribute("InnerClasses"); + if (attr != null) attr.accept(new InnerClassVisitor(), null); + isAnon = isInner & isAnon; + + sb.append(isStatic ? "static " : "") + .append(isPublic ? "public " : "") + .append(isEnum ? "enum " : isInterface ? "interface " : "class ") + .append(cname).append(" -- ") + .append(isInner? "inner " : "" ) + .append(isAnon ? "anon" : "") + .append("\n");; + + for (Method method : classFile.methods) { + new MethodVisitor().visitMethod(method, sb); + } + } + + /** + * Used to visit InnerClasses_attribute of a class, + * to determne if this class is an local class, and anonymous + * inner class or a none-static member class. These types of + * classes all have an containing class instances field that + * requires an implicit or synthetic constructor argument. + */ + class InnerClassVisitor extends AttributeVisitor<Void, Void> { + public Void visitInnerClasses(InnerClasses_attribute iattr, Void v) { + try{ + for (InnerClasses_attribute.Info info : iattr.classes) { + if (info.getInnerClassInfo(classFile.constant_pool) == null) continue; + String in = info.getInnerClassInfo(classFile.constant_pool).getName(); + if (in == null || !cname.equals(in)) continue; + isInner = true; + isAnon = null == info.getInnerName(classFile.constant_pool); + isStatic = info.inner_class_access_flags.is(AccessFlags.ACC_STATIC); + break; + } + } catch(Exception e) { + throw new IllegalStateException(e); + } + return null; + } + } + + /** + * Check the MethodParameters attribute of a method. + */ + class MethodVisitor extends AttributeVisitor<Void, StringBuilder> { + + public String mName; + public Descriptor mDesc; + public int mParams; + public int mAttrs; + public int mNumParams; + public boolean mSynthetic; + public boolean mIsConstructor; + public String prefix; + + void visitMethod(Method method, StringBuilder sb) throws Exception { + + mName = method.getName(classFile.constant_pool); + mDesc = method.descriptor; + mParams = mDesc.getParameterCount(classFile.constant_pool); + mAttrs = method.attributes.attrs.length; + mNumParams = -1; // no MethodParameters attribute found + mSynthetic = method.access_flags.is(AccessFlags.ACC_SYNTHETIC); + mIsConstructor = mName.equals("<init>"); + prefix = cname + "." + mName + "() - "; + + sb.append(cname).append(".").append(mName).append("("); + + for (Attribute a : method.attributes) { + a.accept(this, sb); + } + if (mNumParams == -1) { + if (mSynthetic) { + sb.append("<none>)!!"); + } else { + sb.append("<none>)"); + } + } + sb.append("\n"); + + // IMPL: methods with arguments must have a MethodParameters + // attribute, except possibly some synthetic methods. + if (mNumParams == -1 && mParams > 0 && ! mSynthetic) { + error(prefix + "missing MethodParameters attribute"); + } + } + + public Void visitMethodParameters(MethodParameters_attribute mp, + StringBuilder sb) { + + // SPEC: At most one MethodParameters attribute allowed + if (mNumParams != -1) { + error(prefix + "Multiple MethodParameters attributes"); + return null; + } + + mNumParams = mp.method_parameter_table_length; + + // SPEC: An empty attribute is not allowed! + if (mNumParams == 0) { + error(prefix + "0 length MethodParameters attribute"); + return null; + } + + // SPEC: one name per parameter. + if (mNumParams != mParams) { + error(prefix + "found " + mNumParams + + " parameters, expected " + mParams); + return null; + } + + // IMPL: Whether MethodParameters attributes will be generated + // for some synthetics is unresolved. For now, assume no. + if (mSynthetic) { + warn(prefix + "synthetic has MethodParameter attribute"); + } + + String sep = ""; + String userParam = null; + for (int x = 0; x < mNumParams; x++) { + + // IMPL: Assume all parameters are named, something. + int cpi = mp.method_parameter_table[x].name_index; + if (cpi == 0) { + error(prefix + "name expected, param[" + x + "]"); + return null; + } + + // SPEC: a non 0 index, must be valid! + String param = null; + try { + param = classFile.constant_pool.getUTF8Value(cpi); + sb.append(sep).append(param); + sep = ", "; + } catch(ConstantPoolException e) { + error(prefix + "invalid index " + cpi + " for param[" + + x + "]"); + return null; + } + + + // Check availability, flags and special names + int check = checkParam(mp, param, x, sb); + if (check < 0) { + return null; + } + + // TEST: check test assumptions about parameter name. + // Expected names are calculated starting with the + // 2nd explicit (user given) parameter. + // param[n] == ++param[n-1].charAt(0) + param[n-1] + String expect = null; + if (userParam != null) { + char c = userParam.charAt(0); + expect = (++c) + userParam; + } + if (check > 0) { + userParam = param; + } + if (expect != null && !param.equals(expect)) { + error(prefix + "param[" + x + "]='" + + param + "' expected '" + expect + "'"); + return null; + } + } + if (mSynthetic) { + sb.append(")!!"); + } else { + sb.append(")"); + } + return null; + } + + /* + * Check a parameter for conformity to JLS and javac specific + * assumptions. + * Return -1, if an error is detected. Otherwise, return 0, if + * the parameter is compiler generated, or 1 for an (presumably) + * explicitly declared parameter. + */ + int checkParam(MethodParameters_attribute mp, String param, int index, + StringBuilder sb) { + + boolean synthetic = (mp.method_parameter_table[index].flags + & AccessFlags.ACC_SYNTHETIC) != 0; + boolean mandated = (mp.method_parameter_table[index].flags + & AccessFlags.ACC_MANDATED) != 0; + + // Setup expectations for flags and special names + String expect = null; + boolean allowMandated = false; + boolean allowSynthetic = false; + if (mSynthetic || synthetic) { + // not an implementation gurantee, but okay for now + expect = "arg" + index; // default + } + if (mIsConstructor) { + if (isEnum) { + if (index == 0) { + expect = "\\$enum\\$name"; + allowSynthetic = true; + } else if(index == 1) { + expect = "\\$enum\\$ordinal"; + allowSynthetic = true; + } + } else if (index == 0) { + if (isAnon) { + allowMandated = true; + expect = "this\\$[0-n]*"; + } else if (isInner && !isStatic) { + allowMandated = true; + if (!isPublic) { + // some but not all non-public inner classes + // have synthetic argument. For now we give + // the test a bit of slack and allow either. + allowSynthetic = true; + } + expect = "this\\$[0-n]*"; + } + } else if (isAnon) { + // not an implementation gurantee, but okay for now + expect = "x[0-n]*"; + } + } else if (isEnum && mNumParams == 1 && index == 0 && mName.equals("valueOf")) { + expect = "name"; + allowMandated = true; + } + if (mandated) sb.append("!"); + if (synthetic) sb.append("!!"); + + // IMPL: our rules a somewhat fuzzy, sometimes allowing both mandated + // and synthetic. However, a parameters cannot be both. + if (mandated && synthetic) { + error(prefix + "param[" + index + "] == \"" + param + + "\" ACC_SYNTHETIC and ACC_MANDATED"); + return -1; + } + // ... but must be either, if both "allowed". + if (!(mandated || synthetic) && allowMandated && allowSynthetic) { + error(prefix + "param[" + index + "] == \"" + param + + "\" expected ACC_MANDATED or ACC_SYNTHETIC"); + return -1; + } + + // ... if only one is "allowed", we meant "required". + if (!mandated && allowMandated && !allowSynthetic) { + error(prefix + "param[" + index + "] == \"" + param + + "\" expected ACC_MANDATED"); + return -1; + } + if (!synthetic && !allowMandated && allowSynthetic) { + error(prefix + "param[" + index + "] == \"" + param + + "\" expected ACC_SYNTHETIC"); + return -1; + } + + // ... and not "allowed", means prohibited. + if (mandated && !allowMandated) { + error(prefix + "param[" + index + "] == \"" + param + + "\" unexpected, is ACC_MANDATED"); + return -1; + } + if (synthetic && !allowSynthetic) { + error(prefix + "param[" + index + "] == \"" + param + + "\" unexpected, is ACC_SYNTHETIC"); + return -1; + } + + // Test special name expectations + if (expect != null) { + if (param.matches(expect)) { + return 0; + } + error(prefix + "param[" + index + "]='" + param + + "' expected '" + expect + "'"); + return -1; + } + + // No further checking for synthetic methods. + if (mSynthetic) { + return 0; + } + + // Otherwise, do check test parameter naming convention. + return 1; + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/MethodParameters/Constructors.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,41 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8006582 + * @summary javac should generate method parameters correctly. + * @build Tester + * @compile -parameters Constructors.java + * @run main Tester Constructors + */ + +public class Constructors { + public Constructors() {} + Constructors(final Object a, final String... ba) { } + protected Constructors(Object a, final Object ba, final String... cba) { } + private Constructors(int a, Object ba, final Object cba, final String... dcba) { } +} + + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/MethodParameters/EnumTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,45 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8006582 8008658 + * @summary javac should generate method parameters correctly. + * @build Tester + * @compile -parameters EnumTest.java + * @run main Tester EnumTest + */ + +/** Test that parameter names are recorded for enum methods */ +enum EnumTest { + E1(0), E2(1, "x"), E3(2, "x", "y"), E4; + + EnumTest() { } + EnumTest(int a, String... ba) { } + boolean ok(int c, String... dc) { return true; } + + int valueOf(EnumTest A, EnumTest BA) { return 0; } +} + + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/MethodParameters/InstanceMethods.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,46 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8006582 + * @summary javac should generate method parameters correctly. + * @build Tester + * @compile -parameters InstanceMethods.java + * @run main Tester InstanceMethods + */ + +public class InstanceMethods { + public void empty() {} + final void def(Object a, final Object ba, final String... cba) { } + final public void pub(Object d, final Object ed, final String... fed) { } + protected boolean prot(Object g, final Object hg, final String... ihg) { return true; } + private boolean priv(Object j, final Object kj, final String... lkj) { return true; } + void def(int A, Object BA, final Object CBA, final String... DCBA) { } + public void pub(int B, Object CB, final Object DCB, final String... EDCB) { } + final protected boolean prot(int C, Object DC, final Object EDC, final String... FEDC) { return true; } + final private boolean priv(int D, Object ED, final Object FED, final String... GFED) { return true; } +} + + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/MethodParameters/LambdaTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,51 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8006582 + * @summary javac should generate method parameters correctly. + * @build Tester + * @compile -parameters LambdaTest.java + * @run main Tester LambdaTest + */ + +/** + * Parameter names are not recorded for lambdas. This test verifies + * that there are no MethodParameters attribute for lambdas. + */ +class LambdaTest { + + interface I { + int m(int x); + } + + static int foo(I i) { return i.m(0); } + + static { + foo((int x1) -> { return foo((int x2) -> { return x1 + x2; }); }); + } +} + + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/MethodParameters/LocalClassTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,50 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8006582 8008658 + * @summary javac should generate method parameters correctly. + * @build Tester + * @compile -parameters LocalClassTest.java + * @run main Tester LocalClassTest + */ + +class LocalClassTest { + void foo() { + class Local_default_constructor { + public void foo() {} + public void foo(int m, int nm) {} + } + class Local_has_constructor { + public Local_has_constructor() {} + public Local_has_constructor(int a, int ba) {} + public void foo() {} + public void foo(int m, int nm) {} + } + new LocalClassTest().foo(); + } +} + + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/MethodParameters/MemberClassTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,86 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8006582 8008658 + * @summary javac should generate method parameters correctly. + * @build Tester + * @compile -parameters MemberClassTest.java + * @run main Tester MemberClassTest + */ + +class MemberClassTest { + + interface I { + Long m(); + Long m(Long x, Long yx); + } + + public class Member implements I { + public class Member_Member { + public Member_Member() {} + public Member_Member(String x, String yx) {} + } + + public Member() { } + public Member(Long a, Long ba) { } + public Long m() { return 0L; } + public Long m(Long s, Long ts) { return 0L; } + } + + static class Static_Member implements I { + public class Static_Member_Member { + public Static_Member_Member() {} + public Static_Member_Member(String x, String yx) {} + } + + public static class Static_Member_Static_Member { + public Static_Member_Static_Member() {} + public Static_Member_Static_Member(String x, String yx) {} + } + public Static_Member() { } + public Static_Member(Long arg, Long barg) { } + public Long m() { return 0L; } + public Long m(Long s, Long ts) { return s + ts; } + } + + public MemberClassTest() { + } + public MemberClassTest(final Long a, Long ba) { + } + + public void foo() { + + new I() { + + class Anonymous_Member { + public Anonymous_Member() {} + public Anonymous_Member(String x, String yx) {} + } + + public Long m() { return 0L; } + public Long m(Long s, Long ts) { return s + ts; } + }.m(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/MethodParameters/ReflectionVisitor.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,270 @@ +/* + * 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. + */ + +import java.io.*; +import java.util.*; +import java.net.*; +import java.lang.reflect.*; + +/** + * Test MethodParameter attributs by reflection API + */ +public class ReflectionVisitor extends Tester.Visitor { + + public ReflectionVisitor(Tester tester) { + super(tester); + } + + public void error(String msg) { + super.error("reflection: " + msg); + } + + public void warn(String msg) { + super.warn("reflection: " + msg); + } + + boolean isEnum; + boolean isInterface; + boolean isAnon; + boolean isLocal; + boolean isMember; + boolean isStatic; + boolean isPublic; + Class clazz; + StringBuilder sb; + + /** + * Read class using {@code ClassFile}, and generate a list of methods + * with parameter names as available in the MethodParameters attribute. + */ + void visitClass(final String cl, final File cfile, final StringBuilder sb) + throws Exception { + + this.sb = sb; + clazz = Class.forName(cl); + isEnum = clazz.isEnum(); + isInterface = clazz.isInterface(); + isAnon = clazz.isAnonymousClass(); + isLocal = clazz.isLocalClass(); + isMember = clazz.isMemberClass(); + isStatic = ((clazz.getModifiers() & Modifier.STATIC) != 0); + isPublic = ((clazz.getModifiers() & Modifier.PUBLIC) != 0); + + sb.append(isStatic ? "static " : "") + .append(isPublic ? "public " : "") + .append(isEnum ? "enum " : isInterface ? "interface " : "class ") + .append(cl).append(" -- ") + .append(isMember? "member " : "" ) + .append(isLocal? "local " : "" ) + .append(isAnon ? "anon" : "") + .append("\n"); + + for (Constructor c : clazz.getDeclaredConstructors()) { + testConstructor(c); + } + + for (Method m :clazz.getDeclaredMethods()) { + + testMethod(m); + } + } + + void testConstructor(Constructor c) { + + String prefix = clazz.getName() + "." + c.getName() + "() - "; + + // Parameters must match parameter types + Parameter params[] = c.getParameters(); + int paramTypes = c.getParameterTypes().length; + if (paramTypes != params.length) { + error(prefix + "number of parameter types (" + paramTypes + + ") != number of parameters (" + params.length + ")"); + return; + } + + sb.append(clazz.getName()).append(".").append("<init>").append("("); + String sep = ""; + + // Some paramters are expected + if (params.length < 2 && isEnum) { + error(prefix + "enum constuctor, two arguments expected"); + } else if (params.length < 1 && (isAnon || isLocal || + (isMember && !isStatic ))) { + error(prefix + "class constuctor,expected implicit argument"); + } + + int i = -1; + String param = null; + for (Parameter p : c.getParameters()) { + i++; + String pname = p.getName(); + sb.append(sep).append(pname); + if (p.isImplicit()) sb.append("!"); + if (p.isSynthetic()) sb.append("!!"); + sep = ", "; + + // Set expectations + String expect = null; + boolean allowImplicit = false; + boolean allowSynthetic = false; + if (isEnum) { + if (i == 0) { + expect = "\\$enum\\$name"; + allowSynthetic = true; + } else if(i == 1) { + expect = "\\$enum\\$ordinal"; + allowSynthetic = true; + } + } else if (i == 0) { + if (isAnon) { + allowImplicit = true; + } else if (isLocal) { + allowImplicit = true; + expect = "this\\$[0-n]*"; + } else if ((isMember && !isStatic)) { + allowImplicit = true; + if (!isPublic) { + // some but not all non-public inner classes + // have synthetic argument. For now we give + // the test a bit of slack and allow either. + allowSynthetic = true; + } + expect = "this\\$[0-n]*"; + } + } else if (isAnon) { + // not an implementation gurantee, but okay for now + expect = "x[0-n]*"; + } + + // Check expected flags + if (p.isSynthetic() && p.isImplicit()) { + error(prefix + "param[" + i + "]='" + pname + + "' both isImplicit() and isSynthetic()"); + break; + } + if (allowImplicit && allowSynthetic && + !(p.isSynthetic() || p.isImplicit())) { + error(prefix + "param[" + i + "]='" + pname + + "' isImplicit() or isSynthetic() expected"); + break; + } + + if (allowImplicit && !allowSynthetic && !p.isImplicit()) { + error(prefix + "param[" + i + "]='" + pname + + "' isImplicit() expected"); + break; + } + if (!allowImplicit && allowSynthetic && !p.isSynthetic()) { + error(prefix + "param[" + i + "]='" + pname + + "' isSynthetic() expected"); + break; + } + + if (!allowImplicit && p.isImplicit()) { + error(prefix + "param[" + i + "]='" + pname + + "' isImplicit() unexpected"); + break; + } + + if (!allowSynthetic && p.isSynthetic()) { + error(prefix + "param[" + i + "]='" + pname + + "' isSynthetic() unexpected"); + break; + } + + // Check expected names + if (expect != null) { + if (pname.matches(expect)) continue; + error(prefix + "param[" + i + "]='" + pname + + "' expected '" + expect + "'"); + break; + } + + // Test naming convention for explicit parameters. + boolean fidelity = !isAnon; + if (param != null && fidelity) { + char ch = param.charAt(0); + expect = (++ch) + param; + } + + if (pname != null && fidelity) { + param = pname; + } + + if (expect != null && !expect.equals(pname)) { + error(prefix + "param[" + i + "]='" + pname + + "' expected '" + expect + "'"); + break; + } + } + if (c.isSynthetic()) { + sb.append(")!!\n"); + } else { + sb.append(")\n"); + } + } + + void testMethod(Method m) { + + String prefix = clazz.getName() + "." + m.getName() + "() - "; + + // Parameters must match parameter types + int paramTypes = m.getParameterTypes().length; + int params = m.getParameters().length; + if (paramTypes != params) { + error(prefix + "number of parameter types (" + paramTypes + + ") != number of parameters (" + params + ")"); + return; + } + + sb.append(clazz.getName()).append(".").append(m.getName()).append("("); + String sep = ""; + String param = null; + int i = -1; + // For methods we expect all parameters to follow + // the test-case design pattern, except synthetic methods. + for (Parameter p : m.getParameters()) { + i++; + if (param == null) { + param = p.getName(); + sb.append(sep).append(param); + } else { + char c = param.charAt(0); + String expect = m.isSynthetic() ? ("arg" + i) : ((++c) + param); + param = p.getName(); + sb.append(sep).append(param); + if (!expect.equals(param)) { + error(prefix + "param[" + i + "]='" + + param + "' expected '" + expect + "'"); + break; + } + } + sep = ", "; + } + if (m.isSynthetic()) { + sb.append(")!!\n"); + } else { + sb.append(")\n"); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/MethodParameters/StaticMethods.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,46 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8006582 + * @summary javac should generate method parameters correctly. + * @build Tester + * @compile -parameters StaticMethods.java + * @run main Tester StaticMethods + */ + +public class StaticMethods { + static public void empty() {} + static final void def(Object a, final Object ba, final String... cba) { } + static final public void pub(Object d, final Object ed, final String... fed) { } + static protected boolean prot(Object g, final Object hg, final String... ihg) { return true; } + static private boolean priv(Object j, final Object kj, final String... lkj) { return true; } + static void def(int a, Object ba, final Object cba, final String... dcba) { } + static public void pub(int a, Object ba, final Object cba , final String... dcba) { } + static final protected boolean prot(int aa, Object baa, final Object cbaa, final String... dcbaa) { return true; } + static final private boolean priv(int abc, Object babc, final Object cbabc, final String... dcbabc) { return true; } +} + + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/MethodParameters/Tester.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,162 @@ +/* + * 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. + */ + +import java.io.*; +import java.util.*; +import java.lang.reflect.Constructor; + +/** + * Test driver for MethodParameters testing. + * <p> + * The intended use of this driver is to run it, giving the name of + * a single class compiled with -parameters as argument. The driver + * will test the specified class, and any nested classes it finds. + * <p> + * Each class is tested in two way. By refelction, and by directly + * checking MethodParameters attributes in the classfile. The checking + * is done using two visitor classes {@link ClassFileVisitor} and + * {@link ReflectionVisitor}. + * <p> + * The {@code ReflectionVisitor} test logically belongs with library tests. + * we wish to reuse the same test-cases, so both test are committed together, + * under langtools. The tests, may be duplicated in the jdk repository. + */ +public class Tester { + + final static File classesdir = new File(System.getProperty("test.classes", ".")); + + /** + * The visitor classes that does the actual checking are referenced + * statically, to force compilations, without having to reference + * them in individual test cases. + * <p> + * This makes it easy to change the set of visitors, without + * complicating the design with dynamic discovery and compilation + * of visitor classes. + */ + static final Class visitors[] = { + ClassFileVisitor.class, + ReflectionVisitor.class + }; + + /** + * Test-driver expect a single classname as argument. + */ + public static void main(String... args) throws Exception { + if (args.length != 1) { + throw new Error("A single class name is expected as argument"); + } + final String pattern = args[0] + ".*\\.class"; + File files[] = classesdir.listFiles(new FileFilter() { + public boolean accept(File f) { + return f.getName().matches(pattern); + } + }); + if (files.length == 0) { + File file = new File(classesdir, args[0] + ".class"); + throw new Error(file.getPath() + " not found"); + } + + new Tester(args[0], files).run(); + } + + public Tester(String name, File files[]) { + this.classname = name; + this.files = files; + } + + void run() throws Exception { + + // Test with each visitor + for (Class<Visitor> vclass : visitors) { + try { + String vname = vclass.getName(); + Constructor c = vclass.getConstructor(Tester.class); + + info("\nRun " + vname + " for " + classname + "\n"); + StringBuilder sb = new StringBuilder(); + for (File f : files) { + String fname = f.getName(); + fname = fname.substring(0, fname.length() - 6); + Visitor v = (Visitor) c.newInstance(this); + try { + v.visitClass(fname, f, sb); + } catch(Exception e) { + error("Uncaught exception in visitClass()"); + e.printStackTrace(); + } + } + info(sb.toString()); + } catch(ReflectiveOperationException e) { + warn("Class " + vclass.getName() + " ignored, not a Visitor"); + continue; + } + } + + if(0 != warnings) + System.err.println("Test generated " + warnings + " warnings"); + + if(0 != errors) + throw new Exception("Tester test failed with " + + errors + " errors"); + } + + abstract static class Visitor { + Tester tester; + File classesdir; + + public Visitor(Tester tester) { + this.tester = tester; + } + + abstract void visitClass(final String classname, final File cfile, + final StringBuilder sb) throws Exception; + + public void error(String msg) { + tester.error(msg); + } + + public void warn(String msg) { + tester.warn(msg); + } + } + + void error(String msg) { + System.err.println("Error: " + msg); + errors++; + } + + void warn(String msg) { + System.err.println("Warning: " + msg); + warnings++; + } + + void info(String msg) { + System.out.println(msg); + } + + int errors; + int warnings; + String classname; + File files[]; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/MethodParameters/UncommonParamNames.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,68 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8006582 + * @summary javac should generate method parameters correctly. + * @build Tester + * @compile -parameters UncommonParamNames.java + * @run main Tester UncommonParamNames + */ + +/** Test uncommon parameter names */ +class UncommonParamNames { + public UncommonParamNames(int _x) { } + public UncommonParamNames(short $1) { } + public UncommonParamNames(long \u0061) { } + public UncommonParamNames(char zero\u0000zero\u0000) { } + public UncommonParamNames(String zero\u0000zero\u0000seven\u0007) { } + public UncommonParamNames(Object zero\u0000zero\u0000eight\u0008) { } + public UncommonParamNames(Object aLoooooooooooooooooooooooooooooooooooooooooooooooooooooooooooongName, + Object baLoooooooooooooooooooooooooooooooooooooooooooooooooooooooooooongName, + Object cbaLoooooooooooooooooooooooooooooooooooooooooooooooooooooooooooongName) { } + public UncommonParamNames(int a, int ba, int cba, int dcba, int edcba, int fedcba, int gfedcba, + int hgfedcba, int ihgfedcba, int jihgfedcba, int kjihgfedcba, int lkjihgfedcba, + int mlkjihgfedcba, int nmlkjihgfedcba, int onmlkjihgfedcba, int ponmlkjihgfedcba, + int qponmlkjihgfedcba, int rqponmlkjihgfedcba, int srqponmlkjihgfedcba, + int tsrqponmlkjihgfedcba, int utsrqponmlkjihgfedcba, int vutsrqponmlkjihgfedcba, + int wvutsrqponmlkjihgfedcba, int xwvutsrqponmlkjihgfedcba, + int yxwvutsrqponmlkjihgfedcba, int zyxwvutsrqponmlkjihgfedcba) { } + + public void foo(int _x) { } + public void foo(short $1) { } + public void foo(long \u0061) { } + public void foo(char zero\u0000zero\u0000) { } + public void foo(String zero\u0000zero\u0000seven\u0007) { } + public void foo(Object zero\u0000zero\u0000eight\u0008) { } + public void foo(Object aLoooooooooooooooooooooooooooooooooooooooooooooooooooooooooooongName, + Object baLoooooooooooooooooooooooooooooooooooooooooooooooooooooooooooongName, + Object cbaLoooooooooooooooooooooooooooooooooooooooooooooooooooooooooooongName) { } + public void foo(int a, int ba, int cba, int dcba, int edcba, int fedcba, int gfedcba, + int hgfedcba, int ihgfedcba, int jihgfedcba, int kjihgfedcba, int lkjihgfedcba, + int mlkjihgfedcba, int nmlkjihgfedcba, int onmlkjihgfedcba, int ponmlkjihgfedcba, + int qponmlkjihgfedcba, int rqponmlkjihgfedcba, int srqponmlkjihgfedcba, + int tsrqponmlkjihgfedcba, int utsrqponmlkjihgfedcba, int vutsrqponmlkjihgfedcba, + int wvutsrqponmlkjihgfedcba, int xwvutsrqponmlkjihgfedcba, + int yxwvutsrqponmlkjihgfedcba, int zyxwvutsrqponmlkjihgfedcba) { } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/MethodParametersTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,344 @@ +/* + * 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 + * 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. + */ + +/* + * @test + * @bug 8004727 + * @summary javac should generate method parameters correctly. + */ +// key: opt.arg.parameters +import com.sun.tools.classfile.*; +import com.sun.tools.javac.file.JavacFileManager; +import com.sun.tools.javac.main.Main; +import com.sun.tools.javac.util.Context; +import com.sun.tools.javac.util.Name; +import com.sun.tools.javac.util.Names; +import java.io.*; +import javax.lang.model.element.*; +import java.util.*; + +public class MethodParametersTest { + + static final String Foo_name = "Foo"; + static final String Foo_contents = + "public class Foo {\n" + + " Foo() {}\n" + + " void foo0() {}\n" + + " void foo2(int j, int k) {}\n" + + "}"; + static final String Bar_name = "Bar"; + static final String Bar_contents = + "public class Bar {\n" + + " Bar(int i) {}" + + " Foo foo() { return new Foo(); }\n" + + "}"; + static final String Baz_name = "Baz"; + static final String Baz_contents = + "public class Baz {\n" + + " int baz;" + + " Baz(int i) {}" + + "}"; + static final String Qux_name = "Qux"; + static final String Qux_contents = + "public class Qux extends Baz {\n" + + " Qux(int i) { super(i); }" + + "}"; + static final File classesdir = new File("methodparameters"); + + public static void main(String... args) throws Exception { + new MethodParametersTest().run(); + } + + void run() throws Exception { + classesdir.mkdir(); + final File Foo_java = + writeFile(classesdir, Foo_name + ".java", Foo_contents); + final File Bar_java = + writeFile(classesdir, Bar_name + ".java", Bar_contents); + final File Baz_java = + writeFile(classesdir, Baz_name + ".java", Baz_contents); + System.err.println("Test compile with -parameter"); + compile("-parameters", "-d", classesdir.getPath(), Foo_java.getPath()); + // First test: make sure javac doesn't choke to death on + // MethodParameter attributes + System.err.println("Test compile with classfile containing MethodParameter attributes"); + compile("-parameters", "-d", classesdir.getPath(), + "-cp", classesdir.getPath(), Bar_java.getPath()); + System.err.println("Examine class foo"); + checkFoo(); + checkBar(); + System.err.println("Test debug information conflict"); + compile("-g", "-parameters", "-d", classesdir.getPath(), + "-cp", classesdir.getPath(), Baz_java.getPath()); + System.err.println("Introducing debug information conflict"); + Baz_java.delete(); + modifyBaz(false); + System.err.println("Checking language model"); + inspectBaz(); + System.err.println("Permuting attributes"); + modifyBaz(true); + System.err.println("Checking language model"); + inspectBaz(); + + if(0 != errors) + throw new Exception("MethodParameters test failed with " + + errors + " errors"); + } + + void inspectBaz() throws Exception { + final File Qux_java = + writeFile(classesdir, Qux_name + ".java", Qux_contents); + final String[] args = { "-XDsave-parameter-names", "-d", + classesdir.getPath(), + "-cp", classesdir.getPath(), + Qux_java.getPath() }; + final StringWriter sw = new StringWriter(); + final PrintWriter pw = new PrintWriter(sw); + + // We need to be able to crack open javac and look at its data + // structures. We'll rig up a compiler instance, but keep its + // Context, thus allowing us to get at the ClassReader. + Context context = new Context(); + Main comp = new Main("javac", pw); + JavacFileManager.preRegister(context); + + // Compile Qux, which uses Baz. + comp.compile(args, context); + pw.close(); + final String out = sw.toString(); + if (out.length() > 0) + System.err.println(out); + + // Now get the class reader, construct a name for Baz, and load it. + com.sun.tools.javac.jvm.ClassReader cr = + com.sun.tools.javac.jvm.ClassReader.instance(context); + Name name = Names.instance(context).fromString(Baz_name); + + // Now walk down the language model and check the name of the + // parameter. + final Element baz = cr.loadClass(name); + for (Element e : baz.getEnclosedElements()) { + if (e instanceof ExecutableElement) { + final ExecutableElement ee = (ExecutableElement) e; + final List<? extends VariableElement> params = + ee.getParameters(); + if (1 != params.size()) + throw new Exception("Classfile Baz badly formed: wrong number of methods"); + final VariableElement param = params.get(0); + if (!param.getSimpleName().contentEquals("baz")) { + errors++; + System.err.println("javac did not correctly resolve the metadata conflict, parameter's name reads as " + param.getSimpleName()); + } else + System.err.println("javac did correctly resolve the metadata conflict"); + } + } + } + + void modifyBaz(boolean flip) throws Exception { + final File Baz_class = new File(classesdir, Baz_name + ".class"); + final ClassFile baz = ClassFile.read(Baz_class); + final int ind = baz.constant_pool.getUTF8Index("baz"); + MethodParameters_attribute mpattr = null; + int mpind = 0; + Code_attribute cattr = null; + int cind = 0; + + // Find the indexes of the MethodParameters and the Code attributes + if (baz.methods.length != 1) + throw new Exception("Classfile Baz badly formed: wrong number of methods"); + if (!baz.methods[0].getName(baz.constant_pool).equals("<init>")) + throw new Exception("Classfile Baz badly formed: method has name " + + baz.methods[0].getName(baz.constant_pool)); + for (int i = 0; i < baz.methods[0].attributes.attrs.length; i++) { + if (baz.methods[0].attributes.attrs[i] instanceof + MethodParameters_attribute) { + mpattr = (MethodParameters_attribute) + baz.methods[0].attributes.attrs[i]; + mpind = i; + } else if (baz.methods[0].attributes.attrs[i] instanceof + Code_attribute) { + cattr = (Code_attribute) baz.methods[0].attributes.attrs[i]; + cind = i; + } + } + if (null == mpattr) + throw new Exception("Classfile Baz badly formed: no method parameters info"); + if (null == cattr) + throw new Exception("Classfile Baz badly formed: no local variable table"); + + int flags = mpattr.method_parameter_table[0].flags; + + // Alter the MethodParameters attribute, changing the name of + // the parameter from i to baz. This requires Black Magic... + // + // The (well-designed) classfile library (correctly) does not + // allow us to mess around with the attribute data structures, + // or arbitrarily generate new ones. + // + // Instead, we install a new subclass of Attribute that + // hijacks the Visitor pattern and outputs the sequence of + // bytes that we want. This only works in this particular + // instance, because we know we'll only every see one kind of + // visitor. + // + // If anyone ever changes the makeup of the Baz class, or + // tries to install some kind of visitor that gets run prior + // to serialization, this will break. + baz.methods[0].attributes.attrs[mpind] = + new Attribute(mpattr.attribute_name_index, + mpattr.attribute_length) { + public <R, D> R accept(Visitor<R, D> visitor, D data) { + if (data instanceof ByteArrayOutputStream) { + ByteArrayOutputStream out = + (ByteArrayOutputStream) data; + out.write(1); + out.write((ind >> 8) & 0xff); + out.write(ind & 0xff); + out.write((flags >> 24) & 0xff); + out.write((flags >> 16) & 0xff); + out.write((flags >> 8) & 0xff); + out.write(flags & 0xff); + } else + throw new RuntimeException("Output stream is of type " + data.getClass() + ", which is not handled by this test. Update the test and it should work."); + return null; + } + }; + + // Flip the code and method attributes. This is for checking + // that order doesn't matter. + if (flip) { + baz.methods[0].attributes.attrs[mpind] = cattr; + baz.methods[0].attributes.attrs[cind] = mpattr; + } + + new ClassWriter().write(baz, Baz_class); + } + + // Run a bunch of structural tests on foo to make sure it looks right. + void checkFoo() throws Exception { + final File Foo_class = new File(classesdir, Foo_name + ".class"); + final ClassFile foo = ClassFile.read(Foo_class); + for (int i = 0; i < foo.methods.length; i++) { + System.err.println("Examine method Foo." + foo.methods[i].getName(foo.constant_pool)); + if (foo.methods[i].getName(foo.constant_pool).equals("foo2")) { + for (int j = 0; j < foo.methods[i].attributes.attrs.length; j++) + if (foo.methods[i].attributes.attrs[j] instanceof + MethodParameters_attribute) { + MethodParameters_attribute mp = + (MethodParameters_attribute) + foo.methods[i].attributes.attrs[j]; + System.err.println("Foo.foo2 should have 2 parameters: j and k"); + if (2 != mp.method_parameter_table_length) + error("expected 2 method parameter entries in foo2, got " + + mp.method_parameter_table_length); + else if (!foo.constant_pool.getUTF8Value(mp.method_parameter_table[0].name_index).equals("j")) + error("expected first parameter to foo2 to be \"j\", got \"" + + foo.constant_pool.getUTF8Value(mp.method_parameter_table[0].name_index) + + "\" instead"); + else if (!foo.constant_pool.getUTF8Value(mp.method_parameter_table[1].name_index).equals("k")) + error("expected first parameter to foo2 to be \"k\", got \"" + + foo.constant_pool.getUTF8Value(mp.method_parameter_table[1].name_index) + + "\" instead"); + } + } + else if (foo.methods[i].getName(foo.constant_pool).equals("<init>")) { + for (int j = 0; j < foo.methods[i].attributes.attrs.length; j++) { + if (foo.methods[i].attributes.attrs[j] instanceof + MethodParameters_attribute) + error("Zero-argument constructor shouldn't have MethodParameters"); + } + } + else if (foo.methods[i].getName(foo.constant_pool).equals("foo0")) { + for (int j = 0; j < foo.methods[i].attributes.attrs.length; j++) + if (foo.methods[i].attributes.attrs[j] instanceof + MethodParameters_attribute) + error("Zero-argument method shouldn't have MethodParameters"); + } + else + error("Unknown method " + foo.methods[i].getName(foo.constant_pool) + " showed up in class Foo"); + } + } + + // Run a bunch of structural tests on Bar to make sure it looks right. + void checkBar() throws Exception { + final File Bar_class = new File(classesdir, Bar_name + ".class"); + final ClassFile bar = ClassFile.read(Bar_class); + for (int i = 0; i < bar.methods.length; i++) { + System.err.println("Examine method Bar." + bar.methods[i].getName(bar.constant_pool)); + if (bar.methods[i].getName(bar.constant_pool).equals("<init>")) { + for (int j = 0; j < bar.methods[i].attributes.attrs.length; j++) + if (bar.methods[i].attributes.attrs[j] instanceof + MethodParameters_attribute) { + MethodParameters_attribute mp = + (MethodParameters_attribute) + bar.methods[i].attributes.attrs[j]; + System.err.println("Bar constructor should have 1 parameter: i"); + if (1 != mp.method_parameter_table_length) + error("expected 1 method parameter entries in constructor, got " + + mp.method_parameter_table_length); + else if (!bar.constant_pool.getUTF8Value(mp.method_parameter_table[0].name_index).equals("i")) + error("expected first parameter to foo2 to be \"i\", got \"" + + bar.constant_pool.getUTF8Value(mp.method_parameter_table[0].name_index) + + "\" instead"); + } + } + else if (bar.methods[i].getName(bar.constant_pool).equals("foo")) { + for (int j = 0; j < bar.methods[i].attributes.attrs.length; j++) { + if (bar.methods[i].attributes.attrs[j] instanceof + MethodParameters_attribute) + error("Zero-argument constructor shouldn't have MethodParameters"); + } + } + } + } + + String compile(String... args) throws Exception { + System.err.println("compile: " + Arrays.asList(args)); + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + int rc = com.sun.tools.javac.Main.compile(args, pw); + pw.close(); + String out = sw.toString(); + if (out.length() > 0) + System.err.println(out); + if (rc != 0) + error("compilation failed, rc=" + rc); + return out; + } + + File writeFile(File dir, String path, String body) throws IOException { + File f = new File(dir, path); + f.getParentFile().mkdirs(); + FileWriter out = new FileWriter(f); + out.write(body); + out.close(); + return f; + } + + void error(String msg) { + System.err.println("Error: " + msg); + errors++; + } + + int errors; +}
--- a/test/tools/javac/MissingInclude.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2001, 2002, 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. - */ - -/* - * @test - * @bug 4509051 4785453 - * @summary javac <AT>sourcefiles should catch Exception, when sourcefiles doesn't exist. - * @author gafter - * - * @run shell MissingInclude.sh - */ - -class MissingInclude {}
--- a/test/tools/javac/MissingInclude.sh Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 2001, 2009, 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. -# - - -if [ "${TESTSRC}" = "" ] -then - echo "TESTSRC not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTSRC=${TESTSRC}" -if [ "${TESTJAVA}" = "" ] -then - echo "TESTJAVA not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTJAVA=${TESTJAVA}" -if [ "${TESTCLASSES}" = "" ] -then - echo "TESTCLASSES not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTCLASSES=${TESTCLASSES}" -echo "CLASSPATH=${CLASSPATH}" - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin | CYGWIN* ) - FS="/" - ;; - Windows* ) - FS="\\" - ;; - * ) - echo "Unrecognized system!" - exit 1; - ;; -esac - -TMP1=OUTPUT.txt - -cp "${TESTSRC}${FS}MissingInclude.java" . -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} @/nonexistent_file MissingInclude.java 2> ${TMP1} -result=$? -cat ${TMP1} -rm ${TMP1} - -if [ $result -eq 0 ] -then - echo "Failed" - exit 1 -else - echo "Passed" - exit 0 -fi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/MissingInclude/MissingIncludeTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,50 @@ +/* + * 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. + */ + +/* + * @test + * @bug 4509051 4785453 + * @summary javac <AT>sourcefiles should catch Exception, when sourcefiles + * doesn't exist. + * @library /tools/javac/lib + * @build ToolBox + * @run main MissingIncludeTest + */ + +//original test: test/tools/javac/MissingInclude.sh +public class MissingIncludeTest { + + private static final String MissingIncludeSrc = + "class MissingInclude {}"; + + public static void main(String[] args) throws Exception { + ToolBox.createJavaFileFromSource(MissingIncludeSrc); + +// "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} @/nonexistent_file MissingInclude.java 2> ${TMP1} + ToolBox.JavaToolArgs params = + new ToolBox.JavaToolArgs(ToolBox.Expect.FAIL) + .setAllArgs("@/nonexistent_file", "MissingInclude.java"); + ToolBox.javac(params); + } + +}
--- a/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,84 +0,0 @@ -# -# Copyright (c) 1998, 2012, 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. -# - -# @test -# @bug 4087314 4800342 -# @summary Verify allowed access to protected class from another package. -# @author William Maddox (maddox) -# -# @run shell ProtectedInnerClass.sh - - -if [ "${TESTSRC}" = "" ] -then - echo "TESTSRC not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTSRC=${TESTSRC}" -if [ "${TESTJAVA}" = "" ] -then - echo "TESTJAVA not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTJAVA=${TESTJAVA}" -if [ "${TESTCLASSES}" = "" ] -then - echo "TESTCLASSES not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTCLASSES=${TESTCLASSES}" -echo "CLASSPATH=${CLASSPATH}" - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin ) - PS=":" - FS="/" - ;; - CYGWIN* ) - PS=";" # native PS, not Cygwin PS - FS="/" - ;; - Windows* ) - PS=";" - FS="\\" - ;; - * ) - echo "Unrecognized system!" - exit 1; - ;; -esac - -rm -f ${TESTCLASSES}${FS}p1${FS}*.class ${TESTCLASSES}${FS}p2${FS}*.class - -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d "${TESTCLASSES}" "${TESTSRC}${FS}p1${FS}ProtectedInnerClass1.java" "${TESTSRC}${FS}p2${FS}ProtectedInnerClass2.java" -"${TESTJAVA}${FS}bin${FS}java" ${TESTVMOPTS} -classpath "${CLASSPATH}${PS}${TESTCLASSES}" p2.ProtectedInnerClass2 -result=$? -if [ $result -eq 0 ] -then - echo "Passed" -else - echo "Failed" -fi -exit $result
--- a/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass_2.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2000, 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. - */ - -/* - * @test - * @bug 4307565 - * @summary Verify that access to inaccessable protected inner class is rejected. - * @author William Maddox (maddox) - * - * @run compile p1/ProtectedInnerClass1.java - * @run compile/fail p2/ProtectedInnerClass3.java - */ -class Dummy {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/ProtectedInnerClass/ProtectedInnerClassesTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,118 @@ +/* + * 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. + */ + +/* + * @test + * @bug 4087314 4800342 4307565 + * @summary Verify allowed access to protected class from another package + * @library /tools/javac/lib + * @build ToolBox + * @run main ProtectedInnerClassesTest + */ + +//original tests: test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh +//and test/tools/javac/ProtectedInnerClass/ProtectedInnerClass_2.java +public class ProtectedInnerClassesTest { + + private static final String protectedInnerClass1Src = + "package p1;\n" + + "\n" + + "public class ProtectedInnerClass1 {\n" + + " protected class Foo {\n" + + " public String getBar() { return \"bar\"; }\n" + + " }\n" + + "}"; + + private static final String protectedInnerClass2Src = + "package p2;\n" + + "\n" + + "public class ProtectedInnerClass2 extends p1.ProtectedInnerClass1\n" + + "{\n" + + " class Bug extends Foo {\n" + + " String getBug() { return getBar(); }\n" + + " }\n" + + "\n" + + " public static void main(String[] args) {\n" + + " ProtectedInnerClass2 x = new ProtectedInnerClass2();\n" + + " Bug y = x.new Bug();\n" + + " System.out.println(y.getBug());\n" + + " }\n" + + "}"; + + private static final String protectedInnerClass3Src = + "package p2;\n" + + "\n" + + "public class ProtectedInnerClass3 {\n" + + "\n" + + " void test() {\n" + + " p1.ProtectedInnerClass1.Foo x;\n" + + " }\n" + + "\n" + + "}"; + + public static void main(String args[]) throws Exception { + new ProtectedInnerClassesTest().run(); + } + + void run() throws Exception { + compileAndExecute(); + compileOnly(); + } + + void compileAndExecute() throws Exception { +//"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d "${TESTCLASSES}" "${TESTSRC}${FS}p1${FS}ProtectedInnerClass1.java" "${TESTSRC}${FS}p2${FS}ProtectedInnerClass2.java" + ToolBox.JavaToolArgs javacParams = + new ToolBox.JavaToolArgs() + .setOptions("-d", ".") + .setSources(protectedInnerClass1Src, protectedInnerClass2Src); + + ToolBox.javac(javacParams); + +//"${TESTJAVA}${FS}bin${FS}java" ${TESTVMOPTS} -classpath "${CLASSPATH}${PS}${TESTCLASSES}" p2.ProtectedInnerClass2 + ToolBox.AnyToolArgs javaParams = + new ToolBox.AnyToolArgs() + .appendArgs(ToolBox.javaBinary) + .appendArgs(ToolBox.testVMOpts) + .appendArgs("-classpath", System.getProperty("user.dir"), + "p2.ProtectedInnerClass2"); + ToolBox.executeCommand(javaParams); + } + +//from test/tools/javac/ProtectedInnerClass/ProtectedInnerClass_2.java + void compileOnly() throws Exception { +//@run compile p1/ProtectedInnerClass1.java + ToolBox.JavaToolArgs javacParams = + new ToolBox.JavaToolArgs() + .appendArgs("-d", ".") + .setSources(protectedInnerClass1Src); + + ToolBox.javac(javacParams); + +//@run compile/fail p2/ProtectedInnerClass3.java + javacParams = new ToolBox.JavaToolArgs(ToolBox.Expect.FAIL) + .appendArgs("-d", ".") + .setSources(protectedInnerClass3Src); + ToolBox.javac(javacParams); + } + +}
--- a/test/tools/javac/ProtectedInnerClass/p1/ProtectedInnerClass1.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -/* - * Copyright (c) 1997, 2000, 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. - */ - -/* - * Auxiliary file for test for 4087314. - * Verify allowed access to protected class from another package. - * This file must be compiled prior to compiling p2.ProtectedInnerClass2. - * It is that compilation that will either succeed or fail. - */ - -package p1; - -public class ProtectedInnerClass1 { - protected class Foo { - public String getBar() { return "bar"; } - } -}
--- a/test/tools/javac/ProtectedInnerClass/p2/ProtectedInnerClass2.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -/* - * Copyright (c) 1997, 2000, 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. - */ - -/* - * Auxiliary file for test for 4087314. - * Verify allowed access to protected class from another package. - * - * This file should compile and run successfully. - * Note that class p1.ProtectedInnerClass1 must be compiled first. - */ - -package p2; - -public class ProtectedInnerClass2 extends p1.ProtectedInnerClass1 -{ - class Bug extends Foo { - String getBug() { return getBar(); } - } - - public static void main(String[] args) { - ProtectedInnerClass2 x = new ProtectedInnerClass2(); - Bug y = x.new Bug(); - System.out.println(y.getBug()); - } -}
--- a/test/tools/javac/ProtectedInnerClass/p2/ProtectedInnerClass3.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2000, 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. - */ - -/* - * Auxiliary file for ProtectedInnerClass_2.java (bugid 4307565) - */ - -package p2; - -public class ProtectedInnerClass3 { - - void test() { - p1.ProtectedInnerClass1.Foo x; - } - -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/T4965689/ClassLiteralWastesByteTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,66 @@ +/* + * 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. + */ + +/* + * @test + * @bug 4965689 + * @summary class literal code wastes a byte + */ + +import java.io.PrintWriter; +import java.io.StringWriter; +import java.nio.file.Paths; + +public class ClassLiteralWastesByteTest { + + private static final String assertionErrorMsg = + "Instead of ldc_w, ldc instruction should have been generated"; + + public static void main(String[] args) { + new ClassLiteralWastesByteTest().run(); + } + + void run() { + check("-c", Paths.get(System.getProperty("test.classes"), + "test.class").toString()); + } + + void check(String... params) { + StringWriter s; + String out; + try (PrintWriter pw = new PrintWriter(s = new StringWriter())) { + com.sun.tools.javap.Main.run(params, pw); + out = s.toString(); + } + if (out.contains("ldc_w")) { + throw new AssertionError(assertionErrorMsg); + } + } + +} + +class test { + void m() { + Class<?> aClass = test.class; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/T5053846/MethodRefDupInConstantPoolTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,110 @@ +/* + * 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. + */ + +/* + * @test + * @bug 5053846 8011432 + * @summary javac: MethodRef entries are duplicated in the constant pool + * @summary javac, compiler regression iterable + captured type + */ + +import java.io.PrintWriter; +import java.io.StringWriter; +import java.nio.file.Paths; +import java.util.*; + +public class MethodRefDupInConstantPoolTest { + + private static final String methodToLookFor = + "java/util/Vector.iterator:()Ljava/util/Iterator;"; + + public static void main(String[] args) { + new MethodRefDupInConstantPoolTest().run(); + } + + void run() { + check("-v", Paths.get(System.getProperty("test.classes"), + this.getClass().getSimpleName() + "$TestHelper1.class").toString()); + check("-v", Paths.get(System.getProperty("test.classes"), + this.getClass().getSimpleName() + "$TestHelper2.class").toString()); + check("-v", Paths.get(System.getProperty("test.classes"), + this.getClass().getSimpleName() + "$TestHelper3.class").toString()); + check("-v", Paths.get(System.getProperty("test.classes"), + this.getClass().getSimpleName() + "$TestHelper4.class").toString()); + } + + void check(String... params) { + StringWriter s; + String out; + try (PrintWriter pw = new PrintWriter(s = new StringWriter())) { + com.sun.tools.javap.Main.run(params, pw); + out = s.toString(); + } + String constantPool = getConstantPool(out); + if (constantPool.indexOf(methodToLookFor) != + constantPool.lastIndexOf(methodToLookFor)) { + throw new AssertionError("There is more than one entry for the method seek " + + methodToLookFor); + } + } + + String getConstantPool(String out) { + int start = out.indexOf("Constant pool:"); + int end = out.indexOf("{"); + return out.substring(start, end); + } + + class TestHelper1 { + void m() { + Vector v = new Vector(); + Iterator iter = v.iterator(); + while (iter.hasNext()) { + Object o = iter.next(); + Object o2 = o; + } + for (Object o: v) { + Object o2 = o; + } + } + } + + class TestHelper2<X extends Number & Iterable<String>> { + void test(X x) { + for (String s : x) { } + } + } + + interface Data extends Iterable<String> {} + + class TestHelper3<X extends Number & Iterable<? extends Data>> { + void test(X x) { + for (Data s : x) { } + } + } + + class TestHelper4 { + void test(Iterable<? extends Data> t) { + for(Object a: t.iterator().next()); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/T5090006/AssertionFailureTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,69 @@ +/* + * 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. + */ + +/* + * @test + * @bug 5090006 + * @summary javac fails with assertion error + * @library /tools/javac/lib + * @build ToolBox + * @run main AssertionFailureTest + */ + +import java.io.File; +import java.nio.file.Paths; + +//original test: test/tools/javac/T5090006/compiler.sh +public class AssertionFailureTest { + + private static final String testSrc = + "import stub_tie_gen.wsdl_hello_lit.client.*;\n" + + "import junit.framework.*;\n" + + "import testutil.ClientServerTestUtil;\n" + + "\n" + + "public class Test {\n" + + "\n" + + " void getStub() throws Exception {\n" + + " Hello_PortType_Stub x = null;\n" + + " new ClientServerTestUtil().setTransport(x, null, null, null);\n" + + " }\n" + + "\n" + + " public static void main(String[] args) {\n" + + " System.out.println(\"FISK\");\n" + + " }\n" + + "}"; + + public static void main(String args[]) throws Exception { + String classpath = Paths.get(System.getProperty("test.src"), "broken.jar") + .toString(); + classpath = new StringBuilder(classpath) + .append(File.pathSeparator).append(".").toString(); +// "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -verbose -d "${TESTCLASSES}" -cp "${TESTSRC}${FS}broken.jar" "${TESTSRC}${FS}$1" + ToolBox.JavaToolArgs params = + new ToolBox.JavaToolArgs() + .setOptions("-cp", classpath) + .setSources(testSrc); + ToolBox.javac(params); + } + +}
--- a/test/tools/javac/T5090006/T5090006.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2004, 2006, 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. - */ - -/* - * @test - * @bug 5090006 - * @summary javac fails with assertion error - * @author Peter von der Ah\u00e9 - * @run shell compiler.sh T5090006.java - * @run main T5090006 - */ - -import stub_tie_gen.wsdl_hello_lit.client.*; -import junit.framework.*; -import testutil.ClientServerTestUtil; - -public class T5090006 { - - void getStub() throws Exception { - Hello_PortType_Stub x = null; - new ClientServerTestUtil().setTransport(x, null, null, null); - } - - public static void main(String[] args) { - System.out.println("FISK"); - } -}
--- a/test/tools/javac/T5090006/compiler.sh Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 2004, 2009, 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. -# - - -if [ "${TESTSRC}" = "" ] -then - echo "TESTSRC not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTSRC=${TESTSRC}" -if [ "${TESTJAVA}" = "" ] -then - echo "TESTJAVA not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTJAVA=${TESTJAVA}" -if [ "${TESTCLASSES}" = "" ] -then - echo "TESTCLASSES not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTCLASSES=${TESTCLASSES}" -echo "CLASSPATH=${CLASSPATH}" - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin | CYGWIN* ) - FS="/" - ;; - Windows* ) - FS="\\" - ;; - * ) - echo "Unrecognized system!" - exit 1; - ;; -esac - -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -verbose -d "${TESTCLASSES}" -cp "${TESTSRC}${FS}broken.jar" "${TESTSRC}${FS}$1" - -result=$? - -if [ $result -eq 0 ] -then - echo "Passed" -else - echo "Failed" -fi -exit $result
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/T6181889/EmptyFinallyTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,67 @@ + +import java.io.PrintWriter; +import java.io.StringWriter; +import java.nio.file.Paths; + +/* + * 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. + */ + +/* + * @test + * @bug 6181889 + * @summary Empty try/finally results in bytecodes being generated + */ + +public class EmptyFinallyTest { + private static final String assertionErrorMsg = + "No \"Exception table\" should be generated in this case"; + + public static void main(String[] args) { + new EmptyFinallyTest().run(); + } + + void run() { + check("-c", Paths.get(System.getProperty("test.classes"), + "EmptyFinally.class").toString()); + } + + void check(String... params) { + StringWriter s; + String out; + try (PrintWriter pw = new PrintWriter(s = new StringWriter())) { + com.sun.tools.javap.Main.run(params, pw); + out = s.toString(); + } + if (out.contains("Exception table")) { + throw new AssertionError(assertionErrorMsg); + } + } +} + +class EmptyFinally { + void m() { + try { + System.out.println("EMPTY TRY!"); + } finally {} + } +}
--- a/test/tools/javac/T6558476.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/T6558476.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 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,6 +23,8 @@ /* * @test + * @bug 6558476 + * @summary com/sun/tools/javac/Main.compile don't release file handles on return * @run main/othervm -Xmx512m -Xms512m T6558476 */ @@ -83,8 +85,7 @@ public static void main2(String[] args) throws IOException { File javaHomeDir = new File(System.getProperty("java.home")); - File tmpDir = new File(System.getProperty("java.io.tmpdir")); - File outputDir = new File(tmpDir, "outputDir" + new Random().nextInt(65536)); + File outputDir = new File("outputDir" + new Random().nextInt(65536)); outputDir.mkdir(); outputDir.deleteOnExit();
--- a/test/tools/javac/T6900149.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/T6900149.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 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 @@ -39,7 +39,7 @@ JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); StandardJavaFileManager fm = compiler.getStandardFileManager(null, null, null); - File emptyFile = File.createTempFile("Empty", ".java"); + File emptyFile = createTempFile("Empty.java"); File[] files = new File[] { emptyFile, emptyFile }; CompilationTask task = compiler.getTask(null, fm, diag, null, null, fm.getJavaFileObjects(files)); @@ -47,4 +47,10 @@ throw new AssertionError("compilation failed"); } } + + private static File createTempFile(String path) throws IOException { + File f = new File(path); + try (FileWriter out = new FileWriter(f)) { } + return f; + } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/T8004969.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,103 @@ +/* + * 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. + */ + +/* +@test +@bug 8004969 +@summary Lambda deserialization + +*/ + +import java.io.*; + +public class T8004969 implements Serializable { + + static int assertionCount = 0; + + static void assertTrue(boolean cond) { + assertionCount++; + if (!cond) + throw new AssertionError(); + } + + static String mm(String s) { return "mref" + s; } + + String aField = "aF"; + + public static void main(String[] args) throws Exception { + (new T8004969()).doit(); + } + + public void doit() throws Exception { + String aLocal = "aL"; + int anInt = 99; + + try { + // Write lambdas out + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(baos); + + write(out, z -> "[" + z + "]" ); + write(out, z -> { String x = z + z; return x + x; } ); + write(out, T8004969::mm ); + write(out, z -> (new LSI() { public String convert(String x) { return "*"+x; }} ).convert(z) ); + write(out, z -> aField + z ); + write(out, z -> aLocal + z ); + write(out, z -> z + anInt ); + out.flush(); + out.close(); + + // Read them back + ByteArrayInputStream bais = + new ByteArrayInputStream(baos.toByteArray()); + ObjectInputStream in = new ObjectInputStream(bais); + readAssert(in, "[X]"); + readAssert(in, "XXXX"); + readAssert(in, "mrefX"); + readAssert(in, "*X"); + readAssert(in, "aFX"); + readAssert(in, "aLX"); + readAssert(in, "X99"); + in.close(); + } catch (IOException e) { + e.printStackTrace(); + throw e; + } + assertTrue(assertionCount == 7); + } + + static void write(ObjectOutput out, LSI lamb) throws IOException { + out.writeObject(lamb); + } + + static void readAssert(ObjectInputStream in, String expected) throws IOException, ClassNotFoundException { + LSI ls = (LSI) in.readObject(); + String result = ls.convert("X"); + System.out.printf("Result: %s\n", result); + assertTrue(result.equals(expected)); + } +} + +interface LSI extends Serializable { + String convert(String x); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/T8010659/CompilerCrashWhenMixingBinariesAndSourcesTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,66 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +/* + * @test + * @bug 8010659 + * @summary Javac Crashes while building OpenJFX + * @library /tools/javac/lib + * @build ToolBox + * @run main CompilerCrashWhenMixingBinariesAndSourcesTest + */ + +public class CompilerCrashWhenMixingBinariesAndSourcesTest { + private static final String ASource = + "class A {\n" + + " void test() {new B(){};}\n" + + "}"; + private static final String BSource = + "class B extends C {}"; + private static final String CSource = + "class C extends D {\n" + + " String m(int i) {return null;}\n" + + "}"; + private static final String DSource = + "class D {\n" + + " Object m(int i) {return null;}\n" + + "}"; + + public static void main (String[] args) throws Exception{ + ToolBox.JavaToolArgs javacParams = new ToolBox.JavaToolArgs() + .setSources(ASource, BSource, CSource, DSource); + ToolBox.javac(javacParams); + + ToolBox.rm("A.class"); + ToolBox.rm("A$1.class"); + ToolBox.rm("C.class"); + ToolBox.rm("D.class"); + + javacParams = new ToolBox.JavaToolArgs() + .setOptions("-cp", ".") + .setSources(ASource, CSource, DSource); + ToolBox.javac(javacParams); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/T8011181/EmptyUTF8ForInnerClassNameTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,81 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +/* + * @test + * @bug 8011181 + * @summary javac, empty UTF8 entry generated for inner class + */ + +import java.io.BufferedInputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +import com.sun.tools.javac.util.Assert; +import com.sun.tools.classfile.ClassFile; + +import static com.sun.tools.classfile.ConstantPool.CONSTANT_Utf8; +import static com.sun.tools.classfile.ConstantPool.CONSTANT_Utf8_info; +import static com.sun.tools.classfile.ConstantPool.CPInfo; + +public class EmptyUTF8ForInnerClassNameTest { + + public static void main(String[] args) throws Exception { + new EmptyUTF8ForInnerClassNameTest().run(); + } + + void run() throws Exception { + checkClassFile(Paths.get(System.getProperty("test.classes"), + this.getClass().getName() + "$1.class")); + checkClassFile(Paths.get(System.getProperty("test.classes"), + this.getClass().getName() + "$EnumPlusSwitch.class")); + } + + void checkClassFile(final Path path) throws Exception { + ClassFile classFile = ClassFile.read( + new BufferedInputStream(Files.newInputStream(path))); + for (CPInfo cpInfo : classFile.constant_pool.entries()) { + if (cpInfo.getTag() == CONSTANT_Utf8) { + CONSTANT_Utf8_info utf8Info = (CONSTANT_Utf8_info)cpInfo; + Assert.check(utf8Info.value.length() > 0, + "UTF8 with length 0 found at class " + classFile.getName()); + } + } + } + + static class EnumPlusSwitch { + enum E {E1} + + public int m (E e) { + switch (e) { + case E1: + return 0; + } + return -1; + } + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/repeatingAnnotations/DefaultTarget.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,47 @@ +/* + * 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. + */ + +import java.lang.annotation.*; + +/** + * @test + * @bug 8006547 + * @compile DefaultTarget.java + */ + +@Target({ + ElementType.CONSTRUCTOR, + ElementType.PARAMETER, + ElementType.TYPE, + ElementType.METHOD, + ElementType.LOCAL_VARIABLE, + ElementType.PACKAGE, + ElementType.ANNOTATION_TYPE, + ElementType.FIELD, +}) +@interface Container { + DefaultTarget[] value(); +} + +@Repeatable(Container.class) +public @interface DefaultTarget {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeParameter.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,40 @@ +/* + * 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. + */ + +import java.lang.annotation.*; + +/** + * @test + * @bug 8006547 + * @compile/fail/ref=DefaultTargetTypeParameter.out -XDrawDiagnostics DefaultTargetTypeParameter.java + */ + +@Target({ + ElementType.TYPE_PARAMETER, +}) +@interface Container { + DefaultTargetTypeParameter[] value(); +} + +@Repeatable(Container.class) +public @interface DefaultTargetTypeParameter {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeParameter.out Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,2 @@ +DefaultTargetTypeParameter.java:39:1: compiler.err.invalid.repeatable.annotation.incompatible.target: Container, DefaultTargetTypeParameter +1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeUse.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,40 @@ +/* + * 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. + */ + +import java.lang.annotation.*; + +/** + * @test + * @bug 8006547 + * @compile/fail/ref=DefaultTargetTypeUse.out -XDrawDiagnostics DefaultTargetTypeUse.java + */ + +@Target({ + ElementType.TYPE_USE, +}) +@interface Container { + DefaultTargetTypeUse[] value(); +} + +@Repeatable(Container.class) +public @interface DefaultTargetTypeUse {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeUse.out Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,2 @@ +DefaultTargetTypeUse.java:39:1: compiler.err.invalid.repeatable.annotation.incompatible.target: Container, DefaultTargetTypeUse +1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/repeatingAnnotations/DuplicateErrors.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,37 @@ +/* + * 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. + */ + +/** + * @test + * @bug 7196531 + * @compile/fail/ref=DuplicateErrors.out -XDrawDiagnostics DuplicateErrors.java + */ + + +@interface Foo {} + +@Foo +@Foo +@Foo +public class DuplicateErrors { +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/repeatingAnnotations/DuplicateErrors.out Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,3 @@ +DuplicateErrors.java:34:1: compiler.err.duplicate.annotation.missing.container: Foo, java.lang.annotation.Repeatable +DuplicateErrors.java:35:1: compiler.err.duplicate.annotation.missing.container: Foo, java.lang.annotation.Repeatable +2 errors
--- a/test/tools/javac/annotations/repeatingAnnotations/MissingContainer.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/repeatingAnnotations/MissingContainer.java Tue May 07 17:14:17 2013 -0700 @@ -1,6 +1,6 @@ /** * @test /nodynamiccopyright/ - * @bug 7169362 + * @bug 7169362 8001114 * @author sogoel * @summary ContainerAnnotation does not have FooContainer.class specified * @compile/fail/ref=MissingContainer.out -XDrawDiagnostics MissingContainer.java
--- a/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.java Tue May 07 17:14:17 2013 -0700 @@ -1,6 +1,6 @@ /** * @test /nodynamiccopyright/ - * @bug 7169362 + * @bug 7169362 8001114 * @author sogoel * @summary Default case not specified for other methods in container annotation * @compile/fail/ref=MissingDefaultCase1.out -XDrawDiagnostics MissingDefaultCase1.java
--- a/test/tools/javac/annotations/repeatingAnnotations/NoRepeatableAnno.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/repeatingAnnotations/NoRepeatableAnno.out Tue May 07 17:14:17 2013 -0700 @@ -1,3 +1,2 @@ -NoRepeatableAnno.java:11:1: compiler.err.duplicate.annotation.missing.container: Foo, java.lang.annotation.Repeatable NoRepeatableAnno.java:11:6: compiler.err.duplicate.annotation.missing.container: Foo, java.lang.annotation.Repeatable -2 errors +1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/repeatingAnnotations/NoTargetOnContainer.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,49 @@ +/* + * 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. + */ + +import java.lang.annotation.*; + +/** + * @test + * @bug 8006547 + * @compile NoTargetOnContainer.java + */ + +@interface FooContainer { + Foo[] value(); +} + +@Target({ + ElementType.CONSTRUCTOR, + ElementType.PARAMETER, + ElementType.TYPE, + ElementType.METHOD, + ElementType.LOCAL_VARIABLE, + ElementType.PACKAGE, + ElementType.ANNOTATION_TYPE, + ElementType.FIELD, +}) +@Repeatable(FooContainer.class) +@interface Foo {} + +class NoTargetOnContainer {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/repeatingAnnotations/NoTargetOnContainer2.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,50 @@ +/* + * 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. + */ + +import java.lang.annotation.*; + +/** + * @test + * @bug 8006547 + * @compile NoTargetOnContainer2.java + */ + +@interface FooContainer { + Foo[] value(); +} + +@Target({ + ElementType.CONSTRUCTOR, + ElementType.PARAMETER, + ElementType.TYPE, + ElementType.METHOD, + ElementType.LOCAL_VARIABLE, + ElementType.PACKAGE, + ElementType.ANNOTATION_TYPE, + ElementType.FIELD, + ElementType.TYPE_USE, + ElementType.TYPE_PARAMETER}) +@Repeatable(FooContainer.class) +@interface Foo {} + +class NoTargetOnContainer2 {}
--- a/test/tools/javac/annotations/repeatingAnnotations/combo/Helper.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/repeatingAnnotations/combo/Helper.java Tue May 07 17:14:17 2013 -0700 @@ -21,37 +21,51 @@ * questions. */ +import java.io.File; +import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.util.Arrays; +import java.util.Iterator; + +import javax.tools.Diagnostic; import javax.tools.DiagnosticCollector; import javax.tools.JavaCompiler; +import javax.tools.JavaCompiler.CompilationTask; import javax.tools.JavaFileObject; import javax.tools.SimpleJavaFileObject; +import javax.tools.StandardJavaFileManager; +import javax.tools.StandardLocation; import javax.tools.ToolProvider; -import javax.tools.JavaCompiler.CompilationTask; + +import com.sun.source.util.JavacTask; public class Helper { enum ContentVars { + IMPORTCONTAINERSTMTS("\nimport java.lang.annotation.Repeatable;\n"), IMPORTDEPRECATED("import java.lang.Deprecated;\n"), IMPORTDOCUMENTED("import java.lang.annotation.Documented;\n"), IMPORTINHERITED("import java.lang.annotation.Inherited;\n"), - IMPORTRETENTION("import java.lang.annotation.Retention;\n" + - "\nimport java.lang.annotation.RetentionPolicy;\n"), + IMPORTRETENTION("import java.lang.annotation.Retention;\n" + + "\nimport java.lang.annotation.RetentionPolicy;\n"), + IMPORTSTMTS("import java.lang.annotation.*;\n"), + IMPORTEXPECTED("import expectedFiles.*;\n"), REPEATABLE("\n@Repeatable(FooContainer.class)\n"), - CONTAINER("@interface FooContainer {\n" +" Foo[] value();\n}\n"), + CONTAINER("@interface FooContainer {\n" + " Foo[] value();\n}\n"), BASE("@interface Foo {}\n"), + BASEANNO("@Foo"), + LEGACYCONTAINER("@FooContainer(value = {@Foo, @Foo})\n"), REPEATABLEANNO("\n@Foo() @Foo()"), DEPRECATED("\n@Deprecated"), DOCUMENTED("\n@Documented"), INHERITED("\n@Inherited"), - RETENTION("@Retention(RetentionPolicy.#VAL)\n"); - + TARGET("\n@Target(#VAL)\n"), + RETENTION("@Retention(RetentionPolicy.#VAL)\n"), + RETENTIONRUNTIME("@Retention(RetentionPolicy.RUNTIME)\n"); private String val; - private ContentVars(String val) { this.val = val; } @@ -61,44 +75,6 @@ } } - /* String template where /*<TYPE>*/ /*gets replaced by repeating anno - * Used to generate test src for combo tests - * - BasicSyntaxCombo.java - * - TargetAnnoCombo.java - */ - public static final String template = - "/*PACKAGE*/\n" + - "//pkg test;\n\n" + - "/*TYPE*/ //class\n" + - "class #ClassName {\n" + - " /*FIELD*/ //instance var\n" + - " public int x = 0;\n\n" + - " /*FIELD*/ //Enum constants\n" + - " TestEnum testEnum;\n\n" + - " /*FIELD*/ // Static field\n" + - " public static int num;\n\n" + - " /*STATIC_INI*/\n" + - " static { \n" + "num = 10; \n }\n\n" + - " /*CONSTRUCTOR*/\n" + - " #ClassName() {}\n\n" + - " /*INSTANCE_INI*/\n" + - " { \n x = 10; \n }" + - " /*INNER_CLASS*/\n" + - " class innerClass {}\n" + - " /*METHOD*/\n" + - " void bar(/*PARAMETER*/ int baz) {\n" + - " /*LOCAL_VARIABLE*/\n" + - " int y = 0;\n" + - " }\n" + - "}\n\n" + - "/*TYPE*/ //Enum\n" + - "enum TestEnum {}\n\n" + - "/*TYPE*/ //Interface\n" + - "interface TestInterface {}\n\n" + - "/*TYPE*/\n" + - "/*ANNOTATION_TYPE*/\n" + - "@interface TestAnnotationType{}\n"; - // Create and compile FileObject using values for className and contents public static boolean compileCode(String className, String contents, DiagnosticCollector<JavaFileObject> diagnostics) { @@ -114,21 +90,97 @@ CompilationTask task = compiler.getTask(null, null, diagnostics, null, null, compilationUnit); ok = task.call(); return ok; - } + // Compile a list of FileObjects + // Used when packages are needed and classes need to be loaded at runtime + static File destDir = new File(System.getProperty("user.dir")); - // Compile a list of FileObjects public static boolean compileCode(DiagnosticCollector<JavaFileObject> diagnostics, Iterable<? extends JavaFileObject> files) { + boolean ok = false; JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); if (compiler == null) { throw new RuntimeException("can't get javax.tools.JavaCompiler!"); } - CompilationTask task = compiler.getTask(null, null, diagnostics, null, null, files); - boolean ok = task.call(); + StandardJavaFileManager fm = compiler.getStandardFileManager(null, null, null); + + // Assuming filesCount can maximum be 2 and if true, one file is package-info.java + if (isPkgInfoPresent(files)) { + JavacTask task = (JavacTask) compiler.getTask(null, fm, diagnostics, null, null, files); + try { + fm.setLocation(StandardLocation.CLASS_OUTPUT, Arrays.asList(destDir)); + task.generate(); + } catch (IOException ioe) { + throw new RuntimeException("Compilation failed for package level tests", ioe); + } + int err = 0; + for (Diagnostic<? extends JavaFileObject> d : diagnostics.getDiagnostics()) { + if(d.getKind() == Diagnostic.Kind.ERROR) { + err++; + } + } + ok = (err == 0); + } else { + CompilationTask task = compiler.getTask(null, null, diagnostics, null, null, files); + ok = task.call(); + } return ok; } + static private boolean isPkgInfoPresent(Iterable<? extends JavaFileObject> files) { + Iterator<? extends JavaFileObject> itr = files.iterator(); + while (itr.hasNext()) { + String name = itr.next().getName(); + if (name.contains("package-info")) { + return true; + } + } + return false; + } + /* String template where /*<TYPE>*/ /*gets replaced by repeating anno + * Used to generate test src for combo tests + * - BasicSyntaxCombo.java + * - TargetAnnoCombo.java + */ + + public static final String template = + "/*PACKAGE*/\n" + + "//pkg test;\n\n" + + "/*ANNODATA*/\n" // import statements, declaration of Foo/FooContainer + + "/*TYPE*/ //class\n" + + "class #ClassName {\n" + + " /*FIELD*/ //instance var\n" + + " public int x = 0;\n\n" + + " /*FIELD*/ //Enum constants\n" + + " TestEnum testEnum;\n\n" + + " /*FIELD*/ // Static field\n" + + " public static int num;\n\n" + + " /*STATIC_INI*/\n" + + " static { \n" + "num = 10; \n }\n\n" + + " /*CONSTRUCTOR*/\n" + + " #ClassName() {}\n\n" + + " /*INSTANCE_INI*/\n" + + " { \n x = 10; \n }" + + " /*INNER_CLASS*/\n" + + " class innerClass {}\n" + + " /*METHOD*/\n" + + " void bar(/*PARAMETER*/ int baz) {\n" + + " /*LOCAL_VARIABLE*/\n" + + " int y = 0;\n" + + " }\n" + + "}\n\n" + + "/*TYPE*/ //Enum\n" + + "enum TestEnum {}\n\n" + + "/*TYPE*/ //Interface\n" + + "interface TestInterface {}\n\n" + + "/*TYPE*/\n" + + "/*ANNOTATION_TYPE*/\n" + + "@interface TestAnnotationType{}\n" + + "class TestPkg {}\n" + + "class TestTypeAnno </*TYPE_PARAMETER*/ T extends Object> {\n" + + " String /*TYPE_USE*/[] arr;\n" + + "}"; + static JavaFileObject getFile(String name, String code) { JavaFileObject o = null; try { @@ -138,12 +190,16 @@ } return o; } + static class JavaStringFileObject extends SimpleJavaFileObject { + final String theCode; + public JavaStringFileObject(String fileName, String theCode) throws URISyntaxException { - super(new URI("string:///" + fileName.replace('.','/') + ".java"), Kind.SOURCE); + super(new URI("string:///" + fileName.replace('.', '/') + ".java"), Kind.SOURCE); this.theCode = theCode; } + @Override public CharSequence getCharContent(boolean ignoreEncodingErrors) { return theCode;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/repeatingAnnotations/combo/ReflectionTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,2932 @@ +/* + * 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. + */ + +/** + * @test + * @bug 8001457 + * @author sogoel + * @summary Reflection api tests + * @build Helper + * @compile expectedFiles/ExpectedBase.java expectedFiles/ExpectedContainer.java + * @run main ReflectionTest + */ +import java.io.File; +import java.io.IOException; +import java.lang.annotation.Annotation; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import javax.tools.DiagnosticCollector; +import javax.tools.JavaFileObject; + +import expectedFiles.ExpectedBase; +import expectedFiles.ExpectedContainer; + +/* + * Objective: + * Test the following 6 methods from java.lang.reflect.AnnotatedElement: + * - getAnnotation(Class<T>) + * - getAnnotations() + * - getDeclaredAnnotations() + * - getDeclaredAnnotation(Class<T>) // new method in JDK8 + * - getAnnotationsByType(Class<T>) // new method in JDK8 + * - getDeclaredAnnotationsByType(Class<T>) // new method in JDK8 + * for multiple test cases, for example, BasicNonRepeatable case, BasicRepeatable case + * for each of the src types - class, method, field, package + * + * This test uses following three enums: + * 1. TestCase - Defines the ExpectedBase/ExpectedContainer values for each testCase + * - getTestFiles() - Creates list of JavaFileObjects for the primary + * src types (class, method, field, package) + * - Each testCase is a new scenario with a combination of @Repeatable + * relationship present/absent in conjunction with @Inherited. + * For eg: BasicNonRepeatable_Legacy - It is a pre-JDK8 way of writing a single + * annotation on a given srcType( class, method, field, package) + * BasicRepeatable - It is a JDK8 way of writing repeating annotations + * on a given srcType with a @Repeatable relationship + * defined between Foo and FooContainer. + * + * 2. SrcType - Defines templates used in creation of test src + * - Defines getExpectedBase() and getExpectedContainer() for primary src types + * 3. TestMethod - Defines getActualAnnoBase(), getActualAnnoContainer(), getExpectedAnnoBase(), + * and getExpectedAnnoContainer() for each of the 6 methods that are being tested + * in java.lang.reflect.AnnotatedElement + * + * Test execution flow: + * - Loop over each of the src types and each test cases + * - Creates test src for each flow, compile it, load the class object + * - Run all 6 methods on this class object + * - Get expected and actual annotations for each object and compare them. + * - Increment the error counter if the annotations don't match. + * + * The test fails if the number of errors is greater than 0. + */ +public class ReflectionTest { + + static int errors = 0; + // Variables used in creating test src for a given testcase/testSrcType + static final String TESTPKG = "testpkg"; + static final String TESTMETHOD = "testMethod"; + static final String TESTFIELD = "testField"; + static final String PKGINFONAME = TESTPKG + ".package-info"; + static final String SUPERCLASS = "SuperClass"; + static final String TESTINTERFACE = "TestInterface"; + /* + * Set it to true to get more debug information + */ + static final boolean DEBUG = false; + + public static void main(String args[]) throws Exception { + ReflectionTest test = new ReflectionTest(); + test.runTest(); + } + + public void runTest() throws Exception { + + ClassLoader parentClassLoader = getLoader(); + String className = ""; + Iterable<? extends JavaFileObject> files = null; + + for (SrcType srcType : SrcType.getSrcTypes()) { + for (TestCase testCase : TestCase.values()) { + className = testCase + "_" + srcType; + debugPrint("*****************************************"); + System.out.println("Running Test for ClassName: " + className); + + // @Inherited only applicable for class, exclude cases for + // package, method, field + if (testCase.name().contains("Inherited") + && (srcType != SrcType.CLASS)) { + continue; + } + + // Get list of JavaFileObjects to be compiled + files = testCase.getTestFiles(srcType, className); + if (srcType == SrcType.PACKAGE) { + className = TESTPKG + "." + className; + } + DiagnosticCollector<JavaFileObject> diagnostics = new DiagnosticCollector<>(); + + // Compile the list of JavaFileObjects + try { + Helper.compileCode(diagnostics, files); + } catch (Exception ex) { + printTestSrc(files); + throw new RuntimeException( + "Exception when compiling class " + className, ex); + } + + // Get Class object for the compiled class + Class<?> c = loadClass(className, parentClassLoader, Helper.destDir); + if (c != null) { + // For the loaded class object, compare expected and actual annotation values + // for each of the methods under test from java.lang.reflect.AnnotatedElement + checkAnnoValues(srcType, c); + } else { + error("Could not load className = " + c); + } + } + } + + if (getNumErrors() > 0) { + System.err.println("Test failed with " + getNumErrors() + " errors"); + throw new RuntimeException(); + } + } + + /* + * Each test case in this enum has the following: + * - Define each test case with its @ExpectedBase and @ExpectedContainer annotations + * - Override getTestFiles() that creates list of JavaFileObjects for each case + * based on the src type. + */ + enum TestCase { + BasicNonRepeatable_Legacy( + "@ExpectedBase(value=Foo.class, " + + "getAnnotationVal = \"Foo\", " + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"Foo\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"Foo\"}, " + + "getDeclAnnoVal = \"Foo\", " + + "getAnnosArgs = {\"Foo\"}, " + + "getDeclAnnosArgs = {\"Foo\"}) ", + "@ExpectedContainer") { + + @Override + public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, + String className) { + String anno = ""; + String replaceVal = ""; + String testSrc = ""; + String pkgInfoContents = ""; + String contents = ""; + + JavaFileObject pkgFileObj = null; + JavaFileObject srcFileObj = null; + Iterable<? extends JavaFileObject> files = null; + + String expectedVals = "\n" + getExpectedBase() + "\n" + + getExpectedContainer() + "\n"; + StringBuilder commonStmts = new StringBuilder(); + anno = Helper.ContentVars.BASEANNO.getVal(); + commonStmts.append(Helper.ContentVars.IMPORTEXPECTED.getVal()) + .append(Helper.ContentVars.IMPORTSTMTS.getVal()) + .append(Helper.ContentVars.RETENTIONRUNTIME.getVal()) + .append(Helper.ContentVars.BASE.getVal()); + switch (srcType) { + case PACKAGE: + /* + Sample package-info.java + @ExpectedBase + @ExpectedContainer + @Foo + package testpkg; + + @Retention(RetentionPolicy.RUNTIME) + @interface Foo {} + + Sample testSrc: + package testpkg; + class A {} + */ + testSrc = srcType.getTemplate().replace("#CN", className); + contents = testSrc; + srcFileObj = Helper.getFile(className, contents); + + replaceVal = expectedVals + "\n" + anno; + pkgInfoContents = SrcType.PKGINFO.getTemplate() + .replace("#REPLACE1", replaceVal) + .replace("#REPLACE2", commonStmts); + pkgFileObj = Helper.getFile(PKGINFONAME, pkgInfoContents); + + files = Arrays.asList(pkgFileObj, srcFileObj); + break; + default: + // class, method, field + /* + Sample testSrc for class + @Retention(RetentionPolicy.RUNTIME) + @interface Foo {} + + @ExpectedBase + @ExpectedContainer + @Foo + class A {} + */ + replaceVal = expectedVals + anno; + testSrc = srcType.getTemplate().replace("#CN", className) + .replace("#REPLACE", replaceVal); + contents = commonStmts + testSrc; + srcFileObj = Helper.getFile(className, contents); + files = Arrays.asList(srcFileObj); + } + return files; + } + }, + SingleAnnoInherited_Legacy( + "@ExpectedBase(value=Foo.class, " + + "getAnnotationVal = \"Foo\", " + + "getAnnotationsVals = {\"Foo\", \"ExpectedBase\", \"ExpectedContainer\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\"}, " + + "getDeclAnnoVal = \"NULL\", " + + "getAnnosArgs = {\"Foo\"}, " + + "getDeclAnnosArgs = {})", + "@ExpectedContainer") { + + @Override + public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, + String className) { + String anno = ""; + String replaceVal = ""; + String contents = ""; + JavaFileObject srcFileObj = null; + Iterable<? extends JavaFileObject> files = null; + + String expectedVals = "\n" + getExpectedBase() + "\n" + + getExpectedContainer() + "\n"; + StringBuilder commonStmts = new StringBuilder(); + + /* + Sample testSrc: + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @interface Foo {} + + @Foo + class SuperClass { } + + @ExpectedBase + @ExpectedContainer + class SubClass extends SuperClass {} + */ + + // @Inherited only works for classes, no switch cases for + // method, field, package + anno = Helper.ContentVars.BASEANNO.getVal(); + commonStmts.append(Helper.ContentVars.IMPORTEXPECTED.getVal()) + .append(Helper.ContentVars.IMPORTSTMTS.getVal()) + .append(Helper.ContentVars.RETENTIONRUNTIME.getVal()) + .append(Helper.ContentVars.INHERITED.getVal()) + .append(Helper.ContentVars.BASE.getVal()); + + if (srcType == SrcType.CLASS) { + // Contents for SuperClass + replaceVal = commonStmts + "\n" + anno; + String superClassContents = srcType.getTemplate() + .replace("#CN", SUPERCLASS).replace("#REPLACE", replaceVal); + + // Contents for SubClass that extends SuperClass + replaceVal = expectedVals; + String subClassContents = SrcType.CLASSEXTENDS.getTemplate() + .replace("#CN", className).replace("#SN", SUPERCLASS) + .replace("#REPLACE", replaceVal); + + contents = superClassContents + subClassContents; + srcFileObj = Helper.getFile(className, contents); + files = Arrays.asList(srcFileObj); + } + return files; + } + }, + InheritedAnnoOnInterface_Legacy( + "@ExpectedBase(value=Foo.class, " + + "getAnnotationVal = \"NULL\", " + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\"}," + + "getDeclAnnoVal = \"NULL\"," + "getAnnosArgs = {}," + + "getDeclAnnosArgs = {})", + "@ExpectedContainer") { + + @Override + public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, + String className) { + String anno = ""; + String replaceVal = ""; + String contents = ""; + JavaFileObject srcFileObj = null; + Iterable<? extends JavaFileObject> files = null; + + String expectedVals = "\n" + getExpectedBase() + "\n" + + getExpectedContainer() + "\n"; + StringBuilder commonStmts = new StringBuilder(); + + /* + Sample test src: + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @interface Foo {} + + @Foo + interface TestInterface { } + + @ExpectedBase + @ExpectedContainer + class A implements TestInterface {} + */ + anno = Helper.ContentVars.BASEANNO.getVal(); + commonStmts.append(Helper.ContentVars.IMPORTEXPECTED.getVal()) + .append(Helper.ContentVars.IMPORTSTMTS.getVal()) + .append(Helper.ContentVars.RETENTIONRUNTIME.getVal()) + .append(Helper.ContentVars.INHERITED.getVal()) + .append(Helper.ContentVars.BASE.getVal()); + + if (srcType == SrcType.CLASS) { + // Contents for TestInterface + replaceVal = commonStmts + "\n" + anno; + String interfaceContents = SrcType.INTERFACE.getTemplate() + .replace("#IN", TESTINTERFACE) + .replace("#REPLACE", replaceVal); + + // Contents for class implementing TestInterface + replaceVal = expectedVals; + String classContents = SrcType.INTERFACEIMPL.getTemplate() + .replace("#CN", className).replace("#IN", TESTINTERFACE) + .replace("#REPLACE", replaceVal); + + contents = interfaceContents + classContents; + srcFileObj = Helper.getFile(className, contents); + files = Arrays.asList(srcFileObj); + } + return files; + } + }, + AnnoOnSuperAndSubClass_Inherited_Legacy( + "@ExpectedBase(value=Foo.class, " + + "getAnnotationVal = \"Foo\", " + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"Foo\"}, " + + // override every annotation on superClass + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"Foo\"}, " + + // ignores inherited annotations + "getDeclAnnoVal = \"Foo\", " // ignores inherited + + "getAnnosArgs = {\"Foo\"}, " + + "getDeclAnnosArgs = { \"Foo\" })", // ignores inherited + "@ExpectedContainer(value=FooContainer.class, " + + "getAnnotationVal = \"NULL\", " + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"Foo\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"Foo\"}, " + + // ignores inherited annotations + "getDeclAnnoVal = \"NULL\", " + // ignores inherited + "getAnnosArgs = {}, " + "getDeclAnnosArgs = {})") { // ignores inherited + + @Override + public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, + String className) { + String anno = ""; + String replaceVal = ""; + String contents = ""; + JavaFileObject srcFileObj = null; + Iterable<? extends JavaFileObject> files = null; + + String expectedVals = "\n" + getExpectedBase() + "\n" + + getExpectedContainer() + "\n"; + StringBuilder commonStmts = new StringBuilder(); + + /* + Sample test src + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @interface Foo {} + + @Inherited + @interface FooContainer { + Foo[] value(); + } + + @Foo + class SuperClass { } + + @ExpectedBase + @ExpectedContainer + @Foo + class SubClass extends SuperClass {} + */ + // @Inherited only works for classes, no switch cases for + // method, field, package + commonStmts.append(Helper.ContentVars.IMPORTEXPECTED.getVal()) + .append(Helper.ContentVars.IMPORTSTMTS.getVal()) + .append(Helper.ContentVars.RETENTIONRUNTIME.getVal()) + .append(Helper.ContentVars.INHERITED.getVal()) + .append(Helper.ContentVars.BASE.getVal()) + .append(Helper.ContentVars.INHERITED.getVal()) + .append(Helper.ContentVars.CONTAINER.getVal()); + + if (srcType == SrcType.CLASS) { + // Contents for SuperClass + anno = Helper.ContentVars.BASEANNO.getVal(); + replaceVal = commonStmts + "\n" + anno; + String superClassContents = srcType.getTemplate() + .replace("#CN", SUPERCLASS).replace("#REPLACE", replaceVal); + + // Contents for SubClass that extends SuperClass + replaceVal = expectedVals + "\n" + anno; + String subClassContents = SrcType.CLASSEXTENDS.getTemplate() + .replace("#CN", className).replace("#SN", SUPERCLASS) + .replace("#REPLACE", replaceVal); + + contents = superClassContents + subClassContents; + srcFileObj = Helper.getFile(className, contents); + files = Arrays.asList(srcFileObj); + } + return files; + } + }, + BasicContainer_Legacy( + "@ExpectedBase(value = Foo.class, " + + "getAnnotationVal = \"NULL\"," + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}, " + + "getDeclAnnoVal = \"NULL\", " + "getAnnosArgs = {}, " + + "getDeclAnnosArgs = {} )", + "@ExpectedContainer(value=FooContainer.class, " + + "getAnnotationVal = \"FooContainer\", " + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}, " + + "getDeclAnnoVal = \"FooContainer\", " + + "getAnnosArgs = {\"FooContainer\"}, " + + "getDeclAnnosArgs = {\"FooContainer\"} )") { + + @Override + public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, + String className) { + String anno = ""; + String replaceVal = ""; + String testSrc = ""; + String pkgInfoContents = ""; + String contents = ""; + + JavaFileObject pkgFileObj = null; + JavaFileObject srcFileObj = null; + Iterable<? extends JavaFileObject> files = null; + + String expectedVals = "\n" + getExpectedBase() + "\n" + + getExpectedContainer() + "\n"; + StringBuilder commonStmts = new StringBuilder(); + + anno = Helper.ContentVars.LEGACYCONTAINER.getVal(); + commonStmts.append(Helper.ContentVars.IMPORTEXPECTED.getVal()) + .append(Helper.ContentVars.IMPORTSTMTS.getVal()) + .append(Helper.ContentVars.RETENTIONRUNTIME.getVal()) + .append(Helper.ContentVars.BASE.getVal()) + .append(Helper.ContentVars.RETENTIONRUNTIME.getVal()) + .append(Helper.ContentVars.CONTAINER.getVal()); + switch (srcType) { + case PACKAGE: + /* + Sample package-info.java + @ExpectedBase + @ExpectedContainer + @FooContainer(value = {@Foo, @Foo}) + package testpkg; + + @Retention(RetentionPolicy.RUNTIME) + @interface Foo {} + + @Retention(RetentionPolicy.RUNTIME) + @interface FooContainer { + Foo[] value(); + } + + Sample testSrc: + package testpkg; + class A {} + */ + testSrc = srcType.getTemplate().replace("#CN", className); + contents = testSrc; + srcFileObj = Helper.getFile(className, contents); + + replaceVal = "\n" + expectedVals + "\n" + anno; + pkgInfoContents = SrcType.PKGINFO.getTemplate() + .replace("#REPLACE1", replaceVal) + .replace("#REPLACE2", commonStmts); + pkgFileObj = Helper.getFile(PKGINFONAME, pkgInfoContents); + files = Arrays.asList(pkgFileObj, srcFileObj); + break; + default: + /* + Sample testSrc for class: + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @interface Foo {} + + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @interface FooContainer { + Foo[] value(); + } + + @ExpectedBase + @ExpectedContainer + @FooContainer(value = {@Foo, @Foo}) + class A {} + */ + replaceVal = expectedVals + anno; + testSrc = srcType.getTemplate().replace("#CN", className) + .replace("#REPLACE", replaceVal); + contents = commonStmts + testSrc; + srcFileObj = Helper.getFile(className, contents); + files = Arrays.asList(srcFileObj); + } + return files; + } + }, + SingleAndContainerOnSuper_Legacy( + "@ExpectedBase(value = Foo.class, " + + "getAnnotationVal = \"Foo\"," + + "getAnnotationsVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " + + "getDeclAnnosVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " + + "getDeclAnnoVal = \"Foo\", " + + "getAnnosArgs = {\"Foo\"}, " + + "getDeclAnnosArgs = {\"Foo\"} )", + "@ExpectedContainer(value=FooContainer.class, " + + "getAnnotationVal = \"FooContainer\", " + + "getAnnotationsVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " + + "getDeclAnnosVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " + + "getDeclAnnoVal = \"FooContainer\", " + + "getAnnosArgs = {\"FooContainer\"}, " + + "getDeclAnnosArgs = {\"FooContainer\"} )") { + + @Override + public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, + String className) { + String anno = ""; + String replaceVal = ""; + String testSrc = ""; + String pkgInfoContents = ""; + String contents = ""; + + JavaFileObject pkgFileObj = null; + JavaFileObject srcFileObj = null; + Iterable<? extends JavaFileObject> files = null; + + String expectedVals = "\n" + getExpectedBase() + "\n" + + getExpectedContainer() + "\n"; + StringBuilder commonStmts = new StringBuilder(); + + anno = Helper.ContentVars.LEGACYCONTAINER.getVal() + + Helper.ContentVars.BASEANNO.getVal(); + commonStmts.append(Helper.ContentVars.IMPORTEXPECTED.getVal()) + .append(Helper.ContentVars.IMPORTSTMTS.getVal()) + .append(Helper.ContentVars.RETENTIONRUNTIME.getVal()) + .append(Helper.ContentVars.BASE.getVal()) + .append(Helper.ContentVars.RETENTIONRUNTIME.getVal()) + .append(Helper.ContentVars.CONTAINER.getVal()); + switch (srcType) { + case PACKAGE: + /* + Sample package-info.java + @ExpectedBase + @ExpectedContainer + @Foo + @FooContainer(value = {@Foo, @Foo}) + package testpkg; + + @Retention(RetentionPolicy.RUNTIME) + @interface Foo {} + + @Retention(RetentionPolicy.RUNTIME) + @interface FooContainer { + Foo[] value(); + } + + Sample testSrc: + package testpkg; + class A {} + */ + testSrc = srcType.getTemplate().replace("#CN", className); + contents = testSrc; + + srcFileObj = Helper.getFile(className, contents); + + replaceVal = "\n" + expectedVals + "\n" + anno; + pkgInfoContents = SrcType.PKGINFO.getTemplate() + .replace("#REPLACE1", replaceVal) + .replace("#REPLACE2", commonStmts); + pkgFileObj = Helper.getFile(PKGINFONAME, pkgInfoContents); + files = Arrays.asList(pkgFileObj, srcFileObj); + break; + default: + /* + Sample testSrc for class: + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @interface Foo {} + + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @interface FooContainer { + Foo[] value(); + } + + @ExpectedBase + @ExpectedContainer + @Foo + @FooContainer(value = {@Foo, @Foo}) + class A {} + */ + replaceVal = expectedVals + anno; + testSrc = srcType.getTemplate().replace("#CN", className) + .replace("#REPLACE", replaceVal); + contents = commonStmts + testSrc; + + srcFileObj = Helper.getFile(className, contents); + files = Arrays.asList(srcFileObj); + } + return files; + } + }, + BasicContainer_Inherited_Legacy( + "@ExpectedBase(value = Foo.class, " + + "getAnnotationVal = \"NULL\"," + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\"}, " + + "getDeclAnnoVal = \"NULL\", " + + "getAnnosArgs = {}, " + + "getDeclAnnosArgs = {} )", + "@ExpectedContainer(value=FooContainer.class, " + + "getAnnotationVal = \"FooContainer\", " + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\"}, " + + "getDeclAnnoVal = \"NULL\", " + + "getAnnosArgs = {\"FooContainer\"}, " + + "getDeclAnnosArgs = {} )") { + + @Override + public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, + String className) { + String anno = ""; + String replaceVal = ""; + String contents = ""; + JavaFileObject srcFileObj = null; + Iterable<? extends JavaFileObject> files = null; + + String expectedVals = "\n" + getExpectedBase() + "\n" + + getExpectedContainer() + "\n"; + StringBuilder commonStmts = getCommonStmts(false); + + /* + Sample testSrc: + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @interface Foo {} + + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @interface FooContainer { + Foo[] value(); + } + + @FooContainer(value = {@Foo, @Foo}) + class SuperClass { } + + @ExpectedBase + @ExpectedContainer + class SubClass extends SuperClass {} + */ + // @Inherited only works for classes, no switch cases for + // method, field, package + + if (srcType == SrcType.CLASS) { + // Contents for SuperClass + anno = Helper.ContentVars.LEGACYCONTAINER.getVal(); + replaceVal = commonStmts + "\n" + anno; + String superClassContents = srcType.getTemplate() + .replace("#CN", SUPERCLASS) + .replace("#REPLACE", replaceVal); + + // Contents for SubClass that extends SuperClass + replaceVal = expectedVals; + String subClassContents = SrcType.CLASSEXTENDS.getTemplate() + .replace("#CN", className) + .replace("#SN", SUPERCLASS) + .replace("#REPLACE", replaceVal); + + contents = superClassContents + subClassContents; + srcFileObj = Helper.getFile(className, contents); + files = Arrays.asList(srcFileObj); + } + return files; + } + }, + ContainerOnSuperSingleOnSub_Inherited_Legacy( + "@ExpectedBase(value=Foo.class, " + + "getAnnotationVal = \"Foo\", " + + "getAnnotationsVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"Foo\"}," + + "getDeclAnnoVal = \"Foo\"," + + "getAnnosArgs = {\"Foo\"}," + + "getDeclAnnosArgs = {\"Foo\"})", + "@ExpectedContainer(value=FooContainer.class, " + + "getAnnotationVal = \"FooContainer\", " + + "getAnnotationsVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"Foo\"}," + + "getDeclAnnoVal = \"NULL\"," + + "getAnnosArgs = {\"FooContainer\"}," + + "getDeclAnnosArgs = {})") { + + @Override + public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, + String className) { + String anno = ""; + String replaceVal = ""; + String contents = ""; + JavaFileObject srcFileObj = null; + Iterable<? extends JavaFileObject> files = null; + + String expectedVals = "\n" + getExpectedBase() + "\n" + + getExpectedContainer() + "\n"; + StringBuilder commonStmts = getCommonStmts(false); + + /* + Sample testSrc: + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @interface Foo {} + + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @interface FooContainer { + Foo[] value(); + } + + @FooContainer(value = {@Foo, @Foo}) + class SuperClass { } + + @ExpectedBase + @ExpectedContainer + @Foo + class SubClass extends SuperClass {} + */ + // @Inherited only works for classes, no switch cases for + // method, field, package + + if (srcType == SrcType.CLASS) { + // Contents for SuperClass + anno = Helper.ContentVars.LEGACYCONTAINER.getVal(); + replaceVal = commonStmts + "\n" + anno; + String superClassContents = srcType.getTemplate() + .replace("#CN", SUPERCLASS) + .replace("#REPLACE", replaceVal); + + // Contents for SubClass that extends SuperClass + anno = Helper.ContentVars.BASEANNO.getVal(); + replaceVal = expectedVals + "\n" + anno; + String subClassContents = SrcType.CLASSEXTENDS.getTemplate() + .replace("#CN", className) + .replace("#SN", SUPERCLASS) + .replace("#REPLACE", replaceVal); + + contents = superClassContents + subClassContents; + srcFileObj = Helper.getFile(className, contents); + files = Arrays.asList(srcFileObj); + } + return files; + } + }, + ContainerAndSingleOnSuperSingleOnSub_Inherited_Legacy( + "@ExpectedBase(value=Foo.class, " + + "getAnnotationVal = \"Foo\", " + + "getAnnotationsVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"Foo\"}," + + "getDeclAnnoVal = \"Foo\"," + + "getAnnosArgs = {\"Foo\"}," + + "getDeclAnnosArgs = {\"Foo\"})", + "@ExpectedContainer(value=FooContainer.class, " + + "getAnnotationVal = \"FooContainer\", " + + "getAnnotationsVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"Foo\"}," + + "getDeclAnnoVal = \"NULL\"," + + "getAnnosArgs = {\"FooContainer\"}," + + "getDeclAnnosArgs = {})") { + + @Override + public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, + String className) { + String anno = ""; + String replaceVal = ""; + String contents = ""; + JavaFileObject srcFileObj = null; + Iterable<? extends JavaFileObject> files = null; + + String expectedVals = "\n" + getExpectedBase() + "\n" + + getExpectedContainer() + "\n"; + StringBuilder commonStmts = getCommonStmts(false); + + /* + Sample testSrc: + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @interface Foo {} + + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @interface FooContainer { + Foo[] value(); + } + + @FooContainer(value = {@Foo, @Foo}) @Foo + class SuperClass { } + + @ExpectedBase + @ExpectedContainer + @Foo + class SubClass extends SuperClass {} + */ + // @Inherited only works for classes, no switch cases for + // method, field, package + + if (srcType == SrcType.CLASS) { + // Contents for SuperClass + anno = Helper.ContentVars.LEGACYCONTAINER.getVal() + + Helper.ContentVars.BASEANNO.getVal(); + replaceVal = commonStmts + "\n" + anno; + String superClassContents = srcType.getTemplate() + .replace("#CN", SUPERCLASS) + .replace("#REPLACE", replaceVal); + + // Contents for SubClass that extends SuperClass + anno = Helper.ContentVars.BASEANNO.getVal(); + replaceVal = expectedVals + "\n" + anno; + String subClassContents = SrcType.CLASSEXTENDS.getTemplate() + .replace("#CN", className).replace("#SN", SUPERCLASS) + .replace("#REPLACE", replaceVal); + + contents = superClassContents + subClassContents; + srcFileObj = Helper.getFile(className, contents); + files = Arrays.asList(srcFileObj); + } + return files; + } + }, + SingleOnSuperContainerOnSub_Inherited_Legacy( + "@ExpectedBase(value=Foo.class, " + + "getAnnotationVal = \"Foo\", " + + "getAnnotationsVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}," + + "getDeclAnnoVal = \"NULL\"," + + "getAnnosArgs = {\"Foo\"}," + + "getDeclAnnosArgs = {})", + "@ExpectedContainer(value=FooContainer.class, " + + "getAnnotationVal = \"FooContainer\", " + + "getAnnotationsVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}," + + "getDeclAnnoVal = \"FooContainer\"," + + "getAnnosArgs = {\"FooContainer\"}," + + "getDeclAnnosArgs = {\"FooContainer\"})") { + + @Override + public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, + String className) { + String anno = ""; + String replaceVal = ""; + String contents = ""; + + JavaFileObject srcFileObj = null; + Iterable<? extends JavaFileObject> files = null; + + String expectedVals = "\n" + getExpectedBase() + "\n" + + getExpectedContainer() + "\n"; + StringBuilder commonStmts = getCommonStmts(false); + + /* + Sample testSrc: + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @interface Foo {} + + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @interface FooContainer { + Foo[] value(); + } + + @Foo + class SuperClass { } + + @ExpectedBase + @ExpectedContainer + @FooContainer(value = {@Foo, @Foo}) + class SubClass extends SuperClass {} + */ + + if (srcType == SrcType.CLASS) { + //Contents for SuperClass + anno = Helper.ContentVars.BASEANNO.getVal(); + replaceVal = commonStmts + "\n" + anno; + String superClassContents = srcType.getTemplate() + .replace("#CN", SUPERCLASS) + .replace("#REPLACE", replaceVal); + + //Contents for SubClass that extends SuperClass + anno = Helper.ContentVars.LEGACYCONTAINER.getVal(); + replaceVal = expectedVals + "\n" + anno; + String subClassContents = SrcType.CLASSEXTENDS.getTemplate() + .replace("#CN", className).replace("#SN", SUPERCLASS) + .replace("#REPLACE", replaceVal); + + contents = superClassContents + subClassContents; + srcFileObj = Helper.getFile(className, contents); + files = Arrays.asList(srcFileObj); + } + return files; + } + }, + SingleOnSuperContainerAndSingleOnSub_Inherited_Legacy( + "@ExpectedBase(value=Foo.class, " + + "getAnnotationVal = \"Foo\", " + + "getAnnotationsVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " + + "getDeclAnnosVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}," + + "getDeclAnnoVal = \"Foo\"," + + "getAnnosArgs = {\"Foo\"}," + + "getDeclAnnosArgs = {\"Foo\"})", + "@ExpectedContainer(value=FooContainer.class, " + + "getAnnotationVal = \"FooContainer\", " + + "getAnnotationsVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " + + "getDeclAnnosVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}," + + "getDeclAnnoVal = \"FooContainer\"," + + "getAnnosArgs = {\"FooContainer\"}," + + "getDeclAnnosArgs = {\"FooContainer\"})") { + + @Override + public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, + String className) { + String anno = ""; + String replaceVal = ""; + String contents = ""; + + JavaFileObject srcFileObj = null; + Iterable<? extends JavaFileObject> files = null; + + String expectedVals = "\n" + getExpectedBase() + "\n" + + getExpectedContainer() + "\n"; + StringBuilder commonStmts = getCommonStmts(false); + + /* + Sample testSrc: + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @interface Foo {} + + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @interface FooContainer { + Foo[] value(); + } + + @Foo + class SuperClass { } + + @ExpectedBase + @ExpectedContainer + @FooContainer(value = {@Foo, @Foo}) @Foo + class SubClass extends SuperClass {} + */ + + if (srcType == SrcType.CLASS) { + //Contents for SuperClass + anno = Helper.ContentVars.BASEANNO.getVal(); + replaceVal = commonStmts + "\n" + anno; + String superClassContents = srcType.getTemplate() + .replace("#CN", SUPERCLASS) + .replace("#REPLACE", replaceVal); + + //Contents for SubClass that extends SuperClass + anno = Helper.ContentVars.LEGACYCONTAINER.getVal() + + Helper.ContentVars.BASEANNO.getVal(); + replaceVal = expectedVals + "\n" + anno; + String subClassContents = SrcType.CLASSEXTENDS.getTemplate() + .replace("#CN", className).replace("#SN", SUPERCLASS) + .replace("#REPLACE", replaceVal); + + contents = superClassContents + subClassContents; + srcFileObj = Helper.getFile(className, contents); + files = Arrays.asList(srcFileObj); + } + return files; + } + }, + BasicRepeatable( + "@ExpectedBase(value=Foo.class, " + + "getAnnotationVal = \"NULL\", " + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\" }, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}," + + "getDeclAnnoVal = \"NULL\"," + + "getAnnosArgs = {\"Foo\", \"Foo\"}," + + "getDeclAnnosArgs = {\"Foo\", \"Foo\"})", + "@ExpectedContainer(value=FooContainer.class, " + + "getAnnotationVal = \"FooContainer\"," + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}," + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}, " + + "getDeclAnnoVal = \"FooContainer\"," + + "getAnnosArgs = {\"FooContainer\"}," + + "getDeclAnnosArgs = {\"FooContainer\"} )") { + + @Override + public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, + String className) { + String anno = ""; + String replaceVal = ""; + String testSrc = ""; + String pkgInfoContents = ""; + String contents = ""; + + JavaFileObject pkgFileObj = null; + JavaFileObject srcFileObj = null; + Iterable<? extends JavaFileObject> files = null; + + String expectedVals = "\n" + getExpectedBase() + "\n" + + getExpectedContainer() + "\n"; + StringBuilder commonStmts = new StringBuilder(); + + anno = Helper.ContentVars.REPEATABLEANNO.getVal(); + commonStmts.append(Helper.ContentVars.IMPORTEXPECTED.getVal()) + .append(Helper.ContentVars.IMPORTSTMTS.getVal()) + .append(Helper.ContentVars.RETENTIONRUNTIME.getVal()) + .append(Helper.ContentVars.REPEATABLE.getVal()) + .append(Helper.ContentVars.BASE.getVal()) + .append(Helper.ContentVars.RETENTIONRUNTIME.getVal()) + .append(Helper.ContentVars.CONTAINER.getVal()); + switch (srcType) { + case PACKAGE: + /* + Sample package-info.java + @ExpectedBase + @ExpectedContainer + @Foo() @Foo() + package testpkg; + + @Retention(RetentionPolicy.RUNTIME) + @Repeatable(FooContainer.class) + @interface Foo {} + + @Retention(RetentionPolicy.RUNTIME) + @interface FooContainer { + Foo[] value(); + } + + Sample testSrc: + package testpkg; + class A {} + */ + testSrc = srcType.getTemplate().replace("#CN", className); + contents = testSrc; + srcFileObj = Helper.getFile(className, contents); + + replaceVal = expectedVals + "\n" + anno; + pkgInfoContents = SrcType.PKGINFO.getTemplate() + .replace("#REPLACE1", replaceVal) + .replace("#REPLACE2", commonStmts); + pkgFileObj = Helper.getFile(PKGINFONAME, pkgInfoContents); + files = Arrays.asList(pkgFileObj, srcFileObj); + break; + default: + /* + Sample testSrc for class: + @Retention(RetentionPolicy.RUNTIME) + @Repeatable(FooContainer.class) + @interface Foo {} + + @Retention(RetentionPolicy.RUNTIME) + @interface FooContainer { + Foo[] value(); + } + + @ExpectedBase + @ExpectedContainer + @Foo @Foo + class A { } + */ + replaceVal = expectedVals + anno; + testSrc = srcType.getTemplate().replace("#CN", className) + .replace("#REPLACE", replaceVal); + contents = commonStmts + testSrc; + srcFileObj = Helper.getFile(className, contents); + files = Arrays.asList(srcFileObj); + } + return files; + } + }, + BasicContainerRepeatable( + "@ExpectedBase(value=Foo.class, " + + "getAnnotationVal = \"NULL\", " + + "getAnnotationsVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}, " + + "getDeclAnnosVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}," + + "getDeclAnnoVal = \"NULL\"," + + "getAnnosArgs = {\"Foo\", \"Foo\"}," + + "getDeclAnnosArgs = {\"Foo\", \"Foo\"})", + "@ExpectedContainer(value=FooContainer.class, " + + "getAnnotationVal = \"FooContainer\"," + + "getAnnotationsVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}," + + "getDeclAnnosVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}, " + + "getDeclAnnoVal = \"FooContainer\"," + + "getAnnosArgs = {\"FooContainer\"}," + + "getDeclAnnosArgs = {\"FooContainer\"} )") { + + @Override + public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, + String className) { + String anno = ""; + String replaceVal = ""; + String testSrc = ""; + String pkgInfoContents = ""; + String contents = ""; + + JavaFileObject pkgFileObj = null; + JavaFileObject srcFileObj = null; + Iterable<? extends JavaFileObject> files = null; + + String expectedVals = "\n" + getExpectedBase() + "\n" + + getExpectedContainer() + "\n"; + StringBuilder commonStmts = new StringBuilder(); + + anno = Helper.ContentVars.LEGACYCONTAINER.getVal(); + commonStmts.append(Helper.ContentVars.IMPORTEXPECTED.getVal()) + .append(Helper.ContentVars.IMPORTSTMTS.getVal()) + .append(Helper.ContentVars.RETENTIONRUNTIME.getVal()) + .append(Helper.ContentVars.REPEATABLE.getVal()) + .append(Helper.ContentVars.BASE.getVal()) + .append(Helper.ContentVars.RETENTIONRUNTIME.getVal()) + .append(Helper.ContentVars.CONTAINER.getVal()); + switch (srcType) { + case PACKAGE: + /* + Sample package-info.java + @ExpectedBase + @ExpectedContainer + @FooContainer(value = {@Foo, @Foo}) + package testpkg; + + @Retention(RetentionPolicy.RUNTIME) + @Repeatable(FooContainer.class) + @interface Foo {} + + @Retention(RetentionPolicy.RUNTIME) + @interface FooContainer { + Foo[] value(); + } + + Sample testSrc: + package testpkg; + class A {} + */ + testSrc = srcType.getTemplate().replace("#CN", className); + contents = testSrc; + srcFileObj = Helper.getFile(className, contents); + + replaceVal = expectedVals + "\n" + anno; + pkgInfoContents = SrcType.PKGINFO.getTemplate() + .replace("#REPLACE1", replaceVal) + .replace("#REPLACE2", commonStmts); + pkgFileObj = Helper.getFile(PKGINFONAME, pkgInfoContents); + files = Arrays.asList(pkgFileObj, srcFileObj); + break; + default: + /* + Sample testSrc for class: + @Retention(RetentionPolicy.RUNTIME) + @Repeatable(FooContainer.class) + @interface Foo {} + + @Retention(RetentionPolicy.RUNTIME) + @interface FooContainer { + Foo[] value(); + } + + @ExpectedBase + @ExpectedContainer + @FooContainer(value = {@Foo, @Foo}) + class A { } + */ + replaceVal = expectedVals + anno; + testSrc = srcType.getTemplate().replace("#CN", className) + .replace("#REPLACE", replaceVal); + contents = commonStmts + testSrc; + srcFileObj = Helper.getFile(className, contents); + files = Arrays.asList(srcFileObj); + } + return files; + } + }, + BasicContainerRepeatable_Inherited( + "@ExpectedBase(value=Foo.class, " + + "getAnnotationVal = \"NULL\", " + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\"}, " + + "getDeclAnnoVal = \"NULL\", " + + "getAnnosArgs = {\"Foo\", \"Foo\"}, " + + "getDeclAnnosArgs = {})", + "@ExpectedContainer(value=FooContainer.class, " + + "getAnnotationVal = \"FooContainer\", " + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}, " + + "getDeclAnnosVals = { \"ExpectedBase\", \"ExpectedContainer\"}, " + + "getDeclAnnoVal = \"NULL\", " + + "getAnnosArgs = {\"FooContainer\"}, " + + "getDeclAnnosArgs = {})") { + + @Override + public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, + String className) { + String anno = ""; + String replaceVal = ""; + String contents = ""; + JavaFileObject srcFileObj = null; + Iterable<? extends JavaFileObject> files = null; + + String expectedVals = "\n" + getExpectedBase() + "\n" + + getExpectedContainer() + "\n"; + StringBuilder commonStmts = getCommonStmts(true); + /* + Sample testSrc: + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @Repeatable(FooContainer.class) + @interface Foo {} + + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @interface FooContainer { + Foo[] value(); + } + + @FooContainer(value = {@Foo, @Foo}) + class SuperClass { } + + @ExpectedBase + @ExpectedContainer + class SubClass extends SuperClass { } + */ + // @Inherited only works for classes, no switch cases for + // method, field, package + anno = Helper.ContentVars.LEGACYCONTAINER.getVal(); + + if (srcType == SrcType.CLASS) { + // Contents for SuperClass + replaceVal = commonStmts + "\n" + anno; + String superClassContents = srcType.getTemplate() + .replace("#CN", SUPERCLASS) + .replace("#REPLACE", replaceVal); + + // Contents for SubClass that extends SuperClass + replaceVal = expectedVals; + String subClassContents = SrcType.CLASSEXTENDS.getTemplate() + .replace("#CN", className) + .replace("#SN", SUPERCLASS) + .replace("#REPLACE", replaceVal); + + contents = superClassContents + subClassContents; + srcFileObj = Helper.getFile(className, contents); + files = Arrays.asList(srcFileObj); + } + return files; + } + }, + RepeatableAnnoInherited( + "@ExpectedBase(value=Foo.class, " + + "getAnnotationVal = \"NULL\", " + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\"}, " + + // ignores inherited annotations + "getDeclAnnoVal = \"NULL\", " + + // ignores inherited + "getAnnosArgs = {\"Foo\", \"Foo\"}, " + + "getDeclAnnosArgs = {})", // ignores inherited + "@ExpectedContainer(value=FooContainer.class, " + + "getAnnotationVal = \"FooContainer\", " + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}, " + + "getDeclAnnosVals = { \"ExpectedBase\", \"ExpectedContainer\"}, " + + // ignores inherited annotations + "getDeclAnnoVal = \"NULL\", " + + // ignores inherited + "getAnnosArgs = {\"FooContainer\"}, " + + "getDeclAnnosArgs = {})") { // ignores inherited + + @Override + public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, + String className) { + String anno = ""; + String replaceVal = ""; + String contents = ""; + JavaFileObject srcFileObj = null; + Iterable<? extends JavaFileObject> files = null; + + String expectedVals = "\n" + getExpectedBase() + "\n" + + getExpectedContainer() + "\n"; + StringBuilder commonStmts = getCommonStmts(true); + /* + Sample testSrc: + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @Repeatable(FooContainer.class) + @interface Foo {} + + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @interface FooContainer { + Foo[] value(); + } + + @Foo() @Foo() + class SuperClass { } + + @ExpectedBase + @ExpectedContainer + class SubClass extends SuperClass { } + */ + // @Inherited only works for classes, no switch cases for + // method, field, package + anno = Helper.ContentVars.REPEATABLEANNO.getVal(); + + if (srcType == SrcType.CLASS) { + // Contents for SuperClass + replaceVal = commonStmts + "\n" + anno; + String superClassContents = srcType.getTemplate() + .replace("#CN", SUPERCLASS) + .replace("#REPLACE", replaceVal); + + // Contents for SubClass that extends SuperClass + replaceVal = expectedVals; + String subClassContents = SrcType.CLASSEXTENDS.getTemplate() + .replace("#CN", className) + .replace("#SN", SUPERCLASS) + .replace("#REPLACE", replaceVal); + + contents = superClassContents + subClassContents; + srcFileObj = Helper.getFile(className, contents); + files = Arrays.asList(srcFileObj); + } + return files; + } + }, + SingleAnnoWithContainer( + "@ExpectedBase(value=Foo.class, " + + "getAnnotationVal = \"Foo\", " + + "getAnnotationsVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}," + + "getDeclAnnosVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}," + + "getDeclAnnoVal = \"Foo\"," + + "getAnnosArgs = {\"Foo\", \"Foo\", \"Foo\"}," + + "getDeclAnnosArgs = {\"Foo\", \"Foo\",\"Foo\"})", + "@ExpectedContainer(value=FooContainer.class, " + + "getAnnotationVal = \"FooContainer\", " + + "getAnnotationsVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}," + + "getDeclAnnosVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " + + "getDeclAnnoVal = \"FooContainer\"," + + "getDeclAnnosArgs = {\"FooContainer\"}," + + "getAnnosArgs = {\"FooContainer\"})") { + + @Override + public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, + String className) { + String anno = ""; + String replaceVal = ""; + String testSrc = ""; + String pkgInfoContents = ""; + String contents = ""; + + JavaFileObject pkgFileObj = null; + JavaFileObject srcFileObj = null; + Iterable<? extends JavaFileObject> files = null; + + String expectedVals = "\n" + getExpectedBase() + "\n" + + getExpectedContainer() + "\n"; + StringBuilder commonStmts = new StringBuilder(); + + anno = Helper.ContentVars.BASEANNO.getVal() + " " + + Helper.ContentVars.LEGACYCONTAINER.getVal(); + commonStmts.append(Helper.ContentVars.IMPORTEXPECTED.getVal()) + .append(Helper.ContentVars.IMPORTSTMTS.getVal()) + .append(Helper.ContentVars.RETENTIONRUNTIME.getVal()) + .append(Helper.ContentVars.REPEATABLE.getVal()) + .append(Helper.ContentVars.BASE.getVal()) + .append(Helper.ContentVars.RETENTIONRUNTIME.getVal()) + .append(Helper.ContentVars.CONTAINER.getVal()); + switch (srcType) { + case PACKAGE: + /* + Sample package-info.java + @ExpectedBase + @ExpectedContainer + @Foo @FooContainer(value = {@Foo, @Foo}) + package testpkg; + + @Retention(RetentionPolicy.RUNTIME) + @Repeatable(FooContainer.class) + @interface Foo {} + + @Retention(RetentionPolicy.RUNTIME) + @interface FooContainer { + Foo[] value(); + } + + Sample testSrc: + package testpkg; + class A {} + */ + testSrc = srcType.getTemplate().replace("#CN", className); + contents = testSrc; + srcFileObj = Helper.getFile(className, contents); + + replaceVal = expectedVals + "\n" + anno; + pkgInfoContents = SrcType.PKGINFO.getTemplate() + .replace("#REPLACE1", replaceVal) + .replace("#REPLACE2", commonStmts); + pkgFileObj = Helper.getFile(PKGINFONAME, pkgInfoContents); + files = Arrays.asList(pkgFileObj, srcFileObj); + break; + default: + /* + Sample testSrc: + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @Repeatable(FooContainer.class) + @interface Foo {} + + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @interface FooContainer { + Foo[] value(); + } + + @ExpectedBase + @ExpectedContainer + @Foo @FooContainer(value = {@Foo, @Foo}) + class A { } + */ + replaceVal = expectedVals + anno; + testSrc = srcType.getTemplate() + .replace("#CN", className) + .replace("#REPLACE", replaceVal); + contents = commonStmts + testSrc; + srcFileObj = Helper.getFile(className, contents); + files = Arrays.asList(srcFileObj); + } + return files; + } + }, + AnnoOnSuperAndSubClass_Inherited( + "@ExpectedBase(value=Foo.class, " + + "getAnnotationVal = \"Foo\", " + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"Foo\" }, " + + // override every annotation on superClass + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"Foo\"}, " + + // ignores inherited annotations + "getDeclAnnoVal = \"Foo\", " // ignores inherited + + "getAnnosArgs = {\"Foo\"}, " + + "getDeclAnnosArgs = { \"Foo\" })", // ignores inherited + "@ExpectedContainer(value=FooContainer.class, " + + "getAnnotationVal = \"NULL\", " + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"Foo\" }, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"Foo\"}, " + + // ignores inherited annotations + "getDeclAnnoVal = \"NULL\", " + // ignores inherited + "getAnnosArgs = {}, " + "getDeclAnnosArgs = {})") { + + @Override + public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, + String className) { + String anno = ""; + String replaceVal = ""; + String contents = ""; + JavaFileObject srcFileObj = null; + Iterable<? extends JavaFileObject> files = null; + + String expectedVals = "\n" + getExpectedBase() + "\n" + + getExpectedContainer() + "\n"; + StringBuilder commonStmts = getCommonStmts(true); + + /* + Sample testSrc: + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @Repeatable(FooContainer.class) + @interface Foo {} + + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @interface FooContainer { + Foo[] value(); + } + + @Foo() + class SuperClass { } + + @ExpectedBase + @ExpectedContainer + @Foo + class SubClass extends SuperClass { } + */ + // @Inherited only works for classes, no switch cases for + // method, field, package + + if (srcType == SrcType.CLASS) { + // Contents for SuperClass + anno = Helper.ContentVars.BASEANNO.getVal(); + replaceVal = commonStmts + "\n" + anno; + String superClassContents = srcType.getTemplate() + .replace("#CN", SUPERCLASS) + .replace("#REPLACE", replaceVal); + + // Contents for SubClass that extends SuperClass + replaceVal = expectedVals + "\n" + anno; + String subClassContents = SrcType.CLASSEXTENDS.getTemplate() + .replace("#CN", className) + .replace("#SN", SUPERCLASS) + .replace("#REPLACE", replaceVal); + + contents = superClassContents + subClassContents; + srcFileObj = Helper.getFile(className, contents); + files = Arrays.asList(srcFileObj); + } + return files; + } + }, +// // Testcase not working as expected, JDK-8004912 +// RepeatableOnSuperSingleOnSub_Inherited( +// "@ExpectedBase(value=Foo.class, " +// + "getAnnotationVal = \"Foo\", " +// + "getAnnotationsVals = {" +// + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " +// + //override every annotation on superClass +// "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"Foo\"}, " +// + // ignores inherited annotations +// "getDeclAnnoVal = \"Foo\", " // ignores inherited +// + "getAnnosArgs = {\"Foo\"}, " +// + "getDeclAnnosArgs = { \"Foo\" })", // ignores inherited +// "@ExpectedContainer(value=FooContainer.class, " +// + "getAnnotationVal = \"FooContainer\", " +// + "getAnnotationsVals = {" +// + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " +// + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"Foo\"}, " +// + // ignores inherited annotations +// "getDeclAnnoVal = \"NULL\", " +// + "getAnnosArgs = {\"FooContainer\"}, " +// + "getDeclAnnosArgs = {}) // ignores inherited ") { + +// @Override +// public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, +// String className) { +// String anno = ""; +// String replaceVal = ""; +// String contents = ""; +// JavaFileObject srcFileObj = null; +// Iterable<? extends JavaFileObject> files = null; + +// String expectedVals = "\n" + getExpectedBase() + "\n" +// + getExpectedContainer() + "\n"; +// StringBuilder commonStmts = getCommonStmts(true); + +// /* +// Sample testSrc: +// @Retention(RetentionPolicy.RUNTIME) +// @Inherited +// @Repeatable(FooContainer.class) +// @interface Foo {} + +// @Retention(RetentionPolicy.RUNTIME) +// @Inherited +// @interface FooContainer { +// Foo[] value(); +// } + +// @Foo() @Foo +// class SuperClass { } + +// @ExpectedBase +// @ExpectedContainer +// @Foo +// class SubClass extends SuperClass { } +// */ +// //@Inherited only works for classes, no switch cases for method, field, package + +// if (srcType == SrcType.CLASS) { +// //Contents for SuperClass +// anno = Helper.ContentVars.REPEATABLEANNO.getVal(); +// replaceVal = commonStmts + "\n" + anno; +// String superClassContents = srcType.getTemplate() +// .replace("#CN", SUPERCLASS) +// .replace("#REPLACE", replaceVal); + +// //Contents for SubClass that extends SuperClass +// anno = Helper.ContentVars.BASEANNO.getVal(); +// replaceVal = expectedVals + "\n" + anno; +// String subClassContents = SrcType.CLASSEXTENDS.getTemplate() +// .replace("#CN", className) +// .replace("#SN", SUPERCLASS) +// .replace("#REPLACE", replaceVal); +// contents = superClassContents + subClassContents; +// srcFileObj = Helper.getFile(className, contents); +// files = Arrays.asList(srcFileObj); +// } +// return files; +// } +// }, +// //Testcase not working as expected, JDK-8004912 +// SingleOnSuperRepeatableOnSub_Inherited( +// "@ExpectedBase(value=Foo.class, " +// + "getAnnotationVal = \"Foo\", " +// + "getAnnotationsVals = {" +// + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " +// + //override every annotation on superClass +// "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}, " +// + // ignores inherited annotations +// "getDeclAnnoVal = \"NULL\","// ignores inherited +// + "getAnnosArgs = {\"Foo\", \"Foo\"}, " +// + "getDeclAnnosArgs = { \"Foo\", \"Foo\"})", +// "@ExpectedContainer(value=FooContainer.class, " +// + "getAnnotationVal = \"FooContainer\", " +// + "getAnnotationsVals = {" +// + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " +// + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}, " +// + // ignores inherited annotations +// "getDeclAnnoVal = \"FooContainer\", "// ignores inherited +// + "getAnnosArgs = {\"FooContainer\"}, " +// + "getDeclAnnosArgs = {\"FooContainer\"})") { + +// @Override +// public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, +// String className) { +// String anno = ""; +// String replaceVal = ""; +// String contents = ""; +// JavaFileObject srcFileObj = null; +// Iterable<? extends JavaFileObject> files = null; + +// String expectedVals = "\n" + getExpectedBase() + "\n" +// + getExpectedContainer() + "\n"; +// StringBuilder commonStmts = getCommonStmts(true); + +// /* +// Sample testSrc: +// @Retention(RetentionPolicy.RUNTIME) +// @Inherited +// @Repeatable(FooContainer.class) +// @interface Foo {} + +// @Retention(RetentionPolicy.RUNTIME) +// @Inherited +// @interface FooContainer { +// Foo[] value(); +// } + +// @Foo() +// class SuperClass { } + +// @ExpectedBase +// @ExpectedContainer +// @Foo @Foo +// class SubClass extends SuperClass { } +// */ + +// //@Inherited only works for classes, no switch cases for method, field, package +// if (srcType == SrcType.CLASS) { +// //Contents for SuperClass +// anno = Helper.ContentVars.BASEANNO.getVal(); +// replaceVal = commonStmts + "\n" + anno; +// String superClassContents = srcType.getTemplate() +// .replace("#CN", SUPERCLASS) +// .replace("#REPLACE", replaceVal); + +// //Contents for SubClass that extends SuperClass +// anno = Helper.ContentVars.REPEATABLEANNO.getVal(); +// replaceVal = expectedVals + "\n" + anno; +// String subClassContents = SrcType.CLASSEXTENDS.getTemplate() +// .replace("#CN", className) +// .replace("#SN", SUPERCLASS) +// .replace("#REPLACE", replaceVal); + +// contents = superClassContents + subClassContents; +// srcFileObj = Helper.getFile(className, contents); +// files = Arrays.asList(srcFileObj); +// } +// return files; +// } +// }, +// //Testcase not working as expected, JDK-8004912 +// ContainerOnSuperSingleOnSub_Inherited( +// "@ExpectedBase(value=Foo.class, " +// + "getAnnotationVal = \"Foo\", " +// + "getAnnotationsVals = {" +// + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " +// + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"Foo\"}," +// + "getDeclAnnoVal = \"Foo\"," +// + "getAnnosArgs = {\"Foo\"}," +// + "getDeclAnnosArgs = {\"Foo\"})", +// "@ExpectedContainer(value=FooContainer.class, " +// + "getAnnotationVal = \"FooContainer\", " +// + "getAnnotationsVals = {" +// + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " +// + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"Foo\"}," +// + "getDeclAnnoVal = \"NULL\"," +// + "getAnnosArgs = {\"FooContainer\"}," +// + "getDeclAnnosArgs = {})") { + +// @Override +// public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, +// String className) { +// String anno = ""; +// String replaceVal = ""; +// String contents = ""; +// JavaFileObject srcFileObj = null; +// Iterable<? extends JavaFileObject> files = null; + +// String expectedVals = "\n" + getExpectedBase() + "\n" +// + getExpectedContainer() + "\n"; +// StringBuilder commonStmts = getCommonStmts(true); + +// /* +// Sample testSrc: +// @Retention(RetentionPolicy.RUNTIME) +// @Inherited +// @Repeatable(FooContainer.class) +// @interface Foo {} + +// @Retention(RetentionPolicy.RUNTIME) +// @Inherited +// @interface FooContainer { +// Foo[] value(); +// } + +// @FooContainer(value = {@Foo, @Foo}) +// class SuperClass { } + +// @ExpectedBase +// @ExpectedContainer +// @Foo +// class SubClass extends SuperClass { } +// */ + +// //@Inherited only works for classes, no switch cases for method, field, package +// if (srcType == SrcType.CLASS) { +// //Contents for SuperClass +// anno = Helper.ContentVars.LEGACYCONTAINER.getVal(); +// replaceVal = commonStmts + "\n" + anno; +// String superClassContents = srcType.getTemplate() +// .replace("#CN", SUPERCLASS) +// .replace("#REPLACE", replaceVal); + +// //Contents for SubClass that extends SuperClass +// anno = Helper.ContentVars.BASEANNO.getVal(); +// replaceVal = expectedVals + "\n" + anno; +// String subClassContents = SrcType.CLASSEXTENDS.getTemplate() +// .replace("#CN", className) +// .replace("#SN", SUPERCLASS) +// .replace("#REPLACE", replaceVal); + +// contents = superClassContents + subClassContents; +// srcFileObj = Helper.getFile(className, contents); +// files = Arrays.asList(srcFileObj); +// } +// return files; +// } +// }, +// // TestCase not working as expected, JDK-8004912 +// SingleOnSuperContainerOnSub_Inherited( +// "@ExpectedBase(value=Foo.class, " +// + "getAnnotationVal = \"Foo\", " +// + "getAnnotationsVals = {" +// + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " +// + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}," +// + "getDeclAnnoVal = \"NULL\"," +// + "getAnnosArgs = {\"Foo\", \"Foo\"}," +// + "getDeclAnnosArgs = {\"Foo\", \"Foo\"})", +// "@ExpectedContainer(value=FooContainer.class, " +// + "getAnnotationVal = \"FooContainer\", " +// + "getAnnotationsVals = {" +// + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " +// + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"FooContainer\"}," +// + "getDeclAnnoVal = \"FooContainer\"," +// + "getAnnosArgs = {\"FooContainer\"}," +// + "getDeclAnnosArgs = {\"FooContainer\"})") { + +// @Override +// public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, +// String className) { +// String anno = ""; +// String replaceVal = ""; +// String contents = ""; +// JavaFileObject srcFileObj = null; +// Iterable<? extends JavaFileObject> files = null; + +// String expectedVals = "\n" + getExpectedBase() + "\n" +// + getExpectedContainer() + "\n"; +// StringBuilder commonStmts = getCommonStmts(true); + +// /* +// Sample testSrc: +// @Retention(RetentionPolicy.RUNTIME) +// @Inherited +// @Repeatable(FooContainer.class) +// @interface Foo {} + +// @Retention(RetentionPolicy.RUNTIME) +// @Inherited +// @interface FooContainer { +// Foo[] value(); +// } + +// @Foo +// class SuperClass { } + +// @ExpectedBase +// @ExpectedContainer +// @FooContainer(value = {@Foo, @Foo}) +// class SubClass extends SuperClass { } +// */ + +// //@Inherited only works for classes, no switch cases for method, field, package +// if (srcType == SrcType.CLASS) { +// //Contents for SuperClass +// anno = Helper.ContentVars.BASEANNO.getVal(); +// replaceVal = commonStmts + "\n" + anno; +// String superClassContents = srcType.getTemplate() +// .replace("#CN", SUPERCLASS) +// .replace("#REPLACE", replaceVal); + +// //Contents for SubClass that extends SuperClass +// anno = Helper.ContentVars.LEGACYCONTAINER.getVal(); +// replaceVal = expectedVals + "\n" + anno; +// String subClassContents = SrcType.CLASSEXTENDS.getTemplate() +// .replace("#CN", className) +// .replace("#SN", SUPERCLASS) +// .replace("#REPLACE", replaceVal); + +// contents = superClassContents + subClassContents; +// srcFileObj = Helper.getFile(className, contents); +// files = Arrays.asList(srcFileObj); +// } +// return files; +// } +// }, + SingleOnSuperContainerAndSingleOnSub_Inherited( + "@ExpectedBase(value=Foo.class, " + + "getAnnotationVal = \"Foo\", " + + "getAnnotationsVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " + + "getDeclAnnosVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}," + + "getDeclAnnoVal = \"Foo\"," + + "getAnnosArgs = {\"Foo\", \"Foo\", \"Foo\"}," + + "getDeclAnnosArgs = {\"Foo\", \"Foo\", \"Foo\"})", + "@ExpectedContainer(value=FooContainer.class, " + + "getAnnotationVal = \"FooContainer\", " + + "getAnnotationsVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " + + "getDeclAnnosVals = {" + + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}," + + "getDeclAnnoVal = \"FooContainer\"," + + "getAnnosArgs = {\"FooContainer\"}," + + "getDeclAnnosArgs = {\"FooContainer\"})") { + + @Override + public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, + String className) { + String anno = ""; + String replaceVal = ""; + String contents = ""; + JavaFileObject srcFileObj = null; + Iterable<? extends JavaFileObject> files = null; + String expectedVals = "\n" + getExpectedBase() + "\n" + + getExpectedContainer() + "\n"; + StringBuilder commonStmts = getCommonStmts(true); + + /* + Sample testSrc: + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @interface Foo {} + + @Retention(RetentionPolicy.RUNTIME) + @Inherited + @Repeatable(FooContainer.class) + @interface FooContainer { + Foo[] value(); + } + + @Foo + class SuperClass { } + + @ExpectedBase + @ExpectedContainer + @FooContainer(value = {@Foo, @Foo}) @Foo + class SubClass extends SuperClass {} + */ + + if (srcType == SrcType.CLASS) { + //Contents for SuperClass + anno = Helper.ContentVars.BASEANNO.getVal(); + replaceVal = commonStmts + "\n" + anno; + String superClassContents = srcType.getTemplate() + .replace("#CN", SUPERCLASS) + .replace("#REPLACE", replaceVal); + + //Contents for SubClass that extends SuperClass + anno = Helper.ContentVars.LEGACYCONTAINER.getVal() + + Helper.ContentVars.BASEANNO.getVal(); + replaceVal = expectedVals + "\n" + anno; + String subClassContents = SrcType.CLASSEXTENDS.getTemplate() + .replace("#CN", className) + .replace("#SN", SUPERCLASS) + .replace("#REPLACE", replaceVal); + + contents = superClassContents + subClassContents; + srcFileObj = Helper.getFile(className, contents); + files = Arrays.asList(srcFileObj); + } + return files; + } + }, +// // TestCase not working as expected, JDK-8004912 +// ContainerAndSingleOnSuperSingleOnSub_Inherited( +// "@ExpectedBase(value=Foo.class, " +// + "getAnnotationVal = \"Foo\", " +// + "getAnnotationsVals = {" +// + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " +// + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"Foo\"}," +// + "getDeclAnnoVal = \"Foo\"," +// + "getAnnosArgs = {\"Foo\"}," +// + "getDeclAnnosArgs = {\"Foo\"})", +// "@ExpectedContainer(value=FooContainer.class, " +// + "getAnnotationVal = \"FooContainer\", " +// + "getAnnotationsVals = {" +// + "\"ExpectedBase\", \"ExpectedContainer\", \"Foo\", \"FooContainer\"}, " +// + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"Foo\"}," +// + "getDeclAnnoVal = \"NULL\"," +// + "getAnnosArgs = {\"FooContainer\"}," +// + "getDeclAnnosArgs = {})") { + +// @Override +// public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, +// String className) { +// String anno = ""; +// String replaceVal = ""; +// String contents = ""; +// JavaFileObject srcFileObj = null; +// Iterable<? extends JavaFileObject> files = null; + +// String expectedVals = "\n" + getExpectedBase() + "\n" +// + getExpectedContainer() + "\n"; +// StringBuilder commonStmts = getCommonStmts(true); + +// /* +// Sample testSrc: +// @Retention(RetentionPolicy.RUNTIME) +// @Inherited +// @Repeatable(FooContainer.class) +// @interface Foo {} + +// @Retention(RetentionPolicy.RUNTIME) +// @Inherited +// @interface FooContainer { +// Foo[] value(); +// } + +// @FooContainer(value = {@Foo, @Foo}) +// @Foo +// class SuperClass { } + +// @ExpectedBase +// @ExpectedContainer +// @Foo +// class SubClass extends SuperClass { } +// */ + +// //@Inherited only works for classes, no switch cases for method, field, package +// if (srcType == SrcType.CLASS) { +// //Contents for SuperClass +// anno = Helper.ContentVars.LEGACYCONTAINER.getVal() +// + Helper.ContentVars.BASEANNO.getVal(); +// replaceVal = commonStmts + "\n" + anno; +// String superClassContents = srcType.getTemplate() +// .replace("#CN", SUPERCLASS) +// .replace("#REPLACE", replaceVal); + +// //Contents for SubClass that extends SuperClass +// anno = Helper.ContentVars.BASEANNO.getVal(); +// replaceVal = expectedVals + "\n" + anno; +// String subClassContents = SrcType.CLASSEXTENDS.getTemplate() +// .replace("#CN", className) +// .replace("#SN", SUPERCLASS) +// .replace("#REPLACE", replaceVal); + +// contents = superClassContents + subClassContents; +// srcFileObj = Helper.getFile(className, contents); +// files = Arrays.asList(srcFileObj); +// } +// return files; +// } +// } + ; + private String expectedBase, expectedContainer; + + private TestCase(String expectedBase, String expectedContainer) { + this.expectedBase = expectedBase; + this.expectedContainer = expectedContainer; + } + + public String getExpectedBase() { + return expectedBase; + } + + public String getExpectedContainer() { + return expectedContainer; + } + + // Each enum element should override this method + public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, + String className) { + return null; + } + } + + /* + * Each srctype has its template defined used for test src generation + * Primary src types: class, method, field, package define + * getExpectedBase() and getExpectedContainer() + */ + enum SrcType { + + CLASS("\n#REPLACE\nclass #CN { } ") { + + @Override + public ExpectedBase getExpectedBase(Class<?> c) { + return c.getAnnotation(ExpectedBase.class); + } + + @Override + public ExpectedContainer getExpectedContainer(Class<?> c) { + return c.getAnnotation(ExpectedContainer.class); + } + }, + METHOD("class #CN {\n" + " " + "#REPLACE\n" + " void " + + TESTMETHOD + "() {} \n" + "}\n") { + + @Override + public ExpectedBase getExpectedBase(Class<?> c) { + ExpectedBase ret = null; + try { + ret = c.getDeclaredMethod(TESTMETHOD).getAnnotation( + ExpectedBase.class); + } catch (NoSuchMethodException nme) { + error("Could not get " + TESTMETHOD + " for className " + + c.getName() + " Exception:\n" + nme); + } + return ret; + } + + @Override + public ExpectedContainer getExpectedContainer(Class<?> c) { + ExpectedContainer ret = null; + try { + ret = c.getDeclaredMethod(TESTMETHOD).getAnnotation( + ExpectedContainer.class); + } catch (NoSuchMethodException nme) { + error("Could not get " + TESTMETHOD + " for className " + + c.getName() + " Exception:\n" + nme); + } + return ret; + + } + }, + FIELD("class #CN {\n" + " " + "#REPLACE\n" + " int " + TESTFIELD + + " = 0; \n" + "}\n") { + + @Override + public ExpectedBase getExpectedBase(Class<?> c) { + ExpectedBase ret = null; + try { + ret = c.getDeclaredField(TESTFIELD).getAnnotation( + ExpectedBase.class); + } catch (NoSuchFieldException nme) { + error("Could not get " + TESTFIELD + " for className " + + c.getName() + " Exception:\n" + nme); + } + return ret; + } + + @Override + public ExpectedContainer getExpectedContainer(Class<?> c) { + ExpectedContainer ret = null; + try { + ret = c.getDeclaredField(TESTFIELD).getAnnotation( + ExpectedContainer.class); + } catch (NoSuchFieldException nme) { + error("Could not get " + TESTFIELD + " for className " + + c.getName() + " Exception:\n" + nme); + } + return ret; + + } + }, + PACKAGE("package " + TESTPKG + "; \n" + "class #CN {}") { + + @Override + public ExpectedBase getExpectedBase(Class<?> c) { + return c.getPackage().getAnnotation(ExpectedBase.class); + } + + @Override + public ExpectedContainer getExpectedContainer(Class<?> c) { + return c.getPackage().getAnnotation(ExpectedContainer.class); + } + }, + PKGINFO("#REPLACE1\npackage " + TESTPKG + "; \n" + "#REPLACE2"), + INTERFACE("#REPLACE\ninterface #IN { } "), + INTERFACEIMPL("#REPLACE\nclass #CN implements #IN {}"), + CLASSEXTENDS("#REPLACE\nclass #CN extends #SN {}"); + String template; + + private SrcType(String template) { + this.template = template; + } + + public String getTemplate() { + return template; + } + + // Elements should override + public ExpectedBase getExpectedBase(Class<?> c) { + return null; + } + + public ExpectedContainer getExpectedContainer(Class<?> c) { + return null; + } + + /* + * Returns only primary src types ; + */ + public static SrcType[] getSrcTypes() { + return new SrcType[]{CLASS, PACKAGE, METHOD, FIELD}; + } + } + + /* + * Each enum constant is one of the 6 methods from AnnotatedElement interface + * that needs to be tested. + * Each enum constant overrides these 4 methods: + * - getActualAnnoBase(SrcType srcType, Class<?> c) + * - getActualAnnoContainer(SrcType srcType, Class<?> c) + * - getExpectedAnnoBase(SrcType srcType, Class<?> c) + * - getExpectedAnnoContainer(SrcType srcType, Class<?> c) + */ + enum TestMethod { + + GET_ANNO("getAnnotation") { + + @Override + public Annotation[] getActualAnnoBase(SrcType srcType, Class<?> c) { + Annotation[] actualAnno = new Annotation[1]; + switch (srcType) { + case CLASS: + actualAnno[0] = c.getAnnotation(srcType.getExpectedBase(c).value()); + break; + case PACKAGE: + actualAnno[0] = c.getPackage().getAnnotation( + srcType.getExpectedBase(c).value()); + break; + case METHOD: + try { + actualAnno[0] = c.getDeclaredMethod(TESTMETHOD).getAnnotation( + srcType.getExpectedBase(c).value()); + } catch (NoSuchMethodException nme) { + error("Could not get " + TESTMETHOD + + " for className = " + c.getName() + + "Exception = " + nme); + } + break; + case FIELD: + try { + actualAnno[0] = c.getDeclaredField(TESTFIELD).getAnnotation( + srcType.getExpectedBase(c).value()); + } catch (NoSuchFieldException nfe) { + error("Could not get " + TESTFIELD + + " for className = " + c.getName() + + "Exception = " + nfe); + } + break; + } + return actualAnno; + } + + @Override + public Annotation[] getActualAnnoContainer(SrcType srcType, + Class<?> c) { + Annotation[] actualAnno = new Annotation[1]; + switch (srcType) { + case CLASS: + actualAnno[0] = c.getAnnotation(srcType.getExpectedContainer(c).value()); + break; + case PACKAGE: + actualAnno[0] = c.getPackage().getAnnotation( + srcType.getExpectedContainer(c).value()); + break; + case METHOD: + try { + actualAnno[0] = c.getDeclaredMethod(TESTMETHOD).getAnnotation( + srcType.getExpectedContainer(c).value()); + } catch (NoSuchMethodException nme) { + error("Could not get " + TESTMETHOD + + " for className = " + c.getName() + + "Exception = " + nme); + } + break; + case FIELD: + try { + actualAnno[0] = c.getDeclaredField(TESTFIELD).getAnnotation( + srcType.getExpectedContainer(c).value()); + } catch (NoSuchFieldException nfe) { + error("Could not get " + TESTFIELD + + " for className = " + c.getName() + + "Exception = " + nfe); + } + break; + } + return actualAnno; + } + + @Override + public String[] getExpectedAnnoBase(SrcType srcType, Class<?> c) { + String[] expAnno = {srcType.getExpectedBase(c).getAnnotationVal()}; + return expAnno; + } + + @Override + public String[] getExpectedAnnoContainer(SrcType srcType, Class<?> c) { + String[] expAnno = {srcType.getExpectedContainer(c).getAnnotationVal()}; + return expAnno; + } + }, + GET_ANNOS("getAnnotations") { + + @Override + public Annotation[] getActualAnnoBase(SrcType srcType, Class<?> c) { + Annotation[] actualAnnos = null; + switch (srcType) { + case CLASS: + actualAnnos = c.getAnnotations(); + break; + case PACKAGE: + actualAnnos = c.getPackage().getAnnotations(); + break; + case METHOD: + try { + actualAnnos = c.getDeclaredMethod(TESTMETHOD).getAnnotations(); + } catch (NoSuchMethodException nme) { + error("Could not get " + TESTMETHOD + + " for className = " + c.getName() + + "Exception = " + nme); + } + break; + case FIELD: + try { + actualAnnos = c.getDeclaredField(TESTFIELD).getAnnotations(); + } catch (NoSuchFieldException nfe) { + error("Could not get " + TESTFIELD + + " for className = " + c.getName() + + "Exception = " + nfe); + } + break; + } + return actualAnnos; + } + + @Override + public Annotation[] getActualAnnoContainer(SrcType srcType, + Class<?> c) { + Annotation[] actualAnnos = null; + switch (srcType) { + case CLASS: + actualAnnos = c.getAnnotations(); + break; + case PACKAGE: + actualAnnos = c.getPackage().getAnnotations(); + break; + case METHOD: + try { + actualAnnos = c.getDeclaredMethod(TESTMETHOD).getAnnotations(); + } catch (NoSuchMethodException nme) { + error("Could not get " + TESTMETHOD + + " for className = " + c.getName() + + "Exception = " + nme); + } + break; + case FIELD: + try { + actualAnnos = c.getDeclaredField(TESTFIELD).getAnnotations(); + } catch (NoSuchFieldException nfe) { + error("Could not get " + TESTFIELD + + " for className = " + c.getName() + + "Exception = " + nfe); + } + break; + } + return actualAnnos; + } + + @Override + public String[] getExpectedAnnoBase(SrcType srcType, Class<?> c) { + return srcType.getExpectedBase(c).getAnnotationsVals(); + } + + @Override + public String[] getExpectedAnnoContainer(SrcType srcType, Class<?> c) { + return srcType.getExpectedContainer(c).getAnnotationsVals(); + } + }, + GET_DECL_ANNOS("getDeclaredAnnotations") { + + @Override + public Annotation[] getActualAnnoBase(SrcType srcType, Class<?> c) { + Annotation[] actualDeclAnnos = null; + switch (srcType) { + case CLASS: + actualDeclAnnos = c.getDeclaredAnnotations(); + break; + case PACKAGE: + actualDeclAnnos = c.getPackage().getDeclaredAnnotations(); + break; + case METHOD: + try { + actualDeclAnnos = c.getDeclaredMethod(TESTMETHOD) + .getDeclaredAnnotations(); + } catch (NoSuchMethodException nme) { + error("Could not get " + TESTMETHOD + + " for className = " + c.getName() + + "Exception = " + nme); + } + break; + case FIELD: + try { + actualDeclAnnos = c.getDeclaredField(TESTFIELD) + .getDeclaredAnnotations(); + } catch (NoSuchFieldException nfe) { + error("Could not get " + TESTFIELD + + " for className = " + c.getName() + + "Exception = " + nfe); + } + break; + } + return actualDeclAnnos; + } + + @Override + public Annotation[] getActualAnnoContainer(SrcType srcType, + Class<?> c) { + Annotation[] actualDeclAnnos = null; + switch (srcType) { + case CLASS: + actualDeclAnnos = c.getDeclaredAnnotations(); + break; + case PACKAGE: + actualDeclAnnos = c.getPackage().getDeclaredAnnotations(); + break; + case METHOD: + try { + actualDeclAnnos = c.getDeclaredMethod(TESTMETHOD) + .getDeclaredAnnotations(); + } catch (NoSuchMethodException nme) { + error("Could not get " + TESTMETHOD + + " for className = " + c.getName() + + "Exception = " + nme); + } + break; + case FIELD: + try { + actualDeclAnnos = c.getDeclaredField(TESTFIELD) + .getDeclaredAnnotations(); + } catch (NoSuchFieldException nfe) { + error("Could not get " + TESTFIELD + + " for className = " + c.getName() + + "Exception = " + nfe); + } + break; + } + return actualDeclAnnos; + } + + @Override + public String[] getExpectedAnnoBase(SrcType srcType, Class<?> c) { + return srcType.getExpectedBase(c).getDeclAnnosVals(); + } + + @Override + public String[] getExpectedAnnoContainer(SrcType srcType, Class<?> c) { + return srcType.getExpectedContainer(c).getDeclAnnosVals(); + } + }, + GET_DECL_ANNO("getDeclaredAnnotation") { + + @Override + public Annotation[] getActualAnnoBase(SrcType srcType, Class<?> c) { + Annotation[] actualDeclAnno = new Annotation[1]; + switch (srcType) { + case CLASS: + actualDeclAnno[0] = c.getDeclaredAnnotation( + srcType.getExpectedBase(c).value()); + break; + case PACKAGE: + actualDeclAnno[0] = c.getPackage().getDeclaredAnnotation( + srcType.getExpectedBase(c).value()); + break; + case METHOD: + try { + actualDeclAnno[0] = c.getDeclaredMethod(TESTMETHOD) + .getDeclaredAnnotation( + srcType.getExpectedBase(c).value()); + } catch (NoSuchMethodException nme) { + error("Could not get " + TESTMETHOD + + " for className = " + c.getName() + + "Exception = " + nme); + } + break; + case FIELD: + try { + actualDeclAnno[0] = c.getDeclaredField(TESTFIELD) + .getDeclaredAnnotation( + srcType.getExpectedBase(c).value()); + } catch (NoSuchFieldException nfe) { + error("Could not get " + TESTFIELD + + " for className = " + c.getName() + + "Exception = " + nfe); + } + break; + } + return actualDeclAnno; + } + + @Override + public Annotation[] getActualAnnoContainer(SrcType srcType, + Class<?> c) { + Annotation[] actualDeclAnno = new Annotation[1]; + switch (srcType) { + case CLASS: + actualDeclAnno[0] = c.getDeclaredAnnotation( + srcType.getExpectedContainer(c).value()); + break; + case PACKAGE: + actualDeclAnno[0] = c.getPackage().getDeclaredAnnotation( + srcType.getExpectedContainer(c).value()); + break; + case METHOD: + try { + actualDeclAnno[0] = c.getDeclaredMethod(TESTMETHOD) + .getDeclaredAnnotation( + srcType.getExpectedContainer(c).value()); + } catch (NoSuchMethodException nme) { + error("Could not get " + TESTMETHOD + + " for className = " + c.getName() + + "Exception = " + nme); + } + break; + case FIELD: + try { + actualDeclAnno[0] = c.getDeclaredField(TESTFIELD) + .getDeclaredAnnotation( + srcType.getExpectedContainer(c).value()); + } catch (NoSuchFieldException nfe) { + error("Could not get " + TESTFIELD + + " for className = " + c.getName() + + "Exception = " + nfe); + } + break; + } + return actualDeclAnno; + } + + @Override + public String[] getExpectedAnnoBase(SrcType srcType, Class<?> c) { + String[] expAnno = {srcType.getExpectedBase(c).getDeclAnnoVal()}; + return expAnno; + } + + @Override + public String[] getExpectedAnnoContainer(SrcType srcType, Class<?> c) { + String[] expAnno = {srcType.getExpectedContainer(c).getDeclAnnoVal()}; + return expAnno; + } + }, // new + GET_ANNOS_ARG("getAnnotationsArg") { + + @Override + public Annotation[] getActualAnnoBase(SrcType srcType, Class<?> c) { + Annotation[] actualAnnoArgs = null; + switch (srcType) { + case CLASS: + actualAnnoArgs = c.getAnnotationsByType(srcType.getExpectedBase(c).value()); + break; + case PACKAGE: + actualAnnoArgs = c.getPackage().getAnnotationsByType( + srcType.getExpectedBase(c).value()); + break; + case METHOD: + try { + actualAnnoArgs = c.getDeclaredMethod(TESTMETHOD) + .getAnnotationsByType( + srcType.getExpectedBase(c).value()); + } catch (NoSuchMethodException nme) { + error("Could not get " + TESTMETHOD + + " for className = " + c.getName() + + "Exception = " + nme); + } + break; + case FIELD: + try { + actualAnnoArgs = c.getDeclaredField(TESTFIELD) + .getAnnotationsByType( + srcType.getExpectedBase(c).value()); + } catch (NoSuchFieldException nfe) { + error("Could not get " + TESTFIELD + + " for className = " + c.getName() + + "Exception = " + nfe); + } + break; + } + return actualAnnoArgs; + } + + @Override + public Annotation[] getActualAnnoContainer(SrcType srcType, + Class<?> c) { + Annotation[] actualAnnoArgs = null; + switch (srcType) { + case CLASS: + actualAnnoArgs = c.getAnnotationsByType(srcType.getExpectedContainer(c).value()); + break; + case PACKAGE: + actualAnnoArgs = c.getPackage().getAnnotationsByType( + srcType.getExpectedContainer(c).value()); + break; + case METHOD: + try { + actualAnnoArgs = c.getDeclaredMethod(TESTMETHOD) + .getAnnotationsByType( + srcType.getExpectedContainer(c).value()); + } catch (NoSuchMethodException nme) { + error("Could not get " + TESTMETHOD + + " for className = " + c.getName() + + "Exception = " + nme); + } + break; + case FIELD: + try { + actualAnnoArgs = c.getDeclaredField(TESTFIELD) + .getAnnotationsByType( + srcType.getExpectedContainer(c).value()); + } catch (NoSuchFieldException nfe) { + error("Could not get " + TESTFIELD + + " for className = " + c.getName() + + "Exception = " + nfe); + } + break; + } + return actualAnnoArgs; + } + + @Override + public String[] getExpectedAnnoBase(SrcType srcType, Class<?> c) { + return srcType.getExpectedBase(c).getAnnosArgs(); + } + + @Override + public String[] getExpectedAnnoContainer(SrcType srcType, Class<?> c) { + return srcType.getExpectedContainer(c).getAnnosArgs(); + } + }, // new + GET_DECL_ANNOS_ARG("getDeclAnnosArg") { + + @Override + public Annotation[] getActualAnnoBase(SrcType srcType, Class<?> c) { + Annotation[] actualDeclAnnosArgs = null; + switch (srcType) { + case CLASS: + actualDeclAnnosArgs = c.getDeclaredAnnotationsByType( + srcType.getExpectedBase(c).value()); + break; + case PACKAGE: + actualDeclAnnosArgs = c.getPackage().getDeclaredAnnotationsByType( + srcType.getExpectedBase(c).value()); + break; + case METHOD: + try { + actualDeclAnnosArgs = c.getDeclaredMethod(TESTMETHOD) + .getDeclaredAnnotationsByType( + srcType.getExpectedBase(c).value()); + } catch (NoSuchMethodException nme) { + error("Could not get " + TESTMETHOD + + " for className = " + c.getName() + + "Exception = " + nme); + } + break; + case FIELD: + try { + actualDeclAnnosArgs = c.getDeclaredField(TESTFIELD) + .getDeclaredAnnotationsByType( + srcType.getExpectedBase(c).value()); + } catch (NoSuchFieldException nfe) { + error("Could not get " + TESTFIELD + + " for className = " + c.getName() + + "Exception = " + nfe); + } + break; + } + return actualDeclAnnosArgs; + } + + @Override + public Annotation[] getActualAnnoContainer(SrcType srcType, + Class<?> c) { + Annotation[] actualDeclAnnosArgs = null; + switch (srcType) { + case CLASS: + actualDeclAnnosArgs = c.getDeclaredAnnotationsByType( + srcType.getExpectedContainer(c).value()); + break; + case PACKAGE: + actualDeclAnnosArgs = c.getPackage().getDeclaredAnnotationsByType( + srcType.getExpectedContainer(c).value()); + break; + case METHOD: + try { + actualDeclAnnosArgs = c.getDeclaredMethod(TESTMETHOD) + .getDeclaredAnnotationsByType( + srcType.getExpectedContainer(c).value()); + } catch (NoSuchMethodException nme) { + error("Could not get " + TESTMETHOD + + " for className = " + c.getName() + + "Exception = " + nme); + } + break; + case FIELD: + try { + actualDeclAnnosArgs = c.getDeclaredField(TESTFIELD) + .getDeclaredAnnotationsByType( + srcType.getExpectedContainer(c).value()); + } catch (NoSuchFieldException nfe) { + error("Could not get " + TESTFIELD + + " for className = " + c.getName() + + "Exception = " + nfe); + } + break; + } + return actualDeclAnnosArgs; + } + + @Override + public String[] getExpectedAnnoBase(SrcType srcType, Class<?> c) { + return srcType.getExpectedBase(c).getDeclAnnosArgs(); + } + + @Override + public String[] getExpectedAnnoContainer(SrcType srcType, Class<?> c) { + return srcType.getExpectedContainer(c).getDeclAnnosArgs(); + } + }; // new + String name; + + private TestMethod(String name) { + this.name = name; + } + + public Annotation[] getActualAnnoBase(SrcType srcType, Class<?> c) { + return null; + } + + public Annotation[] getActualAnnoContainer(SrcType srcType, Class<?> c) { + return null; + } + + public String[] getExpectedAnnoBase(SrcType srcType, Class<?> c) { + return null; + } + + public String[] getExpectedAnnoContainer(SrcType srcType, Class<?> c) { + return null; + } + } + + /* + * For a given srcType and class object, compare expectedBase and actualBase + * annotations as well as expectedContainer and actualContainer annotations. + * + * Return true if both comparisons are true else return false. + * + */ + protected static void checkAnnoValues(SrcType srcType, Class<?> c) { + + // Load @ExpectedBase and @ExpectedContainer + ExpectedBase eb = srcType.getExpectedBase(c); + ExpectedContainer ec = srcType.getExpectedContainer(c); + if (eb == null) { + error("Did not find ExpectedBase Annotation, Test will exit"); + throw new RuntimeException(); + } + if (ec == null) { + error("Did not find ExpectedContainer Annotation, Test will exit"); + throw new RuntimeException(); + } + + for (TestMethod testMethod : TestMethod.values()) { + debugPrint("---------------------------------------------"); + debugPrint("Test method = " + testMethod); + boolean isBasePass = true; + boolean isConPass = true; + // ExpectedBase = Annotation, no annotation is defined, skip comparison + if (!eb.value().getSimpleName().equalsIgnoreCase("Annotation")) { + isBasePass = compareAnnotations( + testMethod.getActualAnnoBase(srcType, c), + testMethod.getExpectedAnnoBase(srcType, c)); + } + + // ExpectedContainer = Annotation, no annotation is defined, skip comparison + if (!ec.value().getSimpleName().equalsIgnoreCase("Annotation")) { + isConPass = compareAnnotations( + testMethod.getActualAnnoContainer(srcType, c), + testMethod.getExpectedAnnoContainer(srcType, c)); + } + if (isBasePass && isConPass) { + debugPrint("Testcase passed for " + testMethod + + " for className = " + c.getName()); + } else { + debugPrint("Testcase failed for " + testMethod + + " for className = " + c.getName()); + } + } + } + + // Annotation comparison: Length should be same and all expected values + // should be present in actualAnno[]. + private static boolean compareAnnotations(Annotation[] actualAnnos, + String[] expectedAnnos) { + // Length is different + if (actualAnnos.length != expectedAnnos.length) { + error("Length not same, Actual length = " + actualAnnos.length + + " Expected length = " + expectedAnnos.length); + printArrContents(actualAnnos); + printArrContents(expectedAnnos); + return false; + } else { + int i = 0; + // Length is same and 0 + if (actualAnnos.length == 0) { + // Expected/actual lengths already checked for + // equality; no more checks do to + return true; + } + // Expected annotation should be NULL + if (actualAnnos[0] == null) { + if (expectedAnnos[0].equals("NULL")) { + debugPrint("Arr values are NULL as expected"); + return true; + } else { + error("Array values are not NULL"); + printArrContents(actualAnnos); + printArrContents(expectedAnnos); + return false; + } + } + // Lengths are same, compare array contents + String[] actualArr = new String[actualAnnos.length]; + for (Annotation a : actualAnnos) { + actualArr[i++] = a.annotationType().getSimpleName(); + } + + List<String> actualList = Arrays.asList(actualArr); + List<String> expectedList = Arrays.asList(expectedAnnos); + + if (!actualList.containsAll(expectedList)) { + error("Array values are not same"); + printArrContents(actualAnnos); + printArrContents(expectedAnnos); + return false; + } else { + debugPrint("Arr values are same as expected"); + } + } + return true; + } + + private static void printArrContents(Annotation[] actualAnnos) { + System.out.print("Actual Arr Values: "); + for (Annotation a : actualAnnos) { + if (a != null && a.annotationType() != null) { + System.out.print("[" + a.annotationType().getSimpleName() + "]"); + } else { + System.out.println("[null]"); + } + } + System.out.println(); + } + + private static void printArrContents(String[] expectedAnnos) { + System.out.print("Expected Arr Values: "); + for (String s : expectedAnnos) { + System.out.print("[" + s + "]"); + } + System.out.println(); + } + + private ClassLoader getLoader() { + return getClass().getClassLoader(); + } + + private static Class<?> loadClass(String className, ClassLoader parentClassLoader, File... destDirs) { + try { + List<URL> list = new ArrayList<>(); + for (File f : destDirs) { + list.add(new URL("file:" + f.toString().replace("\\", "/") + "/")); + } + return Class.forName(className, true, new URLClassLoader( + list.toArray(new URL[list.size()]), parentClassLoader)); + } catch (ClassNotFoundException | MalformedURLException e) { + throw new RuntimeException("Error loading class " + className, e); + } + } + + private static void printTestSrc(Iterable<? extends JavaFileObject> files) { + for (JavaFileObject f : files) { + System.out.println("Test file " + f.getName() + ":"); + try { + System.out.println("" + f.getCharContent(true)); + } catch (IOException e) { + throw new RuntimeException( + "Exception when printing test src contents for class " + + f.getName(), e); + } + } + + } + + public static StringBuilder getCommonStmts(boolean isRepeatable) { + StringBuilder sb = new StringBuilder(); + + sb.append(Helper.ContentVars.IMPORTEXPECTED.getVal()) + .append(Helper.ContentVars.IMPORTSTMTS.getVal()) + .append(Helper.ContentVars.RETENTIONRUNTIME.getVal()) + .append(Helper.ContentVars.INHERITED.getVal()); + if(isRepeatable) { + sb.append(Helper.ContentVars.REPEATABLE.getVal()); + } + sb.append(Helper.ContentVars.BASE.getVal()) + .append(Helper.ContentVars.RETENTIONRUNTIME.getVal()) + .append(Helper.ContentVars.INHERITED.getVal()) + .append(Helper.ContentVars.CONTAINER.getVal()); + return sb; + } + + private static int getNumErrors() { + return errors; + } + + private static void error(String msg) { + System.out.println("error: " + msg); + errors++; + } + + private static void debugPrint(String string) { + if(DEBUG) + System.out.println(string); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/repeatingAnnotations/combo/TargetAnnoCombo.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,508 @@ +/* + * 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. + */ + +/* + * @test + * @bug 7151010 8006547 8007766 + * @summary Default test cases for running combinations for Target values + * @build Helper + * @run main TargetAnnoCombo + */ + +import java.util.Set; +import java.util.List; +import java.io.IOException; +import java.lang.annotation.ElementType; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.EnumSet; +import javax.tools.Diagnostic; +import javax.tools.DiagnosticCollector; +import javax.tools.JavaFileObject; + +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.ElementType.PACKAGE; +import static java.lang.annotation.ElementType.LOCAL_VARIABLE; +import static java.lang.annotation.ElementType.TYPE_USE; +import static java.lang.annotation.ElementType.TYPE_PARAMETER; + +public class TargetAnnoCombo { + + static final String TESTPKG = "testpkg"; + + // Set it to true to get more debug information including base and container + // target sets for a given test case. + static final boolean DEBUG = false; + + // Define constant target sets to be used for the combination of the target values. + final static Set<ElementType> noSet = null; + final static Set<ElementType> empty = EnumSet.noneOf(ElementType.class); + + // [TYPE, FIELD, METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE, ANNOTATION_TYPE, + // PACKAGE, TYPE_PARAMETER, TYPE_USE] + final static Set<ElementType> allTargets = EnumSet.allOf(ElementType.class); + + // [TYPE, FIELD, METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE, ANNOTATION_TYPE, + // PACKAGE] + final static Set<ElementType> jdk7 = EnumSet.range(TYPE, PACKAGE); + + // [TYPE_USE, TYPE_PARAMETER] + final static Set<ElementType> jdk8 = EnumSet.range(TYPE_PARAMETER, TYPE_USE); + + // List of test cases to run. This list is created in generate(). + // To run a specific test cases add case number in @run main line. + List<TestCase> testCases = new ArrayList<TestCase>(); + + int errors = 0; + + // Identify test cases that fail. + enum IgnoreKind { + RUN, + IGNORE + }; + + private class TestCase { + + private Set<ElementType> baseAnnotations; + private Set<ElementType> containerAnnotations; + private IgnoreKind ignore; + + public TestCase(Set<ElementType> baseAnnotations, Set<ElementType> containerAnnotations) { + this(baseAnnotations, containerAnnotations, IgnoreKind.RUN); + } + + public TestCase(Set<ElementType> baseAnnotations, Set<ElementType> containerAnnotations, + IgnoreKind ignoreKind) { + this.baseAnnotations = baseAnnotations; + this.containerAnnotations = containerAnnotations; + this.ignore = ignoreKind; + } + + public Set getBaseAnnotations() { + return baseAnnotations; + } + + public Set getContainerAnnotations() { + return containerAnnotations; + } + + public boolean isIgnored() { + return ignore == IgnoreKind.IGNORE; + } + + // Determine if a testCase should compile or not. + private boolean isValidSubSet() { + /* + * RULE 1: conAnnoTarget should be a subset of baseAnnoTarget + * RULE 2: For empty @Target ({}) - annotation cannot be applied anywhere + * - Empty sets for both is valid + * - Empty baseTarget set is invalid with non-empty conTarget set + * - Non-empty baseTarget set is valid with empty conTarget set + * RULE 3: For no @Target specified - annotation can be applied to any JDK 7 targets + * - No @Target for both is valid + * - No @Target for baseTarget set with @Target conTarget set is valid + * - @Target for baseTarget set with no @Target for conTarget is invalid + */ + + + /* If baseAnno has no @Target, Foo can be either applied to @Target specified + * for container annotation else will be applicable for all default targets + * if no @Target is present for container annotation. + * In both cases, the set will be a valid set with no @Target for base annotation + */ + if (baseAnnotations == null) { + if (containerAnnotations == null) { + return true; + } + return !(containerAnnotations.contains(TYPE_USE) || + containerAnnotations.contains(TYPE_PARAMETER)); + } + + Set<ElementType> tempBaseSet = EnumSet.noneOf(ElementType.class); + tempBaseSet.addAll(baseAnnotations); + // If BaseAnno has TYPE, then ANNOTATION_TYPE is allowed by default. + if (baseAnnotations.contains(TYPE)) { + tempBaseSet.add(ANNOTATION_TYPE); + } + + // If containerAnno has no @Target, only valid case if baseAnnoTarget has + // all targets defined else invalid set. + if (containerAnnotations == null) { + return tempBaseSet.containsAll(jdk7); + } + + // At this point, neither conAnnoTarget or baseAnnoTarget are null. + if (containerAnnotations.isEmpty()) { + return true; + } + + // At this point, conAnnoTarget is non-empty. + if (baseAnnotations.isEmpty()) { + return false; + } + + // At this point, neither conAnnoTarget or baseAnnoTarget are empty. + return tempBaseSet.containsAll(containerAnnotations); + } + } + + public static void main(String args[]) throws Exception { + TargetAnnoCombo tac = new TargetAnnoCombo(); + // Generates all test cases to be run. + tac.generate(); + List<Integer> cases = new ArrayList<Integer>(); + for (int i = 0; i < args.length; i++) { + cases.add(Integer.parseInt(args[i])); + } + if (cases.isEmpty()) { + tac.run(); + } else { + for (int index : cases) { + tac.executeTestCase(tac.testCases.get(index), index); + } + } + } + + private void generate() { + // Adding test cases to run. + testCases.addAll(Arrays.asList( + // No base target against no container target. + new TestCase(noSet, noSet), + // No base target against empty container target. + new TestCase(noSet, empty), + // No base target against TYPE_USE only container target. + new TestCase(noSet, less(jdk8, TYPE_PARAMETER)), + // No base target against TYPE_PARAMETER only container target. + new TestCase(noSet, less(jdk8, TYPE_USE)), + // No base target against TYPE_USE + TYPE_PARAMETER only container target. + new TestCase(noSet, jdk8), + // No base target against TYPE_USE + some selection of jdk7 targets. + new TestCase(noSet, + plus(EnumSet.range(TYPE, LOCAL_VARIABLE), TYPE_USE)), + // No base target against TYPE_PARAMETER + some selection of jdk7 targets. + new TestCase(noSet, + plus(EnumSet.range(TYPE, LOCAL_VARIABLE), TYPE_PARAMETER)), + // No base target against each jdk7 target alone as container target. + new TestCase(noSet, plus(empty, TYPE)), + new TestCase(noSet, plus(empty, PARAMETER)), + new TestCase(noSet, plus(empty, PACKAGE)), + new TestCase(noSet, plus(empty, METHOD)), + new TestCase(noSet, plus(empty, LOCAL_VARIABLE)), + new TestCase(noSet, plus(empty, FIELD)), + new TestCase(noSet, plus(empty, CONSTRUCTOR)), + new TestCase(noSet, plus(empty, ANNOTATION_TYPE)), + // Empty base target against no container target. + new TestCase(empty, noSet), + // Empty base target against empty container target. + new TestCase(empty, empty), + // Empty base target against any lone container target. + new TestCase(empty, plus(empty, TYPE)), + new TestCase(empty, plus(empty, PARAMETER)), + new TestCase(empty, plus(empty, PACKAGE)), + new TestCase(empty, plus(empty, METHOD)), + new TestCase(empty, plus(empty, LOCAL_VARIABLE)), + new TestCase(empty, plus(empty, FIELD)), + new TestCase(empty, plus(empty, CONSTRUCTOR)), + new TestCase(empty, plus(empty, ANNOTATION_TYPE)), + new TestCase(empty, less(jdk8, TYPE_USE)), + new TestCase(empty, less(jdk8, TYPE_PARAMETER)), + // No container target against all all-but one jdk7 targets. + new TestCase(less(jdk7, TYPE), noSet), + new TestCase(less(jdk7, PARAMETER), noSet), + new TestCase(less(jdk7, PACKAGE), noSet), + new TestCase(less(jdk7, METHOD), noSet), + new TestCase(less(jdk7, LOCAL_VARIABLE), noSet), + new TestCase(less(jdk7, FIELD), noSet), + new TestCase(less(jdk7, CONSTRUCTOR), noSet), + new TestCase(less(jdk7, ANNOTATION_TYPE), noSet), + // No container against all but TYPE and ANNOTATION_TYPE + new TestCase(less(jdk7, TYPE, ANNOTATION_TYPE), noSet), + // No container against jdk7 targets. + new TestCase(jdk7, noSet), + // No container against jdk7 targets plus one or both of TYPE_USE, TYPE_PARAMETER + new TestCase(plus(jdk7, TYPE_USE), noSet), + new TestCase(plus(jdk7, TYPE_PARAMETER), noSet), + new TestCase(allTargets, noSet), + // Empty container target against any lone target. + new TestCase(plus(empty, TYPE), empty), + new TestCase(plus(empty, PARAMETER), empty), + new TestCase(plus(empty, PACKAGE), empty), + new TestCase(plus(empty, METHOD), empty), + new TestCase(plus(empty, LOCAL_VARIABLE), empty), + new TestCase(plus(empty, FIELD), empty), + new TestCase(plus(empty, CONSTRUCTOR), empty), + new TestCase(plus(empty, ANNOTATION_TYPE), empty), + new TestCase(plus(empty, TYPE_USE), empty), + new TestCase(plus(empty, TYPE_PARAMETER), empty), + // All base targets against all container targets. + new TestCase(allTargets, allTargets), + // All base targets against all but one container targets. + new TestCase(allTargets, less(allTargets, TYPE)), + new TestCase(allTargets, less(allTargets, PARAMETER)), + new TestCase(allTargets, less(allTargets, PACKAGE)), + new TestCase(allTargets, less(allTargets, METHOD)), + new TestCase(allTargets, less(allTargets, LOCAL_VARIABLE)), + new TestCase(allTargets, less(allTargets, FIELD)), + new TestCase(allTargets, less(allTargets, CONSTRUCTOR)), + new TestCase(allTargets, less(allTargets, ANNOTATION_TYPE)), + new TestCase(allTargets, less(allTargets, TYPE_USE)), + new TestCase(allTargets, less(allTargets, TYPE_PARAMETER)), + // All container targets against all but one base targets. + new TestCase(less(allTargets, TYPE), allTargets), + new TestCase(less(allTargets, PARAMETER), allTargets), + new TestCase(less(allTargets, PACKAGE), allTargets), + new TestCase(less(allTargets, METHOD), allTargets), + new TestCase(less(allTargets, LOCAL_VARIABLE), allTargets), + new TestCase(less(allTargets, FIELD), allTargets), + new TestCase(less(allTargets, CONSTRUCTOR), allTargets), + new TestCase(less(allTargets, ANNOTATION_TYPE), allTargets), + new TestCase(less(allTargets, TYPE_USE), allTargets), + new TestCase(less(allTargets, TYPE_PARAMETER), allTargets))); + // Generates 100 test cases for any lone base target contained in Set + // allTargets against any lone container target. + for (ElementType b : allTargets) { + for (ElementType c : allTargets) { + testCases.add(new TestCase(plus(empty, b), plus(empty, c))); + } + } + } + + void run() throws Exception { + int testCtr = 0; + for (TestCase tc : testCases) { + if (!tc.isIgnored()) { + executeTestCase(tc, testCases.indexOf(tc)); + testCtr++; + } + } + System.out.println("Total tests run: " + testCtr); + if (errors > 0) { + throw new Exception(errors + " errors found"); + } + } + + private void executeTestCase(TestCase testCase, int index) { + debugPrint("Test case number = " + index); + debugPrint(" => baseAnnoTarget = " + testCase.getBaseAnnotations()); + debugPrint(" => containerAnnoTarget = " + testCase.getContainerAnnotations()); + + String className = "TC" + index; + boolean shouldCompile = testCase.isValidSubSet(); + Iterable<? extends JavaFileObject> files = getFileList(className, testCase, shouldCompile); + // Get result of compiling test src file(s). + boolean result = getCompileResult(className, shouldCompile, files); + // List test src code if test fails. + if (!result) { + System.out.println("FAIL: Test " + index); + try { + for (JavaFileObject f : files) { + System.out.println("File: " + f.getName() + "\n" + f.getCharContent(true)); + } + } catch (IOException ioe) { + System.out.println("Exception: " + ioe); + } + } else { + debugPrint("PASS: Test " + index); + } + + } + + // Create src code and corresponding JavaFileObjects. + private Iterable<? extends JavaFileObject> getFileList(String className, + TestCase testCase, boolean shouldCompile) { + Set<ElementType> baseAnnoTarget = testCase.getBaseAnnotations(); + Set<ElementType> conAnnoTarget = testCase.getContainerAnnotations(); + String srcContent = ""; + String pkgInfoContent = ""; + String template = Helper.template; + String baseTarget = "", conTarget = ""; + + String target = Helper.ContentVars.TARGET.getVal(); + if (baseAnnoTarget != null) { + String tmp = target.replace("#VAL", convertToString(baseAnnoTarget).toString()); + baseTarget = tmp.replace("[", "{").replace("]", "}"); + } + if (conAnnoTarget != null) { + String tmp = target.replace("#VAL", convertToString(conAnnoTarget).toString()); + conTarget = tmp.replace("[", "{").replace("]", "}"); + } + + String annoData = Helper.ContentVars.IMPORTSTMTS.getVal() + + conTarget + + Helper.ContentVars.CONTAINER.getVal() + + baseTarget + + Helper.ContentVars.REPEATABLE.getVal() + + Helper.ContentVars.BASE.getVal(); + + JavaFileObject pkgInfoFile = null; + + // If shouldCompile = true and no @Target is specified for container annotation, + // then all 8 ElementType enum constants are applicable as targets for + // container annotation. + if (shouldCompile && conAnnoTarget == null) { + Set<ElementType> copySet = EnumSet.noneOf(ElementType.class); + copySet.addAll(jdk7); + conAnnoTarget = copySet; + } + + if (shouldCompile) { + boolean isPkgCasePresent = conAnnoTarget.contains(PACKAGE); + String repeatableAnno = Helper.ContentVars.BASEANNO.getVal() + + " " + Helper.ContentVars.BASEANNO.getVal(); + for (ElementType s : conAnnoTarget) { + String replaceStr = "/*" + s.name() + "*/"; + if (s.name().equalsIgnoreCase("PACKAGE")) { + //Create packageInfo file. + String pkgInfoName = TESTPKG + "." + "package-info"; + pkgInfoContent = repeatableAnno + "\npackage " + TESTPKG + ";" + annoData; + pkgInfoFile = Helper.getFile(pkgInfoName, pkgInfoContent); + } else { + template = template.replace(replaceStr, repeatableAnno); + if (!isPkgCasePresent) { + srcContent = template.replace( + "/*ANNODATA*/", annoData).replace("#ClassName", className); + } else { + replaceStr = "/*PACKAGE*/"; + String tmp = template.replace(replaceStr, "package " + TESTPKG + ";"); + srcContent = tmp.replace("#ClassName", className); + } + } + } + } else { + // For invalid cases, compilation should fail at declaration site. + template = "class #ClassName {}"; + srcContent = annoData + template.replace("#ClassName", className); + } + JavaFileObject srcFile = Helper.getFile(className, srcContent); + Iterable<? extends JavaFileObject> files = null; + if (pkgInfoFile != null) { + files = Arrays.asList(pkgInfoFile, srcFile); + } else { + files = Arrays.asList(srcFile); + } + return files; + } + + // Compile the test source file(s) and return test result. + private boolean getCompileResult(String className, boolean shouldCompile, + Iterable<? extends JavaFileObject> files) { + + DiagnosticCollector<JavaFileObject> diagnostics = + new DiagnosticCollector<JavaFileObject>(); + Helper.compileCode(diagnostics, files); + // Test case pass or fail. + boolean ok = false; + String errMesg = ""; + int numDiags = diagnostics.getDiagnostics().size(); + if (numDiags == 0) { + if (shouldCompile) { + debugPrint("Test passed, compiled as expected."); + ok = true; + } else { + errMesg = "Test failed, compiled unexpectedly."; + ok = false; + } + } else { + if (shouldCompile) { + // did not compile. + errMesg = "Test failed, did not compile."; + ok = false; + } else { + // Error in compilation as expected. + String expectedErrKey = "compiler.err.invalid.repeatable." + + "annotation.incompatible.target"; + for (Diagnostic<?> d : diagnostics.getDiagnostics()) { + if ((d.getKind() == Diagnostic.Kind.ERROR) + && d.getCode().contains(expectedErrKey)) { + // Error message as expected. + debugPrint("Error message as expected."); + ok = true; + break; + } else { + // error message is incorrect. + ok = false; + } + } + if (!ok) { + errMesg = "Incorrect error received when compiling " + + className + ", expected: " + expectedErrKey; + } + } + } + + if (!ok) { + error(errMesg); + for (Diagnostic<?> d : diagnostics.getDiagnostics()) { + System.out.println(" Diags: " + d); + } + } + return ok; + } + + private Set<ElementType> less(Set<ElementType> base, ElementType... sub) { + Set<ElementType> res = EnumSet.noneOf(ElementType.class); + res.addAll(base); + for (ElementType t : sub) { + res.remove(t); + } + return res; + } + + private Set<ElementType> plus(Set<ElementType> base, ElementType... add) { + Set<ElementType> res = EnumSet.noneOf(ElementType.class); + res.addAll(base); + for (ElementType t : add) { + res.add(t); + } + return res; + } + + // Iterate target set and add "ElementType." in front of every target type. + private List<String> convertToString(Set<ElementType> annoTarget) { + if (annoTarget == null) { + return null; + } + List<String> annoTargets = new ArrayList<String>(); + for (ElementType e : annoTarget) { + annoTargets.add("ElementType." + e.name()); + } + return annoTargets; + } + + private void debugPrint(String string) { + if (DEBUG) { + System.out.println(string); + } + } + + private void error(String msg) { + System.out.println("ERROR: " + msg); + errors++; + } +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/repeatingAnnotations/combo/expectedFiles/ExpectedBase.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2012, 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 expectedFiles; +import java.lang.annotation.Annotation; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +@Retention(RetentionPolicy.RUNTIME) +public @interface ExpectedBase { + Class<? extends Annotation> value() default Annotation.class; + String getAnnotationVal() default ""; + String[] getAnnotationsVals() default {}; + String[] getDeclAnnosVals() default {}; + // JDK8 methods + String getDeclAnnoVal() default ""; + String[] getAnnosArgs() default{}; + String[] getDeclAnnosArgs() default {}; +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/repeatingAnnotations/combo/expectedFiles/ExpectedContainer.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2012, 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 expectedFiles; +import java.lang.annotation.Annotation; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +@Retention(RetentionPolicy.RUNTIME) +public @interface ExpectedContainer { + Class<? extends Annotation> value() default Annotation.class; + String getAnnotationVal() default ""; + String[] getAnnotationsVals() default {}; + String[] getDeclAnnosVals() default {}; + // JDK8 methods + String getDeclAnnoVal() default ""; + String[] getAnnosArgs() default{}; + String[] getDeclAnnosArgs() default {}; +} +
--- a/test/tools/javac/annotations/typeAnnotations/TargetTypes.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/TargetTypes.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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
--- a/test/tools/javac/annotations/typeAnnotations/TypeProcOnly.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/TypeProcOnly.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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 @@ -32,12 +32,12 @@ import com.sun.source.util.JavacTask; import com.sun.source.util.TaskEvent; import com.sun.source.util.TaskListener; -import com.sun.source.util.TreePath; import com.sun.tools.javac.main.JavaCompiler; -import com.sun.tools.javac.main.JavaCompiler.CompileState; import com.sun.tools.javac.processing.JavacProcessingEnvironment; import com.sun.tools.javac.util.Context; +import static com.sun.tools.javac.comp.CompileStates.CompileState; + /* * @test * @summary test that type processors are run when -proc:only is passed.
--- a/test/tools/javac/annotations/typeAnnotations/api/AnnotatedArrayOrder.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/api/AnnotatedArrayOrder.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 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
--- a/test/tools/javac/annotations/typeAnnotations/api/ArrayCreationTree.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/api/ArrayCreationTree.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 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
--- a/test/tools/javac/annotations/typeAnnotations/api/ArrayPositionConsistency.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/api/ArrayPositionConsistency.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 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
--- a/test/tools/javac/annotations/typeAnnotations/classfile/ClassfileTestHelper.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/classfile/ClassfileTestHelper.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013 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
--- a/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. + * 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 @@ -174,22 +174,20 @@ String sourceBase = new String("@Retention("+retentn+")\n" + "@Target({TYPE_USE,_OTHER_})\n" + - "@ContainedBy( AC.class )\n" + + "@Repeatable( AC.class )\n" + "@interface A { }\n\n" + "@Retention("+retentn+")\n" + "@Target({TYPE_USE,_OTHER_})\n" + - "@ContainerFor(A.class)\n" + "@interface AC { A[] value(); }\n\n" + "@Retention("+retentn+")\n" + "@Target({TYPE_USE,_OTHER_})\n" + - "@ContainedBy( BC.class )\n" + + "@Repeatable( BC.class )\n" + "@interface B { }\n\n" + "@Retention("+retentn+")\n" + "@Target({TYPE_USE,_OTHER_})\n" + - "@ContainerFor(B.class)\n" + "@interface BC { B[] value(); } \n\n" + "@Retention("+retentn+")\n" + @@ -198,12 +196,11 @@ "@Retention("+retentn+")\n" + "@Target({TYPE_USE,TYPE_PARAMETER,_OTHER_})\n" + - "@ContainedBy(DC.class)\n" + + "@Repeatable(DC.class)\n" + "@interface D { }\n\n" + "@Retention("+retentn+")\n" + "@Target({TYPE_USE,TYPE_PARAMETER,_OTHER_})\n" + - "@ContainerFor(D.class) \n" + "@interface DC { D[] value(); }\n\n"); // Test case sources with sample generated source.
--- a/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. + * 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 @@ -171,32 +171,29 @@ String sourceBase = new String("@Retention("+retentn+")\n" + "@Target({TYPE_USE,_OTHER_})\n" + - "@ContainedBy( AC.class )\n" + + "@Repeatable( AC.class )\n" + "@interface A { }\n\n" + "@Retention("+retentn+")\n" + "@Target({TYPE_USE,_OTHER_})\n" + - "@ContainerFor(A.class)\n" + "@interface AC { A[] value(); }\n\n" + "@Retention("+retentn+")\n" + "@Target({TYPE_USE,_OTHER_})\n" + - "@ContainedBy( BC.class )\n" + + "@Repeatable( BC.class )\n" + "@interface B { }\n\n" + "@Retention("+retentn+")\n" + "@Target({TYPE_USE,_OTHER_})\n" + - "@ContainerFor(B.class)\n" + "@interface BC { B[] value(); } \n\n" + "@Retention("+retentn+")\n" + "@Target({TYPE_USE,TYPE_PARAMETER,_OTHER_})\n" + - "@ContainedBy(DC.class)\n" + + "@Repeatable(DC.class)\n" + "@interface D { }\n\n" + "@Retention("+retentn+")\n" + "@Target({TYPE_USE,TYPE_PARAMETER,_OTHER_})\n" + - "@ContainerFor(D.class) \n" + "@interface DC { D[] value(); }\n\n"); // Test case sources with sample generated source
--- a/test/tools/javac/annotations/typeAnnotations/classfile/NewTypeArguments.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/classfile/NewTypeArguments.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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
--- a/test/tools/javac/annotations/typeAnnotations/classfile/NoTargetAnnotations.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/classfile/NoTargetAnnotations.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 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
--- a/test/tools/javac/annotations/typeAnnotations/classfile/TypeCasts.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/classfile/TypeCasts.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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
--- a/test/tools/javac/annotations/typeAnnotations/classfile/Wildcards.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/classfile/Wildcards.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/failures/LazyConstantValue.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,44 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8008077 + * @summary Type annotations in a lazy constant need to be attributed + * in the correct order. + * @author Werner Dietl + * @compile LazyConstantValue.java + */ + +import java.lang.annotation.*; + +class ClassA { + Object o = ClassB.lcv; +} + +class ClassB { + static final String[] lcv = new @TA String[0]; +} + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/failures/TypeVariable.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,43 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8008077 + * @summary Type annotations on a type variable, where the bound of + * the type variable is also annotated, need to be processed correctly. + * @author Werner Dietl + * @compile TypeVariable.java + */ + +import java.lang.annotation.*; + +class TypeVariable { + <TV extends @TA Object> TV cast(TV p) { + return (@TA TV) p; + } +} + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA {} +
--- a/test/tools/javac/annotations/typeAnnotations/failures/VoidGenericMethod.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/failures/VoidGenericMethod.java Tue May 07 17:14:17 2013 -0700 @@ -21,6 +21,8 @@ * questions. */ +import java.lang.annotation.*; + /* * @test * @bug 6843077 8006775 @@ -29,7 +31,8 @@ * @compile/fail VoidGenericMethod.java */ class VoidGenericMethod { - public <T> @A void method() { } + public @A <T> void method() { } } +@Target(ElementType.TYPE_USE) @interface A { }
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.out Tue May 07 17:14:17 2013 -0700 @@ -1,3 +1,2 @@ -DuplicateTypeAnnotation.java:11:12: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable DuplicateTypeAnnotation.java:11:15: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable -2 errors +1 error
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.out Tue May 07 17:14:17 2013 -0700 @@ -1,3 +1,2 @@ -DuplicateTypeAnnotation.java:11:17: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable DuplicateTypeAnnotation.java:11:20: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable -2 errors +1 error
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.out Tue May 07 17:14:17 2013 -0700 @@ -1,3 +1,2 @@ -DuplicateTypeAnnotation.java:11:29: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable DuplicateTypeAnnotation.java:11:32: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable -2 errors +1 error
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.out Tue May 07 17:14:17 2013 -0700 @@ -1,3 +1,2 @@ -DuplicateTypeAnnotation.java:9:35: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable DuplicateTypeAnnotation.java:9:38: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable -2 errors \ No newline at end of file +1 error
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.out Tue May 07 17:14:17 2013 -0700 @@ -1,3 +1,2 @@ -DuplicateTypeAnnotation.java:10:13: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable DuplicateTypeAnnotation.java:10:16: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable -2 errors +1 error
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.out Tue May 07 17:14:17 2013 -0700 @@ -1,3 +1,2 @@ -DuplicateTypeAnnotation.java:11:9: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable DuplicateTypeAnnotation.java:11:12: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable -2 errors \ No newline at end of file +1 error
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.out Tue May 07 17:14:17 2013 -0700 @@ -1,3 +1,2 @@ -DuplicateTypeAnnotation.java:10:21: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable DuplicateTypeAnnotation.java:10:24: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable -2 errors \ No newline at end of file +1 error
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.out Tue May 07 17:14:17 2013 -0700 @@ -1,3 +1,2 @@ -DuplicateTypeAnnotation.java:9:25: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable DuplicateTypeAnnotation.java:9:28: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable -2 errors \ No newline at end of file +1 error
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.out Tue May 07 17:14:17 2013 -0700 @@ -1,3 +1,2 @@ -DuplicateTypeAnnotation.java:10:21: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable DuplicateTypeAnnotation.java:10:24: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable -2 errors \ No newline at end of file +1 error
--- a/test/tools/javac/annotations/typeAnnotations/failures/target/DotClass.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/failures/target/DotClass.java Tue May 07 17:14:17 2013 -0700 @@ -1,13 +1,5 @@ -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.ElementType.TYPE_PARAMETER; -import static java.lang.annotation.ElementType.TYPE_USE; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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 @@ -36,6 +28,14 @@ * @compile/fail/ref=DotClass.out -XDrawDiagnostics DotClass.java */ +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.ElementType.TYPE_PARAMETER; +import static java.lang.annotation.ElementType.TYPE_USE; + @Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface A {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/newlocations/Lambda.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,59 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8008077 + * @summary new type annotation location: lambda expressions + * @compile Lambda.java + * @author Werner Dietl + */ + +import java.lang.annotation.*; + +public class Lambda { + + interface LambdaInt { + <S, T> void generic(S p1, T p2); + } + + static class LambdaImpl implements LambdaInt { + <S, T> LambdaImpl(S p1, T p2) {} + public <S, T> void generic(S p1, T p2) {} + } + + LambdaInt getMethodRefTA(LambdaImpl r) { + return r::<@TA Object, @TB Object>generic; + } + + LambdaInt getConstructorRefTA() { + return LambdaImpl::<@TA Object, @TB Object>new; + } + +} + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { } + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TB { }
--- a/test/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.java Tue May 07 17:14:17 2013 -0700 @@ -120,7 +120,6 @@ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTA { } -@ContainerFor(RTA.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTAs { RTA[] value();
--- a/test/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.out Tue May 07 17:14:17 2013 -0700 @@ -1,53 +1,28 @@ -RepeatingTypeAnnotations.java:39:21: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:39:25: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:41:21: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:41:25: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:42:21: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:42:25: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:50:22: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:50:31: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:52:20: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:52:24: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:61:17: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:61:21: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:63:34: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:63:38: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:65:20: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:65:24: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:72:17: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:72:21: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:77:24: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:77:28: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:79:17: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:79:21: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:79:32: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:79:36: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:81:15: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:81:19: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:85:15: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:85:19: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:85:30: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:85:34: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:89:14: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:89:18: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:89:29: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:89:33: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:93:15: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:93:19: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:93:31: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:93:35: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:97:30: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:97:34: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:97:15: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:97:19: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:101:22: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:101:26: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:101:33: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:101:37: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:101:68: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:101:72: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable -RepeatingTypeAnnotations.java:101:52: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable RepeatingTypeAnnotations.java:101:56: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable - compiler.note.unchecked.filename: RepeatingTypeAnnotations.java - compiler.note.unchecked.recompile -50 errors \ No newline at end of file +25 errors
--- a/test/tools/javac/annotations/typeAnnotations/newlocations/Varargs.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/newlocations/Varargs.java Tue May 07 17:14:17 2013 -0700 @@ -1,6 +1,5 @@ - /* - * Copyright (c) 2008 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 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 @@ -22,8 +21,6 @@ * questions. */ -import java.lang.annotation.*; - /* * @test * @summary test acceptance of varargs annotations @@ -31,6 +28,8 @@ * @compile Varargs.java */ +import java.lang.annotation.*; + @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface A {}
--- a/test/tools/javac/annotations/typeAnnotations/packageanno/PackageProcessor.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/packageanno/PackageProcessor.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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 @@ -31,12 +31,12 @@ import com.sun.source.util.JavacTask; import com.sun.source.util.TaskEvent; import com.sun.source.util.TaskListener; -import com.sun.source.util.TreePath; import com.sun.tools.javac.main.JavaCompiler; -import com.sun.tools.javac.main.JavaCompiler.CompileState; import com.sun.tools.javac.processing.JavacProcessingEnvironment; import com.sun.tools.javac.util.Context; +import static com.sun.tools.javac.comp.CompileStates.CompileState; + /* * @test * @summary test that package annotations are available to type processors.
--- a/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/Anno.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/Anno.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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
--- a/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/MyClass.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/MyClass.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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
--- a/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/package-info.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/package-info.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 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
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/Driver.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/Driver.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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 @@ -241,8 +241,8 @@ sb.append("\n@Repeatable(RTAs.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTA {}"); sb.append("\n@Repeatable(RTBs.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTB {}"); - sb.append("\n@ContainerFor(RTA.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTAs { RTA[] value(); }"); - sb.append("\n@ContainerFor(RTB.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTBs { RTB[] value(); }"); + sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTAs { RTA[] value(); }"); + sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTBs { RTB[] value(); }"); sb.append("\n@Target(value={ElementType.TYPE,ElementType.FIELD,ElementType.METHOD,ElementType.PARAMETER,ElementType.CONSTRUCTOR,ElementType.LOCAL_VARIABLE})"); sb.append("\n@interface Decl {}");
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. + * 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
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,262 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8008077 + * @summary Test population of reference info for lambda expressions + * @compile -g Driver.java ReferenceInfoUtil.java Lambda.java + * @run main Driver Lambda + * @author Werner Dietl + */ + +import static com.sun.tools.classfile.TypeAnnotation.TargetType.*; + +public class Lambda { + + @TADescriptions({ + @TADescription(annotation = "TA", type = METHOD_REFERENCE, + offset = ReferenceInfoUtil.IGNORE_VALUE), + @TADescription(annotation = "TB", type = METHOD_REFERENCE, + offset = ReferenceInfoUtil.IGNORE_VALUE) + }) + public String returnMethodRef1() { + return + "class Lambda {" + + " public String getName() { return \"Lambda!\"; }" + + "}" + + + "class Test {" + + " java.util.function.Function<Lambda, String> lambda() {" + + " return @TA @TB Lambda::getName;" + + " }" + + "}"; + } + + @TADescriptions({ + @TADescription(annotation = "TA", type = METHOD_REFERENCE, + offset = ReferenceInfoUtil.IGNORE_VALUE), + @TADescription(annotation = "TB", type = METHOD_REFERENCE, + offset = ReferenceInfoUtil.IGNORE_VALUE, + genericLocation = { 3, 0 }), + @TADescription(annotation = "TC", type = METHOD_REFERENCE, + offset = ReferenceInfoUtil.IGNORE_VALUE, + genericLocation = { 3, 0 }), + @TADescription(annotation = "TD", type = METHOD_REFERENCE, + offset = ReferenceInfoUtil.IGNORE_VALUE, + genericLocation = { 3, 1 }), + @TADescription(annotation = "TE", type = METHOD_REFERENCE, + offset = ReferenceInfoUtil.IGNORE_VALUE, + genericLocation = { 3, 1 }) + }) + public String returnMethodRef2() { + return + "class Lambda<S, T> {" + + " public String getName() { return \"Lambda!\"; }" + + "}" + + + "class Test {" + + " java.util.function.Function<Lambda<Integer, Float>, String> lambda() {" + + " return @TA Lambda<@TB @TC Integer, @TD @TE Float>::getName;" + + " }" + + "}"; + } + + @TADescriptions({ + @TADescription(annotation = "CTA", type = METHOD_REFERENCE, + offset = ReferenceInfoUtil.IGNORE_VALUE), + @TADescription(annotation = "CTB", type = METHOD_REFERENCE, + offset = ReferenceInfoUtil.IGNORE_VALUE, + genericLocation = { 3, 0 }), + @TADescription(annotation = "CTC", type = METHOD_REFERENCE, + offset = ReferenceInfoUtil.IGNORE_VALUE, + genericLocation = { 3, 1 }) + }) + public String returnMethodRef3() { + return + "class Lambda<S, T> {" + + " public String getName() { return \"Lambda!\"; }" + + "}" + + + "@Target(ElementType.TYPE_USE)" + + "@interface CTA {" + + " String value();" + + "}" + + + "@Target(ElementType.TYPE_USE)" + + "@interface CTB {" + + " int age();" + + "}" + + + "@Target(ElementType.TYPE_USE)" + + "@interface CTC {" + + " String name();" + + "}" + + + "class Test {" + + " java.util.function.Function<Lambda<Integer, Float>, String> lambda() {" + + " return @CTA(\"x\") Lambda<@CTB(age = 5) Integer, @CTC(name = \"y\") Float>::getName;" + + " }" + + "}"; + } + + + @TADescriptions({ + @TADescription(annotation = "TA", type = CONSTRUCTOR_REFERENCE, + offset = ReferenceInfoUtil.IGNORE_VALUE), + @TADescription(annotation = "TB", type = CONSTRUCTOR_REFERENCE, + offset = ReferenceInfoUtil.IGNORE_VALUE) + }) + public String returnConstructorRef1() { + return + "class Lambda {" + + " Lambda() { }" + + "}" + + + "class Test {" + + " Runnable lambda() {" + + " return @TA @TB Lambda::new;" + + " }" + + "}"; + } + + @TADescriptions({ + @TADescription(annotation = "TA", type = CONSTRUCTOR_REFERENCE, + offset = ReferenceInfoUtil.IGNORE_VALUE), + @TADescription(annotation = "TB", type = CONSTRUCTOR_REFERENCE, + offset = ReferenceInfoUtil.IGNORE_VALUE, + genericLocation = { 3, 0 }), + @TADescription(annotation = "TC", type = CONSTRUCTOR_REFERENCE, + offset = ReferenceInfoUtil.IGNORE_VALUE, + genericLocation = { 3, 0 }), + @TADescription(annotation = "TD", type = CONSTRUCTOR_REFERENCE, + offset = ReferenceInfoUtil.IGNORE_VALUE, + genericLocation = { 3, 1 }), + @TADescription(annotation = "TE", type = CONSTRUCTOR_REFERENCE, + offset = ReferenceInfoUtil.IGNORE_VALUE, + genericLocation = { 3, 1 }) + }) + public String returnConstructorRef2() { + return + "class Lambda<S, T> {" + + " Lambda() { }" + + "}" + + + "class Test {" + + " Runnable lambda() {" + + " return @TA Lambda<@TB @TC Integer, @TD @TE Float>::new;" + + " }" + + "}"; + } + + @TADescriptions({ + @TADescription(annotation = "CTA", type = CONSTRUCTOR_REFERENCE, + offset = ReferenceInfoUtil.IGNORE_VALUE), + @TADescription(annotation = "CTB", type = CONSTRUCTOR_REFERENCE, + offset = ReferenceInfoUtil.IGNORE_VALUE, + genericLocation = { 3, 0 }), + @TADescription(annotation = "CTC", type = CONSTRUCTOR_REFERENCE, + offset = ReferenceInfoUtil.IGNORE_VALUE, + genericLocation = { 3, 1 }) + }) + public String returnConstructorRef3() { + return + "class Lambda<S, T> {" + + " Lambda() { }" + + "}" + + + "@Target(ElementType.TYPE_USE)" + + "@interface CTA {" + + " String value();" + + "}" + + + "@Target(ElementType.TYPE_USE)" + + "@interface CTB {" + + " int age();" + + "}" + + + "@Target(ElementType.TYPE_USE)" + + "@interface CTC {" + + " String name();" + + "}" + + + "class Test {" + + " Runnable lambda() {" + + " return @CTA(\"x\") Lambda<@CTB(age = 5) Integer, @CTC(name = \"y\") Float>::new;" + + " }" + + "}"; + } + + + @TADescriptions({ + @TADescription(annotation = "TA", type = METHOD_REFERENCE_TYPE_ARGUMENT, + offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0), + @TADescription(annotation = "TB", type = METHOD_REFERENCE_TYPE_ARGUMENT, + offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 1) + }) + public String returnMethodRefTA1() { + return + "interface Lambda {" + + " <S, T> void generic(S p1, T p2);" + + "}" + + + "class LambdaImpl implements Lambda {" + + " public <S, T> void generic(S p1, T p2) {}" + + "}" + + + "class Test {" + + " Lambda lambda(LambdaImpl r) {" + + " return r::<@TA Object, @TB Object>generic;" + + " }" + + "}"; + } + + @TADescriptions({ + @TADescription(annotation = "TA", type = CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT, + offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0), + @TADescription(annotation = "TB", type = CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT, + offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 1) + }) + public String returnConstructorRefTA2() { + return + "interface Lambda {" + + " <S, T> void generic(S p1, T p2);" + + "}" + + + "class LambdaImpl implements Lambda {" + + " <S, T> LambdaImpl(S p1, T p2) {}" + + " public <S, T> void generic(S p1, T p2) {}" + + "}" + + + "class Test {" + + " Lambda lambda() {" + + " return LambdaImpl::<@TA Object, @TB Object>new;" + + " }" + + "}"; + } + +}
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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 @@ -93,6 +93,28 @@ } @TADescriptions({ + @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, + genericLocation = { 0, 0 }, paramIndex = 1), + @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER, + genericLocation = { 0, 0 }, paramIndex = 1) + }) + public String methodParamAsArray2() { + return "void test(Object b, @TA @TB String [] a) { }"; + } + + @TADescriptions({ + @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, + genericLocation = { 0, 0 }, paramIndex = 1), + @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER, + genericLocation = { 0, 0 }, paramIndex = 1), + @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER, + genericLocation = { 0, 0 }, paramIndex = 1) + }) + public String methodParamAsArray3() { + return "void test(Object b, @TA @TB @TC String [] a) { }"; + } + + @TADescriptions({ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 1), @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER, genericLocation = { 0, 0 }, paramIndex = 1),
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodThrows.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodThrows.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. + * 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
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 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
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/NewObjects.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/NewObjects.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/ReferenceInfoUtil.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/ReferenceInfoUtil.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/RepeatingTypeAnnotations.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/RepeatingTypeAnnotations.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 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
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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 @@ -31,118 +31,170 @@ */ public class TypeCasts { - @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE) + @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0) public String returnObject() { return "Object returnObject() { return (@TA String)null; }"; } @TADescriptions({ - @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE), + @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0), @TADescription(annotation = "TB", type = CAST, - genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE), + genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0), @TADescription(annotation = "TC", type = CAST, - genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE) + genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0) }) public String returnObjectArray() { return "Object returnObjectArray() { return (@TC String @TA [] @TB [])null; }"; } @TADescriptions({ - @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE), + @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0), @TADescription(annotation = "TB", type = CAST, - genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE) + genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0) }) public String returnObjectGeneric() { return "Object returnObjectGeneric() { return (@TA List<@TB String>)null; }"; } - @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE) + @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0) public String returnPrim() { return "Object returnPrim() { return (@TA int)0; }"; } @TADescriptions({ - @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE), + @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0), @TADescription(annotation = "TB", type = CAST, - genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE) + genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0) }) public String returnPrimArray() { return "Object returnPrimArray() { return (@TB int @TA [])null; }"; } - @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE) + @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0) public String initObject() { return "void initObject() { Object a = (@TA String)null; }"; } @TADescriptions({ - @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE), + @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0), @TADescription(annotation = "TB", type = CAST, - genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE) + genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0) }) public String initObjectArray() { return "void initObjectArray() { Object a = (@TB String @TA [])null; }"; } @TADescriptions({ - @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE), + @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0), @TADescription(annotation = "TB", type = CAST, - genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE) + genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0) }) public String initObjectGeneric() { return "void initObjectGeneric() { Object a = (@TA List<@TB String>)null; }"; } - @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE) + @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0) public String initPrim() { return "void initPrim() { Object a = (@TA int)0; }"; } @TADescriptions({ - @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE), + @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0), @TADescription(annotation = "TB", type = CAST, - genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE) + genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0) }) public String initPrimArray() { return "void initPrimArray() { Object a = (@TB int @TA [])null; }"; } - @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE) + @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0) public String eqtestObject() { return "void eqtestObject() { if (null == (@TA String)null); }"; } @TADescriptions({ - @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE), + @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0), @TADescription(annotation = "TB", type = CAST, - genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE) + genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0) }) public String eqtestObjectArray() { return "void eqtestObjectArray() { if (null == (@TB String @TA [])null); }"; } @TADescriptions({ - @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE), + @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0), @TADescription(annotation = "TB", type = CAST, - genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE) + genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0) }) public String eqtestObjectGeneric() { return "void eqtestObjectGeneric() { if (null == (@TA List<@TB String >)null); }"; } - @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE) + @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0) // compiler optimizes away compile time constants casts public String eqtestPrim() { return "void eqtestPrim(int a) { if (0 == (@TA int)a); }"; } @TADescriptions({ - @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE), + @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0), @TADescription(annotation = "TB", type = CAST, - genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE) + genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE, + typeIndex = 0) }) public String eqtestPrimArray() { return "void eqtestPrimArray() { if (null == (@TB int @TA [])null); }"; } + @TADescriptions({ + @TADescription(annotation = "TA", type = CAST, + offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 0), + @TADescription(annotation = "TB", type = CAST, + offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 1), + @TADescription(annotation = "TC", type = CAST, + offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 1, + genericLocation = {3, 0}) + }) + public String intersection1() { + return "void intersection() { Object o = (@TA String & @TB Comparable<@TC String>) null; }"; + } + + @TADescriptions({ + @TADescription(annotation = "TA", type = CAST, + offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 0), + @TADescription(annotation = "TB", type = CAST, + offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 1), + @TADescription(annotation = "TC", type = CAST, + offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 1, + genericLocation = {3, 0}), + @TADescription(annotation = "TD", type = CAST, + offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 2), + }) + public String intersection2() { + return "void intersection() { Object o = (@TA String & @TB Comparable<@TC String> & @TD CharSequence) null; }"; + } }
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/api/8007344/Test.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,229 @@ +/* + * Copyright (c) 2010, 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. + */ + +/* + * @test + * @bug 8007344 + * @summary javac may not make tree end positions and/or doc comments + * available to processors and listeners + * @library /tools/javac/lib + * @build JavacTestingAbstractProcessor + * @run main Test + */ + +import java.io.File; +import java.io.PrintWriter; +import java.util.Arrays; +import java.util.Set; + +import javax.annotation.processing.RoundEnvironment; +import javax.lang.model.element.Element; +import javax.lang.model.element.TypeElement; +import javax.tools.JavaFileObject; +import javax.tools.StandardJavaFileManager; +import javax.tools.StandardLocation; + +import com.sun.source.doctree.DocCommentTree; +import com.sun.source.tree.*; +import com.sun.source.util.DocTrees; +import com.sun.source.util.JavacTask; +import com.sun.source.util.SourcePositions; +import com.sun.source.util.TaskEvent; +import com.sun.source.util.TaskListener; +import com.sun.source.util.TreePath; +import com.sun.source.util.TreePathScanner; +import com.sun.tools.javac.api.JavacTool; +import com.sun.tools.javac.tree.JCTree; +import com.sun.tools.javac.tree.Pretty; +import com.sun.tools.javac.util.Position; + +/** Doc comment: Test */ +public class Test { + public static final int EXPECT_DOC_COMMENTS = 3; + + /** Doc comment: main */ + public static void main(String... args) throws Exception { + PrintWriter out = new PrintWriter(System.err); + try { + new Test(out).run(); + } finally { + out.flush(); + } + } + + PrintWriter out; + int errors; + + Test(PrintWriter out) { + this.out = out; + } + + /** Doc comment: run */ + void run() throws Exception { + File testSrc = new File(System.getProperty("test.src")); + File thisFile = new File(testSrc, getClass().getName() + ".java"); + JavacTool javac = JavacTool.create(); + StandardJavaFileManager fm = javac.getStandardFileManager(null, null, null); + fm.setLocation(StandardLocation.CLASS_OUTPUT, Arrays.asList(new File("."))); + Iterable<? extends JavaFileObject> fos = fm.getJavaFileObjects(thisFile); + testAnnoProcessor(javac, fm, fos, out, EXPECT_DOC_COMMENTS); + testTaskListener(javac, fm, fos, out, EXPECT_DOC_COMMENTS); + + if (errors > 0) + throw new Exception(errors + " errors occurred"); + } + + void testAnnoProcessor(JavacTool javac, StandardJavaFileManager fm, + Iterable<? extends JavaFileObject> files, PrintWriter out, + int expectedDocComments) { + out.println("Test annotation processor"); + JavacTask task = javac.getTask(out, fm, null, null, null, files); + AnnoProc ap = new AnnoProc(DocTrees.instance(task)); + task.setProcessors(Arrays.asList(ap)); + task.call(); + ap.checker.checkDocComments(expectedDocComments); + } + + void testTaskListener(JavacTool javac, StandardJavaFileManager fm, + Iterable<? extends JavaFileObject> files, PrintWriter out, + int expectedDocComments) { + out.println("Test task listener"); + JavacTask task = javac.getTask(out, fm, null, null, null, files); + TaskListnr tl = new TaskListnr(DocTrees.instance(task)); + task.addTaskListener(tl); + task.call(); + tl.checker.checkDocComments(expectedDocComments); + } + + void error(String msg) { + out.println("Error: " + msg); + errors++; + } + + class AnnoProc extends JavacTestingAbstractProcessor { + Checker checker; + + AnnoProc(DocTrees trees) { + checker = new Checker(trees); + } + + @Override + public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) { + for (Element e : roundEnv.getRootElements()) { + checker.scan(checker.trees.getPath(e), null); + } + return true; + } + } + + class TaskListnr implements TaskListener { + Checker checker; + + TaskListnr(DocTrees trees) { + checker = new Checker(trees); + } + + public void started(TaskEvent e) { + if (e.getKind() == TaskEvent.Kind.ANALYZE) + checker.scan(new TreePath(e.getCompilationUnit()), null); + } + + public void finished(TaskEvent e) { + } + } + + class Checker extends TreePathScanner<Void,Void> { + DocTrees trees; + SourcePositions srcPosns; + + int docComments = 0; + + Checker(DocTrees trees) { + this.trees = trees; + srcPosns = trees.getSourcePositions(); + } + + @Override + public Void scan(Tree tree, Void ignore) { + if (tree != null) { + switch (tree.getKind()) { + // HACK: Workaround 8007350 + // Some tree nodes do not have endpos set + case ASSIGNMENT: + case BLOCK: + case IDENTIFIER: + case METHOD_INVOCATION: + break; + + default: + checkEndPos(getCurrentPath().getCompilationUnit(), tree); + } + } + return super.scan(tree, ignore); + } + + @Override + public Void visitClass(ClassTree tree, Void ignore) { + checkComment(); + return super.visitClass(tree, ignore); + } + + @Override + public Void visitMethod(MethodTree tree, Void ignore) { + checkComment(); + return super.visitMethod(tree, ignore); + } + + @Override + public Void visitVariable(VariableTree tree, Void ignore) { + checkComment(); + return super.visitVariable(tree, ignore); + } + + void checkComment() { + DocCommentTree dc = trees.getDocCommentTree(getCurrentPath()); + if (dc != null) { + out.println("comment: " + dc.toString().replaceAll("\\s+", " ")); + docComments++; + } + } + + void checkEndPos(CompilationUnitTree unit, Tree tree) { + long sp = srcPosns.getStartPosition(unit, tree); + long ep = srcPosns.getEndPosition(unit, tree); + if (sp >= 0 && ep == Position.NOPOS) { + error("endpos not set for " + tree.getKind() + + " " + Pretty.toSimpleString(((JCTree) tree)) + +", start:" + sp); + } + } + + void checkDocComments(int expected) { + if (docComments != expected) { + error("Unexpected number of doc comments received: " + + docComments + ", expected: " + expected); + } + } + + } +}
--- a/test/tools/javac/api/T6306137.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/api/T6306137.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -25,10 +25,9 @@ * @test * @bug 6306137 * @summary JSR 199: encoding option doesn't affect standard file manager + * @compile -encoding utf-8 T6306137.java + * @run main T6306137 * @author Peter von der Ahé - * @ignore - * Need to make the contentCache in JavacFileManager be aware of changes to the encoding. - * Need to propogate -source (and -encoding?) down to the JavacFileManager */ import java.io.File;
--- a/test/tools/javac/api/TestJavacTaskScanner.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/api/TestJavacTaskScanner.java Tue May 07 17:14:17 2013 -0700 @@ -179,7 +179,6 @@ @Override public Scanner newScanner(CharSequence input, boolean keepDocComments) { - assert !keepDocComments; if (input instanceof CharBuffer) { return new MyScanner(this, (CharBuffer)input, test); } else { @@ -190,7 +189,6 @@ @Override public Scanner newScanner(char[] input, int inputLength, boolean keepDocComments) { - assert !keepDocComments; return new MyScanner(this, input, inputLength, test); }
--- a/test/tools/javac/constDebug/ConstDebug.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2002, 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. - */ - -/* - * @test - * @bug 4645152 4785453 - * @summary javac compiler incorrectly inserts <clinit> when -g is specified - * @author gafter - * - * @run shell ConstDebug.sh ConstDebug - */ - -public class ConstDebug { - public static final long l = 12; -}
--- a/test/tools/javac/constDebug/ConstDebug.sh Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,80 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 2002, 2009, 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. -# - - -if [ "${TESTSRC}" = "" ] -then - echo "TESTSRC not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTSRC=${TESTSRC}" -if [ "${TESTJAVA}" = "" ] -then - echo "TESTJAVA not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTJAVA=${TESTJAVA}" -if [ "${TESTCLASSES}" = "" ] -then - echo "TESTCLASSES not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTCLASSES=${TESTCLASSES}" -echo "CLASSPATH=${CLASSPATH}" - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin ) - PS=":" - FS="/" - ;; - CYGWIN* ) - PS=";" # Platform PS, not Cygwin PS - FS="/" - ;; - Windows* ) - PS=";" - FS="\\" - ;; - * ) - echo "Unrecognized system!" - exit 1; - ;; -esac - -TMP1=OUTPUT.txt - -cp "${TESTSRC}${FS}$1.java" . -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -g -d . -classpath .${PS}${TESTSRC} $1.java 2> ${TMP1} -result=$? -if [ $result -ne 0 ]; then exit $result; fi -if "${TESTJAVA}${FS}bin${FS}javap" $1.class | grep clinit; then - echo "Failed" - exit 1; -else - echo "Passed" - exit 0; -fi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/constDebug/ConstDebugTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,51 @@ +/* + * 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. + */ + +/* + * @test + * @bug 4645152 4785453 + * @summary javac compiler incorrectly inserts <clinit> when -g is specified + * @library /tools/javac/lib + * @build ToolBox + * @run compile -g ConstDebugTest.java + * @run main ConstDebugTest + */ + +//original test: test/tools/javac/constDebug/ConstDebug.sh +public class ConstDebugTest { + + public static final long l = 12; + + public static void main(String args[]) throws Exception { +// "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -g -d . -classpath .${PS}${TESTSRC} $1.java 2> ${TMP1} +// if "${TESTJAVA}${FS}bin${FS}javap" $1.class | grep clinit; then fail + ToolBox.JavaToolArgs javapArgs = + new ToolBox.JavaToolArgs().setAllArgs("-v", + "-classpath", System.getProperty("test.classes"), "ConstDebugTest.class"); + if (ToolBox.javap(javapArgs).contains("clinit")) { + throw new AssertionError( + "javac should not create a <clinit> method for ConstDebugTest class"); + } + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/defaultMethods/DefaultMethodFlags.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,111 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8011383 + * @summary Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods + */ + +import java.io.File; +import java.io.IOException; +import java.util.Arrays; + +import javax.lang.model.element.*; +import javax.tools.JavaCompiler; +import javax.tools.JavaFileObject; +import javax.tools.StandardJavaFileManager; +import javax.tools.ToolProvider; + +import com.sun.source.util.JavacTask; +import com.sun.source.util.TaskEvent; +import com.sun.source.util.TaskListener; +import com.sun.tools.javac.util.Assert; + +public class DefaultMethodFlags { + + public static void main(String[] args) throws IOException { + new DefaultMethodFlags().run(args); + } + + void run(String[] args) throws IOException { + checkDefaultMethodFlags(); + } + + void checkDefaultMethodFlags() throws IOException { + JavaCompiler c = ToolProvider.getSystemJavaCompiler(); + StandardJavaFileManager fm = c.getStandardFileManager(null, null, null); + Iterable<? extends JavaFileObject> fos = + fm.getJavaFileObjectsFromFiles( + Arrays.asList(new File( + System.getProperty("test.src"), + this.getClass().getSimpleName() + ".java"))); + JavacTask task = (JavacTask) c.getTask(null, fm, null, null, null, fos); + + task.addTaskListener(new TaskListener() { + + @Override + public void started(TaskEvent e) {} + + @Override + public void finished(TaskEvent e) { + if (e.getKind() == TaskEvent.Kind.ANALYZE) { + TypeElement te = e.getTypeElement(); + if (te.getSimpleName().toString().equals("I")) { + checkDefaultInterface(te); + } + } + } + }); + + task.analyze(); + } + + void checkDefaultInterface(TypeElement te) { + System.err.println("Checking " + te.getSimpleName()); + Assert.check(te.getModifiers().contains(Modifier.ABSTRACT)); + for (Element e : te.getEnclosedElements()) { + if (e.getSimpleName().toString().matches("(\\w)_(default|static|abstract)")) { + boolean abstractExpected = false; + String methodKind = e.getSimpleName().toString().substring(2); + switch (methodKind) { + case "default": + case "static": + break; + case "abstract": + abstractExpected = true; + break; + default: + Assert.error("Cannot get here!" + methodKind); + } + Assert.check(e.getModifiers().contains(Modifier.ABSTRACT) == abstractExpected); + } + } + } +} + +interface I { + default void m_default() { } + static void m_static() { } + void m_abstract(); +}
--- a/test/tools/javac/defaultMethods/TestNoBridgeOnDefaults.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/defaultMethods/TestNoBridgeOnDefaults.java Tue May 07 17:14:17 2013 -0700 @@ -23,7 +23,6 @@ /* * @test - * @ignore awaits for VM support * @summary check that javac does not generate bridge methods for defaults */
--- a/test/tools/javac/diags/CheckExamples.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/diags/CheckExamples.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 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 @@ -34,6 +34,8 @@ */ import java.io.*; +import java.nio.file.*; +import java.nio.file.attribute.BasicFileAttributes; import java.util.*; /** @@ -53,7 +55,27 @@ * Standard entry point. */ public static void main(String... args) throws Exception { - new CheckExamples().run(); + boolean jtreg = (System.getProperty("test.src") != null); + Path tmpDir; + boolean deleteOnExit; + if (jtreg) { + // use standard jtreg scratch directory: the current directory + tmpDir = Paths.get(System.getProperty("user.dir")); + deleteOnExit = false; + } else { + tmpDir = Files.createTempDirectory(Paths.get(System.getProperty("java.io.tmpdir")), + CheckExamples.class.getName()); + deleteOnExit = true; + } + Example.setTempDir(tmpDir.toFile()); + + try { + new CheckExamples().run(); + } finally { + if (deleteOnExit) { + clean(tmpDir); + } + } } /** @@ -190,6 +212,25 @@ int errors; + /** + * Clean the contents of a directory. + */ + static void clean(Path dir) throws IOException { + Files.walkFileTree(dir, new SimpleFileVisitor<Path>() { + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + Files.delete(file); + return super.visitFile(file, attrs); + } + + @Override + public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { + if (exc == null) Files.delete(dir); + return super.postVisitDirectory(dir, exc); + } + }); + } + static class Counts { static String[] prefixes = { "compiler.err.",
--- a/test/tools/javac/diags/MessageFile.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/diags/MessageFile.java Tue May 07 17:14:17 2013 -0700 @@ -65,7 +65,7 @@ } void insertAfter(Line l) { - assert prev == null && next == null; + assert l.prev == null && l.next == null; l.prev = this; l.next = next; if (next == null) @@ -82,7 +82,7 @@ } void insertBefore(Line l) { - assert prev == null && next == null; + assert l.prev == null && l.next == null; l.prev = prev; l.next = this; if (prev == null)
--- a/test/tools/javac/diags/MessageInfo.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/diags/MessageInfo.java Tue May 07 17:14:17 2013 -0700 @@ -409,5 +409,3 @@ } } - -
--- a/test/tools/javac/diags/RunExamples.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/diags/RunExamples.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 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 @@ -33,7 +33,8 @@ */ import java.io.*; -import java.text.SimpleDateFormat; +import java.nio.file.*; +import java.nio.file.attribute.BasicFileAttributes; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -56,16 +57,18 @@ public class RunExamples { public static void main(String... args) throws Exception { jtreg = (System.getProperty("test.src") != null); - File tmpDir; + Path tmpDir; + boolean deleteOnExit; if (jtreg) { // use standard jtreg scratch directory: the current directory - tmpDir = new File(System.getProperty("user.dir")); + tmpDir = Paths.get(System.getProperty("user.dir")); + deleteOnExit = false; } else { - tmpDir = new File(System.getProperty("java.io.tmpdir"), - RunExamples.class.getName() - + (new SimpleDateFormat("yyMMddHHmmss")).format(new Date())); + tmpDir = Files.createTempDirectory(Paths.get(System.getProperty("java.io.tmpdir")), + RunExamples.class.getName()); + deleteOnExit = true; } - Example.setTempDir(tmpDir); + Example.setTempDir(tmpDir.toFile()); RunExamples r = new RunExamples(); @@ -73,15 +76,8 @@ if (r.run(args)) return; } finally { - /* VERY IMPORTANT NOTE. In jtreg mode, tmpDir is set to the - * jtreg scratch directory, which is the current directory. - * In case someone is faking jtreg mode, make sure to only - * clean tmpDir when it is reasonable to do so. - */ - if (tmpDir.isDirectory() && - tmpDir.getName().startsWith(RunExamples.class.getName())) { - if (clean(tmpDir)) - tmpDir.delete(); + if (deleteOnExit) { + clean(tmpDir); } } @@ -203,14 +199,20 @@ /** * Clean the contents of a directory. */ - static boolean clean(File dir) { - boolean ok = true; - for (File f: dir.listFiles()) { - if (f.isDirectory()) - ok &= clean(f); - ok &= f.delete(); - } - return ok; + static void clean(Path dir) throws IOException { + Files.walkFileTree(dir, new SimpleFileVisitor<Path>() { + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + Files.delete(file); + return super.visitFile(file, attrs); + } + + @Override + public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { + if (exc == null) Files.delete(dir); + return super.postVisitDirectory(dir, exc); + } + }); } static abstract class Runner {
--- a/test/tools/javac/diags/examples.not-yet.txt Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/diags/examples.not-yet.txt Tue May 07 17:14:17 2013 -0700 @@ -110,4 +110,5 @@ compiler.warn.unexpected.archive.file # Paths: zip file with unknown extn compiler.warn.unknown.enum.constant # in bad class file compiler.warn.unknown.enum.constant.reason # in bad class file +compiler.warn.override.equals.but.not.hashcode # when a class overrides equals but not hashCode method from Object
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/diags/examples/BadArgTypesInLambda.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,38 @@ +/* + * 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. + */ + +// key: compiler.err.cant.apply.symbol +// key: compiler.misc.no.conforming.assignment.exists +// key: compiler.misc.bad.arg.types.in.lambda + +class BadArgTypesInLambda { + interface SAM { + void m(Integer i); + } + + void g(SAM s) { } + + void test() { + g(x->{ String s = x; }); + } +}
--- a/test/tools/javac/diags/examples/CantApplyDiamond1.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/diags/examples/CantApplyDiamond1.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -23,7 +23,7 @@ // key: compiler.err.prob.found.req // key: compiler.misc.cant.apply.diamond.1 -// key: compiler.misc.inferred.do.not.conform.to.upper.bounds +// key: compiler.misc.incompatible.eq.upper.bounds // key: compiler.misc.diamond class CantApplyDiamond1<X> {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/diags/examples/IncompatibleArgTypesInMethodRef.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,40 @@ +/* + * 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. + */ + +// key: compiler.err.cant.apply.symbol +// key: compiler.misc.infer.no.conforming.assignment.exists +// key: compiler.misc.incompatible.arg.types.in.mref + +class IncompatibleArgTypesInMethodRef { + interface SAM<X> { + void m(X x); + } + + void g(String s, Integer i) { } + + <Z> void m(SAM<Z> s) { } + + void test() { + m(this::g); + } +}
--- a/test/tools/javac/diags/examples/InferredDoNotConformToEq.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/diags/examples/InferredDoNotConformToEq.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -23,6 +23,7 @@ // key: compiler.err.cant.apply.symbol // key: compiler.misc.inferred.do.not.conform.to.eq.bounds +// options: -source 7 -Xlint:-options import java.util.*;
--- a/test/tools/javac/diags/examples/InferredDoNotConformToUpper.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/diags/examples/InferredDoNotConformToUpper.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -23,6 +23,7 @@ // key: compiler.err.cant.apply.symbol // key: compiler.misc.inferred.do.not.conform.to.upper.bounds +// options: -source 7 -Xlint:-options import java.util.*;
--- a/test/tools/javac/diags/examples/NonStaticCantBeRefFragment.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/diags/examples/NonStaticCantBeRefFragment.java Tue May 07 17:14:17 2013 -0700 @@ -21,9 +21,8 @@ * questions. */ -// key: compiler.err.prob.found.req // key: compiler.misc.non-static.cant.be.ref -// key: compiler.misc.invalid.mref +// key: compiler.err.invalid.mref class NonStaticCantBeRefFragment {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/diags/examples/NotAnInterfaceComponent.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,30 @@ +/* + * 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. + */ + +// key: compiler.err.prob.found.req +// key: compiler.misc.bad.intersection.target.for.functional.expr +// key: compiler.misc.not.an.intf.component + +class NotAnInterfaceComponent { + Object o = (Object & Runnable) ()-> { }; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/diags/examples/NotDefPublicCantAccessFragment/NotDefPublicCantAccessFragment.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,36 @@ +/* + * 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. + */ + +// key: compiler.err.prob.found.req +// key: compiler.misc.invalid.mref +// key: compiler.misc.not.def.public.cant.access + +class NotDefPublicCantAccessFragment { + interface SAM { + void m(); + } + + void test (p.C c) { + SAM s = c::m; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/diags/examples/NotDefPublicCantAccessFragment/p/C.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,28 @@ +/* + * 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 p; + +public class C { + void m() { } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/diags/examples/NotInProfile.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2010, 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. + */ + +// key: compiler.err.not.in.profile +// options: -profile compact1 + +class NotInProfile { + Class<?> c = java.awt.Frame.class; +}
--- a/test/tools/javac/diags/examples/SecondaryBoundMustBeMarkerIntf.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2012, 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. - */ - -// key: compiler.err.prob.found.req -// key: compiler.misc.secondary.bound.must.be.marker.intf - -class SecondaryBoundMustBeMarkerInterface { - Runnable r = (Runnable & Comparable<?>)()->{}; -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/diags/examples/StaticMethodInUnboundLookup.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,36 @@ +/* + * 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. + */ + +// key: compiler.err.invalid.mref +// key: compiler.misc.static.method.in.unbound.lookup + +class StaticBoundMref { + + interface SAM { + void m(StaticBoundMref m); + } + + SAM s = StaticBoundMref::m; + + static void m() { } +}
--- a/test/tools/javac/diags/examples/WhereFreshTvar.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/diags/examples/WhereFreshTvar.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -24,7 +24,7 @@ // key: compiler.misc.where.fresh.typevar // key: compiler.misc.where.description.typevar // key: compiler.err.prob.found.req -// key: compiler.misc.inferred.do.not.conform.to.upper.bounds +// key: compiler.misc.inconvertible.types // options: -XDdiags=where,simpleNames // run: simple @@ -33,5 +33,5 @@ class WhereFreshTvar { <T extends List<T>> T m() {} - { List<String> ls = m(); } + { Object o = (List<String>)m(); } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/doclint/ImplicitHeadersTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,35 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8006346 + * @summary doclint should make allowance for headers generated by standard doclet + * @compile -Xdoclint:all/public ImplicitHeadersTest.java + */ + +/** + * <h3> Header </h3> + */ +public class ImplicitHeadersTest { } +
--- a/test/tools/javac/fatalErrors/NoJavaLang.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -/* - * Copyright (c) 1999, 2002, 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. - */ - -/** - * @test - * @bug 4263768 4785453 - * @summary Verify that the compiler does not crash when java.lang is not - * found. - * @author iag - * - * @run shell NoJavaLang.sh - */ - -public class NoJavaLang { - private String s; - - public String s() { - return s; - } -}
--- a/test/tools/javac/fatalErrors/NoJavaLang.out Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -Fatal Error: Unable to find package java.lang in classpath or bootclasspath
--- a/test/tools/javac/fatalErrors/NoJavaLang.sh Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,114 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 1999, 2009, 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. -# - - -if [ "${TESTSRC}" = "" ] -then - echo "TESTSRC not set. Test cannot execute. Failed." - exit 1 -fi -printf '%s' "TESTSRC=${TESTSRC}" ; echo -if [ "${TESTJAVA}" = "" ] -then - echo "TESTJAVA not set. Test cannot execute. Failed." - exit 1 -fi -printf '%s' "TESTJAVA=${TESTJAVA}" ; echo -if [ "${TESTCLASSES}" = "" ] -then - echo "TESTCLASSES not set. Test cannot execute. Failed." - exit 1 -fi -printf '%s' "TESTCLASSES=${TESTCLASSES}" ; echo -printf '%s' "CLASSPATH=${CLASSPATH}" ; echo -echo - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin ) - FS="/" - ;; - CYGWIN* ) - FS="/" - DIFFOPTS="--strip-trailing-cr" - ;; - Windows* ) - FS="\\" - ;; - * ) - echo "Unrecognized system!" - exit 1; - ;; -esac - -TMP1=OUTPUT.txt - -cp "${TESTSRC}${FS}NoJavaLang.java" . - -echo "- verifing that fatal error is not produced in the regular case" -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} NoJavaLang.java 2> "${TMP1}" -result=$? - -if [ $result -eq 0 ] -then - echo "Passed - base compilation successful" -else - echo "Failed - unable to compile test" - exit $result -fi - -echo - -echo "- verifing the fatal error is produced" -rm "${TMP1}" -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -bootclasspath . NoJavaLang.java 2> "${TMP1}" - -# return code should be EXIT_SYSERR -result=$? -if [ $result -ne 3 ] -then - echo "Failed - unexpected return code" - exit $result -else - echo "Passed - expected return code" -fi - -# expected message -cat "${TMP1}" -diff ${DIFFOPTS} -c "${TESTSRC}${FS}NoJavaLang.out" "${TMP1}" -result=$? -rm "${TMP1}" - -if [ $result -eq 0 ] -then - echo "Passed - expected message" -else - echo "Failed - unexpected message" - exit $result - -fi - -exit
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/fatalErrors/NoJavaLangTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,76 @@ +/* + * 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. + */ + +/* + * @test + * @bug 4263768 4785453 + * @summary Verify that the compiler does not crash when java.lang is not + * @library /tools/javac/lib + * @build ToolBox + * @run main NoJavaLangTest + */ + +import java.util.ArrayList; +import java.util.List; + +//original test: test/tools/javac/fatalErrors/NoJavaLang.sh +public class NoJavaLangTest { + + private static final String noJavaLangSrc = + "public class NoJavaLang {\n" + + " private String s;\n" + + "\n" + + " public String s() {\n" + + " return s;\n" + + " }\n" + + "}"; + + private static final String compilerErrorMessage = + "Fatal Error: Unable to find package java.lang in classpath or bootclasspath"; + + public static void main(String[] args) throws Exception { +// "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} NoJavaLang.java 2> "${TMP1}" + ToolBox.JavaToolArgs javacSuccessArgs = + new ToolBox.JavaToolArgs().setSources(noJavaLangSrc); + ToolBox.javac(javacSuccessArgs); + +// "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -bootclasspath . NoJavaLang.java 2> "${TMP1}" + List<String> output = new ArrayList<>(); + ToolBox.JavaToolArgs javacFailArgs = + new ToolBox.JavaToolArgs(ToolBox.Expect.FAIL) + .setOptions("-bootclasspath", ".") + .setSources(noJavaLangSrc) + .setErrOutput(output); + + int cr = ToolBox.javac(javacFailArgs); + if (cr != 3) { + throw new AssertionError("Compiler exit result should be 3"); + } + +// diff ${DIFFOPTS} -c "${TESTSRC}${FS}NoJavaLang.out" "${TMP1}" + if (!(output.size() == 1 && output.get(0).equals(compilerErrorMessage))) { + throw new AssertionError("javac generated error output is not correct"); + } + } + +}
--- a/test/tools/javac/generics/7015430/T7015430.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/generics/7015430/T7015430.out Tue May 07 17:14:17 2013 -0700 @@ -1,14 +1,14 @@ -T7015430.java:41:15: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<E> +T7015430.java:41:15: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<java.lang.Exception> T7015430.java:41:14: compiler.warn.unchecked.meth.invocation.applied: kindname.method, empty, java.lang.Iterable<E>, java.lang.Iterable, kindname.class, T7015430 T7015430.java:50:42: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<java.lang.RuntimeException> T7015430.java:50:41: compiler.warn.unchecked.meth.invocation.applied: kindname.method, empty, java.lang.Iterable<E>, java.lang.Iterable, kindname.class, T7015430 -T7015430.java:68:22: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<E> +T7015430.java:68:22: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<java.lang.Exception> T7015430.java:68:9: compiler.warn.unchecked.meth.invocation.applied: kindname.constructor, <init>, java.lang.Iterable<E>, java.lang.Iterable, kindname.class, T7015430 T7015430.java:77:40: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<java.lang.RuntimeException> T7015430.java:77:9: compiler.warn.unchecked.meth.invocation.applied: kindname.constructor, <init>, java.lang.Iterable<E>, java.lang.Iterable, kindname.class, T7015430 T7015430.java:104:41: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<java.lang.RuntimeException> T7015430.java:104:9: compiler.warn.unchecked.meth.invocation.applied: kindname.constructor, <init>, java.lang.Iterable<E>, java.lang.Iterable, kindname.class, T7015430 -T7015430.java:113:22: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<E> +T7015430.java:113:22: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<java.lang.Exception> T7015430.java:113:9: compiler.warn.unchecked.meth.invocation.applied: kindname.constructor, <init>, java.lang.Iterable<E>, java.lang.Iterable, kindname.class, T7015430 T7015430.java:41:14: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Exception T7015430.java:68:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Exception
--- a/test/tools/javac/generics/7151802/T7151802.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/generics/7151802/T7151802.out Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ T7151802.java:14:31: compiler.warn.unchecked.meth.invocation.applied: kindname.method, get1, Z, T7151802.Foo, kindname.class, T7151802 -T7151802.java:22:31: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T7151802.Foo, T7151802.Foo<Z> +T7151802.java:22:31: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T7151802.Foo, T7151802.Foo<java.lang.Object> T7151802.java:22:30: compiler.warn.unchecked.meth.invocation.applied: kindname.method, get3, T7151802.Foo<Z>, T7151802.Foo, kindname.class, T7151802 T7151802.java:30:36: compiler.warn.unchecked.meth.invocation.applied: kindname.method, get5, compiler.misc.no.args, compiler.misc.no.args, kindname.class, T7151802 T7151802.java:38:32: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T7151802.Foo, T7151802.Foo<java.lang.String>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/generics/diamond/6939780/T6939780.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,39 @@ +/* + * @test /nodynamiccopyright/ + * @bug 6939780 7020044 8009459 + * + * @summary add a warning to detect diamond sites + * @author mcimadamore + * @compile/ref=T6939780_7.out -Xlint:-options -source 7 T6939780.java -XDrawDiagnostics -XDfindDiamond + * @compile/ref=T6939780_8.out T6939780.java -XDrawDiagnostics -XDfindDiamond + * + */ + +class T6939780 { + + static class Foo<X extends Number> { + Foo() {} + Foo(X x) {} + } + + void testAssign() { + Foo<Number> f1 = new Foo<Number>(1); + Foo<?> f2 = new Foo<Number>(); + Foo<?> f3 = new Foo<Integer>(); + Foo<Number> f4 = new Foo<Number>(1) {}; + Foo<?> f5 = new Foo<Number>() {}; + Foo<?> f6 = new Foo<Integer>() {}; + } + + void testMethod() { + gn(new Foo<Number>(1)); + gw(new Foo<Number>()); + gw(new Foo<Integer>()); + gn(new Foo<Number>(1) {}); + gw(new Foo<Number>() {}); + gw(new Foo<Integer>() {}); + } + + void gw(Foo<?> fw) { } + void gn(Foo<Number> fn) { } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/generics/diamond/6939780/T6939780_7.out Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,4 @@ +T6939780.java:21:28: compiler.warn.diamond.redundant.args: T6939780.Foo<java.lang.Number>, T6939780.Foo<java.lang.Number> +T6939780.java:22:28: compiler.warn.diamond.redundant.args.1: T6939780.Foo<java.lang.Integer>, T6939780.Foo<java.lang.Number> +T6939780.java:30:19: compiler.warn.diamond.redundant.args: T6939780.Foo<java.lang.Number>, T6939780.Foo<java.lang.Number> +3 warnings
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/generics/diamond/6939780/T6939780_8.out Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,7 @@ +T6939780.java:20:33: compiler.warn.diamond.redundant.args: T6939780.Foo<java.lang.Number>, T6939780.Foo<java.lang.Number> +T6939780.java:21:28: compiler.warn.diamond.redundant.args: T6939780.Foo<java.lang.Number>, T6939780.Foo<java.lang.Number> +T6939780.java:22:28: compiler.warn.diamond.redundant.args.1: T6939780.Foo<java.lang.Integer>, T6939780.Foo<java.lang.Number> +T6939780.java:29:19: compiler.warn.diamond.redundant.args: T6939780.Foo<java.lang.Number>, T6939780.Foo<java.lang.Number> +T6939780.java:30:19: compiler.warn.diamond.redundant.args: T6939780.Foo<java.lang.Number>, T6939780.Foo<java.lang.Number> +T6939780.java:31:19: compiler.warn.diamond.redundant.args.1: T6939780.Foo<java.lang.Integer>, T6939780.Foo<java.lang.Number> +6 warnings
--- a/test/tools/javac/generics/diamond/T6939780.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -/* - * @test /nodynamiccopyright/ - * @bug 6939780 7020044 - * - * @summary add a warning to detect diamond sites - * @author mcimadamore - * @compile/ref=T6939780.out T6939780.java -XDrawDiagnostics -XDfindDiamond - * - */ - -class T6939780 { - - void test() { - class Foo<X extends Number> { - Foo() {} - Foo(X x) {} - } - Foo<Number> f1 = new Foo<Number>(1); - Foo<?> f2 = new Foo<Number>(); - Foo<?> f3 = new Foo<Integer>(); - Foo<Number> f4 = new Foo<Number>(1) {}; - Foo<?> f5 = new Foo<Number>() {}; - Foo<?> f6 = new Foo<Integer>() {}; - } -}
--- a/test/tools/javac/generics/diamond/T6939780.out Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -T6939780.java:18:33: compiler.warn.diamond.redundant.args: Foo<java.lang.Number>, Foo<java.lang.Number> -T6939780.java:19:28: compiler.warn.diamond.redundant.args: Foo<java.lang.Number>, Foo<java.lang.Number> -T6939780.java:20:28: compiler.warn.diamond.redundant.args.1: Foo<java.lang.Integer>, Foo<java.lang.Number> -3 warnings
--- a/test/tools/javac/generics/diamond/neg/Neg06.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/generics/diamond/neg/Neg06.out Tue May 07 17:14:17 2013 -0700 @@ -1,2 +1,2 @@ -Neg06.java:16:37: compiler.err.prob.found.req: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg06.CFoo), (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.String, java.lang.Number)) +Neg06.java:16:37: compiler.err.prob.found.req: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg06.CFoo), (compiler.misc.incompatible.eq.upper.bounds: X, java.lang.String, java.lang.Number)) 1 error
--- a/test/tools/javac/generics/inference/6278587/T6278587Neg.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/generics/inference/6278587/T6278587Neg.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 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,10 +23,11 @@ /* * @test - * @bug 6278587 + * @bug 6278587 8007464 * @summary Inference broken for subtypes of subtypes of F-bounded types * @author Peter von der Ah\u00e9 - * @compile/fail T6278587Neg.java + * @compile/fail -source 7 T6278587Neg.java + * @compile T6278587Neg.java */ public abstract class T6278587Neg {
--- a/test/tools/javac/generics/inference/6638712/T6638712d.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/generics/inference/6638712/T6638712d.out Tue May 07 17:14:17 2013 -0700 @@ -1,2 +1,2 @@ -T6638712d.java:16:9: compiler.err.cant.apply.symbol: kindname.method, m, U,java.util.List<java.util.List<U>>, int,java.util.List<java.util.List<java.lang.String>>, kindname.class, T6638712d, (compiler.misc.inferred.do.not.conform.to.lower.bounds: java.lang.String, java.lang.Integer) +T6638712d.java:16:9: compiler.err.cant.apply.symbol: kindname.method, m, U,java.util.List<java.util.List<U>>, int,java.util.List<java.util.List<java.lang.String>>, kindname.class, T6638712d, (compiler.misc.incompatible.eq.lower.bounds: U, java.lang.String, java.lang.Integer) 1 error
--- a/test/tools/javac/generics/inference/6638712/T6638712e.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/generics/inference/6638712/T6638712e.out Tue May 07 17:14:17 2013 -0700 @@ -1,2 +1,2 @@ -T6638712e.java:17:27: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.Object, java.lang.Boolean,java.lang.Object) +T6638712e.java:17:27: compiler.err.prob.found.req: (compiler.misc.incompatible.eq.upper.bounds: X, java.lang.Object, java.lang.Boolean,java.lang.Object) 1 error
--- a/test/tools/javac/generics/inference/7154127/T7154127.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/generics/inference/7154127/T7154127.java Tue May 07 17:14:17 2013 -0700 @@ -1,8 +1,9 @@ /** * @test /nodynamiccopyright/ - * @bug 7154127 + * @bug 7154127 8007464 * @summary Inference cleanup: remove bound check analysis from visitors in Types.java - * @compile/fail/ref=T7154127.out -XDrawDiagnostics T7154127.java + * @compile/fail/ref=T7154127.out -Xlint:-options -source 7 -XDrawDiagnostics T7154127.java + * @compile T7154127.java */ class T7154127 {
--- a/test/tools/javac/generics/inference/7154127/T7154127.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/generics/inference/7154127/T7154127.out Tue May 07 17:14:17 2013 -0700 @@ -1,2 +1,2 @@ -T7154127.java:19:49: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: Y, T7154127.D,T7154127.B<U>) +T7154127.java:20:49: compiler.err.prob.found.req: (compiler.misc.incompatible.upper.bounds: Y, T7154127.B<U>,T7154127.D) 1 error
--- a/test/tools/javac/generics/inference/7177306/T7177306a.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/generics/inference/7177306/T7177306a.out Tue May 07 17:14:17 2013 -0700 @@ -1,4 +1,4 @@ -T7177306a.java:13:34: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.util.List, java.util.List<E> +T7177306a.java:13:34: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.util.List, java.util.List<java.lang.Object> T7177306a.java:13:33: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, java.util.List<E>, java.util.List, kindname.class, T7177306a T7177306a.java:13:33: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T7177306a, T7177306a<java.lang.Object> - compiler.err.warnings.and.werror
--- a/test/tools/javac/generics/inference/7177306/T7177306e.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/generics/inference/7177306/T7177306e.java Tue May 07 17:14:17 2013 -0700 @@ -1,8 +1,9 @@ /** * @test /nodynamiccopyright/ - * @bug 7177306 + * @bug 7177306 8007464 * @summary Regression: unchecked method call does not erase return type - * @compile/fail/ref=T7177306e.out -XDrawDiagnostics T7177306e.java + * @compile/fail/ref=T7177306e.out -source 7 -Xlint:-options -XDrawDiagnostics T7177306e.java + * @compile/fail T7177306e.java */ import java.util.List;
--- a/test/tools/javac/generics/inference/7177306/T7177306e.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/generics/inference/7177306/T7177306e.out Tue May 07 17:14:17 2013 -0700 @@ -1,2 +1,2 @@ -T7177306e.java:15:9: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.util.List<?>, java.util.List<compiler.misc.type.captureof: 1, ?>) +T7177306e.java:16:9: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.util.List<?>, java.util.List<compiler.misc.type.captureof: 1, ?>) 1 error
--- a/test/tools/javac/generics/odersky/BadTest4.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/generics/odersky/BadTest4.java Tue May 07 17:14:17 2013 -0700 @@ -23,11 +23,12 @@ /* * @test - * @ bug + * @bug 8007464 * @summary Negative regression test from odersky * @author odersky * - * @compile/fail BadTest4.java + * @compile/fail -source 7 BadTest4.java + * @compile BadTest4.java */ class BadTest4 {
--- a/test/tools/javac/innerClassFile/Driver.sh Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,73 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 2002, 2009, 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. -# - -# @test -# @bug 4491755 4785453 -# @summary Prob w/static inner class with same name as a regular class -# @author gafter -# -# @run shell Driver.sh - -if [ "${TESTSRC}" = "" ] -then - echo "TESTSRC not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTSRC=${TESTSRC}" -if [ "${TESTJAVA}" = "" ] -then - echo "TESTJAVA not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTJAVA=${TESTJAVA}" -if [ "${TESTCLASSES}" = "" ] -then - echo "TESTCLASSES not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTCLASSES=${TESTCLASSES}" -echo "CLASSPATH=${CLASSPATH}" - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin | CYGWIN* ) - FS="/" - ;; - Windows* ) - FS="\\" - ;; - * ) - echo "Unrecognized system!" - exit 1; - ;; -esac - -set -x -mkdir src -cp -r ${TESTSRC}${FS}* src -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . -classpath . -sourcepath src src/x/B.java src/x/C.java src/y/Main.java -rm y/R3.class -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . -classpath . -sourcepath src src/y/Main.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/innerClassFile/InnerClassFileTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,127 @@ +/* + * 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. + */ + +/* + * @test + * @bug 4491755 4785453 + * @summary Prob w/static inner class with same name as a regular class + * @library /tools/javac/lib + * @build ToolBox + * @run main InnerClassFileTest + */ + +import java.nio.file.Paths; + +//original test: test/tools/javac/innerClassFile/Driver.sh +public class InnerClassFileTest { + + private static final String BSrc = + "package x;\n" + + "\n" + + "import x.*;\n" + + "\n" + + "public class B {\n" + + " public static class C {}\n" + + "}"; + + private static final String CSrc = + "package x;\n" + + "\n" + + "import x.*;\n" + + "\n" + + "public class C {}"; + + private static final String MainSrc = + "package y;\n" + + "\n" + + "class Main {\n" + + " private R1 a;\n" + + " private R2 b;\n" + + " private R3 c;\n" + + "}"; + + private static final String R1Src = + "package y;\n" + + "\n" + + "public final class R1 {\n" + + " x.B.C a = null;\n" + + " x.C b = null;\n" + + " R2 c = new R2();\n" + + "}"; + + private static final String R2Src = + "package y;\n" + + "\n" + + "public final class R2 {\n" + + " x.B.C a = null;\n" + + " x.C b = null;\n" + + "}"; + + private static final String R3Src = + "package y;\n" + + "\n" + + "public final class R3 {\n" + + " x.B.C a = null;\n" + + " x.C b = null;\n" + + " R1 c = new R1();\n" + + "}"; + + public static void main(String args[]) throws Exception { + new InnerClassFileTest().run(); + } + + void run() throws Exception { + createFiles(); + compileFiles(); + } + + void createFiles() throws Exception { +// mkdir src +// cp -r ${TESTSRC}${FS}* src + ToolBox.createJavaFileFromSource(Paths.get("src"), BSrc); + ToolBox.createJavaFileFromSource(Paths.get("src"), CSrc); + ToolBox.createJavaFileFromSource(Paths.get("src"), MainSrc); + ToolBox.createJavaFileFromSource(Paths.get("src"), R1Src); + ToolBox.createJavaFileFromSource(Paths.get("src"), R2Src); + ToolBox.createJavaFileFromSource(Paths.get("src"), R3Src); + } + + void compileFiles() throws Exception { +// "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . -classpath . +// -sourcepath src src/x/B.java src/x/C.java src/y/Main.java + ToolBox.JavaToolArgs args = + new ToolBox.JavaToolArgs() + .setAllArgs("-d", ".", "-cp" , ".", "-sourcepath", "src", + "src/x/B.java", "src/x/C.java", "src/y/Main.java"); + ToolBox.javac(args); + +// rm y/R3.class + ToolBox.rm(Paths.get("y", "R3.class")); + +// "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . -classpath . +// -sourcepath src src/y/Main.java + args.setAllArgs("-d", ".", "-cp", ".", "-sourcepath", "src", "src/y/Main.java"); + ToolBox.javac(args); + } + +}
--- a/test/tools/javac/innerClassFile/x/B.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2002, 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 x; - -import x.*; - -public class B { - public static class C {} -}
--- a/test/tools/javac/innerClassFile/x/C.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2002, 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 x; - -import x.*; - -public class C {}
--- a/test/tools/javac/innerClassFile/y/Main.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2002, 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 y; - -class Main { - private R1 a; - private R2 b; - private R3 c; -}
--- a/test/tools/javac/innerClassFile/y/R1.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2002, 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 y; - -public final class R1 { - x.B.C a = null; - x.C b = null; - R2 c = new R2(); -}
--- a/test/tools/javac/innerClassFile/y/R2.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2002, 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 y; - -public final class R2 { - x.B.C a = null; - x.C b = null; -}
--- a/test/tools/javac/innerClassFile/y/R3.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2002, 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 y; - -public final class R3 { - x.B.C a = null; - x.C b = null; - R1 c = new R1(); -}
--- a/test/tools/javac/javazip/A.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2005, 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. - */ - -// A class that references another -class A { - B b; -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/javazip/JavaZipTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,126 @@ +/* + * 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. + */ + +/* + * @test + * @bug 4098712 6304984 6388453 + * @summary check that source files inside zip files on the class path are ignored + * @library /tools/javac/lib + * @build ToolBox + * @run main JavaZipTest + */ + +import java.io.File; +import java.nio.file.Paths; + +//original test: test/tools/javac/javazip/Test.sh +public class JavaZipTest { + + private static final String ASrc = + "class A {\n" + + " B b;\n" + + "}"; + + private static final String BGoodSrc = + "public class B {}"; + + private static final String BBadSrc = + "class B"; + + private static final String[][] jarArgs = { + {"cf", "good.jar", "-C", "good", "B.java"}, + {"cf", "good.zip", "-C", "good", "B.java"}, + {"cf", "bad.jar", "-C", "bad", "B.java"}, + {"cf", "bad.zip", "-C", "bad", "B.java"}, + }; + + private static final String[][] successfulCompilationArgs = { + {"-d", "output", "A.java", "good/B.java"}, + {"-d", "output", "-cp", "good", "A.java"}, + {"-d", "output", "-sourcepath", "good", "A.java"}, + {"-d", "output", "-cp", "good.zip", "A.java"}, + {"-d", "output", "-cp", "good.jar", "A.java"}, + }; + + private static final String[][] unSuccessfulCompilationArgs = { + {"-d", "output", "A.java", "bad/B.java"}, + {"-d", "output", "-cp", "bad", "A.java"}, + {"-d", "output", "-sourcepath", "bad", "A.java"}, + {"-d", "output", "-sourcepath", "bad.zip", "A.java"}, + {"-d", "output", "-sourcepath", "bad.jar", "A.java"}, + }; + + public static void main(String[] args) throws Exception { + new JavaZipTest().test(); + } + + public void test() throws Exception { + createOutputDirAndSourceFiles(); + createZipsAndJars(); + check(ToolBox.Expect.SUCCESS, successfulCompilationArgs); + check(ToolBox.Expect.FAIL, unSuccessfulCompilationArgs); + } + + void createOutputDirAndSourceFiles() throws Exception { + //create output dir + new File("output").mkdir(); + + //source file creation + ToolBox.createJavaFileFromSource(Paths.get("good"), BGoodSrc); + ToolBox.createJavaFileFromSource(Paths.get("bad"), BBadSrc); + ToolBox.createJavaFileFromSource(ASrc); + } + + void createZipsAndJars() throws Exception { + //jar and zip creation +// check ok "${TESTJAVA}${FS}bin${FS}jar" cf "${SCR}${FS}good.jar" -C "${TESTSRC}${FS}good" B.java +// check ok "${TESTJAVA}${FS}bin${FS}jar" cf "${SCR}${FS}good.zip" -C "${TESTSRC}${FS}good" B.java +// check ok "${TESTJAVA}${FS}bin${FS}jar" cf "${SCR}${FS}bad.jar" -C "${TESTSRC}${FS}bad" B.java +// check ok "${TESTJAVA}${FS}bin${FS}jar" cf "${SCR}${FS}bad.zip" -C "${TESTSRC}${FS}bad" B.java + for (String[] args: jarArgs) { + ToolBox.jar(args); + } + } + + void check(ToolBox.Expect whatToExpect, String[][] theArgs) throws Exception { +// check ok "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} "${TESTSRC}${FS}A.java" "${TESTSRC}${FS}good${FS}B.java" +// check ok "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -classpath "${TESTSRC}${FS}good" "${TESTSRC}${FS}A.java" +// check ok "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -sourcepath "${TESTSRC}${FS}good" "${TESTSRC}${FS}A.java" +// check ok "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -classpath "${SCR}${FS}good.zip" "${TESTSRC}${FS}A.java" +// check ok "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -classpath "${SCR}${FS}good.jar" "${TESTSRC}${FS}A.java" + +// check err "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} "${TESTSRC}${FS}A.java" "${TESTSRC}${FS}bad${FS}B.java" +// check err "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -classpath "${TESTSRC}${FS}bad" "${TESTSRC}${FS}A.java" +// check err "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -sourcepath "${TESTSRC}${FS}bad" "${TESTSRC}${FS}A.java" +// check err "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -sourcepath "${SCR}${FS}bad.zip" "${TESTSRC}${FS}A.java" +// check err "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -sourcepath "${SCR}${FS}bad.jar" "${TESTSRC}${FS}A.java" + ToolBox.JavaToolArgs args = + new ToolBox.JavaToolArgs(whatToExpect); + + for (String[] allArgs: theArgs) { + args.setAllArgs(allArgs); + ToolBox.javac(args); + } + } + +}
--- a/test/tools/javac/javazip/Test.sh Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,111 +0,0 @@ -#! /bin/sh -f - -# -# Copyright (c) 2005, 2011, 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. -# - -# @test -# @bug 4098712 6304984 6388453 -# @summary check that source files inside zip files on the class path are ignored -# @run shell Test.sh - -TS=${TESTSRC-.} -TC=${TESTCLASSES-.} -SCR=`pwd` - -if [ "${TESTJAVA}" = "" ] -then - echo "TESTJAVA not set. Test cannot execute. Failed." - exit 1 -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin ) - FS="/" - SCR=`pwd` - ;; - CYGWIN* ) - FS="/" - SCR=`pwd | cygpath -d -f -` - ;; - Windows* ) - FS="\\" - SCR=`pwd` - ;; - * ) - echo "Unrecognized system!" - exit 1; - ;; -esac - -check() { - expected=$1 - shift - - # clean old classes - rm -f ${TC}${FS}*.class - - echo "$@" - if "$@" 2>&1 ; then - actual=ok - else - actual=err - fi - if [ "$actual" != "$expected" ]; then - case "$actual" in - ok ) echo "error: unexpected result: command succeeded" ;; - err ) echo "error: unexpected result: command failed" - esac - exit 1 - else - case "$actual" in - ok ) echo "command succeeded as expected" ;; - err ) echo "command failed as expected." - esac - fi - - echo -} - -echo "# create zip/jar files with source code" -check ok "${TESTJAVA}${FS}bin${FS}jar" cf "${SCR}${FS}good.jar" -C "${TESTSRC}${FS}good" B.java -check ok "${TESTJAVA}${FS}bin${FS}jar" cf "${SCR}${FS}good.zip" -C "${TESTSRC}${FS}good" B.java -check ok "${TESTJAVA}${FS}bin${FS}jar" cf "${SCR}${FS}bad.jar" -C "${TESTSRC}${FS}bad" B.java -check ok "${TESTJAVA}${FS}bin${FS}jar" cf "${SCR}${FS}bad.zip" -C "${TESTSRC}${FS}bad" B.java - -echo "# control tests, with no paths" -check ok "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} "${TESTSRC}${FS}A.java" "${TESTSRC}${FS}good${FS}B.java" -check err "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} "${TESTSRC}${FS}A.java" "${TESTSRC}${FS}bad${FS}B.java" - -echo "# test that source files are found in directories on path" -check ok "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -classpath "${TESTSRC}${FS}good" "${TESTSRC}${FS}A.java" -check ok "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -sourcepath "${TESTSRC}${FS}good" "${TESTSRC}${FS}A.java" -check err "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -classpath "${TESTSRC}${FS}bad" "${TESTSRC}${FS}A.java" -check err "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -sourcepath "${TESTSRC}${FS}bad" "${TESTSRC}${FS}A.java" - -echo "# test that source files are found in zip/jar files on path" -check ok "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -classpath "${SCR}${FS}good.zip" "${TESTSRC}${FS}A.java" -check ok "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -classpath "${SCR}${FS}good.jar" "${TESTSRC}${FS}A.java" -check err "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -sourcepath "${SCR}${FS}bad.zip" "${TESTSRC}${FS}A.java" -check err "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -sourcepath "${SCR}${FS}bad.jar" "${TESTSRC}${FS}A.java"
--- a/test/tools/javac/javazip/bad/B.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2005, 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. - */ - -// this class is invalid -class B
--- a/test/tools/javac/javazip/good/B.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2005, 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. - */ - -// this is a valid class -public class B { -}
--- a/test/tools/javac/lambda/BadRecovery.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/lambda/BadRecovery.out Tue May 07 17:14:17 2013 -0700 @@ -1,3 +1,2 @@ -BadRecovery.java:17:9: compiler.err.cant.apply.symbol: kindname.method, m, BadRecovery.SAM1, @369, kindname.class, BadRecovery, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.arg.types.in.lambda)) BadRecovery.java:17:77: compiler.err.cant.resolve.location: kindname.variable, f, , , (compiler.misc.location: kindname.class, BadRecovery, null) -2 errors +1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/DoubleStaticImport.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2011, 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. + */ + +/* + * @test + * @bug 8009820 + * @summary AssertionError when compiling java code with two identical static imports + * @compile DoubleStaticImport.java + */ + +import static java.lang.Thread.holdsLock; +import static java.lang.Thread.holdsLock; //dup + +class DoubleStaticImport { + public void test() { + holdsLock(null); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/FunctionalInterfaceAnno02.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,38 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8007535 + * @summary Compiler crashes on FunctionalInterface used on interface with two inherited methods with same signatures + * @compile FunctionalInterfaceAnno02.java + */ +class FunctionalInterfaceAnno02 { + interface Foo<T, N extends Number> { + void m(T arg); + void m(N arg); + } + + @FunctionalInterface + interface Baz extends Foo<Integer, Integer> { } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/GenericMethodRefImplClass.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,81 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8009582 + * @summary Method reference generic constructor gives: IllegalArgumentException: Invalid lambda deserialization + * @author Robert Field + * @run main GenericMethodRefImplClass + */ + +import java.io.*; +import java.util.*; + +public class GenericMethodRefImplClass { + + static int assertionCount = 0; + + static void assertTrue(boolean cond) { + assertionCount++; + if (!cond) + throw new AssertionError(); + } + + public static void main(String[] args) throws Exception { + try { + // Write lambdas out + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(baos); + + write(out, HashMap::new ); + out.flush(); + out.close(); + + // Read them back + ByteArrayInputStream bais = + new ByteArrayInputStream(baos.toByteArray()); + ObjectInputStream in = new ObjectInputStream(bais); + readIt(in); + in.close(); + } catch (IOException e) { + e.printStackTrace(); + throw e; + } + assertTrue(assertionCount == 1); + } + + static void write(ObjectOutput out, GenericMethodRefImplClassLSI lamb) throws IOException { + out.writeObject(lamb); + } + + static void readIt(ObjectInputStream in) throws IOException, ClassNotFoundException { + GenericMethodRefImplClassLSI ls = (GenericMethodRefImplClassLSI) in.readObject(); + Map result = ls.convert(); + assertTrue(result.getClass().getName().equals("java.util.HashMap")); + } +} + +interface GenericMethodRefImplClassLSI extends Serializable { + Map convert(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/IdentifierTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,182 @@ +/* + * @test /nodynamiccopyright/ + * @bug 8007401 8007427 + * @author sogoel + * @summary Test generation of warnings when '_' is used an identifier + * @compile/fail/ref=IdentifierTest.out -Werror -XDrawDiagnostics IdentifierTest.java + */ + +import java.util.List; + +/* + * This test checks for the generation of warnings when '_' is used as an + * identifier in following cases: + * package name, class name, class member names including constructor + * cass members access using class object or this + * loops: for, enhanced-for, while, do-while + * arrays, + * switch, + * annotations, element=value pair + * try-catch, + * enum + * break + identifier + * continue + identifier + * type-bounds + * Above cases for identifier occurrences have been identified from JLS v3. + * + */ + +// Test class +public class IdentifierTest { + class _UnderscorePrefix {} + class Underscore_Infix {} + class UnderscorePostfix_ {} + class __ {} + + static final int _prefix = 10; + List<String> postfix_; + + // Test: class with name as '_' + class _ { + String in_fix; + //Test: Constructor, "_", local variable, value + public _() { + String _ = "_"; + in_fix = _; + } + + public void testClassMembersAccess(String[] _args) { + // Instance creation + _ _ = new _(); + //Method invocation + _.testTryCatch(); + //Field access + _.in_fix = "__"; + } + + // Test: try-catch + public void testTryCatch() { + try { + int _ = 30/0; + } catch (ArithmeticException _) { + System.out.println("Got Arithmentic exception " + _); + } + } + } + + // Test: class member access using class object '_', use of this. + class TestMisc { + int _; + void _ () { + this._ = 5; + } + + public void testClassMemberAccess(String[] args) { + // Instance creation + TestMisc _ = new TestMisc(); + //Field access + _._ = 10; + //Method access + _._(); + } + } + + //Test: Type Bounds + class TestTypeBounds { + //Type bounds + <_ extends Object> void test(_ t) {} + } + + // Test: enum and switch case + static class TestEnum { + // Enum + enum _ { + _MONDAY, _TUESDAY, _WEDNESDAY, _THURSDAY, _FRIDAY, + _SATURDAY, _SUNDAY; + } + + void foo() { + // switch-case + for(_ _day : _.values()) { + switch(_day) { + case _SATURDAY: + case _SUNDAY: + System.out.println("Weekend is here!"); + break; + default: + System.out.println("Weekday is here!"); + break; + } + } + } + } + + // Test: Annotation + static class TestAnno { + // Annotation with name as _ + @interface _ { + String _name(); + int _id(); + } + // Element-Value pair + @_(_name ="m",_id=1) + public void m(int arg) {} + + //Annotation with _ as one of the elements + @interface MyAnno { + int _(); + } + // Element Value pair + @MyAnno(_='1') + public void m2() {} + } + + // Test: for loop, while loop, do-while loop, increment/decrement op, condition, print + public void testLoop() { + // for loop + for(int _ = 0; _ < 5; ++_) { + System.out.println("_=" + _ + " "); + } + + // while loop + int _ = 0; + while(_ <= 5) { + _++; + } + + //do-while loop + do { + --_; + } while(_ > 0); + } + + // Test: Array and enhanced for loop + public void testArraysEnhancedForLoop() { + // Arrays + String _[] = {"A","B","C","D"}; + + for(String _s : _ ) { + System.out.println("_s="+_s); + } + } + + // Test: Labels in break, continue + public void testLabels() { + // break/continue with labels + int j = 0; + _: + for (int i = 0; i <= 5; i++) { + while( j > 4 ) { + j++; + continue _; + } + break _; + } + } +} + +//interface +interface _ { + void mI(); +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/IdentifierTest.out Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,47 @@ +IdentifierTest.java:40:11: compiler.warn.underscore.as.identifier +IdentifierTest.java:43:16: compiler.warn.underscore.as.identifier +IdentifierTest.java:44:20: compiler.warn.underscore.as.identifier +IdentifierTest.java:45:22: compiler.warn.underscore.as.identifier +IdentifierTest.java:50:13: compiler.warn.underscore.as.identifier +IdentifierTest.java:50:15: compiler.warn.underscore.as.identifier +IdentifierTest.java:50:23: compiler.warn.underscore.as.identifier +IdentifierTest.java:52:13: compiler.warn.underscore.as.identifier +IdentifierTest.java:54:13: compiler.warn.underscore.as.identifier +IdentifierTest.java:60:21: compiler.warn.underscore.as.identifier +IdentifierTest.java:61:42: compiler.warn.underscore.as.identifier +IdentifierTest.java:62:67: compiler.warn.underscore.as.identifier +IdentifierTest.java:69:13: compiler.warn.underscore.as.identifier +IdentifierTest.java:70:14: compiler.warn.underscore.as.identifier +IdentifierTest.java:71:18: compiler.warn.underscore.as.identifier +IdentifierTest.java:76:22: compiler.warn.underscore.as.identifier +IdentifierTest.java:78:13: compiler.warn.underscore.as.identifier +IdentifierTest.java:78:15: compiler.warn.underscore.as.identifier +IdentifierTest.java:80:13: compiler.warn.underscore.as.identifier +IdentifierTest.java:80:15: compiler.warn.underscore.as.identifier +IdentifierTest.java:87:10: compiler.warn.underscore.as.identifier +IdentifierTest.java:87:38: compiler.warn.underscore.as.identifier +IdentifierTest.java:93:14: compiler.warn.underscore.as.identifier +IdentifierTest.java:100:17: compiler.warn.underscore.as.identifier +IdentifierTest.java:100:26: compiler.warn.underscore.as.identifier +IdentifierTest.java:117:20: compiler.warn.underscore.as.identifier +IdentifierTest.java:122:10: compiler.warn.underscore.as.identifier +IdentifierTest.java:127:17: compiler.warn.underscore.as.identifier +IdentifierTest.java:130:17: compiler.warn.underscore.as.identifier +IdentifierTest.java:137:17: compiler.warn.underscore.as.identifier +IdentifierTest.java:137:24: compiler.warn.underscore.as.identifier +IdentifierTest.java:137:33: compiler.warn.underscore.as.identifier +IdentifierTest.java:138:39: compiler.warn.underscore.as.identifier +IdentifierTest.java:142:13: compiler.warn.underscore.as.identifier +IdentifierTest.java:143:15: compiler.warn.underscore.as.identifier +IdentifierTest.java:144:13: compiler.warn.underscore.as.identifier +IdentifierTest.java:149:15: compiler.warn.underscore.as.identifier +IdentifierTest.java:150:17: compiler.warn.underscore.as.identifier +IdentifierTest.java:156:16: compiler.warn.underscore.as.identifier +IdentifierTest.java:158:25: compiler.warn.underscore.as.identifier +IdentifierTest.java:167:5: compiler.warn.underscore.as.identifier +IdentifierTest.java:171:26: compiler.warn.underscore.as.identifier +IdentifierTest.java:173:19: compiler.warn.underscore.as.identifier +IdentifierTest.java:179:11: compiler.warn.underscore.as.identifier +- compiler.err.warnings.and.werror +1 error +44 warnings
--- a/test/tools/javac/lambda/Intersection01.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/lambda/Intersection01.java Tue May 07 17:14:17 2013 -0700 @@ -25,7 +25,7 @@ * @test * @bug 8002099 * @summary Add support for intersection types in cast expression - * @compile/fail/ref=Intersection01.out -XDrawDiagnostics Intersection01.java + * @compile Intersection01.java */ class Intersection01 {
--- a/test/tools/javac/lambda/Intersection01.out Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -Intersection01.java:36:45: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: java.io.Serializable, (compiler.misc.no.abstracts: kindname.interface, java.io.Serializable)) -Intersection01.java:38:45: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: java.io.Serializable, (compiler.misc.no.abstracts: kindname.interface, java.io.Serializable)) -2 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/Intersection02.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2012, 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. + */ + +/* + * @test + * @bug 8010101 + * @summary Intersection type cast issues redundant unchecked warning + * @compile/fail/ref=Intersection02.out -Werror -Xlint:unchecked -XDrawDiagnostics Intersection02.java + */ +import java.io.Serializable; +import java.util.List; + +class Intersection02 { + + interface P<X> { } + + void test(List<String> ls) { + Object o1 = (List<String> & Serializable)ls; + Object o2 = (List<String> & Serializable & P<String>)ls; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/Intersection02.out Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,4 @@ +Intersection02.java:39:62: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), java.util.List<java.lang.String>, java.lang.Object&java.util.List<java.lang.String>&java.io.Serializable&Intersection02.P<java.lang.String> +- compiler.err.warnings.and.werror +1 error +1 warning
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/Intersection03.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,49 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8011392 + * @summary Missing checkcast when casting to intersection type + */ +import java.util.*; + +public class Intersection03 { + + static int assertionCount = 0; + + static void assertTrue(boolean cond) { + assertionCount++; + if (!cond) throw new AssertionError(); + } + + public static void main(String[] args) { + try { + Runnable r = (List<?> & Runnable)new ArrayList<String>(); + assertTrue(false); + } catch (ClassCastException cce) { + assertTrue(true); + } + assertTrue(assertionCount == 1); + } +}
--- a/test/tools/javac/lambda/LambdaCapture06.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/lambda/LambdaCapture06.java Tue May 07 17:14:17 2013 -0700 @@ -23,7 +23,6 @@ /* * @test - * @ignore investigate as to whether code generation fails * @bug 8003280 * @summary Add lambda tests * Compiler crash when local inner class nested inside lambda captures local variables from enclosing scope
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/LambdaCapture07.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,60 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8004962 + * @summary Code generation crash with lambda and local classes + */ +public class LambdaCapture07 { + + static int assertionCount = 0; + + static void assertTrue(boolean cond) { + assertionCount++; + if (!cond) + throw new AssertionError(); + } + + interface SAM { + void m(); + } + + void test(int i) { + class Local { Local() { assertTrue(i == 42); } } + class LocalSub extends Local { } + SAM s_sup = ()->new Local(); + s_sup.m(); + SAM s_sub = ()->new LocalSub(); + s_sub.m(); + SAM s_sup_nested = ()->{ SAM s = ()->new Local(); s.m(); }; + s_sup_nested.m(); + SAM s_sub_nested = ()->{ SAM s = ()->new LocalSub(); s.m(); }; + s_sub_nested.m(); + } + + public static void main(String[] args) { + new LambdaCapture07().test(42); + assertTrue(assertionCount == 4); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/LambdaConv25.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,21 @@ +/* + * @test /nodynamiccopyright/ + * @summary check that merged inherited descriptors preservers type-parameters + * @compile/fail/ref=LambdaConv25.out -XDrawDiagnostics LambdaConv25.java + */ +class LambdaConv25 { + + interface A { + <X> void m(); + } + + interface B { + <X> void m(); + } + + interface C extends A, B { } + + void test() { + C c = ()->{}; //should fail + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/LambdaConv25.out Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,2 @@ +LambdaConv25.java:19:15: compiler.err.prob.found.req: (compiler.misc.invalid.generic.lambda.target: <X>()void, kindname.interface, LambdaConv25.C) +1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/LambdaConv26.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,41 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8006749 + * @summary compiler does not allow Object protected methods to be used in lambda + * @compile LambdaConv26.java + */ +public class LambdaConv26 { + interface I { + Object clone(); + } + + Object m() { return null; } + + void test() { + I i1 = ()->null; + I i2 = this::m; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/LambdaConv27.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,40 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8008227 + * @summary Mixing lambdas with anonymous classes leads to NPE thrown by compiler + * @run main LambdaConv27 + */ +public class LambdaConv27 { + + public static void main(String[] args) { + SAM s = ()-> { SAM s2 = ()->{ new Object() { }; }; s2.m(); }; + s.m(); + } + + interface SAM { + void m(); + } +}
--- a/test/tools/javac/lambda/LambdaExpr15.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/lambda/LambdaExpr15.java Tue May 07 17:14:17 2013 -0700 @@ -23,7 +23,6 @@ /* * @test - * @ignore investigate as to whether code generation fails * @bug 8003280 * @summary Add lambda tests * check that nested inner class in statement lambdas don't get corrupted return statements
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/LambdaInnerTypeVarArgs.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,80 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8005653 + * @summary A lambda containing an inner class referencing an external type var in class parameter type + * @author Robert Field + * @run main LambdaInnerTypeVarArgs + */ + +import java.io.Serializable; +import java.util.List; +import java.util.ArrayList; + +public class LambdaInnerTypeVarArgs { + + static int assertionCount = 0; + + static void assertTrue(boolean cond) { + assertionCount++; + if (!cond) + throw new AssertionError(); + } + + interface I { + C doit(); + } + + abstract class C { + abstract Object it(); + } + + class TV { + C go() { + List<String> ls = new ArrayList<>(); + ls.add("Oh"); + ls.add("my"); + return foo(ls).doit(); + } + + <RRRRR> I foo(List<RRRRR> r) { + return () -> new C() { + List<RRRRR> xxxxx = r; + @Override + Object it() { return xxxxx; }; + }; + } + } + + void test1() { + assertTrue(((List<String>)(new TV().go().it())).get(0).equals("Oh")); + } + + public static void main(String[] args) { + LambdaInnerTypeVarArgs t = new LambdaInnerTypeVarArgs(); + t.test1(); + assertTrue(assertionCount == 1); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/LambdaInnerTypeVarArgsSerialize.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,80 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8005653 + * @summary A serialized lambda containing an inner class referencing an external type var in class parameter type + * @author Robert Field + * @run main LambdaInnerTypeVarArgsSerialize + */ + +import java.io.Serializable; +import java.util.List; +import java.util.ArrayList; + +public class LambdaInnerTypeVarArgsSerialize { + + static int assertionCount = 0; + + static void assertTrue(boolean cond) { + assertionCount++; + if (!cond) + throw new AssertionError(); + } + + interface I extends Serializable { + C doit(); + } + + abstract class C { + abstract Object it(); + } + + class TV { + C go() { + List<String> ls = new ArrayList<>(); + ls.add("Oh"); + ls.add("my"); + return foo(ls).doit(); + } + + <RRRRR> I foo(List<RRRRR> r) { + return () -> new C() { + List<RRRRR> xxxxx = r; + @Override + Object it() { return xxxxx; }; + }; + } + } + + void test1() { + assertTrue(((List<String>)(new TV().go().it())).get(0).equals("Oh")); + } + + public static void main(String[] args) { + LambdaInnerTypeVarArgsSerialize t = new LambdaInnerTypeVarArgsSerialize(); + t.test1(); + assertTrue(assertionCount == 1); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/LambdaInnerTypeVarReflect.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,86 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8005653 + * @summary A lambda containing an inner class referencing an external type var + * @author Robert Field + * @run main LambdaInnerTypeVarReflect + */ + +import java.io.StringWriter; +import java.io.PrintWriter; +import java.io.IOException; + +public class LambdaInnerTypeVarReflect { + + static int assertionCount = 0; + + static void assertTrue(boolean cond) { + assertionCount++; + if (!cond) + throw new AssertionError(); + } + + interface I { + C doit(); + } + + abstract class C { + abstract Object it(); + } + + class TV { + C go() { + return foo("Frump").doit(); + } + + <RRRRR> I foo(RRRRR r) { + return () -> new C() { + public RRRRR xxxxx = r; + @Override + Object it() { return xxxxx; }; + }; + } + } + + void test1() throws IOException { + char[] buffer = new char[1024]; + String innerName = new TV().go().getClass().getName(); + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + int exitCode = com.sun.tools.javap.Main.run(new String[] {innerName}, pw); + assertTrue(exitCode == 0); + + String javapOut = sw.toString(); + assertTrue(javapOut.contains(innerName)); + assertTrue(!javapOut.contains("RRRRR")); + } + + public static void main(String[] args) throws IOException { + LambdaInnerTypeVarReflect t = new LambdaInnerTypeVarReflect(); + t.test1(); + assertTrue(assertionCount == 3); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/LambdaInnerTypeVarSerialize.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,75 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8005653 + * @summary A serialized lambda containing an inner class referencing an external type var + * @author Robert Field + * @run main LambdaInnerTypeVarSerialize + */ + +import java.io.Serializable; + +public class LambdaInnerTypeVarSerialize { + + static int assertionCount = 0; + + static void assertTrue(boolean cond) { + assertionCount++; + if (!cond) + throw new AssertionError(); + } + + interface I extends Serializable { + C doit(); + } + + abstract class C { + abstract Object it(); + } + + class TV { + C go() { + return foo("Frump").doit(); + } + + <RRRRR> I foo(RRRRR r) { + return () -> new C() { + RRRRR xxxxx = r; + @Override + Object it() { return xxxxx; }; + }; + } + } + + void test1() { + assertTrue(new TV().go().it().equals("Frump")); + } + + public static void main(String[] args) { + LambdaInnerTypeVarSerialize t = new LambdaInnerTypeVarSerialize(); + t.test1(); + assertTrue(assertionCount == 1); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/LambdaLambdaSerialized.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,79 @@ +/* + * 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. + */ + +/* +@test +@bug 8010010 +@summary NPE generating serializedLambdaName for nested lambda +*/ + +import java.io.*; +import java.util.Map; +import java.util.HashMap; + +public class LambdaLambdaSerialized { + + static int assertionCount = 0; + + static void assertTrue(boolean cond) { + assertionCount++; + if (!cond) + throw new AssertionError(); + } + + public static void main(String[] args) throws Exception { + try { + // Write lambdas out + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(baos); + LSI<LSI<Map>> ssi = () -> (() -> new HashMap()); + write(out, ssi ); + out.flush(); + out.close(); + + // Read them back + ByteArrayInputStream bais = + new ByteArrayInputStream(baos.toByteArray()); + ObjectInputStream in = new ObjectInputStream(bais); + readAssert(in, "[X]"); + in.close(); + } catch (IOException e) { + e.printStackTrace(); + throw e; + } + } + + static void write(ObjectOutput out, LSI<LSI<Map>> lamb) throws IOException { + out.writeObject(lamb); + } + + static void readAssert(ObjectInputStream in, String expected) throws IOException, ClassNotFoundException { + LSI<LSI<Map>> ls = (LSI<LSI<Map>>) in.readObject(); + Map result = ls.get().get(); + System.out.printf("Result: %s\n", result); + } +} + +interface LSI<T> extends Serializable { + T get(); +}
--- a/test/tools/javac/lambda/MethodReference22.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/lambda/MethodReference22.java Tue May 07 17:14:17 2013 -0700 @@ -48,19 +48,19 @@ } static void test2() { - SAM2 s1 = MethodReference22::m1; //ok - call2(MethodReference22::m1); //ok - SAM2 s2 = MethodReference22::m2; //ok - call2(MethodReference22::m2); //ok - SAM2 s3 = MethodReference22::m3; //fail - call2(MethodReference22::m3); //fail - SAM2 s4 = MethodReference22::m4; //fail - call2(MethodReference22::m4); //fail + SAM2 s1 = MethodReference22::m1; //ambiguous + call2(MethodReference22::m1); //ambiguous + SAM2 s2 = MethodReference22::m2; //ambiguous + call2(MethodReference22::m2); //ambiguous + SAM2 s3 = MethodReference22::m3; //ambiguous + call2(MethodReference22::m3); //ambiguous + SAM2 s4 = MethodReference22::m4; //ambiguous + call2(MethodReference22::m4); //ambiguous } static void test3() { - call3(MethodReference22::m1); //ok - call3(MethodReference22::m2); //ambiguous + call3(MethodReference22::m1); //fail + call3(MethodReference22::m2); //ok call3(MethodReference22::m3); //ok call3(MethodReference22::m4); //fail }
--- a/test/tools/javac/lambda/MethodReference22.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/lambda/MethodReference22.out Tue May 07 17:14:17 2013 -0700 @@ -1,11 +1,15 @@ -MethodReference22.java:40:19: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.non-static.cant.be.ref: kindname.method, m1(java.lang.String))) -MethodReference22.java:41:9: compiler.err.cant.apply.symbol: kindname.method, call1, MethodReference22.SAM1, @999, kindname.class, MethodReference22, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.non-static.cant.be.ref: kindname.method, m1(java.lang.String)))) -MethodReference22.java:46:19: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.non-static.cant.be.ref: kindname.method, m4(java.lang.String))) -MethodReference22.java:47:9: compiler.err.cant.apply.symbol: kindname.method, call1, MethodReference22.SAM1, @1270, kindname.class, MethodReference22, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.non-static.cant.be.ref: kindname.method, m4(java.lang.String)))) -MethodReference22.java:55:19: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.non-static.cant.be.ref: kindname.method, m3(MethodReference22,java.lang.String))) -MethodReference22.java:56:9: compiler.err.cant.apply.symbol: kindname.method, call2, MethodReference22.SAM2, @1574, kindname.class, MethodReference22, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.non-static.cant.be.ref: kindname.method, m3(MethodReference22,java.lang.String)))) +MethodReference22.java:40:19: compiler.err.invalid.mref: kindname.method, (compiler.misc.non-static.cant.be.ref: kindname.method, m1(java.lang.String)) +MethodReference22.java:41:15: compiler.err.invalid.mref: kindname.method, (compiler.misc.non-static.cant.be.ref: kindname.method, m1(java.lang.String)) +MethodReference22.java:46:19: compiler.err.invalid.mref: kindname.method, (compiler.misc.non-static.cant.be.ref: kindname.method, m4(java.lang.String)) +MethodReference22.java:47:15: compiler.err.invalid.mref: kindname.method, (compiler.misc.non-static.cant.be.ref: kindname.method, m4(java.lang.String)) +MethodReference22.java:51:19: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.ref.ambiguous: m1, kindname.method, m1(MethodReference22,java.lang.String), MethodReference22, kindname.method, m1(java.lang.String), MethodReference22)) +MethodReference22.java:52:9: compiler.err.cant.apply.symbol: kindname.method, call2, MethodReference22.SAM2, @1401, kindname.class, MethodReference22, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.ref.ambiguous: m1, kindname.method, m1(MethodReference22,java.lang.String), MethodReference22, kindname.method, m1(java.lang.String), MethodReference22))) +MethodReference22.java:53:19: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.ref.ambiguous: m2, kindname.method, m2(MethodReference22,java.lang.String), MethodReference22, kindname.method, m2(java.lang.String), MethodReference22)) +MethodReference22.java:54:9: compiler.err.cant.apply.symbol: kindname.method, call2, MethodReference22.SAM2, @1504, kindname.class, MethodReference22, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.ref.ambiguous: m2, kindname.method, m2(MethodReference22,java.lang.String), MethodReference22, kindname.method, m2(java.lang.String), MethodReference22))) +MethodReference22.java:55:19: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.ref.ambiguous: m3, kindname.method, m3(MethodReference22,java.lang.String), MethodReference22, kindname.method, m3(java.lang.String), MethodReference22)) +MethodReference22.java:56:9: compiler.err.cant.apply.symbol: kindname.method, call2, MethodReference22.SAM2, @1607, kindname.class, MethodReference22, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.ref.ambiguous: m3, kindname.method, m3(MethodReference22,java.lang.String), MethodReference22, kindname.method, m3(java.lang.String), MethodReference22))) MethodReference22.java:57:19: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.ref.ambiguous: m4, kindname.method, m4(MethodReference22,java.lang.String), MethodReference22, kindname.method, m4(java.lang.String), MethodReference22)) -MethodReference22.java:58:9: compiler.err.cant.apply.symbol: kindname.method, call2, MethodReference22.SAM2, @1667, kindname.class, MethodReference22, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.ref.ambiguous: m4, kindname.method, m4(MethodReference22,java.lang.String), MethodReference22, kindname.method, m4(java.lang.String), MethodReference22))) -MethodReference22.java:63:9: compiler.err.ref.ambiguous: call3, kindname.method, call3(MethodReference22.SAM1), MethodReference22, kindname.method, call3(MethodReference22.SAM2), MethodReference22 -MethodReference22.java:65:9: compiler.err.cant.apply.symbols: kindname.method, call3, @1881,{(compiler.misc.inapplicable.method: kindname.method, MethodReference22, call3(MethodReference22.SAM1), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.non-static.cant.be.ref: kindname.method, m4(java.lang.String))))),(compiler.misc.inapplicable.method: kindname.method, MethodReference22, call3(MethodReference22.SAM2), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.ref.ambiguous: m4, kindname.method, m4(MethodReference22,java.lang.String), MethodReference22, kindname.method, m4(java.lang.String), MethodReference22))))} -10 errors +MethodReference22.java:58:9: compiler.err.cant.apply.symbol: kindname.method, call2, MethodReference22.SAM2, @1710, kindname.class, MethodReference22, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.ref.ambiguous: m4, kindname.method, m4(MethodReference22,java.lang.String), MethodReference22, kindname.method, m4(java.lang.String), MethodReference22))) +MethodReference22.java:62:15: compiler.err.invalid.mref: kindname.method, (compiler.misc.non-static.cant.be.ref: kindname.method, m1(java.lang.String)) +MethodReference22.java:65:15: compiler.err.invalid.mref: kindname.method, (compiler.misc.non-static.cant.be.ref: kindname.method, m4(java.lang.String)) +14 errors
--- a/test/tools/javac/lambda/MethodReference28.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/lambda/MethodReference28.out Tue May 07 17:14:17 2013 -0700 @@ -1,7 +1,7 @@ MethodReference28.java:31:19: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.cant.apply.symbol: kindname.method, static_m2, java.lang.Integer,java.lang.Integer, int, kindname.class, MethodReference28, (compiler.misc.arg.length.mismatch))) MethodReference28.java:32:19: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.cant.apply.symbol: kindname.method, static_m3, java.lang.String, int, kindname.class, MethodReference28, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String)))) MethodReference28.java:33:19: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.cant.apply.symbol: kindname.method, static_m4, java.lang.String[], int, kindname.class, MethodReference28, (compiler.misc.varargs.argument.mismatch: (compiler.misc.inconvertible.types: int, java.lang.String)))) -MethodReference28.java:37:19: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.non-static.cant.be.ref: kindname.method, m1(java.lang.Integer))) +MethodReference28.java:37:19: compiler.err.invalid.mref: kindname.method, (compiler.misc.non-static.cant.be.ref: kindname.method, m1(java.lang.Integer)) MethodReference28.java:38:19: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.cant.apply.symbol: kindname.method, m2, java.lang.Integer,java.lang.Integer, int, kindname.class, MethodReference28, (compiler.misc.arg.length.mismatch))) MethodReference28.java:39:19: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.cant.apply.symbol: kindname.method, m3, java.lang.String, int, kindname.class, MethodReference28, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String)))) MethodReference28.java:40:19: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.cant.apply.symbol: kindname.method, m4, java.lang.String[], int, kindname.class, MethodReference28, (compiler.misc.varargs.argument.mismatch: (compiler.misc.inconvertible.types: int, java.lang.String))))
--- a/test/tools/javac/lambda/MethodReference38.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/lambda/MethodReference38.out Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ -MethodReference38.java:24:18: compiler.err.abstract.cant.be.instantiated -MethodReference38.java:25:18: compiler.err.abstract.cant.be.instantiated -MethodReference38.java:26:18: compiler.err.abstract.cant.be.instantiated +MethodReference38.java:24:18: compiler.err.abstract.cant.be.instantiated: MethodReference38.A +MethodReference38.java:25:18: compiler.err.abstract.cant.be.instantiated: MethodReference38.I +MethodReference38.java:26:18: compiler.err.abstract.cant.be.instantiated: MethodReference38.AC MethodReference38.java:27:18: compiler.err.enum.cant.be.instantiated 4 errors
--- a/test/tools/javac/lambda/MethodReference51.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/lambda/MethodReference51.out Tue May 07 17:14:17 2013 -0700 @@ -2,6 +2,6 @@ MethodReference51.java:40:21: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.cant.apply.symbol: kindname.method, f, java.lang.String, int, kindname.class, MethodReference51, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String)))) MethodReference51.java:41:21: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.cant.apply.symbols: kindname.method, g, int,{(compiler.misc.inapplicable.method: kindname.method, MethodReference51, g(java.lang.Integer,java.lang.Number), (compiler.misc.arg.length.mismatch)),(compiler.misc.inapplicable.method: kindname.method, MethodReference51, g(java.lang.Number,java.lang.Integer), (compiler.misc.arg.length.mismatch))})) MethodReference51.java:42:32: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.ref.ambiguous: g, kindname.method, g(java.lang.Integer,java.lang.Number), MethodReference51, kindname.method, g(java.lang.Number,java.lang.Integer), MethodReference51)) -MethodReference51.java:43:21: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.non-static.cant.be.ref: kindname.method, h(int))) +MethodReference51.java:43:21: compiler.err.invalid.mref: kindname.method, (compiler.misc.non-static.cant.be.ref: kindname.method, h(int)) MethodReference51.java:44:21: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.not.def.access.class.intf.cant.access: j(int), MethodReference51.Foo)) 6 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/MethodReference61.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,43 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8006763 + * @summary super in method reference used in anonymous class + */ +public class MethodReference61 { + interface SAM { + void m(); + } + + static class MyTester { + public void ifoo() { } + } + + public static void main(String args[]) { + MyTester t = new MyTester() { + SAM s = super::ifoo; + }; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/MethodReference62.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,22 @@ +/* + * @test /nodynamiccopyright/ + * @bug 8007285 + * @summary AbstractMethodError instead of compile-time error when method reference with super and abstract + * @compile/fail/ref=MethodReference62.out -XDrawDiagnostics MethodReference62.java + */ +class MethodReference62 { + interface SAM { + int m(); + } + + static abstract class Sup { + abstract int foo() ; + } + + static abstract class Sub extends Sup { + abstract int foo() ; + void test() { + SAM s = super::foo; + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/MethodReference62.out Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,2 @@ +MethodReference62.java:19:21: compiler.err.abstract.cant.be.accessed.directly: kindname.method, foo(), MethodReference62.Sup +1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/MethodReference63.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,43 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8005183 + * @summary Missing accessor for constructor reference pointing to private inner class ctor + */ +public class MethodReference63 { + + interface SAM { + void m(); + } + + static class Foo { + private Foo() { } + } + + public static void main(String[] args) { + SAM s = Foo::new; + s.m(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/MethodReference64.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,46 @@ +/* + * @test /nodynamiccopyright/ + * @bug 8008540 8008539 8008538 + * @summary Constructor reference to non-reifiable array should be rejected + * @compile/fail/ref=MethodReference64.out -XDrawDiagnostics MethodReference64.java + */ +class MethodReference64 { + interface ClassFactory { + Object m(); + } + + interface ArrayFactory { + Object m(int i); + } + + @interface Anno { } + + enum E { } + + interface I { } + + static class Foo<X> { } + + void m(ClassFactory cf) { } + void m(ArrayFactory cf) { } + + void testAssign() { + ClassFactory c1 = Anno::new; //error + ClassFactory c2 = E::new; //error + ClassFactory c3 = I::new; //error + ClassFactory c4 = Foo<?>::new; //error + ClassFactory c5 = 1::new; //error + ArrayFactory a1 = Foo<?>[]::new; //ok + ArrayFactory a2 = Foo<? extends String>[]::new; //error + } + + void testMethod() { + m(Anno::new); //error + m(E::new); //error + m(I::new); //error + m(Foo<?>::new); //error + m(1::new); //error + m(Foo<?>[]::new); //ok - resolves to m(ArrayFactory) + m(Foo<? extends String>[]::new); //error + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/MethodReference64.out Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,13 @@ +MethodReference64.java:28:27: compiler.err.abstract.cant.be.instantiated: MethodReference64.Anno +MethodReference64.java:29:27: compiler.err.enum.cant.be.instantiated +MethodReference64.java:30:27: compiler.err.abstract.cant.be.instantiated: MethodReference64.I +MethodReference64.java:31:30: compiler.err.type.found.req: ?, (compiler.misc.type.req.exact) +MethodReference64.java:32:27: compiler.err.unexpected.type: kindname.class, kindname.value +MethodReference64.java:34:48: compiler.err.generic.array.creation +MethodReference64.java:38:11: compiler.err.abstract.cant.be.instantiated: MethodReference64.Anno +MethodReference64.java:39:11: compiler.err.enum.cant.be.instantiated +MethodReference64.java:40:11: compiler.err.abstract.cant.be.instantiated: MethodReference64.I +MethodReference64.java:41:14: compiler.err.type.found.req: ?, (compiler.misc.type.req.exact) +MethodReference64.java:42:11: compiler.err.unexpected.type: kindname.class, kindname.value +MethodReference64.java:44:32: compiler.err.generic.array.creation +12 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/MethodReference65.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,41 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8009154 + * @summary Missing cast in method reference bridge leads to NoSuchMethodError + */ +public class MethodReference65 { + + interface SAM<X> { + void m(X ss, String s); + } + + void m(String... s) { } + + public static void main(String[] args) { + SAM<MethodReference65> st = MethodReference65::m; + st.m(new MethodReference65(), ""); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/MethodReference66.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,52 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8009299 + * @summary Javac crashes when compiling method reference to static interface method + * @run main/othervm -Xverify:none MethodReference66 + */ +public class MethodReference66 { + + static int assertionCount = 0; + + static void assertTrue(boolean cond) { + assertionCount++; + if (!cond) + throw new AssertionError(); + } + + interface SAM { + void m(int i); + } + + interface I { + static void f(int i) { assertTrue(i == 42); } + } + public static void main(String[] args) { + SAM s = I::f; + s.m(42); + assertTrue(assertionCount == 1); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/MostSpecific08.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,62 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8008813 + * @summary Structural most specific fails when method reference is passed to overloaded method + * @compile MostSpecific08.java + */ +class MostSpecific08 { + + static class C { + int getInt() { return -1; } + Integer getInteger() { return -1; } + } + + interface IntResult { } + interface ReferenceResult<X> { } + + interface PrimitiveFunction { + int f(C c); + } + + interface ReferenceFunction<X> { + X f(C c); + } + + interface Tester { + IntResult apply(PrimitiveFunction p); + <Z> ReferenceResult<Z> apply(ReferenceFunction<Z> p); + } + + void testMref(Tester t) { + IntResult pr = t.apply(C::getInt); + ReferenceResult<Integer> rr = t.apply(C::getInteger); + } + + void testLambda(Tester t) { + IntResult pr = t.apply(c->c.getInt()); + ReferenceResult<Integer> rr = t.apply(c->c.getInteger()); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/SerializedLambdaInInit.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,118 @@ +/* + * 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. + */ + +/* +@test +@bug 8009742 +@summary Bad method name: Serialized lambda in a constructor or class init +*/ + +import java.io.*; +import java.lang.reflect.Method; + +public class SerializedLambdaInInit { + static int assertionCount = 0; + + static void assertTrue(boolean cond) { + assertionCount++; + if (!cond) + throw new AssertionError(); + } + + static LSI cvisi = z -> "[" + z + "]"; + static LSI cisi; + + static { + cisi = z -> z + z; + } + + LSI ivsi = z -> "blah"; + LSI iisi; + + SerializedLambdaInInit() { + iisi = z -> "*" + z; + } + + public static void main(String[] args) throws Exception { + try { + // Write lambdas out + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(baos); + SerializedLambdaInInit slii = new SerializedLambdaInInit(); + + write(out, cvisi ); + write(out, cisi ); + write(out, slii.ivsi ); + write(out, slii.iisi ); + out.flush(); + out.close(); + + // Read them back + ByteArrayInputStream bais = + new ByteArrayInputStream(baos.toByteArray()); + ObjectInputStream in = new ObjectInputStream(bais); + readAssert(in, "[X]"); + readAssert(in, "XX"); + readAssert(in, "blah"); + readAssert(in, "*X"); + in.close(); + + // Reflectively test for valid method names + for (Method meth : slii.getClass().getDeclaredMethods()) { + checkIdentifier(meth.getName()); + } + } catch (IOException e) { + e.printStackTrace(); + throw e; + } + assertTrue(assertionCount == 4); + } + + static void write(ObjectOutput out, LSI lamb) throws IOException { + out.writeObject(lamb); + } + + static void readAssert(ObjectInputStream in, String expected) throws IOException, ClassNotFoundException { + LSI ls = (LSI) in.readObject(); + String result = ls.convert("X"); + System.out.printf("Result: %s\n", result); + assertTrue(result.equals(expected)); + } + + public static void checkIdentifier(String str) throws Exception { + // null and zero length identifers will throw their own exceptions + char[] chars = str.toCharArray(); + if (!Character.isJavaIdentifierStart(chars[0])) { + throw new IllegalArgumentException(str + ": bad identifier start character: '" + chars[0] + "'"); + } + for (char ch : chars) { + if (!Character.isJavaIdentifierPart(ch)) { + throw new IllegalArgumentException(str + ": bad identifier character: '" + ch + "'"); + } + } + } +} + +interface LSI extends Serializable { + String convert(String x); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/StaticMethodNegTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,26 @@ +/** + * @test /nodynamiccopyright/ + * @bug 8008337 + * @author sogoel + * @summary static method is called via super + * @compile/fail/ref=StaticMethodNegTest.out -XDrawDiagnostics StaticMethodNegTest.java + */ + +interface A { + static String m() { + return "A"; + } +} + +interface B { + static String m() { + return "B"; + } +} + +interface AB extends A, B { + static String m() { + return A.super.m(); + } +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/StaticMethodNegTest.out Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,2 @@ +StaticMethodNegTest.java:23:12: compiler.err.not.encl.class: A +1 error
--- a/test/tools/javac/lambda/TargetType01.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/lambda/TargetType01.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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,11 +23,10 @@ /* * @test - * @bug 8003280 + * @bug 8003280 8009131 * @summary Add lambda tests * check nested case of overload resolution and lambda parameter inference - * @author Maurizio Cimadamore - * @compile/fail/ref=TargetType01.out -XDrawDiagnostics TargetType01.java + * @compile TargetType01.java */ class TargetType01 {
--- a/test/tools/javac/lambda/TargetType01.out Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -TargetType01.java:46:9: compiler.err.ref.ambiguous: M, kindname.method, M(TargetType01.F_I_I), TargetType01, kindname.method, M(TargetType01.F_S_S), TargetType01 -TargetType01.java:46:26: compiler.err.ref.ambiguous: M, kindname.method, M(TargetType01.F_I_I), TargetType01, kindname.method, M(TargetType01.F_S_S), TargetType01 -2 errors
--- a/test/tools/javac/lambda/TargetType14.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/lambda/TargetType14.out Tue May 07 17:14:17 2013 -0700 @@ -1,2 +1,2 @@ -TargetType14.java:20:29: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.lower.bounds: java.lang.Integer, java.lang.String) +TargetType14.java:20:29: compiler.err.prob.found.req: (compiler.misc.incompatible.eq.lower.bounds: X, java.lang.Integer, java.lang.String) 1 error
--- a/test/tools/javac/lambda/TargetType20.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/lambda/TargetType20.java Tue May 07 17:14:17 2013 -0700 @@ -1,10 +1,33 @@ /* - * @test /nodynamiccopyright/ + * 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. + */ + +/* + * @test * @bug 8003280 * @summary Add lambda tests * complex case of lambda return type that depends on generic method * inference variable - * @compile/fail/ref=TargetType20.out -XDrawDiagnostics TargetType20.java + * @compile -XDrawDiagnostics TargetType20.java */ import java.util.*;
--- a/test/tools/javac/lambda/TargetType20.out Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -TargetType20.java:19:10: compiler.err.cant.apply.symbol: kindname.method, call, TargetType20.SAM2<Z>,TargetType20.SAM2<Z>, @428,@459, kindname.class, TargetType20.Test, (compiler.misc.inferred.do.not.conform.to.eq.bounds: java.lang.String, java.lang.String,java.lang.Object) -1 error
--- a/test/tools/javac/lambda/TargetType28.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/lambda/TargetType28.out Tue May 07 17:14:17 2013 -0700 @@ -1,3 +1,2 @@ -TargetType28.java:20:32: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.eq.bounds: java.lang.Number, java.lang.Number,java.lang.String) -TargetType28.java:21:33: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.eq.bounds: java.lang.Number, java.lang.Number,java.lang.Integer) -2 errors +TargetType28.java:20:32: compiler.err.prob.found.req: (compiler.misc.incompatible.eq.upper.bounds: X, R,java.lang.String, java.lang.Object,java.lang.Number) +1 error
--- a/test/tools/javac/lambda/TargetType43.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/lambda/TargetType43.out Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,4 @@ TargetType43.java:13:20: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: java.lang.Object) TargetType43.java:13:30: compiler.err.cant.resolve.location: kindname.class, NonExistentClass, , , (compiler.misc.location: kindname.class, TargetType43, null) -TargetType43.java:14:9: compiler.err.cant.apply.symbol: kindname.method, m, java.lang.Object, @359, kindname.class, TargetType43, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.not.a.functional.intf: java.lang.Object)) TargetType43.java:14:21: compiler.err.cant.resolve.location: kindname.class, NonExistentClass, , , (compiler.misc.location: kindname.class, TargetType43, null) -4 errors +3 errors
--- a/test/tools/javac/lambda/TargetType50.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/lambda/TargetType50.java Tue May 07 17:14:17 2013 -0700 @@ -1,9 +1,32 @@ /* - * @test /nodynamiccopyright/ + * 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. + */ + +/* + * @test * @bug 8003280 * @summary Add lambda tests * bad stuck check for method reference leads to javac crash - * @compile/fail/ref=TargetType50.out -XDrawDiagnostics TargetType50.java + * @compile TargetType50.java */ import java.util.*; @@ -17,7 +40,7 @@ static <Z> Sink<Z> make() { return null; } } - <Y, S extends Sink<Y>> List<Y> m(Factory<S> factory) { } + <Y, S extends Sink<Y>> List<Y> m(Factory<S> factory) { return null; } void test() { List<?> l1 = m(Sink::new);
--- a/test/tools/javac/lambda/TargetType50.out Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -TargetType50.java:25:28: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: TargetType50.Sink<java.lang.Object>, TargetType50.Sink<java.lang.String>) -TargetType50.java:26:28: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: TargetType50.Sink<java.lang.Object>, TargetType50.Sink<java.lang.String>) -2 errors
--- a/test/tools/javac/lambda/TargetType51.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/lambda/TargetType51.java Tue May 07 17:14:17 2013 -0700 @@ -23,7 +23,9 @@ /* * @test - * @summary smoke test for combinator-like stuck analysis + * @bug 8005244 + * @summary Implement overload resolution as per latest spec EDR + * smoke test for combinator-like stuck analysis * @author Maurizio Cimadamore * @compile TargetType51.java */
--- a/test/tools/javac/lambda/TargetType52.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/lambda/TargetType52.java Tue May 07 17:14:17 2013 -0700 @@ -1,6 +1,8 @@ /* * @test /nodynamiccopyright/ - * @summary uncatched sam conversion failure exception lead to javac crash + * @bug 8005244 + * @summary Implement overload resolution as per latest spec EDR + * uncatched sam conversion failure exception lead to javac crash * @compile/fail/ref=TargetType52.out -XDrawDiagnostics TargetType52.java */ class TargetType52 {
--- a/test/tools/javac/lambda/TargetType52.out Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/lambda/TargetType52.out Tue May 07 17:14:17 2013 -0700 @@ -1,2 +1,2 @@ -TargetType52.java:15:9: compiler.err.cant.apply.symbol: kindname.method, m, TargetType52.FI<? extends java.lang.CharSequence,? extends java.util.ArrayList<? extends java.lang.CharSequence>>, @444, kindname.class, TargetType52, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.no.suitable.functional.intf.inst: TargetType52.FI<java.lang.CharSequence,java.util.ArrayList<? extends java.lang.CharSequence>>)) +TargetType52.java:17:9: compiler.err.cant.apply.symbol: kindname.method, m, TargetType52.FI<? extends java.lang.CharSequence,? extends java.util.ArrayList<? extends java.lang.CharSequence>>, @525, kindname.class, TargetType52, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.no.suitable.functional.intf.inst: TargetType52.FI<java.lang.CharSequence,java.util.ArrayList<? extends java.lang.CharSequence>>)) 1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/TargetType53.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,47 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8007464 + * @summary Add graph inference support + * smoke test for graph inference + * @ignore awaits stream API: 800NNNN + * @compile TargetType53.java + */ +import java.util.*; +import java.util.stream.*; +import java.util.function.*; + +class TargetType53 { + + <P> List<List<P>> perm(List<P> l) { return null; } + + void g(List<List<UnaryOperator<IntStream>>> l) { } + + void test() { + List<List<UnaryOperator<IntStream>>> l = + perm(Arrays.asList(s -> s.sorted())); + g(perm(Arrays.asList(s -> s.sorted()))); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/TargetType54.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,45 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8007464 + * @summary Add graph inference support + * smoke test for graph inference + * @ignore awaits stream API: 800NNNN + * @compile TargetType54.java + */ +import java.util.stream.*; +import java.util.*; +import static java.util.stream.Collectors.*; + +class TargetType54 { + void test(Stream<Integer> si) { + List<Integer> l1 = si.collect(toList()); + List<Integer> l2 = si.collect(toCollection(ArrayList::new)); + m(si.collect(toList())); + m(si.collect(toCollection(ArrayList::new))); + } + + void m(List<Integer> l) { } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/TargetType55.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,42 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8007464 + * @summary Add graph inference + * support smoke test for graph inference + * @compile TargetType55.java + */ +import java.util.function.*; + +class TargetType55 { + + <R> void m(Function<Integer, R> collector) { } + + <T, D> Function<T, Integer> g(D d, BinaryOperator<D> reducer) { return null; } + + public void test() { + m(g((Integer)null, (x,y)->1)); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/TargetType56.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,40 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8007464 + * @summary Add graph inference support + * smoke test for graph inference + * @compile TargetType56.java + */ +class TargetType56 { + <Z> Z m(Z z) { return null; } + + void test() { + double d1 = m(1); + double d2 = m((Integer)null); + double d3 = m(m(1)); + double d4 = m(m((Integer)null)); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/TargetType57.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,20 @@ +/* + * @test /nodynamiccopyright/ + * @bug 8007464 + * @summary Add graph inference support + * more smoke tests for graph inference + * @compile/fail/ref=TargetType57.out -XDrawDiagnostics TargetType57.java + */ +import java.util.*; +import java.util.function.*; + +class TargetType57 { + + void test(List<Integer> list) { + m(list, s -> s.intValue(), s -> s.nonExistentMethod()); + } + + <U, R, S_IN, S_OUT> R m(List<S_IN> list, + Function<S_IN, S_OUT> f1, + Function<S_OUT, R> f2) { return null; } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/TargetType57.out Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,2 @@ +TargetType57.java:14:42: compiler.err.cant.resolve.location.args: kindname.method, nonExistentMethod, , , (compiler.misc.location.1: kindname.variable, s, java.lang.Integer) +1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/TargetType58.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,46 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8007464 + * @summary Add graph inference support + * more smoke tests for graph inference + * @ignore awaits stream API: 800NNNN + * @compile TargetType58.java + */ +import java.util.*; +import java.util.function.*; +import java.util.stream.*; + +class TargetType58 { + + void test(List<Integer> li) { + g(li, s -> s.substream(200), Collections.emptyList()); + } + + <T, U, S_OUT extends Stream<U>, + I extends Iterable<U>> Collection<U> g(Collection<T> coll, Function<Stream<T>, S_OUT> f, I i) { + return null; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/TargetType59.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,49 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8007464 + * @summary Add graph inference support + * more smoke tests for graph inference + * @ignore awaits stream API: 800NNNN + * @compile TargetType59.java + */ +import java.util.*; +import java.util.function.*; +import java.util.stream.*; + +class TargetType59 { + + <T, R> Collector<T, R> m(Supplier<? extends R> supplier, BiConsumer<R, T> accumulator) { + return null; + } + + <T, C extends Collection<T>> Collector<T,C> test1(Supplier<C> collectionFactory) { + return m(collectionFactory, Collection::add); + } + + Collector<String, StringBuilder> test2(Supplier<StringBuilder> sb) { + return m(sb, StringBuilder::append); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/TargetType60.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,65 @@ +/* + * @test /nodynamiccopyright/ + * @bug 8007462 + * @summary Fix provisional applicability for method references + * @compile/fail/ref=TargetType60.out -XDrawDiagnostics TargetType60.java + */ +class TargetType60 { + + interface Sam0 { + void m(); + } + + interface Sam1<X> { + void m(X x); + } + + interface Sam2<X,Y> { + void m(X x, Y y); + } + + void m0() { } + void m1(String s) { } + void m2(String s1, String s2) { } + + void m01() { } + void m01(String s) { } + + void m012() { } + void m012(String s) { } + void m012(String s1, String s2) { } + + void n0() { } + void n1(String s) { } + void n2(TargetType60 rec, String s2) { } + + void n01() { } + void n01(String s) { } + + void n012() { } + void n012(String s) { } + void n012(TargetType60 rec, String s2) { } + + static String g(Sam0 s) { return null; } + static <U> U g(Sam1<U> s) { return null; } + static <U> U g(Sam2<U,String> s) { return null; } + + static <U> U u(Sam1<U> s) { return null; } + static <U> U u(Sam2<U,String> s) { return null; } + + void testBound() { + String s1 = g(this::m0); //ok - resolves to g(Sam0) + String s2 = g(this::m1); //ok - resolves to g(Sam1) + String s3 = g(this::m2); //ok - resolves to g(Sam2) + String s4 = g(this::m01);//ambiguous (g(Sam0), g(Sam1) apply) + String s5 = g(this::m012);//ambiguous (g(Sam0), g(Sam1), g(Sam2) apply) + } + + static void testUnbound() { + TargetType60 s1 = u(TargetType60::n0); //ok - resolves to u(Sam1) + TargetType60 s2 = u(TargetType60::n1); //ambiguous (u(Sam1), u(Sam2) apply) + TargetType60 s3 = u(TargetType60::n2); //none is applicable + TargetType60 s4 = u(TargetType60::n01);//ambiguous (u(Sam1), u(Sam2) apply) + TargetType60 s5 = u(TargetType60::n012);//ambiguous (u(Sam1), u(Sam2) apply) + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/TargetType60.out Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,8 @@ +TargetType60.java:54:21: compiler.err.ref.ambiguous: g, kindname.method, g(TargetType60.Sam0), TargetType60, kindname.method, <U>g(TargetType60.Sam1<U>), TargetType60 +TargetType60.java:55:21: compiler.err.ref.ambiguous: g, kindname.method, <U>g(TargetType60.Sam1<U>), TargetType60, kindname.method, <U>g(TargetType60.Sam2<U,java.lang.String>), TargetType60 +TargetType60.java:60:27: compiler.err.ref.ambiguous: u, kindname.method, <U>u(TargetType60.Sam1<U>), TargetType60, kindname.method, <U>u(TargetType60.Sam2<U,java.lang.String>), TargetType60 +TargetType60.java:60:28: compiler.err.prob.found.req: (compiler.misc.infer.no.conforming.assignment.exists: U, (compiler.misc.invalid.mref: kindname.method, (compiler.misc.cant.apply.symbol: kindname.method, n1, java.lang.String, TargetType60, kindname.class, TargetType60, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: TargetType60, java.lang.String))))) +TargetType60.java:61:29: compiler.err.invalid.mref: kindname.method, (compiler.misc.non-static.cant.be.ref: kindname.method, n2(TargetType60,java.lang.String)) +TargetType60.java:62:27: compiler.err.ref.ambiguous: u, kindname.method, <U>u(TargetType60.Sam1<U>), TargetType60, kindname.method, <U>u(TargetType60.Sam2<U,java.lang.String>), TargetType60 +TargetType60.java:63:27: compiler.err.ref.ambiguous: u, kindname.method, <U>u(TargetType60.Sam1<U>), TargetType60, kindname.method, <U>u(TargetType60.Sam2<U,java.lang.String>), TargetType60 +7 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/TargetType61.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,47 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8007464 + * @summary Add graph inference support + * check that new wildcards inference strategy doesn't run into 7190296 + * @compile TargetType61.java + */ +class TargetType61 { + + interface Stream<T> { + void forEach(Sink<? super T> sink); + } + + interface Sink<T> { + void put(T t); + } + + public boolean add(CharSequence s) { return false; } + + public void addAll(Stream<? extends CharSequence> stream) { + stream.forEach(this::add); + stream.forEach(e -> { add(e); }); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/TargetType62.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,46 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8007464 + * @summary Add graph inference support + * check that new wildcards inference strategy doesn't run into 7190296 + * @ignore awaits stream API: 800NNNN + * @compile TargetType62.java + */ +import java.util.*; +import java.util.function.*; +import java.util.stream.*; + +class TargetType61 { + + Collector test(Function<Integer, Integer> classifier) { + return g(classifier, TreeMap::new, m(HashSet::new)); + } + + <R> Collector<Integer, R> m(Supplier<R> s) { return null; } + + <T, K, D, M extends Map<K, D>> + Collector<T, M> g(Function<T, K> classifier, Supplier<M> mapFactory, Collector<T, D> downstream) { return null; } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/TargetType64.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,41 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8008293 + * @summary Declared bounds not considered when functional interface containing unbound wildcards is instantiated + * @compile TargetType64.java + */ +class TargetType64 { + interface SAM<X extends Number> { + void m(X x); + } + + void g(Object o) { } + + void test() { + SAM<?> s1 = (x)->{}; + SAM<?> s2 = this::g; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/TargetType65.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,58 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8008723 + * @summary Graph Inference: bad graph calculation leads to assertion error + * @compile TargetType65.java + */ +class TargetType65 { + interface Predicate<X> { + boolean accepts(X x); + } + + static class Optional<T> { + public boolean isPresent() { return false; } + public static<E> Optional<E> empty() { return null; } + } + + interface Supplier<X> { + X make(); + } + + static class Sink<O, T> { } + + static class SubSink<R> extends Sink<R, Optional<R>> { } + + static class Tester<T, O> { + public static <F> Tester<F, Optional<F>> makeRef() { + return new Tester<>(Optional.empty(), Optional::isPresent, SubSink::new); + } + + private Tester(O emptyValue, + Predicate<O> presentPredicate, + Supplier<Sink<T, O>> sinkSupplier) { + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/TargetType66.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,26 @@ +/* + * @test /nodynamiccopyright/ + * @bug 8009131 + * @summary Overload: javac should discard methods that lead to errors in lambdas with implicit parameter types + * @compile/fail/ref=TargetType66.out -XDrawDiagnostics TargetType66.java + */ +class TargetType66 { + interface SAM1 { + void m(String s); + } + + interface SAM2 { + void m(Integer s); + } + + void g(SAM1 s1) { } + void g(SAM2 s2) { } + + void test() { + g(x->{ String s = x; }); //g(SAM1) + g(x->{ Integer i = x; }); //g(SAM2) + g(x->{ Object o = x; }); //ambiguous + g(x->{ Character c = x; }); //error: inapplicable methods + g(x->{ Character c = ""; }); //error: incompatible types + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/TargetType66.out Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,4 @@ +TargetType66.java:22:9: compiler.err.ref.ambiguous: g, kindname.method, g(TargetType66.SAM1), TargetType66, kindname.method, g(TargetType66.SAM2), TargetType66 +TargetType66.java:23:9: compiler.err.cant.apply.symbols: kindname.method, g, @578,{(compiler.misc.inapplicable.method: kindname.method, TargetType66, g(TargetType66.SAM1), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.bad.arg.types.in.lambda: java.lang.String))),(compiler.misc.inapplicable.method: kindname.method, TargetType66, g(TargetType66.SAM2), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.bad.arg.types.in.lambda: java.lang.Integer)))} +TargetType66.java:24:30: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, java.lang.Character) +3 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/TargetType67.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,50 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8010303 + * @summary Graph inference: missing incorporation step causes spurious inference error + * @compile TargetType67.java + */ +class TargetType67 { + + interface Func<A, B> { + B f(A a); + } + + class List<X> { + + <M> List<M> map(Func<X, M> f) { + return null; + } + + <A> List<A> apply(final List<Func<X, A>> lf) { + return null; + } + + <B, C> List<C> bind(final List<B> lb, final Func<X, Func<B, C>> f) { + return lb.apply(map(f)); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/TargetType68.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,63 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8010303 + * @summary Graph inference: missing incorporation step causes spurious inference error + * @compile TargetType68.java + */ +import java.util.*; + +class TargetType68 { + + //derived from FX 2.2 API + static class XYChart<X,Y> { + static final class Series<X,Y> { + Series(java.lang.String name, ObservableList<XYChart.Data<X,Y>> data) { } + } + + static final class Data<X,Y> { } + + ObservableList<XYChart.Series<X,Y>> getData() { return null; } + } + + //derived from FX 2.2 API + interface ObservableList<X> extends List<X> { + boolean setAll(Collection<? extends X> col); + } + + //derived from FX 2.2 API + static class FXCollections { + static <E> ObservableList<E> observableList(List<E> l) { return null; } + } + + private void testMethod() { + XYChart<Number, Number> numberChart = null; + List<XYChart.Data<Number, Number>> data_1 = new ArrayList<>(); + List<XYChart.Data<Number, Number>> data_2 = new ArrayList<>(); + numberChart.getData().setAll( + Arrays.asList(new XYChart.Series<>("Data", FXCollections.observableList(data_1)), + new XYChart.Series<>("Data", FXCollections.observableList(data_2)))); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/TargetType69.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,51 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8010303 + * @summary Graph inference: missing incorporation step causes spurious inference error + * @compile TargetType69.java + */ +import java.util.*; + +class TargetType69 { + + interface Function<X,Y> { + Y m(X x); + } + + abstract class TabulationAssertion<T, U> { } + + class GroupedMapAssertion<K, M1 extends Map<K, ?>> extends TabulationAssertion<Integer, M1> { + GroupedMapAssertion(Function<Integer, K> classifier) { } + } + + + <T, M2 extends Map> void exerciseMapTabulation(Function<T, ? extends M2> collector, + TabulationAssertion<T, M2> assertion) { } + + void test(Function<Integer, Integer> classifier, Function<Integer, Map<Integer, List<Integer>>> coll) { + exerciseMapTabulation(coll, new GroupedMapAssertion<>(classifier)); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/TargetType70.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,52 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8011028 + * @summary lang/INFR/infr001/infr00101md/infr00101md.java fails to compile after switch to JDK8-b82 + * @compile TargetType70.java + */ +class TargetType70 { + + static class Sup {} + static class Sub extends Sup {} + + interface I<T extends GenSup<U>, U> { + T m(U o); + } + + static class GenSup<T> { + GenSup(T f) { } + } + + static class GenSub<T> extends GenSup<T> { + GenSub(T f) { super(f); } + } + + <T extends Sup> void m(I<? extends GenSup<T>, T> o1, T o2) { } + + void test(Sub sub) { + m(GenSub::new, sub); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/TargetType71.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,34 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8011377 + * @summary Javac crashes when multiple lambdas are defined in an array + * @compile TargetType71.java + */ +class TargetType71 { + void test() { + Runnable[] rs = { () -> { String x = null; }, () -> { String x = null; } }; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/TargetType72.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,39 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8011376 + * @summary Spurious checked exception errors in nested method call + * @compile TargetType72.java + */ +import java.io.IOException; +import java.util.concurrent.Callable; + +class TargetType72 { + + Callable<Number> c = id(id(()->{ if (true) throw new java.io.IOException(); return 0; })); + + <Z> Z id(Z z) { return null; } + +}
--- a/test/tools/javac/lambda/TestInvokeDynamic.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/lambda/TestInvokeDynamic.java Tue May 07 17:14:17 2013 -0700 @@ -24,7 +24,7 @@ /* * @test * @bug 7194586 - * @bug 8003280 8006694 + * @bug 8003280 8006694 8010404 * @summary Add lambda tests * Add back-end support for invokedynamic * temporarily workaround combo tests are causing time out in several platforms @@ -48,6 +48,7 @@ import com.sun.tools.classfile.Code_attribute; import com.sun.tools.classfile.ConstantPool.*; import com.sun.tools.classfile.Instruction; +import com.sun.tools.classfile.LineNumberTable_attribute; import com.sun.tools.classfile.Method; import com.sun.tools.javac.api.JavacTaskImpl; @@ -239,7 +240,7 @@ int id = checkCount.incrementAndGet(); JavaSource source = new JavaSource(id); JavacTaskImpl ct = (JavacTaskImpl)comp.getTask(null, fm.get(), dc, - null, null, Arrays.asList(source)); + Arrays.asList("-g"), null, Arrays.asList(source)); Context context = ct.getContext(); Symtab syms = Symtab.instance(context); Names names = Names.instance(context); @@ -349,6 +350,16 @@ bsm_ref.getNameAndTypeInfo().getType() + " " + asBSMSignatureString()); } + + LineNumberTable_attribute lnt = + (LineNumberTable_attribute)ea.attributes.get(Attribute.LineNumberTable); + + if (lnt == null) { + throw new Error("No LineNumberTable attribute"); + } + if (lnt.line_number_table_length != 2) { + throw new Error("Wrong number of entries in LineNumberTable"); + } } catch (Exception e) { e.printStackTrace(); throw new Error("error reading " + compiledTest +": " + e); @@ -376,7 +387,10 @@ "}\n" + "class Test#ID {\n" + " void m() { }\n" + - " void test() { m(); }\n" + + " void test() {\n" + + " Object o = this; // marker statement \n" + + " m();\n" + + " }\n" + "}"; String source;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/abort/CompletionFailure.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,137 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8009227 + * @summary Certain diagnostics should not be deferred + */ + +import com.sun.source.util.JavacTask; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.util.Arrays; +import javax.tools.Diagnostic; +import javax.tools.JavaCompiler; +import javax.tools.JavaFileObject; +import javax.tools.SimpleJavaFileObject; +import javax.tools.ToolProvider; + +public class CompletionFailure { + + public static void main(String... args) throws Exception { + + String SCRATCH_DIR = System.getProperty("user.dir"); + JavaCompiler javacTool = ToolProvider.getSystemJavaCompiler(); + File scratchDir = new File(SCRATCH_DIR); + + sourceA.dumpTo(scratchDir); + sourceB.dumpTo(scratchDir); + + JavacTask ct = (JavacTask)javacTool.getTask(null, null, null, + null, null, Arrays.asList(sourceA.asJFO(scratchDir), sourceB.asJFO(scratchDir))); + + ct.generate(); + + remove(scratchDir, "A.java"); + remove(scratchDir, "B.java"); + remove(scratchDir, "A.class"); + + sourceC.dumpTo(scratchDir); + sourceD.dumpTo(scratchDir); + + DiagnosticChecker diagChecker = new DiagnosticChecker(); + ct = (JavacTask)javacTool.getTask(null, null, diagChecker, + Arrays.asList("-XDrawDiagnostics", "-cp", scratchDir.getAbsolutePath()), + null, Arrays.asList(sourceC.asJFO(scratchDir), sourceD.asJFO(scratchDir))); + try { + ct.analyze(); + } catch (Throwable ex) { + //ignore abort exception thrown by javac + } + + if (!diagChecker.errorFound) { + throw new AssertionError("Missing diagnostic"); + } + } + + static void remove(File dir, String fileName) { + File fileToRemove = new File(dir, fileName); + fileToRemove.delete(); + } + + static class JavaSource { + String contents; + String filename; + + public JavaSource(String filename, String contents) { + this.filename = filename; + this.contents = contents; + } + + void dumpTo(java.io.File loc) throws Exception { + File file = new File(loc, filename); + BufferedWriter bw = new java.io.BufferedWriter(new FileWriter(file)); + bw.append(contents); + bw.close(); + } + + SimpleJavaFileObject asJFO(java.io.File dir) { + return new SimpleJavaFileObject(new File(dir, filename).toURI(), JavaFileObject.Kind.SOURCE) { + @Override + public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException { + return contents; + } + }; + } + } + + static JavaSource sourceA = new JavaSource("A.java", "public interface A { }\n"); + + static JavaSource sourceB = new JavaSource("B.java", "public class B implements A {\n" + + " public static Object n() { return null; }\n" + + "}\n"); + + static JavaSource sourceC = new JavaSource("C.java", "public class C {\n" + + " void test(B b) {\n" + + " D.m(B.n());\n" + + "} }\n"); + + static JavaSource sourceD = new JavaSource("D.java", "public class D {\n" + + " static void m(Object o) { }\n" + + "}\n"); + + static class DiagnosticChecker implements javax.tools.DiagnosticListener<JavaFileObject> { + + boolean errorFound; + + public void report(Diagnostic<? extends JavaFileObject> diagnostic) { + if (diagnostic.getKind() == Diagnostic.Kind.ERROR && + diagnostic.getCode().contains("compiler.err.cant.access")) { + errorFound = true; + } + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/bytecode/TestLambdaBytecode.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,365 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8009649 + * @summary Lambda back-end should generate invokespecial for method handles referring to private instance methods + * @library ../../lib + * @build JavacTestingAbstractThreadedTest + * @run main/othervm TestLambdaBytecode + */ + +// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047) +// see JDK-8006746 + +import com.sun.tools.classfile.Attribute; +import com.sun.tools.classfile.BootstrapMethods_attribute; +import com.sun.tools.classfile.ClassFile; +import com.sun.tools.classfile.Code_attribute; +import com.sun.tools.classfile.ConstantPool.*; +import com.sun.tools.classfile.Instruction; +import com.sun.tools.classfile.Method; + +import com.sun.tools.javac.api.JavacTaskImpl; + + +import java.io.File; +import java.net.URI; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Locale; + +import javax.tools.Diagnostic; +import javax.tools.JavaFileObject; +import javax.tools.SimpleJavaFileObject; + +import static com.sun.tools.javac.jvm.ClassFile.*; + +public class TestLambdaBytecode + extends JavacTestingAbstractThreadedTest + implements Runnable { + + enum ClassKind { + CLASS("class"), + INTERFACE("interface"); + + String classStr; + + ClassKind(String classStr) { + this.classStr = classStr; + } + } + + enum AccessKind { + PUBLIC("public"), + PRIVATE("private"); + + String accessStr; + + AccessKind(String accessStr) { + this.accessStr = accessStr; + } + } + + enum StaticKind { + STATIC("static"), + INSTANCE(""); + + String staticStr; + + StaticKind(String staticStr) { + this.staticStr = staticStr; + } + } + + enum DefaultKind { + DEFAULT("default"), + NO_DEFAULT(""); + + String defaultStr; + + DefaultKind(String defaultStr) { + this.defaultStr = defaultStr; + } + } + + enum ExprKind { + LAMBDA("Runnable r = ()->{ target(); };"); + + String exprString; + + ExprKind(String exprString) { + this.exprString = exprString; + } + } + + static class MethodKind { + ClassKind ck; + AccessKind ak; + StaticKind sk; + DefaultKind dk; + + MethodKind(ClassKind ck, AccessKind ak, StaticKind sk, DefaultKind dk) { + this.ck = ck; + this.ak = ak; + this.sk = sk; + this.dk = dk; + } + + boolean inInterface() { + return ck == ClassKind.INTERFACE; + } + + boolean isPrivate() { + return ak == AccessKind.PRIVATE; + } + + boolean isStatic() { + return sk == StaticKind.STATIC; + } + + boolean isDefault() { + return dk == DefaultKind.DEFAULT; + } + + boolean isOK() { + if (isDefault() && (!inInterface() || isStatic())) { + return false; + } else if (inInterface() && + ((!isStatic() && !isDefault()) || isPrivate())) { + return false; + } else { + return true; + } + } + + String mods() { + StringBuilder buf = new StringBuilder(); + buf.append(ak.accessStr); + buf.append(' '); + buf.append(sk.staticStr); + buf.append(' '); + buf.append(dk.defaultStr); + return buf.toString(); + } + } + + public static void main(String... args) throws Exception { + for (ClassKind ck : ClassKind.values()) { + for (AccessKind ak1 : AccessKind.values()) { + for (StaticKind sk1 : StaticKind.values()) { + for (DefaultKind dk1 : DefaultKind.values()) { + for (AccessKind ak2 : AccessKind.values()) { + for (StaticKind sk2 : StaticKind.values()) { + for (DefaultKind dk2 : DefaultKind.values()) { + for (ExprKind ek : ExprKind.values()) { + pool.execute(new TestLambdaBytecode(ck, ak1, ak2, sk1, sk2, dk1, dk2, ek)); + } + } + } + } + } + } + } + } + + checkAfterExec(); + } + + MethodKind mk1, mk2; + ExprKind ek; + DiagChecker dc; + + TestLambdaBytecode(ClassKind ck, AccessKind ak1, AccessKind ak2, StaticKind sk1, + StaticKind sk2, DefaultKind dk1, DefaultKind dk2, ExprKind ek) { + mk1 = new MethodKind(ck, ak1, sk1, dk1); + mk2 = new MethodKind(ck, ak2, sk2, dk2); + this.ek = ek; + dc = new DiagChecker(); + } + + public void run() { + int id = checkCount.incrementAndGet(); + JavaSource source = new JavaSource(id); + JavacTaskImpl ct = (JavacTaskImpl)comp.getTask(null, fm.get(), dc, + null, null, Arrays.asList(source)); + try { + ct.generate(); + } catch (Throwable t) { + t.printStackTrace(); + throw new AssertionError( + String.format("Error thrown when compiling following code\n%s", + source.source)); + } + if (dc.diagFound) { + boolean errorExpected = !mk1.isOK() || !mk2.isOK(); + errorExpected |= mk1.isStatic() && !mk2.isStatic(); + + if (!errorExpected) { + throw new AssertionError( + String.format("Diags found when compiling following code\n%s\n\n%s", + source.source, dc.printDiags())); + } + return; + } + verifyBytecode(id, source); + } + + void verifyBytecode(int id, JavaSource source) { + File compiledTest = new File(String.format("Test%d.class", id)); + try { + ClassFile cf = ClassFile.read(compiledTest); + Method testMethod = null; + for (Method m : cf.methods) { + if (m.getName(cf.constant_pool).equals("test")) { + testMethod = m; + break; + } + } + if (testMethod == null) { + throw new Error("Test method not found"); + } + Code_attribute ea = + (Code_attribute)testMethod.attributes.get(Attribute.Code); + if (testMethod == null) { + throw new Error("Code attribute for test() method not found"); + } + + int bsmIdx = -1; + + for (Instruction i : ea.getInstructions()) { + if (i.getMnemonic().equals("invokedynamic")) { + CONSTANT_InvokeDynamic_info indyInfo = + (CONSTANT_InvokeDynamic_info)cf + .constant_pool.get(i.getShort(1)); + bsmIdx = indyInfo.bootstrap_method_attr_index; + if (!indyInfo.getNameAndTypeInfo().getType().equals(makeIndyType(id))) { + throw new + AssertionError("type mismatch for CONSTANT_InvokeDynamic_info " + source.source + "\n" + indyInfo.getNameAndTypeInfo().getType() + "\n" + makeIndyType(id)); + } + } + } + if (bsmIdx == -1) { + throw new Error("Missing invokedynamic in generated code"); + } + + BootstrapMethods_attribute bsm_attr = + (BootstrapMethods_attribute)cf + .getAttribute(Attribute.BootstrapMethods); + if (bsm_attr.bootstrap_method_specifiers.length != 1) { + throw new Error("Bad number of method specifiers " + + "in BootstrapMethods attribute"); + } + BootstrapMethods_attribute.BootstrapMethodSpecifier bsm_spec = + bsm_attr.bootstrap_method_specifiers[0]; + + if (bsm_spec.bootstrap_arguments.length != MF_ARITY) { + throw new Error("Bad number of static invokedynamic args " + + "in BootstrapMethod attribute"); + } + + CONSTANT_MethodHandle_info mh = + (CONSTANT_MethodHandle_info)cf.constant_pool.get(bsm_spec.bootstrap_arguments[1]); + + boolean kindOK; + switch (mh.reference_kind) { + case REF_invokeStatic: kindOK = mk2.isStatic(); break; + case REF_invokeSpecial: kindOK = !mk2.isStatic(); break; + case REF_invokeInterface: kindOK = mk2.inInterface(); break; + default: + kindOK = false; + } + + if (!kindOK) { + throw new Error("Bad invoke kind in implementation method handle"); + } + + if (!mh.getCPRefInfo().getNameAndTypeInfo().getType().toString().equals(MH_SIG)) { + throw new Error("Type mismatch in implementation method handle"); + } + } catch (Exception e) { + e.printStackTrace(); + throw new Error("error reading " + compiledTest +": " + e); + } + } + String makeIndyType(int id) { + StringBuilder buf = new StringBuilder(); + buf.append("("); + if (!mk2.isStatic() || mk1.inInterface()) { + buf.append(String.format("LTest%d;", id)); + } + buf.append(")Ljava/lang/Runnable;"); + return buf.toString(); + } + + static final int MF_ARITY = 3; + static final String MH_SIG = "()V"; + + class JavaSource extends SimpleJavaFileObject { + + static final String source_template = + "#CK Test#ID {\n" + + " #MOD1 void test() { #EK }\n" + + " #MOD2 void target() { }\n" + + "}\n"; + + String source; + + JavaSource(int id) { + super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE); + source = source_template.replace("#CK", mk1.ck.classStr) + .replace("#MOD1", mk1.mods()) + .replace("#MOD2", mk2.mods()) + .replace("#EK", ek.exprString) + .replace("#ID", String.valueOf(id)); + } + + @Override + public CharSequence getCharContent(boolean ignoreEncodingErrors) { + return source; + } + } + + static class DiagChecker + implements javax.tools.DiagnosticListener<JavaFileObject> { + + boolean diagFound; + ArrayList<String> diags = new ArrayList<>(); + + public void report(Diagnostic<? extends JavaFileObject> diagnostic) { + diags.add(diagnostic.getMessage(Locale.getDefault())); + diagFound = true; + } + + String printDiags() { + StringBuilder buf = new StringBuilder(); + for (String s : diags) { + buf.append(s); + buf.append("\n"); + } + return buf.toString(); + } + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/inaccessibleMref01/InaccessibleMref01.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,39 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8003280 + * @summary Add lambda tests + * check that classfiles with member ref CP entries are read correctly + * @compile/fail/ref=InaccessibleMref01.out -XDrawDiagnostics InaccessibleMref01.java + */ +class InaccessibleMref01 { + interface SAM { + void m(); + } + + void test(p1.C c) { + SAM s = c::m; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/inaccessibleMref01/InaccessibleMref01.out Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,2 @@ +InaccessibleMref01.java:37:17: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.not.def.public.cant.access: m(), p1.C)) +1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/inaccessibleMref01/p1/C.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,27 @@ +/* + * 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 p1; + +public class C { + void m() { } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/inaccessibleMref02/InaccessibleMref02.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,40 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8003280 + * @summary Add lambda tests + * check that classfiles with member ref CP entries are read correctly + */ +public class InaccessibleMref02 { + interface SAM { + void m(); + } + + public static void main(String[] args) { + p1.C c = new p1.C(); + SAM s = c::m; + s.m(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/inaccessibleMref02/p1/C.java Tue May 07 17:14:17 2013 -0700 @@ -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 p1; + +class Sup { + public void m() { } +} + +public class C extends Sup { }
--- a/test/tools/javac/lambda/intersection/IntersectionTargetTypeTest.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/lambda/intersection/IntersectionTargetTypeTest.java Tue May 07 17:14:17 2013 -0700 @@ -28,10 +28,11 @@ */ import com.sun.source.util.JavacTask; -import com.sun.tools.javac.util.List; import com.sun.tools.javac.util.ListBuffer; import java.net.URI; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import javax.tools.Diagnostic; import javax.tools.JavaCompiler; import javax.tools.JavaFileObject; @@ -45,37 +46,45 @@ enum BoundKind { INTF, - CLASS, - SAM, - ZAM; + CLASS; } enum MethodKind { - NONE, - ABSTRACT, - DEFAULT; + NONE(false), + ABSTRACT_M(true), + DEFAULT_M(false), + ABSTRACT_G(true), + DEFAULT_G(false); + + boolean isAbstract; + + MethodKind(boolean isAbstract) { + this.isAbstract = isAbstract; + } } enum TypeKind { - A("interface A { }\n", "A", BoundKind.ZAM), - B("interface B { default void m() { } }\n", "B", BoundKind.ZAM), - C("interface C { void m(); }\n", "C", BoundKind.SAM), - D("interface D extends B { }\n", "D", BoundKind.ZAM), - E("interface E extends C { }\n", "E", BoundKind.SAM), - F("interface F extends C { void g(); }\n", "F", BoundKind.INTF), - G("interface G extends B { void g(); }\n", "G", BoundKind.SAM), - H("interface H extends A { void g(); }\n", "H", BoundKind.SAM), + A("interface A { }\n", "A", BoundKind.INTF, MethodKind.NONE), + B("interface B { default void m() { } }\n", "B", BoundKind.INTF, MethodKind.DEFAULT_M), + C("interface C { void m(); }\n", "C", BoundKind.INTF, MethodKind.ABSTRACT_M), + D("interface D extends B { }\n", "D", BoundKind.INTF, MethodKind.DEFAULT_M), + E("interface E extends C { }\n", "E", BoundKind.INTF, MethodKind.ABSTRACT_M), + F("interface F extends C { void g(); }\n", "F", BoundKind.INTF, MethodKind.ABSTRACT_G, MethodKind.ABSTRACT_M), + G("interface G extends B { void g(); }\n", "G", BoundKind.INTF, MethodKind.ABSTRACT_G, MethodKind.DEFAULT_M), + H("interface H extends A { void g(); }\n", "H", BoundKind.INTF, MethodKind.ABSTRACT_G), OBJECT("", "Object", BoundKind.CLASS), STRING("", "String", BoundKind.CLASS); String declStr; String typeStr; BoundKind boundKind; + MethodKind[] methodKinds; - private TypeKind(String declStr, String typeStr, BoundKind boundKind) { + private TypeKind(String declStr, String typeStr, BoundKind boundKind, MethodKind... methodKinds) { this.declStr = declStr; this.typeStr = typeStr; this.boundKind = boundKind; + this.methodKinds = methodKinds; } boolean compatibleSupertype(TypeKind tk) { @@ -263,14 +272,22 @@ boolean errorExpected = !cInfo.wellFormed(); if (ek.isFunctional) { - //first bound must be a SAM - errorExpected |= cInfo.types[0].boundKind != BoundKind.SAM; - if (cInfo.types.length > 1) { - //additional bounds must be ZAMs - for (int i = 1; i < cInfo.types.length; i++) { - errorExpected |= cInfo.types[i].boundKind != BoundKind.ZAM; + List<MethodKind> mks = new ArrayList<>(); + for (TypeKind tk : cInfo.types) { + if (tk.boundKind == BoundKind.CLASS) { + errorExpected = true; + break; + } else { + mks = mergeMethods(mks, Arrays.asList(tk.methodKinds)); } } + int abstractCount = 0; + for (MethodKind mk : mks) { + if (mk.isAbstract) { + abstractCount++; + } + } + errorExpected |= abstractCount != 1; } if (errorExpected != diagChecker.errorFound) { @@ -281,6 +298,32 @@ } } + List<MethodKind> mergeMethods(List<MethodKind> l1, List<MethodKind> l2) { + List<MethodKind> mergedMethods = new ArrayList<>(l1); + for (MethodKind mk2 : l2) { + boolean add = !mergedMethods.contains(mk2); + switch (mk2) { + case ABSTRACT_G: + add = add && !mergedMethods.contains(MethodKind.DEFAULT_G); + break; + case ABSTRACT_M: + add = add && !mergedMethods.contains(MethodKind.DEFAULT_M); + break; + case DEFAULT_G: + mergedMethods.remove(MethodKind.ABSTRACT_G); + case DEFAULT_M: + mergedMethods.remove(MethodKind.ABSTRACT_M); + case NONE: + add = false; + break; + } + if (add) { + mergedMethods.add(mk2); + } + } + return mergedMethods; + } + static class DiagnosticChecker implements javax.tools.DiagnosticListener<JavaFileObject> { boolean errorFound;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/separate/Foo.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,30 @@ +/* + * 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. + */ +interface Foo<X extends Number> { + void m(X x); +} + +class FooLib { + void m1(Foo<?> uf) { } + void m2(Foo<? extends Object> uf) { } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/separate/Test.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,34 @@ +/* + * 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 + * 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. + */ + +/* + * @test + * @compile Foo.java + * @compile Test.java + */ +class Test { + void test(FooLib fl) { + fl.m1(x->{}); + fl.m2(x->{}); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/speculative/MissingError.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,17 @@ +/* + * @test /nodynamiccopyright/ + * @bug 8008276 + * @summary assertion error in com.sun.tools.javac.comp.TransTypes.visitApply + * @compile/fail/ref=MissingError.out -XDrawDiagnostics MissingError.java + */ +class MissingError { + void test() { + mtest(new Bad(){ Integer i = ""; }); + } + + void mtest(Bad t){ } +} + +class Bad { + String s = 1; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/speculative/MissingError.out Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,3 @@ +MissingError.java:16:16: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, java.lang.String) +MissingError.java:9:37: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, java.lang.Integer) +2 errors
--- a/test/tools/javac/lambdaShapes/org/openjdk/tests/vm/DefaultMethodsTest.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/vm/DefaultMethodsTest.java Tue May 07 17:14:17 2013 -0700 @@ -427,6 +427,8 @@ */ public void testReflectCall() { Interface I = new Interface("I", DefaultMethod.std("99")); + //workaround accessibility issue when loading C with DirectedClassLoader + I.addAccessFlag(AccessFlag.PUBLIC); Class C = new Class("C", I); Compiler.Flags[] flags = this.verbose ?
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lib/DPrinter.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,1332 @@ +/* + * 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. + */ + +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; + +import javax.lang.model.element.Name; +import javax.lang.model.element.TypeElement; +import javax.tools.FileObject; +import javax.tools.JavaCompiler; +import javax.tools.JavaFileObject; +import javax.tools.StandardJavaFileManager; +import javax.tools.StandardLocation; +import javax.tools.ToolProvider; + +import com.sun.source.util.JavacTask; +import com.sun.source.util.TaskEvent; +import com.sun.source.util.TaskListener; +import com.sun.source.util.Trees; +import com.sun.tools.javac.api.JavacTrees; +import com.sun.tools.javac.code.Annotations; +import com.sun.tools.javac.code.Attribute; +import com.sun.tools.javac.code.Flags; +import com.sun.tools.javac.code.Kinds; +import com.sun.tools.javac.code.Printer; +import com.sun.tools.javac.code.Scope; +import com.sun.tools.javac.code.Scope.CompoundScope; +import com.sun.tools.javac.code.Symbol; +import com.sun.tools.javac.code.Symbol.*; +import com.sun.tools.javac.code.Type; +import com.sun.tools.javac.code.Type.*; +import com.sun.tools.javac.code.TypeTag; +import com.sun.tools.javac.tree.JCTree; +import com.sun.tools.javac.tree.JCTree.*; +import com.sun.tools.javac.tree.Pretty; +import com.sun.tools.javac.tree.TreeInfo; +import com.sun.tools.javac.tree.TreeScanner; +import com.sun.tools.javac.util.Assert; +import com.sun.tools.javac.util.Context; +import com.sun.tools.javac.util.Log; + + +/** + * Debug printer for javac internals, for when toString() just isn't enough. + * + * <p> + * The printer provides an API to generate structured views of javac objects, + * such as AST nodes, symbol, types and annotations. Various aspects of the + * output can be configured, such as whether to show nulls, empty lists, or + * a compressed representation of the source code. Visitors are used to walk + * object hierarchies, and can be replaced with custom visitors if the default + * visitors are not flexible enough. + * + * <p> + * In general, nodes are printed with an initial line identifying the node + * followed by indented lines for the child nodes. Currently, graphs are + * represented by printing a spanning subtree. + * + * <p> + * The printer can be accessed via a simple command-line utility, + * which makes it easy to see the internal representation of source code, + * such as simple test programs, during the compilation pipeline. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice.</b> + */ + +public class DPrinter { + protected final PrintWriter out; + protected final Trees trees; + protected Printer printer; + protected boolean showEmptyItems = true; + protected boolean showNulls = true; + protected boolean showPositions = false; + protected boolean showSrc; + protected boolean showTreeSymbols; + protected boolean showTreeTypes; + protected int maxSrcLength = 32; + protected Locale locale = Locale.getDefault(); + protected static final String NULL = "#null"; + + // <editor-fold defaultstate="collapsed" desc="Configuration"> + + public static DPrinter instance(Context context) { + DPrinter dp = context.get(DPrinter.class); + if (dp == null) { + dp = new DPrinter(context); + } + return dp; + + } + + protected DPrinter(Context context) { + context.put(DPrinter.class, this); + out = context.get(Log.outKey); + trees = JavacTrees.instance(context); + } + + public DPrinter(PrintWriter out, Trees trees) { + this.out = out; + this.trees = trees; + } + + public DPrinter emptyItems(boolean showEmptyItems) { + this.showEmptyItems = showEmptyItems; + return this; + } + + public DPrinter nulls(boolean showNulls) { + this.showNulls = showNulls; + return this; + } + + public DPrinter positions(boolean showPositions) { + this.showPositions = showPositions; + return this; + } + + public DPrinter source(boolean showSrc) { + this.showSrc = showSrc; + return this; + } + + public DPrinter source(int maxSrcLength) { + this.showSrc = true; + this.maxSrcLength = maxSrcLength; + return this; + } + + public DPrinter treeSymbols(boolean showTreeSymbols) { + this.showTreeSymbols = showTreeSymbols; + return this; + } + + public DPrinter treeTypes(boolean showTreeTypes) { + this.showTreeTypes = showTreeTypes; + return this; + } + + public DPrinter typeSymbolPrinter(Printer p) { + printer = p; + return this; + } + + // </editor-fold> + + // <editor-fold defaultstate="collapsed" desc="Printing"> + + protected enum Details { + /** A one-line non-recursive summary */ + SUMMARY, + /** Multi-line, possibly recursive. */ + FULL + }; + + public void printAnnotations(String label, Annotations annotations) { + printAnnotations(label, annotations, Details.FULL); + } + + protected void printAnnotations(String label, Annotations annotations, Details details) { + if (annotations == null) { + printNull(label); + } else { + // no SUMMARY format currently available to use + + // use reflection to get at private fields + Object DECL_NOT_STARTED = getField(null, Annotations.class, "DECL_NOT_STARTED"); + Object DECL_IN_PROGRESS = getField(null, Annotations.class, "DECL_IN_PROGRESS"); + Object attributes = getField(annotations, Annotations.class, "attributes"); + Object type_attributes = getField(annotations, Annotations.class, "type_attributes"); + + if (!showEmptyItems) { + if (attributes instanceof List && ((List) attributes).isEmpty() + && attributes != DECL_NOT_STARTED + && attributes != DECL_IN_PROGRESS + && type_attributes instanceof List && ((List) type_attributes).isEmpty()) + return; + } + + printString(label, hashString(annotations)); + + indent(+1); + if (attributes == DECL_NOT_STARTED) + printString("attributes", "DECL_NOT_STARTED"); + else if (attributes == DECL_IN_PROGRESS) + printString("attributes", "DECL_IN_PROGRESS"); + else if (attributes instanceof List) + printList("attributes", (List) attributes); + else + printObject("attributes", attributes, Details.SUMMARY); + + if (attributes instanceof List) + printList("type_attributes", (List) type_attributes); + else + printObject("type_attributes", type_attributes, Details.SUMMARY); + indent(-1); + } + } + + public void printAttribute(String label, Attribute attr) { + if (attr == null) { + printNull(label); + } else { + printString(label, attr.getClass().getSimpleName()); + + indent(+1); + attr.accept(attrVisitor); + indent(-1); + } + } + + public void printFileObject(String label, FileObject fo) { + if (fo == null) { + printNull(label); + } else { + printString(label, fo.getName()); + } + } + + protected <T> void printImplClass(T item, Class<? extends T> stdImplClass) { + if (item.getClass() != stdImplClass) + printString("impl", item.getClass().getName()); + } + + public void printInt(String label, int i) { + printString(label, String.valueOf(i)); + } + + public void printList(String label, List<?> list) { + if (list == null) { + printNull(label); + } else if (!list.isEmpty() || showEmptyItems) { + printString(label, "[" + list.size() + "]"); + + indent(+1); + int i = 0; + for (Object item: list) { + printObject(String.valueOf(i++), item, Details.FULL); + } + indent(-1); + } + } + + public void printName(String label, Name name) { + if (name == null) { + printNull(label); + } else { + printString(label, name.toString()); + } + } + + public void printNull(String label) { + if (showNulls) + printString(label, NULL); + } + + protected void printObject(String label, Object item, Details details) { + if (item == null) { + printNull(label); + } else if (item instanceof Attribute) { + printAttribute(label, (Attribute) item); + } else if (item instanceof Symbol) { + printSymbol(label, (Symbol) item, details); + } else if (item instanceof Type) { + printType(label, (Type) item, details); + } else if (item instanceof JCTree) { + printTree(label, (JCTree) item); + } else if (item instanceof List) { + printList(label, (List) item); + } else if (item instanceof Name) { + printName(label, (Name) item); + } else { + printString(label, String.valueOf(item)); + } + } + + public void printScope(String label, Scope scope) { + printScope(label, scope, Details.FULL); + } + + public void printScope(String label, Scope scope, Details details) { + if (scope == null) { + printNull(label); + } else { + switch (details) { + case SUMMARY: { + indent(); + out.print(label); + out.print(": ["); + String sep = ""; + for (Symbol sym: scope.getElements()) { + out.print(sep); + out.print(sym.name); + sep = ","; + } + out.println("]"); + break; + } + + case FULL: { + indent(); + out.println(label); + + indent(+1); + printImplClass(scope, Scope.class); + printSymbol("owner", scope.owner, Details.SUMMARY); + printScope("next", scope.next, Details.SUMMARY); + printObject("shared", getField(scope, Scope.class, "shared"), Details.SUMMARY); + if (scope instanceof CompoundScope) { + printObject("subScopes", + getField(scope, CompoundScope.class, "subScopes"), + Details.FULL); + } else { + for (Symbol sym : scope.getElements()) { + printSymbol(sym.name.toString(), sym, Details.SUMMARY); + } + } + indent(-1); + break; + } + } + } + } + + public void printSource(String label, JCTree tree) { + printString(label, Pretty.toSimpleString(tree, maxSrcLength)); + } + + public void printString(String label, String text) { + indent(); + out.print(label); + out.print(": "); + out.print(text); + out.println(); + } + + public void printSymbol(String label, Symbol symbol) { + printSymbol(label, symbol, Details.FULL); + } + + protected void printSymbol(String label, Symbol sym, Details details) { + if (sym == null) { + printNull(label); + } else { + switch (details) { + case SUMMARY: + printString(label, toString(sym)); + break; + + case FULL: + indent(); + out.print(label); + out.println(": " + + info(sym.getClass(), + String.format("0x%x--%s", sym.kind, Kinds.kindName(sym)), + sym.getKind()) + + " " + sym.name + + " " + hashString(sym)); + + indent(+1); + if (showSrc) { + JCTree tree = (JCTree) trees.getTree(sym); + if (tree != null) + printSource("src", tree); + } + printString("flags", String.format("0x%x--%s", + sym.flags_field, Flags.toString(sym.flags_field))); + printObject("completer", sym.completer, Details.SUMMARY); // what if too long? + printSymbol("owner", sym.owner, Details.SUMMARY); + printType("type", sym.type, Details.SUMMARY); + printType("erasure", sym.erasure_field, Details.SUMMARY); + sym.accept(symVisitor, null); + printAnnotations("annotations", sym.annotations, Details.SUMMARY); + indent(-1); + } + } + } + + protected String toString(Symbol sym) { + return (printer != null) ? printer.visit(sym, locale) : String.valueOf(sym); + } + + protected void printTree(String label, JCTree tree) { + if (tree == null) { + printNull(label); + } else { + indent(); + String ext; + try { + ext = tree.getKind().name(); + } catch (Throwable t) { + ext = "n/a"; + } + out.print(label + ": " + info(tree.getClass(), tree.getTag(), ext)); + if (showPositions) { + // We can always get start position, but to get end position + // and/or line+offset, we would need a JCCompilationUnit + out.print(" pos:" + tree.pos); + } + if (showTreeTypes && tree.type != null) + out.print(" type:" + toString(tree.type)); + Symbol sym; + if (showTreeSymbols && (sym = TreeInfo.symbolFor(tree)) != null) + out.print(" sym:" + toString(sym)); + out.println(); + + indent(+1); + if (showSrc) { + indent(); + out.println("src: " + Pretty.toSimpleString(tree, maxSrcLength)); + } + tree.accept(treeVisitor); + indent(-1); + } + } + + public void printType(String label, Type type) { + printType(label, type, Details.FULL); + } + + protected void printType(String label, Type type, Details details) { + if (type == null) + printNull(label); + else { + switch (details) { + case SUMMARY: + printString(label, toString(type)); + break; + + case FULL: + indent(); + out.print(label); + out.println(": " + info(type.getClass(), type.getTag(), type.getKind()) + + " " + hashString(type)); + + indent(+1); + printSymbol("tsym", type.tsym, Details.SUMMARY); + printObject("constValue", type.constValue(), Details.SUMMARY); + type.accept(typeVisitor, null); + indent(-1); + } + } + } + + protected String toString(Type type) { + return (printer != null) ? printer.visit(type, locale) : String.valueOf(type); + } + + protected String hashString(Object obj) { + return String.format("#%x", obj.hashCode()); + } + + protected String info(Class<?> clazz, Object internal, Object external) { + return String.format("%s,%s,%s", clazz.getSimpleName(), internal, external); + } + + private int indent = 0; + + protected void indent() { + for (int i = 0; i < indent; i++) { + out.print(" "); + } + } + + protected void indent(int n) { + indent += n; + } + + protected Object getField(Object o, Class<?> clazz, String name) { + try { + Field f = clazz.getDeclaredField(name); + boolean prev = f.isAccessible(); + f.setAccessible(true); + try { + return f.get(o); + } finally { + f.setAccessible(prev); + } + } catch (ReflectiveOperationException e) { + return e; + } catch (SecurityException e) { + return e; + } + } + + // </editor-fold> + + // <editor-fold defaultstate="collapsed" desc="JCTree visitor methods"> + + protected JCTree.Visitor treeVisitor = new TreeVisitor(); + + /** + * Default visitor class for JCTree (AST) objects. + */ + public class TreeVisitor extends JCTree.Visitor { + @Override + public void visitTopLevel(JCCompilationUnit tree) { + printList("packageAnnotations", tree.packageAnnotations); + printTree("pid", tree.pid); + printList("defs", tree.defs); + } + + @Override + public void visitImport(JCImport tree) { + printTree("qualid", tree.qualid); + } + + @Override + public void visitClassDef(JCClassDecl tree) { + printName("name", tree.name); + printTree("mods", tree.mods); + printList("typarams", tree.typarams); + printTree("extending", tree.extending); + printList("implementing", tree.implementing); + printList("defs", tree.defs); + } + + @Override + public void visitMethodDef(JCMethodDecl tree) { + printName("name", tree.name); + printTree("mods", tree.mods); + printTree("restype", tree.restype); + printList("typarams", tree.typarams); + printTree("recvparam", tree.recvparam); + printList("params", tree.params); + printList("thrown", tree.thrown); + printTree("defaultValue", tree.defaultValue); + printTree("body", tree.body); + } + + @Override + public void visitVarDef(JCVariableDecl tree) { + printName("name", tree.name); + printTree("mods", tree.mods); + printTree("vartype", tree.vartype); + printTree("init", tree.init); + } + + @Override + public void visitSkip(JCSkip tree) { + } + + @Override + public void visitBlock(JCBlock tree) { + printList("stats", tree.stats); + } + + @Override + public void visitDoLoop(JCDoWhileLoop tree) { + printTree("body", tree.body); + printTree("cond", tree.cond); + } + + @Override + public void visitWhileLoop(JCWhileLoop tree) { + printTree("cond", tree.cond); + printTree("body", tree.body); + } + + @Override + public void visitForLoop(JCForLoop tree) { + printList("init", tree.init); + printTree("cond", tree.cond); + printList("step", tree.step); + printTree("body", tree.body); + } + + @Override + public void visitForeachLoop(JCEnhancedForLoop tree) { + printTree("var", tree.var); + printTree("expr", tree.expr); + printTree("body", tree.body); + } + + @Override + public void visitLabelled(JCLabeledStatement tree) { + printTree("body", tree.body); + } + + @Override + public void visitSwitch(JCSwitch tree) { + printTree("selector", tree.selector); + printList("cases", tree.cases); + } + + @Override + public void visitCase(JCCase tree) { + printTree("pat", tree.pat); + printList("stats", tree.stats); + } + + @Override + public void visitSynchronized(JCSynchronized tree) { + printTree("lock", tree.lock); + printTree("body", tree.body); + } + + @Override + public void visitTry(JCTry tree) { + printList("resources", tree.resources); + printTree("body", tree.body); + printList("catchers", tree.catchers); + printTree("finalizer", tree.finalizer); + } + + @Override + public void visitCatch(JCCatch tree) { + printTree("param", tree.param); + printTree("body", tree.body); + } + + @Override + public void visitConditional(JCConditional tree) { + printTree("cond", tree.cond); + printTree("truepart", tree.truepart); + printTree("falsepart", tree.falsepart); + } + + @Override + public void visitIf(JCIf tree) { + printTree("cond", tree.cond); + printTree("thenpart", tree.thenpart); + printTree("elsepart", tree.elsepart); + } + + @Override + public void visitExec(JCExpressionStatement tree) { + printTree("expr", tree.expr); + } + + @Override + public void visitBreak(JCBreak tree) { + printName("label", tree.label); + } + + @Override + public void visitContinue(JCContinue tree) { + printName("label", tree.label); + } + + @Override + public void visitReturn(JCReturn tree) { + printTree("expr", tree.expr); + } + + @Override + public void visitThrow(JCThrow tree) { + printTree("expr", tree.expr); + } + + @Override + public void visitAssert(JCAssert tree) { + printTree("cond", tree.cond); + printTree("detail", tree.detail); + } + + @Override + public void visitApply(JCMethodInvocation tree) { + printList("typeargs", tree.typeargs); + printTree("meth", tree.meth); + printList("args", tree.args); + } + + @Override + public void visitNewClass(JCNewClass tree) { + printTree("encl", tree.encl); + printList("typeargs", tree.typeargs); + printTree("clazz", tree.clazz); + printList("args", tree.args); + printTree("def", tree.def); + } + + @Override + public void visitNewArray(JCNewArray tree) { + printList("annotations", tree.annotations); + printTree("elemtype", tree.elemtype); + printList("dims", tree.dims); + printList("dimAnnotations", tree.dimAnnotations); + printList("elems", tree.elems); + } + + @Override + public void visitLambda(JCLambda tree) { + printTree("body", tree.body); + printList("params", tree.params); + } + + @Override + public void visitParens(JCParens tree) { + printTree("expr", tree.expr); + } + + @Override + public void visitAssign(JCAssign tree) { + printTree("lhs", tree.lhs); + printTree("rhs", tree.rhs); + } + + @Override + public void visitAssignop(JCAssignOp tree) { + printTree("lhs", tree.lhs); + printTree("rhs", tree.rhs); + } + + @Override + public void visitUnary(JCUnary tree) { + printTree("arg", tree.arg); + } + + @Override + public void visitBinary(JCBinary tree) { + printTree("lhs", tree.lhs); + printTree("rhs", tree.rhs); + } + + @Override + public void visitTypeCast(JCTypeCast tree) { + printTree("clazz", tree.clazz); + printTree("expr", tree.expr); + } + + @Override + public void visitTypeTest(JCInstanceOf tree) { + printTree("expr", tree.expr); + printTree("clazz", tree.clazz); + } + + @Override + public void visitIndexed(JCArrayAccess tree) { + printTree("indexed", tree.indexed); + printTree("index", tree.index); + } + + @Override + public void visitSelect(JCFieldAccess tree) { + printTree("selected", tree.selected); + } + + @Override + public void visitReference(JCMemberReference tree) { + printTree("expr", tree.expr); + printList("typeargs", tree.typeargs); + } + + @Override + public void visitIdent(JCIdent tree) { + printName("name", tree.name); + } + + @Override + public void visitLiteral(JCLiteral tree) { + printString("value", Pretty.toSimpleString(tree, 32)); + } + + @Override + public void visitTypeIdent(JCPrimitiveTypeTree tree) { + printString("typetag", tree.typetag.name()); + } + + @Override + public void visitTypeArray(JCArrayTypeTree tree) { + printTree("elemtype", tree.elemtype); + } + + @Override + public void visitTypeApply(JCTypeApply tree) { + printTree("clazz", tree.clazz); + printList("arguments", tree.arguments); + } + + @Override + public void visitTypeUnion(JCTypeUnion tree) { + printList("alternatives", tree.alternatives); + } + + @Override + public void visitTypeIntersection(JCTypeIntersection tree) { + printList("bounds", tree.bounds); + } + + @Override + public void visitTypeParameter(JCTypeParameter tree) { + printName("name", tree.name); + printList("annotations", tree.annotations); + printList("bounds", tree.bounds); + } + + @Override + public void visitWildcard(JCWildcard tree) { + printTree("kind", tree.kind); + printTree("inner", tree.inner); + } + + @Override + public void visitTypeBoundKind(TypeBoundKind tree) { + printString("kind", tree.kind.name()); + } + + @Override + public void visitModifiers(JCModifiers tree) { + printList("annotations", tree.annotations); + printString("flags", String.valueOf(Flags.asFlagSet(tree.flags))); + } + + @Override + public void visitAnnotation(JCAnnotation tree) { + printTree("annotationType", tree.annotationType); + printList("args", tree.args); + } + + @Override + public void visitAnnotatedType(JCAnnotatedType tree) { + printList("annotations", tree.annotations); + printTree("underlyingType", tree.underlyingType); + } + + @Override + public void visitErroneous(JCErroneous tree) { + printList("errs", tree.errs); + } + + @Override + public void visitLetExpr(LetExpr tree) { + printList("defs", tree.defs); + printTree("expr", tree.expr); + } + + @Override + public void visitTree(JCTree tree) { + Assert.error(); + } + } + + // </editor-fold> + + // <editor-fold defaultstate="collapsed" desc="Symbol visitor"> + + protected Symbol.Visitor<Void,Void> symVisitor = new SymbolVisitor(); + + /** + * Default visitor class for Symbol objects. + * Note: each visitXYZ method ends by calling the corresponding + * visit method for its superclass. + */ + class SymbolVisitor implements Symbol.Visitor<Void,Void> { + @Override + public Void visitClassSymbol(ClassSymbol sym, Void ignore) { + printName("fullname", sym.fullname); + printName("flatname", sym.flatname); + printScope("members", sym.members_field); + printFileObject("sourcefile", sym.sourcefile); + printFileObject("classfile", sym.classfile); + // trans-local? + // pool? + return visitTypeSymbol(sym, null); + } + + @Override + public Void visitMethodSymbol(MethodSymbol sym, Void ignore) { + // code + printList("params", sym.params); + printList("savedParameterNames", sym.savedParameterNames); + return visitSymbol(sym, null); + } + + @Override + public Void visitPackageSymbol(PackageSymbol sym, Void ignore) { + printName("fullname", sym.fullname); + printScope("members", sym.members_field); + printSymbol("package-info", sym.package_info, Details.SUMMARY); + return visitTypeSymbol(sym, null); + } + + @Override + public Void visitOperatorSymbol(OperatorSymbol sym, Void ignore) { + printInt("opcode", sym.opcode); + return visitMethodSymbol(sym, null); + } + + @Override + public Void visitVarSymbol(VarSymbol sym, Void ignore) { + printInt("pos", sym.pos); + printInt("adm", sym.adr); + // data is a private field, and the standard accessors may + // mutate it as part of lazy evaluation. Therefore, use + // reflection to get the raw data. + printObject("data", getField(sym, VarSymbol.class, "data"), Details.SUMMARY); + return visitSymbol(sym, null); + } + + @Override + public Void visitTypeSymbol(TypeSymbol sym, Void ignore) { + return visitSymbol(sym, null); + } + + @Override + public Void visitSymbol(Symbol sym, Void ignore) { + return null; + } + } + + // </editor-fold> + + // <editor-fold defaultstate="collapsed" desc="Type visitor"> + + protected Type.Visitor<Void,Void> typeVisitor = new TypeVisitor(); + + /** + * Default visitor class for Type objects. + * Note: each visitXYZ method ends by calling the corresponding + * visit method for its superclass. + */ + public class TypeVisitor implements Type.Visitor<Void,Void> { + public Void visitAnnotatedType(AnnotatedType type, Void ignore) { + printList("typeAnnotations", type.typeAnnotations); + printType("underlyingType", type.underlyingType, Details.FULL); + return visitType(type, null); + } + + public Void visitArrayType(ArrayType type, Void ignore) { + printType("elemType", type.elemtype, Details.FULL); + return visitType(type, null); + } + + public Void visitCapturedType(CapturedType type, Void ignore) { + printType("wildcard", type.wildcard, Details.FULL); + return visitTypeVar(type, null); + } + + public Void visitClassType(ClassType type, Void ignore) { + printType("outer", type.getEnclosingType(), Details.SUMMARY); + printList("typarams", type.typarams_field); + printList("allparams", type.allparams_field); + printType("supertype", type.supertype_field, Details.SUMMARY); + printList("interfaces", type.interfaces_field); + printList("allinterfaces", type.all_interfaces_field); + return visitType(type, null); + } + + public Void visitErrorType(ErrorType type, Void ignore) { + printType("originalType", type.getOriginalType(), Details.FULL); + return visitClassType(type, null); + } + + public Void visitForAll(ForAll type, Void ignore) { + printList("tvars", type.tvars); + return visitDelegatedType(type); + } + + public Void visitMethodType(MethodType type, Void ignore) { + printList("argtypes", type.argtypes); + printType("restype", type.restype, Details.FULL); + printList("thrown", type.thrown); + return visitType(type, null); + } + + public Void visitPackageType(PackageType type, Void ignore) { + return visitType(type, null); + } + + public Void visitTypeVar(TypeVar type, Void ignore) { + // For TypeVars (and not subtypes), the bound should always be + // null or bot. So, only print the bound for subtypes of TypeVar, + // or if the bound is (erroneously) not null or bot. + if (!type.hasTag(TypeTag.TYPEVAR) + || !(type.bound == null || type.bound.hasTag(TypeTag.BOT))) { + printType("bound", type.bound, Details.FULL); + } + printType("lower", type.lower, Details.FULL); + return visitType(type, null); + } + + public Void visitUndetVar(UndetVar type, Void ignore) { + for (UndetVar.InferenceBound ib: UndetVar.InferenceBound.values()) + printList("bounds." + ib, type.getBounds(ib)); + printInt("declaredCount", type.declaredCount); + printType("inst", type.inst, Details.SUMMARY); + return visitDelegatedType(type); + } + + public Void visitWildcardType(WildcardType type, Void ignore) { + printType("type", type.type, Details.SUMMARY); + printString("kind", type.kind.name()); + printType("bound", type.bound, Details.SUMMARY); + return visitType(type, null); + } + + protected Void visitDelegatedType(DelegatedType type) { + printType("qtype", type.qtype, Details.FULL); + return visitType(type, null); + } + + public Void visitType(Type type, Void ignore) { + return null; + } + } + + // </editor-fold> + + // <editor-fold defaultstate="collapsed" desc="Attribute (annotations) visitor"> + + protected Attribute.Visitor attrVisitor = new AttributeVisitor(); + + /** + * Default visitor class for Attribute (annotation) objects. + */ + public class AttributeVisitor implements Attribute.Visitor { + + public void visitConstant(Attribute.Constant a) { + printObject("value", a.value, Details.SUMMARY); + visitAttribute(a); + } + + public void visitClass(Attribute.Class a) { + printObject("classType", a.classType, Details.SUMMARY); + visitAttribute(a); + } + + public void visitCompound(Attribute.Compound a) { + if (a instanceof Attribute.TypeCompound) { + Attribute.TypeCompound ta = (Attribute.TypeCompound) a; + // consider a custom printer? + printObject("position", ta.position, Details.SUMMARY); + } + printObject("synthesized", a.isSynthesized(), Details.SUMMARY); + printList("values", a.values); + visitAttribute(a); + } + + public void visitArray(Attribute.Array a) { + printList("values", Arrays.asList(a.values)); + visitAttribute(a); + } + + public void visitEnum(Attribute.Enum a) { + printSymbol("value", a.value, Details.SUMMARY); + visitAttribute(a); + } + + public void visitError(Attribute.Error a) { + visitAttribute(a); + } + + public void visitAttribute(Attribute a) { + printType("type", a.type, Details.SUMMARY); + } + + } + // </editor-fold> + + // <editor-fold defaultstate="collapsed" desc="Utility front end"> + + /** + * Utility class to invoke DPrinter from the command line. + */ + static class Main { + public static void main(String... args) throws IOException { + Main m = new Main(); + PrintWriter out = new PrintWriter(System.out); + try { + if (args.length == 0) + m.usage(out); + else + m.run(out, args); + } finally { + out.flush(); + } + } + + void usage(PrintWriter out) { + out.println("Usage:"); + out.println(" java " + Main.class.getName() + " mode [options] [javac-options]"); + out.print("where mode is one of: "); + String sep = ""; + for (Handler h: getHandlers().values()) { + out.print(sep); + out.print(h.name); + sep = ", "; + } + out.println(); + out.println("and where options include:"); + out.println(" -before PARSE|ENTER|ANALYZE|GENERATE|ANNOTATION_PROCESSING|ANNOTATION_PROCESSING_ROUND"); + out.println(" -after PARSE|ENTER|ANALYZE|GENERATE|ANNOTATION_PROCESSING|ANNOTATION_PROCESSING_ROUND"); + out.println(" -showPositions"); + out.println(" -showSource"); + out.println(" -showTreeSymbols"); + out.println(" -showTreeTypes"); + out.println(" -hideEmptyItems"); + out.println(" -hideNulls"); + } + + void run(PrintWriter out, String... args) throws IOException { + JavaCompiler c = ToolProvider.getSystemJavaCompiler(); + StandardJavaFileManager fm = c.getStandardFileManager(null, null, null); + + // DPrinter options + final Set<TaskEvent.Kind> before = EnumSet.noneOf(TaskEvent.Kind.class); + final Set<TaskEvent.Kind> after = EnumSet.noneOf(TaskEvent.Kind.class); + boolean showPositions = false; + boolean showSource = false; + boolean showTreeSymbols = false; + boolean showTreeTypes = false; + boolean showEmptyItems = true; + boolean showNulls = true; + + // javac options + Collection<String> options = new ArrayList<String>(); + Collection<File> files = new ArrayList<File>(); + String classpath = null; + String classoutdir = null; + + final Handler h = getHandlers().get(args[0]); + if (h == null) + throw new IllegalArgumentException(args[0]); + + for (int i = 1; i < args.length; i++) { + String arg = args[i]; + if (arg.equals("-before") && i + 1 < args.length) { + before.add(getKind(args[++i])); + } else if (arg.equals("-after") && i + 1 < args.length) { + after.add(getKind(args[++i])); + } else if (arg.equals("-showPositions")) { + showPositions = true; + } else if (arg.equals("-showSource")) { + showSource = true; + } else if (arg.equals("-showTreeSymbols")) { + showTreeSymbols = true; + } else if (arg.equals("-showTreeTypes")) { + showTreeTypes = true; + } else if (arg.equals("-hideEmptyLists")) { + showEmptyItems = false; + } else if (arg.equals("-hideNulls")) { + showNulls = false; + } else if (arg.equals("-classpath") && i + 1 < args.length) { + classpath = args[++i]; + } else if (arg.equals("-d") && i + 1 < args.length) { + classoutdir = args[++i]; + } else if (arg.startsWith("-")) { + int n = c.isSupportedOption(arg); + if (n < 0) throw new IllegalArgumentException(arg); + options.add(arg); + while (n > 0) options.add(args[++i]); + } else if (arg.endsWith(".java")) { + files.add(new File(arg)); + } + } + + if (classoutdir != null) { + fm.setLocation(StandardLocation.CLASS_OUTPUT, Arrays.asList(new File(classoutdir))); + } + + if (classpath != null) { + Collection<File> path = new ArrayList<File>(); + for (String p: classpath.split(File.pathSeparator)) { + if (p.isEmpty()) continue; + File f = new File(p); + if (f.exists()) path.add(f); + } + fm.setLocation(StandardLocation.CLASS_PATH, path); + } + Iterable<? extends JavaFileObject> fos = fm.getJavaFileObjectsFromFiles(files); + + JavacTask task = (JavacTask) c.getTask(out, fm, null, options, null, fos); + final Trees trees = Trees.instance(task); + + final DPrinter dprinter = new DPrinter(out, trees); + dprinter.source(showSource) + .emptyItems(showEmptyItems) + .nulls(showNulls) + .positions(showPositions) + .treeSymbols(showTreeSymbols) + .treeTypes(showTreeTypes); + + if (before.isEmpty() && after.isEmpty()) { + if (h.name.equals("trees") && !showTreeSymbols && !showTreeTypes) + after.add(TaskEvent.Kind.PARSE); + else + after.add(TaskEvent.Kind.ANALYZE); + } + + task.addTaskListener(new TaskListener() { + public void started(TaskEvent e) { + if (before.contains(e.getKind())) + handle(e); + } + + public void finished(TaskEvent e) { + if (after.contains(e.getKind())) + handle(e); + } + + private void handle(TaskEvent e) { + switch (e.getKind()) { + case PARSE: + case ENTER: + h.handle(e.getSourceFile().getName(), + (JCTree) e.getCompilationUnit(), + dprinter); + break; + + default: + TypeElement elem = e.getTypeElement(); + h.handle(elem.toString(), + (JCTree) trees.getTree(elem), + dprinter); + break; + } + } + }); + + task.call(); + } + + TaskEvent.Kind getKind(String s) { + return TaskEvent.Kind.valueOf(s.toUpperCase()); + } + + static protected abstract class Handler { + final String name; + Handler(String name) { + this.name = name; + } + abstract void handle(String label, JCTree tree, DPrinter dprinter); + } + + Map<String,Handler> getHandlers() { + Map<String,Handler> map = new HashMap<String, Handler>(); + for (Handler h: defaultHandlers) { + map.put(h.name, h); + } + return map; + } + + protected final Handler[] defaultHandlers = { + new Handler("trees") { + @Override + void handle(String name, JCTree tree, DPrinter dprinter) { + dprinter.printTree(name, tree); + dprinter.out.println(); + } + }, + + new Handler("symbols") { + @Override + void handle(String name, JCTree tree, final DPrinter dprinter) { + TreeScanner ds = new TreeScanner() { + @Override + public void visitClassDef(JCClassDecl tree) { + visitDecl(tree, tree.sym); + super.visitClassDef(tree); + } + + @Override + public void visitMethodDef(JCMethodDecl tree) { + visitDecl(tree, tree.sym); + super.visitMethodDef(tree); + } + + @Override + public void visitVarDef(JCVariableDecl tree) { + visitDecl(tree, tree.sym); + super.visitVarDef(tree); + } + + void visitDecl(JCTree tree, Symbol sym) { + dprinter.printSymbol(sym.name.toString(), sym); + dprinter.out.println(); + } + }; + ds.scan(tree); + } + }, + + new Handler("types") { + @Override + void handle(String name, JCTree tree, final DPrinter dprinter) { + TreeScanner ts = new TreeScanner() { + @Override + public void scan(JCTree tree) { + if (tree == null) { + return; + } + if (tree.type != null) { + String label = Pretty.toSimpleString(tree); + dprinter.printType(label, tree.type); + dprinter.out.println(); + } + super.scan(tree); + } + }; + ts.scan(tree); + } + } + }; + } + + // </editor-fold> + +}
--- a/test/tools/javac/lib/JavacTestingAbstractThreadedTest.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/lib/JavacTestingAbstractThreadedTest.java Tue May 07 17:14:17 2013 -0700 @@ -41,14 +41,20 @@ * * If the property is not set the class will use a heuristic to determine the * maximum number of threads that can be fired to execute a given test. + * + * This code will have to be revisited if jprt starts using concurrency for + * for running jtreg tests. */ public abstract class JavacTestingAbstractThreadedTest { + protected static AtomicInteger numberOfThreads = new AtomicInteger(); + protected static int getThreadPoolSize() { Integer testConc = Integer.getInteger("test.concurrency"); if (testConc != null) return testConc; int cores = Runtime.getRuntime().availableProcessors(); - return Math.max(2, Math.min(8, cores / 2)); + numberOfThreads.set(Math.max(2, Math.min(8, cores / 2))); + return numberOfThreads.get(); } protected static void checkAfterExec() throws InterruptedException { @@ -82,11 +88,18 @@ } else if (printCheckCount) { outWriter.println("Total check executed: " + checkCount.get()); } + /* + * This output is for supporting debugging. It does not mean that a given + * test had executed that number of threads concurrently. The value printed + * here is the maximum possible amount. + */ closePrinters(); if (printAll) { System.out.println(errSWriter.toString()); System.out.println(outSWriter.toString()); } + System.out.println("Total number of threads in thread pool: " + + numberOfThreads.get()); } protected static void closePrinters() {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lib/ToolBox.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,977 @@ +/* + * 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. + */ + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.net.URI; +import java.nio.charset.Charset; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.EnumSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.tools.JavaCompiler; +import javax.tools.JavaFileObject; +import javax.tools.SimpleJavaFileObject; +import javax.tools.ToolProvider; + +import com.sun.source.util.JavacTask; +import com.sun.tools.javac.api.JavacTaskImpl; + +import sun.tools.jar.Main; + +import static java.nio.file.StandardCopyOption.*; + +/** + * Toolbox for jtreg tests. + */ + +public class ToolBox { + + public static final String lineSeparator = System.getProperty("line.separator"); + public static final String jdkUnderTest = System.getProperty("test.jdk"); + public static final Path javaBinary = Paths.get(jdkUnderTest, "bin", "java"); + public static final Path javacBinary = Paths.get(jdkUnderTest, "bin", "javac"); + + public static final List<String> testToolVMOpts; + public static final List<String> testVMOpts; + + private static final Charset defaultCharset = Charset.defaultCharset(); + + static final JavaCompiler comp = ToolProvider.getSystemJavaCompiler(); + + static { + String sysProp = System.getProperty("test.tool.vm.opts"); + if (sysProp != null && sysProp.length() > 0) { + testToolVMOpts = Arrays.asList(sysProp.split("\\s+")); + } else { + testToolVMOpts = Collections.<String>emptyList(); + } + + sysProp = System.getProperty("test.vm.opts"); + if (sysProp != null && sysProp.length() > 0) { + testVMOpts = Arrays.asList(sysProp.split("\\s+")); + } else { + testVMOpts = Collections.<String>emptyList(); + } + } + + /** + * The expected result of command-like method execution. + */ + public enum Expect {SUCCESS, FAIL} + + enum AcceptedParams { + EXPECT, + SOURCES, + OPTIONS, + STD_OUTPUT, + ERR_OUTPUT, + EXTRA_ENV, + } + + enum OutputKind {STD, ERR} + + /** + * Helper class to abstract the processing of command's output. + */ + static abstract class WriterHelper { + OutputKind kind; + public abstract void pipeOutput(ProcessBuilder pb); + public abstract void readFromStream(Process p) throws IOException; + public abstract void addAll(Collection<? extends String> c) throws IOException; + } + + /** + * Helper class for redirecting command's output to a file. + */ + static class FileWriterHelper extends WriterHelper { + File file; + + FileWriterHelper(File file, OutputKind kind) { + this.file = file; + this.kind = kind; + } + + @Override + public void pipeOutput(ProcessBuilder pb) { + if (file != null) { + switch (kind) { + case STD: + pb.redirectInput(file); + break; + case ERR: + pb.redirectError(file); + break; + } + } + } + + @Override + public void readFromStream(Process p) throws IOException {} + + @Override + public void addAll(Collection<? extends String> c) throws IOException { + if (file.exists()) + Files.write(file.toPath(), c, defaultCharset, + StandardOpenOption.WRITE, StandardOpenOption.APPEND); + else + Files.write(file.toPath(), c, defaultCharset); + } + } + + /** + * Helper class for redirecting command's output to a String list. + */ + static class ListWriterHelper extends WriterHelper { + List<String> list; + + public ListWriterHelper(List<String> list, OutputKind kind) { + this.kind = kind; + this.list = list; + } + + @Override + public void pipeOutput(ProcessBuilder pb) {} + + @Override + public void readFromStream(Process p) throws IOException { + BufferedReader br = null; + switch (kind) { + case STD: + br = new BufferedReader(new InputStreamReader(p.getInputStream())); + break; + case ERR: + br = new BufferedReader(new InputStreamReader(p.getErrorStream())); + break; + } + String line; + while ((line = br.readLine()) != null) { + list.add(line); + } + } + + public void addAll(Collection<? extends String> c) { + list.addAll(c); + } + } + + /** + * Simple factory class for creating a WriterHelper instance. + */ + static class WriterHelperFactory { + static WriterHelper make(File file, OutputKind kind) { + return new FileWriterHelper(file, kind); + } + + static WriterHelper make(List<String> list, OutputKind kind) { + return new ListWriterHelper(list, kind); + } + } + + /** + * A generic class for holding command's arguments. + */ + public static abstract class GenericArgs <T extends GenericArgs> { + protected static List<Set<AcceptedParams>> minAcceptedParams; + + protected Set<AcceptedParams> currentParams = + EnumSet.<AcceptedParams>noneOf(AcceptedParams.class); + + protected Expect whatToExpect; + protected WriterHelper stdOutput; + protected WriterHelper errOutput; + protected List<String> args = new ArrayList<>(); + protected String[] argsArr; + + protected GenericArgs() { + set(Expect.SUCCESS); + } + + public T set(Expect whatToExpt) { + currentParams.add(AcceptedParams.EXPECT); + this.whatToExpect = whatToExpt; + return (T)this; + } + + public T setStdOutput(List<String> stdOutput) { + currentParams.add(AcceptedParams.STD_OUTPUT); + this.stdOutput = WriterHelperFactory.make(stdOutput, OutputKind.STD); + return (T)this; + } + + public T setStdOutput(File output) { + currentParams.add(AcceptedParams.STD_OUTPUT); + this.stdOutput = WriterHelperFactory.make(output, OutputKind.STD); + return (T)this; + } + + public T setErrOutput(List<String> errOutput) { + currentParams.add(AcceptedParams.ERR_OUTPUT); + this.errOutput = WriterHelperFactory.make(errOutput, OutputKind.ERR); + return (T)this; + } + + public T setErrOutput(File errOutput) { + currentParams.add(AcceptedParams.ERR_OUTPUT); + this.errOutput = WriterHelperFactory.make(errOutput, OutputKind.ERR); + return (T)this; + } + + public T setAllArgs(String... args) { + currentParams.add(AcceptedParams.OPTIONS); + this.argsArr = args; + return (T) this; + } + + + public T appendArgs(String... args) { + appendArgs(Arrays.asList(args)); + return (T)this; + } + + public T appendArgs(Path... args) { + if (args != null) { + List<String> list = new ArrayList<>(); + for (int i = 0; i < args.length; i++) { + if (args[i] != null) { + list.add(args[i].toString()); + } + } + appendArgs(list); + } + return (T)this; + } + + public T appendArgs(List<String> args) { + if (args != null && args.size() > 0) { + currentParams.add(AcceptedParams.OPTIONS); + for (int i = 0; i < args.size(); i++) { + if (args.get(i) != null) { + this.args.add(args.get(i)); + } + } + } + return (T)this; + } + + public T setOptions(List<String> options) { + currentParams.add(AcceptedParams.OPTIONS); + this.args = options; + return (T)this; + } + + public T setOptions(String... options) { + currentParams.add(AcceptedParams.OPTIONS); + this.args = Arrays.asList(options); + return (T)this; + } + + public boolean hasMinParams() { + for (Set<AcceptedParams> minSet : minAcceptedParams) { + if (currentParams.containsAll(minSet)) { + return true; + } + } + return false; + } + } + + /** + * A more specific class for holding javac-like command's arguments. + */ + public static class JavaToolArgs extends GenericArgs<JavaToolArgs> { + + static { + minAcceptedParams = new ArrayList<>(); + minAcceptedParams.add(EnumSet.<AcceptedParams>of( + AcceptedParams.EXPECT, AcceptedParams.OPTIONS)); + minAcceptedParams.add(EnumSet.<AcceptedParams>of( + AcceptedParams.EXPECT, AcceptedParams.SOURCES)); + } + + protected List<? extends JavaFileObject> sources; + + public JavaToolArgs() { + super(); + } + + public JavaToolArgs(Expect whatToExpt) { + super.set(whatToExpt); + } + + public JavaToolArgs setSources(List<? extends JavaFileObject> sources) { + currentParams.add(AcceptedParams.SOURCES); + this.sources = sources; + return this; + } + + public JavaToolArgs setSources(JavaSource... sources) { + return setSources(Arrays.asList(sources)); + } + + public JavaToolArgs setSources(String... sources) { + List<JavaSource> javaSrcs = new ArrayList<>(); + for (String source : sources) { + javaSrcs.add(new JavaSource(source)); + } + return setSources(javaSrcs); + } + } + + /** + * A more specific class for holding any command's arguments. + */ + public static class AnyToolArgs extends GenericArgs<AnyToolArgs> { + + static { + minAcceptedParams = new ArrayList<>(); + minAcceptedParams.add(EnumSet.<AcceptedParams>of( + AcceptedParams.EXPECT, AcceptedParams.OPTIONS)); + } + + Map<String, String> extraEnv; + + public AnyToolArgs() { + super(); + } + + public AnyToolArgs(Expect whatToExpt) { + set(whatToExpt); + } + + public AnyToolArgs set(Map<String, String> extraEnv) { + currentParams.add(AcceptedParams.EXTRA_ENV); + this.extraEnv = extraEnv; + return this; + } + } + + /** + * Custom exception for bad command execution. + */ + public static class CommandExecutionException extends Exception { + CommandExecutionException(List<String> command, Expect whatToExpt) { + super(createMessage(command, whatToExpt)); + } + + CommandExecutionException(Expect whatToExpt, String... command) { + this(Arrays.asList(command), whatToExpt); + } + + private static String createMessage(List<String> command, Expect whatToExpt) { + StringBuilder sb = new StringBuilder().append("Command : "); + sb.append(command.toString()).append(lineSeparator); + switch (whatToExpt) { + case SUCCESS: + sb.append(" has unexpectedly failed"); + break; + case FAIL: + sb.append(" has been unexpectedly successful"); + break; + } + return sb.toString(); + } + } + + /** + * Custom exception for not equal resources. + */ + public static class ResourcesNotEqualException extends Exception { + public ResourcesNotEqualException(List<String> res1, List<String> res2) { + super(createMessage(res1, res2)); + } + + public ResourcesNotEqualException(String line1, String line2) { + super(createMessage(line1, line2)); + } + + public ResourcesNotEqualException(Path path1, Path path2) { + super(createMessage(path1, path2)); + } + + private static String createMessage(Path path1, Path path2) { + return new StringBuilder() + .append("The resources provided for comparison in paths \n") + .append(path1.toString()).append(" and \n") + .append(path2.toString()).append("are different").toString(); + } + + private static String createMessage(String line1, String line2) { + return new StringBuilder() + .append("The resources provided for comparison are different at lines: \n") + .append(line1).append(" and \n") + .append(line2).toString(); + } + + private static String createMessage(List<String> res1, List<String> res2) { + return new StringBuilder() + .append("The resources provided for comparison are different: \n") + .append("Resource 1 is: ").append(res1).append("\n and \n") + .append("Resource 2 is: ").append(res2).append("\n").toString(); + } + } + + /** + * A javac compiler caller method. + */ + public static int javac(JavaToolArgs params) + throws CommandExecutionException, IOException { + if (params.hasMinParams()) { + if (params.argsArr != null) { + return genericJavaCMD(JavaCMD.JAVAC, params); + } else { + return genericJavaCMD(JavaCMD.JAVAC_API, params); + } + } + throw new AssertionError("javac command has been invoked with less parameters than needed"); + } + + /** + * A javap calling method. + */ + public static String javap(JavaToolArgs params) + throws CommandExecutionException, IOException { + if (params.hasMinParams()) { + List<String> list = new ArrayList<>(); + params.setErrOutput(list); + genericJavaCMD(JavaCMD.JAVAP, params); + return listToString(list); + } + throw new AssertionError("javap command has been invoked with less parameters than needed"); + } + + /** + * A javah calling method. + */ + public static int javah(JavaToolArgs params) + throws CommandExecutionException, IOException { + if (params.hasMinParams()) { + return genericJavaCMD(JavaCMD.JAVAH, params); + } + throw new AssertionError("javah command has been invoked with less parameters than needed"); + } + + /** + * A enum class for langtools commands. + */ + enum JavaCMD { + JAVAC { + @Override + int run(JavaToolArgs params, PrintWriter pw) { + return com.sun.tools.javac.Main.compile(params.argsArr, pw); + } + }, + JAVAC_API { + @Override + int run(JavaToolArgs params, PrintWriter pw) { + JavacTask ct = (JavacTask)comp.getTask(pw, null, null, + params.args, null, params.sources); + return ((JavacTaskImpl)ct).doCall().exitCode; + } + + @Override + String getName() { + return "javac"; + } + + @Override + List<String> getExceptionMsgContent(JavaToolArgs params) { + List<String> result = super.getExceptionMsgContent(params); + for (JavaFileObject source : params.sources) { + if (source instanceof JavaSource) { + result.add(((JavaSource)source).name); + } + } + return result; + } + }, + JAVAH { + @Override + int run(JavaToolArgs params, PrintWriter pw) { + return com.sun.tools.javah.Main.run(params.argsArr, pw); + } + }, + JAVAP { + @Override + int run(JavaToolArgs params, PrintWriter pw) { + return com.sun.tools.javap.Main.run(params.argsArr, pw); + } + }; + + abstract int run(JavaToolArgs params, PrintWriter pw); + + String getName() { + return this.name().toLowerCase(); + } + + List<String> getExceptionMsgContent(JavaToolArgs params) { + List<String> result = new ArrayList<>(); + result.add(getName()); + result.addAll(params.argsArr != null ? + Arrays.asList(params.argsArr) : + params.args); + return result; + } + } + + /** + * A helper method for executing langtools commands. + */ + private static int genericJavaCMD( + JavaCMD cmd, + JavaToolArgs params) + throws CommandExecutionException, IOException { + int rc = 0; + StringWriter sw = null; + try (PrintWriter pw = (params.errOutput == null) ? + null : new PrintWriter(sw = new StringWriter())) { + rc = cmd.run(params, pw); + } + String out = (sw == null) ? null : sw.toString(); + + if (params.errOutput != null && (out != null) && !out.isEmpty()) { + params.errOutput.addAll(splitLines(out, lineSeparator)); + } + + if ( (rc == 0 && params.whatToExpect == Expect.SUCCESS) || + (rc != 0 && params.whatToExpect == Expect.FAIL) ) { + return rc; + } + + throw new CommandExecutionException(cmd.getExceptionMsgContent(params), + params.whatToExpect); + } + + /** + * A jar calling method. + */ + public static boolean jar(String... params) throws CommandExecutionException { + Main jarGenerator = new Main(System.out, System.err, "jar"); + boolean result = jarGenerator.run(params); + if (!result) { + List<String> command = new ArrayList<>(); + command.add("jar"); + command.addAll(Arrays.asList(params)); + throw new CommandExecutionException(command, Expect.SUCCESS); + } + return result; + } + + /** + * A general command calling method. + */ + public static int executeCommand(AnyToolArgs params) + throws CommandExecutionException, IOException, InterruptedException { + if (params.hasMinParams()) { + List<String> cmd = (params.args != null) ? + params.args : + Arrays.asList(params.argsArr); + return executeCommand(cmd, params.extraEnv, params.stdOutput, + params.errOutput, params.whatToExpect); + } + throw new AssertionError("command has been invoked with less parameters than needed"); + } + + /** + * A helper method for calling a general command. + */ + private static int executeCommand( + List<String> command, + Map<String, String> extraEnv, + WriterHelper stdOutput, + WriterHelper errOutput, + Expect whatToExpt) + throws IOException, InterruptedException, CommandExecutionException { + ProcessBuilder pb = new ProcessBuilder(command); + + if (stdOutput != null) stdOutput.pipeOutput(pb); + if (errOutput != null) errOutput.pipeOutput(pb); + + if (extraEnv != null) { + pb.environment().putAll(extraEnv); + } + + Process p = pb.start(); + + if (stdOutput != null) stdOutput.readFromStream(p); + if (errOutput != null) errOutput.readFromStream(p); + + int result = p.waitFor(); + if ( (result == 0 && whatToExpt == Expect.SUCCESS) || + (result != 0 && whatToExpt == Expect.FAIL) ) { + return result; + } + + throw new CommandExecutionException(command, whatToExpt); + } + + /** + * This set of methods can be used instead of diff when the only needed + * result is the equality or inequality of the two given resources. + * + * A resource can be a file or a String list. + */ + public static void compareLines(Path aPath, Path otherPath, String encoding) + throws FileNotFoundException, IOException, ResourcesNotEqualException { + compareLines(aPath, otherPath, encoding, false); + } + + public static void compareLines( + Path aPath, Path otherPath, String encoding, boolean trim) + throws FileNotFoundException, IOException, ResourcesNotEqualException { + Charset charset = encoding != null ? + Charset.forName(encoding) : + defaultCharset; + List<String> list1 = Files.readAllLines(aPath, charset); + List<String> list2 = Files.readAllLines(otherPath, charset); + compareLines(list1, list2, trim); + } + + public static void compareLines(Path path, List<String> strings, String encoding) + throws FileNotFoundException, IOException, ResourcesNotEqualException { + compareLines(path, strings, encoding, false); + } + + public static void compareLines(Path path, List<String> strings, + String encoding, boolean trim) + throws FileNotFoundException, IOException, ResourcesNotEqualException { + Charset charset = encoding != null ? + Charset.forName(encoding) : + defaultCharset; + List<String> list = Files.readAllLines(path, charset); + compareLines(list, strings, trim); + } + + public static void compareLines(List<String> list1, List<String> list2) + throws ResourcesNotEqualException { + compareLines(list1, list2, false); + } + + public static void compareLines(List<String> list1, + List<String> list2, boolean trim) throws ResourcesNotEqualException { + if ((list1 == list2) || (list1 == null && list2 == null)) return; + if (list1.size() != list2.size()) + throw new ResourcesNotEqualException(list1, list2); + int i = 0; + int j = 0; + while (i < list1.size() && + j < list2.size() && + equals(list1.get(i), list2.get(j), trim)) { + i++; j++; + } + if (!(i == list1.size() && j == list2.size())) + throw new ResourcesNotEqualException(list1, list2); + } + + private static boolean equals(String s1, String s2, boolean trim) { + return (trim ? s1.trim().equals(s2.trim()) : s1.equals(s2)); + } + + /** + * A set of simple grep-like methods, looks for regExpr in text. + * The content of text is split using the new line character as a pattern + * and later the regExpr is seek in every split line. If a match is found, + * the whole line is added to the result. + */ + public static List<String> grep(String regExpr, String text, String sep) { + return grep(regExpr, splitLines(text, sep)); + } + + public static List<String> grep(String regExpr, List<String> text) { + List<String> result = new ArrayList<>(); + Pattern pattern = Pattern.compile(regExpr); + for (String s : text) { + if (pattern.matcher(s).find()) { + result.add(s); + } + } + return result; + } + + public static List<String> grep(String regExpr, File f) + throws IOException { + List<String> lines = Files.readAllLines(f.toPath(), defaultCharset); + return grep(regExpr, lines); + } + + /** + * A touch-like method. + */ + public static boolean touch(String fileName) { + File file = new File(fileName); + return touch(file); + } + + public static boolean touch(File file) { + if (file.exists()) { + file.setLastModified(System.currentTimeMillis()); + return true; + } + return false; + } + + public static void createJavaFile(File outFile) throws IOException { + createJavaFile(outFile, null); + } + + /** + * A method for creating a valid but very simple java file. + */ + public static void createJavaFile(File outFile, File superClass) + throws IOException { + String srcStr = "public class " + getSimpleName(outFile) + " "; + if (superClass != null) { + srcStr = srcStr.concat("extends " + getSimpleName(superClass) + " "); + } + srcStr = srcStr.concat("{}"); + try (PrintWriter ps = new PrintWriter(new FileWriter(outFile))) { + ps.println(srcStr); + } + } + + /** + * Creates a java file name given its source. + * The file is created in the working directory, creating a directory + * tree if there is a package declaration. + */ + public static void createJavaFileFromSource(String source) throws IOException { + createJavaFileFromSource(null, source); + } + + /** + * Creates a java file name given its source. + * The file is created in the working directory, creating a directory + * tree if there is a package declaration or the argument initialPath + * has a valid path. + * + * e.i. if initialPath is foo/ and the source is: + * package bar; + * + * public class bazz {} + * + * this method will create the file foo/bar/bazz.java in the working + * directory. + */ + public static void createJavaFileFromSource(Path initialPath, + String source) throws IOException { + String fileName = getJavaFileNameFromSource(source); + String dirTree = getDirTreeFromSource(source); + Path path = (dirTree != null) ? + Paths.get(dirTree, fileName) : + Paths.get(fileName); + path = (initialPath != null) ? + initialPath.resolve(path): + path; + writeFile(path, source); + } + + static Pattern publicClassPattern = + Pattern.compile("public\\s+(?:class|enum|interface){1}\\s+(\\w+)"); + static Pattern packageClassPattern = + Pattern.compile("(?:class|enum|interface){1}\\s+(\\w+)"); + + /** + * Extracts the java file name from the class declaration. + * This method is intended for simple files and uses regular expressions, + * so comments matching the pattern can make the method fail. + */ + private static String getJavaFileNameFromSource(String source) { + String className = null; + Matcher matcher = publicClassPattern.matcher(source); + if (matcher.find()) { + className = matcher.group(1) + ".java"; + } else { + matcher = packageClassPattern.matcher(source); + if (matcher.find()) { + className = matcher.group(1) + ".java"; + } else { + throw new AssertionError("Could not extract the java class " + + "name from the provided source"); + } + } + return className; + } + + static Pattern packagePattern = + Pattern.compile("package\\s+(((?:\\w+\\.)*)(?:\\w+))"); + + /** + * Extracts the path from the package declaration if present. + * This method is intended for simple files and uses regular expressions, + * so comments matching the pattern can make the method fail. + */ + private static String getDirTreeFromSource(String source) { + Matcher matcher = packagePattern.matcher(source); + return matcher.find() ? + matcher.group(1).replace(".", File.separator) : + null; + } + + /** + * A method for creating a jar's manifest file with supplied data. + */ + public static void mkManifestWithClassPath(String mainClass, + String... classes) throws IOException { + List <String> lines = new ArrayList<>(); + + StringBuilder sb = new StringBuilder("Class-Path: ".length() + + classes[0].length()).append("Class-Path: ").append(classes[0]); + for (int i = 1; i < classes.length; i++) { + sb.append(" ").append(classes[i]); + } + lines.add(sb.toString()); + if (mainClass != null) { + lines.add(new StringBuilder("Main-Class: ".length() + + mainClass.length()) + .append("Main-Class: ") + .append(mainClass).toString()); + } + Files.write(Paths.get("MANIFEST.MF"), lines, null); + } + + /** + * A utility method to obtain the file name. + */ + static String getSimpleName(File inFile) { + return inFile.toPath().getFileName().toString(); + } + + /** + * A method to write to a file, the directory tree is created if needed. + */ + public static File writeFile(Path path, String body) throws IOException { + File result; + if (path.getParent() != null) { + Files.createDirectories(path.getParent()); + } + try (FileWriter out = new FileWriter(result = path.toAbsolutePath().toFile())) { + out.write(body); + } + return result; + } + + public static File writeFile(String path, String body) throws IOException { + return writeFile(Paths.get(path), body); + } + + /** + * A rm-like method, the file is deleted only if it exists. + */ + public static void rm(Path path) throws Exception { + Files.deleteIfExists(path); + } + + public static void rm(String filename) throws Exception { + rm(Paths.get(filename)); + } + + public static void rm(File f) throws Exception { + rm(f.toPath()); + } + + /** + * Copy source file to destination file. + */ + public static void copyFile(File destfile, File srcfile) + throws IOException { + copyFile(destfile.toPath(), srcfile.toPath()); + } + + public static void copyFile(Path destPath, Path srcPath) + throws IOException { + Files.createDirectories(destPath); + Files.copy(srcPath, destPath, REPLACE_EXISTING); + } + + /** + * Splits a String using the System's line separator character as splitting point. + */ + public static List<String> splitLines(String lines, String sep) { + return Arrays.asList(lines.split(sep)); + } + + /** + * Converts a String list into one String by appending the System's line separator + * character after each component. + */ + private static String listToString(List<String> lines) { + StringBuilder sb = new StringBuilder(); + for (String s : lines) { + sb.append(s).append(lineSeparator); + } + return sb.toString(); + } + + /** + * Returns true if the OS is a Windows version. + */ + public static boolean isWindows() { + String osName = System.getProperty("os.name"); + return osName.toUpperCase().startsWith("WINDOWS"); + } + + /** + * Class representing an in-memory java source file. It is able to extract + * the file name from simple source codes using regular expressions. + */ + public static class JavaSource extends SimpleJavaFileObject { + String source; + String name; + + public JavaSource(String className, String source) { + super(URI.create(className), + JavaFileObject.Kind.SOURCE); + this.name = className; + this.source = source; + } + + public JavaSource(String source) { + super(URI.create(getJavaFileNameFromSource(source)), + JavaFileObject.Kind.SOURCE); + this.name = getJavaFileNameFromSource(source); + this.source = source; + } + + @Override + public CharSequence getCharContent(boolean ignoreEncodingErrors) { + return source; + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/links/LinksTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,66 @@ +/* + * 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. + */ + +/* + * @test + * @bug 4266026 + * @summary javac no longer follows symlinks + * @library /tools/javac/lib + * @build ToolBox + * @run main LinksTest + */ + +import java.nio.file.Files; +import java.nio.file.Paths; + +//original test: test/tools/javac/links/links.sh +public class LinksTest { + + private static final String BSrc = + "package a;\n" + + "\n" + + "public class B {}"; + + private static final String TSrc = + "class T extends a.B {}"; + + public static void main(String args[]) + throws Exception { +// mkdir tmp +// cp ${TESTSRC}/b/B.java tmp + ToolBox.writeFile(Paths.get("tmp", "B.java"), BSrc); + + try { +// ln -s `pwd`/tmp "${TESTCLASSES}/a" + Files.createSymbolicLink(Paths.get("a"), Paths.get("tmp")); + ////"${TESTJAVA}/bin/javac" ${TESTTOOLVMOPTS} -sourcepath "${TESTCLASSES}" -d "${TESTCLASSES}/classes" "${TESTSRC}/T.java" 2>&1 + ToolBox.JavaToolArgs javacArgs = + new ToolBox.JavaToolArgs() + .setOptions("-sourcepath", ".", "-d", ".").setSources(TSrc); + ToolBox.javac(javacArgs); + } catch (UnsupportedOperationException e) { + System.err.println("Symbolic links not supported on this system. The test can't finish"); + } + } + +}
--- a/test/tools/javac/links/T.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2001, 2008, 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. - */ - -class T extends a.B {}
--- a/test/tools/javac/links/b/B.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2001, 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 a; - -public class B {}
--- a/test/tools/javac/links/links.sh Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,74 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 2001, 2008, 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. -# - -# @test -# @bug 4266026 -# @summary javac no longer follows symlinks -# -# @run shell links.sh - - -if [ "${TESTSRC}" = "" ] -then - echo "TESTSRC not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTSRC=${TESTSRC}" -if [ "${TESTJAVA}" = "" ] -then - echo "TESTJAVA not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTJAVA=${TESTJAVA}" -if [ "${TESTCLASSES}" = "" ] -then - echo "TESTCLASSES not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTCLASSES=${TESTCLASSES}" -echo "CLASSPATH=${CLASSPATH}" - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin ) - NULL=/dev/null - PS=":" - FS="/" - ;; - * ) - echo "Unrecognized system - test skipped." - exit 0; - ;; -esac - -mkdir tmp -cp ${TESTSRC}/b/B.java tmp - -rm -rf T.class B.class b/B.class "${TESTCLASSES}/a" "${TESTCLASSES}/classes" -ln -s `pwd`/tmp "${TESTCLASSES}/a" -mkdir "${TESTCLASSES}/classes" - -"${TESTJAVA}/bin/javac" ${TESTTOOLVMOPTS} -sourcepath "${TESTCLASSES}" -d "${TESTCLASSES}/classes" "${TESTSRC}/T.java" 2>&1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/newlines/NewLineTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,61 @@ +/* + * 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. + */ + +/* + * @test + * @bug 4110560 4785453 + * @summary portability : javac.properties + * @library /tools/javac/lib + * @build ToolBox + * @run main NewLineTest + */ + +import java.io.File; +import java.nio.charset.Charset; +import java.nio.file.Files; +import java.util.List; + +//original test: test/tools/javac/newlines/Newlines.sh +public class NewLineTest { + + public static void main(String args[]) throws Exception { +// "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -J-Dline.separator='@' > ${TMP1} 2>&1 + File javacErrOutput = new File("output.txt"); + ToolBox.AnyToolArgs cmdArgs = + new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL) + .appendArgs(ToolBox.javacBinary) + .appendArgs(ToolBox.testToolVMOpts) + .appendArgs("-J-Dline.separator='@'") + .setErrOutput(javacErrOutput); + ToolBox.executeCommand(cmdArgs); + +// result=`cat ${TMP1} | wc -l` +// if [ "$result" -eq 0 ] passed + List<String> lines = Files.readAllLines(javacErrOutput.toPath(), + Charset.defaultCharset()); + if (lines.size() != 1) { + throw new AssertionError("The compiler output should have one line only"); + } + } + +}
--- a/test/tools/javac/newlines/Newlines.sh Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,76 +0,0 @@ -# -# Copyright (c) 2002, 2012, 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. -# - -# @test -# @bug 4110560 4785453 -# @summary portability : javac.properties -# -# @run shell Newlines.sh - -if [ "${TESTSRC}" = "" ] -then - echo "TESTSRC not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTSRC=${TESTSRC}" -if [ "${TESTJAVA}" = "" ] -then - echo "TESTJAVA not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTJAVA=${TESTJAVA}" -if [ "${TESTCLASSES}" = "" ] -then - echo "TESTCLASSES not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTCLASSES=${TESTCLASSES}" -echo "CLASSPATH=${CLASSPATH}" - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin | CYGWIN* ) - FS="/" - ;; - Windows* ) - FS="\\" - ;; - * ) - echo "Unrecognized system!" - exit 1; - ;; -esac - -TMP1=OUTPUT.txt - -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -J-Dline.separator='@' > ${TMP1} 2>&1 -cat ${TMP1} -result=`cat ${TMP1} | wc -l` -if [ "$result" -eq 0 ] -then - echo "Passed" -else - echo "Failed" -fi -exit $result
--- a/test/tools/javac/processing/model/element/TestExecutableElement.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/processing/model/element/TestExecutableElement.java Tue May 07 17:14:17 2013 -0700 @@ -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 8005046 + * @bug 8005046 8011052 * @summary Test basic properties of javax.lang.element.Element * @author Joseph D. Darcy * @library /tools/javac/lib @@ -35,6 +35,7 @@ import java.util.Formatter; import java.util.Set; import java.util.Objects; +import java.util.regex.*; import javax.annotation.processing.*; import javax.lang.model.SourceVersion; import static javax.lang.model.SourceVersion.*; @@ -79,9 +80,39 @@ boolean methodIsDefault = method.isDefault(); + if (expectedDefault) { + if (!method.getModifiers().contains(Modifier.DEFAULT)) { + messager.printMessage(ERROR, + "Modifier \"default\" not present as expected.", + method); + } + + // Check printing output + java.io.Writer stringWriter = new java.io.StringWriter(); + eltUtils.printElements(stringWriter, method); + Pattern p = Pattern.compile(expectedIsDefault.expectedTextRegex(), Pattern.DOTALL); + + if (! p.matcher(stringWriter.toString()).matches()) { + messager.printMessage(ERROR, + new Formatter().format("Unexpected printing ouptput:%n\tgot %s,%n\texpected pattern %s.", + stringWriter.toString(), + expectedIsDefault.expectedTextRegex()).toString(), + method); + } + + System.out.println("\t" + stringWriter.toString()); + + } else { + if (method.getModifiers().contains(Modifier.DEFAULT)) { + messager.printMessage(ERROR, + "Modifier \"default\" present when not expected.", + method); + } + } + if (methodIsDefault != expectedDefault) { messager.printMessage(ERROR, - new Formatter().format("Unexpected Executable.isDefault result: got %s, expected %s", + new Formatter().format("Unexpected Executable.isDefault result: got ``%s'', expected ``%s''.", expectedDefault, methodIsDefault).toString(), method); @@ -98,6 +129,7 @@ @Target(ElementType.METHOD) @interface IsDefault { boolean value(); + String expectedTextRegex() default ""; } /** @@ -108,6 +140,6 @@ boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv); - @IsDefault(true) - default void quux() {}; + @IsDefault(value=true, expectedTextRegex="\\s*@IsDefault\\(.*\\)\\s*default strictfp void quux\\(\\);\\s*$") + default strictfp void quux() {}; }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/ElementRepAnnoTester.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,555 @@ +/* + * 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. + */ + +import java.lang.annotation.Annotation; +import java.util.Arrays; +import java.util.EnumSet; +import java.util.List; +import java.util.Set; +import javax.annotation.processing.*; +import javax.lang.model.element.*; +import javax.lang.model.type.MirroredTypeException; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.util.Elements; + +public class ElementRepAnnoTester extends JavacTestingAbstractProcessor { + // All methods to test. + final EnumSet<TestMethod> ALL_TEST_METHODS = EnumSet.allOf(TestMethod.class); + int count = 0; + int error = 0; + + public boolean process(Set<? extends TypeElement> annotations, + RoundEnvironment roundEnv) { + if (!roundEnv.processingOver()) { + List<String> superClass = Arrays.asList("A", "B", "C", "D", "E", + "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P"); + // Go through all test classes + for (Element element : roundEnv.getRootElements()) { + // For now, no testing super classes (TODO) + if (element.getKind() == ElementKind.CLASS + && !superClass.contains(element.getSimpleName().toString())) { + // Compare expected and actual values from methods. + checkAnnoValues(element, ALL_TEST_METHODS); + // Now, look for enclosed elements in test classes. + for (Element elements : element.getEnclosedElements()) { + // Look for Methods annotations. + if (elements.getKind() == ElementKind.METHOD + && elements.getSimpleName().toString().equals("testMethod")) { + checkAnnoValues(elements, ALL_TEST_METHODS); + } + // Look for Field annotations. + if (elements.getKind() == ElementKind.FIELD + && elements.getSimpleName().toString().equals("testField")) { + checkAnnoValues(elements, ALL_TEST_METHODS); + } + } + } + } + + if (error != 0) { + System.out.println("Total tests : " + count); + System.out.println("Total test failures : " + error); + throw new RuntimeException(); + } else { + System.out.println("ALL TESTS PASSED. " + count); + } + } + return true; + } + + enum TestMethod { + getAnnotation, + getAnnotationsByType, + getAllAnnotationMirrors, + getAnnotationMirrors + } + + protected void checkAnnoValues(Element element, EnumSet<TestMethod> testMethods) { + boolean baseAnnoPresent = false; + boolean conAnnoPresent = false; + ExpectedBase eb = null; + ExpectedContainer ec = null; + // Getting the expected values to compare with. + eb = element.getAnnotation(ExpectedBase.class); + ec = element.getAnnotation(ExpectedContainer.class); + + if (eb == null) { + System.out.println("Did not find ExpectedBase Annotation in " + + element.getSimpleName().toString() + ", Test will exit"); + throw new RuntimeException(); + } + if (ec == null) { + System.out.println("Did not find ExpectedContainer Annotation in " + + element.getSimpleName().toString() + " Test will exit"); + throw new RuntimeException(); + } + // Look if all test cases have ExpectedBase and ExpectedContainer values(). + TypeMirror valueBase = null; + TypeMirror valueCon = null; + + try { + eb.value(); + } catch (MirroredTypeException mte) { + valueBase = mte.getTypeMirror(); + } + + try { + ec.value(); + } catch (MirroredTypeException mte1) { + valueCon = mte1.getTypeMirror(); + } + + String expectedBaseAnno = valueBase.toString(); + String expectedConAnno = valueCon.toString(); + + if (!expectedBaseAnno.equals("java.lang.annotation.Annotation")) { + baseAnnoPresent = true; + } + if (!expectedConAnno.equalsIgnoreCase("java.lang.annotation.Annotation")) { + conAnnoPresent = true; + } + + // Look into TestMethod and compare method's output with expected values. + for (TestMethod testMethod : testMethods) { + boolean isBasePass = true; + boolean isConPass = true; + + switch (testMethod) { + case getAnnotation: + if (baseAnnoPresent) { + count++; + Annotation actualAnno = getAnnotationBase(element); + String expectedAnno = eb.getAnnotation(); + isBasePass = compareAnnotation(actualAnno, expectedAnno); + } + if (conAnnoPresent) { + count++; + Annotation actualAnno = getAnnotationContainer(element); + String expectedAnno = ec.getAnnotation(); + isConPass = compareAnnotation(actualAnno, expectedAnno); + } + if (!isBasePass || !isConPass) { + System.out.println("FAIL in " + element.getSimpleName() + + "-" + element.getKind() + + " method: getAnnotation(class <T>)"); + error++; + } + break; + + case getAnnotationMirrors: + if (baseAnnoPresent) { + count++; + List<? extends AnnotationMirror> actualDeclAnnos = + element.getAnnotationMirrors(); + String[] expectedAnnos = eb.getAnnotationMirrors(); + isBasePass = compareArrVals(actualDeclAnnos, expectedAnnos); + } + if (conAnnoPresent) { + isConPass = true; + } + if (!isBasePass || !isConPass) { + System.out.println("FAIL in " + element.getSimpleName() + + "-" + element.getKind() + + " method: getAnnotationMirrors()"); + error++; + } + break; + + case getAnnotationsByType: + if (baseAnnoPresent) { + count++; + Annotation[] actualAnnosArgs = getAnnotationsBase(element); + String[] expectedAnnos = eb.getAnnotationsByType(); + isBasePass = compareArrVals(actualAnnosArgs, expectedAnnos); + } + if (conAnnoPresent) { + count++; + Annotation[] actualAnnosArgs = getAnnotationsContainer(element); + String[] expectedAnnos = ec.getAnnotationsByType(); + isConPass = compareArrVals(actualAnnosArgs, expectedAnnos); + } + if (!isBasePass || !isConPass) { + System.out.println("FAIL in " + element.getSimpleName() + + "-" + element.getKind() + + " method: getAnnotationsByType(class <T>)"); + error++; + } + break; + + case getAllAnnotationMirrors: + if (baseAnnoPresent) { + count++; + Elements elements = processingEnv.getElementUtils(); + List<? extends AnnotationMirror> actualAnnosMirrors = + elements.getAllAnnotationMirrors(element); + String[] expectedAnnos = eb.getAllAnnotationMirrors(); + isBasePass = compareArrVals(actualAnnosMirrors, expectedAnnos); + } + if (conAnnoPresent) { + isConPass = true; + } + if (!isBasePass || !isConPass) { + System.out.println("FAIL in " + element.getSimpleName() + + "-" + element.getKind() + + " method: getAllAnnotationMirrors(e)"); + error++; + } + break; + } + } + } + // Sort tests to be run with different anno processors. + final List<String> singularAnno = Arrays.asList( + "SingularBasicTest" + ); + final List<String> singularInheritedAnno = Arrays.asList( + "SingularInheritedATest" + ); + final List<String> repeatableAnno = Arrays.asList( + "RepeatableBasicTest", + "MixRepeatableAndOfficialContainerBasicTest", + "OfficialContainerBasicTest", + "RepeatableOfficialContainerBasicTest" + ); + final List<String> repeatableInheritedAnno = Arrays.asList( + "RepeatableInheritedTest", + "RepeatableOverrideATest", + "RepeatableOverrideBTest", + "OfficialContainerInheritedTest", + "MixRepeatableAndOfficialContainerInheritedA1Test", + "MixRepeatableAndOfficialContainerInheritedB1Test", + "MixRepeatableAndOfficialContainerInheritedA2Test", + "MixRepeatableAndOfficialContainerInheritedB2Test" + ); + final List<String> repeatableContainerInheritedAnno = Arrays.asList( + "RepeatableOfficialContainerInheritedTest" + ); + final List<String> unofficialAnno = Arrays.asList( + "UnofficialContainerBasicTest", + "MixSingularAndUnofficialContainerBasicTest" + ); + final List<String> unofficialInheritedAnno = Arrays.asList( + "UnofficialContainerInheritedTest", + "SingularInheritedBTest", + "MixSingularAndUnofficialContainerInheritedA1Test", + "MixSingularAndUnofficialContainerInheritedB1Test", + "MixSingularAndUnofficialContainerInheritedA2Test", + "MixSingularAndUnofficialContainerInheritedB2Test" + ); + // Respective container annotation for the different test cases to test. + final List<String> repeatableAnnoContainer = repeatableAnno; + final List<String> repeatableInheritedAnnoContainer = repeatableInheritedAnno; + final List<String> repeatableContainerInheritedAnnoContainer = + repeatableContainerInheritedAnno; + final List<String> unofficialAnnoContainer = unofficialAnno; + final List<String> unofficialInheritedAnnoContainer = unofficialInheritedAnno; + + // Variables to verify if all test cases have been run. + private Annotation specialAnno = new Annotation() { + @Override + public Class annotationType() { + return null; + } + }; + private Annotation[] specialAnnoArray = new Annotation[1]; + private List<AnnotationMirror> specialAnnoMirrors = + new java.util.ArrayList<AnnotationMirror>(2); + + private Annotation getAnnotationBase(Element e) { + Annotation actualAnno = specialAnno; + + if (singularAnno.contains( + e.getEnclosingElement().toString()) + || singularAnno.contains( + e.getSimpleName().toString()) + || unofficialAnno.contains( + e.getEnclosingElement().toString()) + || unofficialAnno.contains( + e.getSimpleName().toString())) { + actualAnno = e.getAnnotation(Foo.class); + } + if (singularInheritedAnno.contains( + e.getEnclosingElement().toString()) + || singularInheritedAnno.contains( + e.getSimpleName().toString()) + || unofficialInheritedAnno.contains( + e.getEnclosingElement().toString()) + || unofficialInheritedAnno.contains( + e.getSimpleName().toString())) { + actualAnno = e.getAnnotation(FooInherited.class); + } + if (repeatableAnno.contains( + e.getEnclosingElement().toString()) + || repeatableAnno.contains( + e.getSimpleName().toString())) { + actualAnno = e.getAnnotation(Bar.class); + } + if (repeatableInheritedAnno.contains( + e.getEnclosingElement().toString()) + || repeatableInheritedAnno.contains( + e.getSimpleName().toString())) { + actualAnno = e.getAnnotation(BarInherited.class); + } + if (repeatableContainerInheritedAnno.contains( + e.getEnclosingElement().toString()) + || repeatableContainerInheritedAnno.contains( + e.getSimpleName().toString())) { + actualAnno = e.getAnnotation(BarInheritedContainer.class); + } + return actualAnno; + } + + private Annotation getAnnotationContainer(Element e) { + Annotation actualAnno = specialAnno; + + if (repeatableAnnoContainer.contains( + e.getEnclosingElement().toString()) + || repeatableAnnoContainer.contains( + e.getSimpleName().toString())) { + actualAnno = e.getAnnotation(BarContainer.class); + } + if (repeatableInheritedAnnoContainer.contains( + e.getEnclosingElement().toString()) + || repeatableInheritedAnnoContainer.contains( + e.getSimpleName().toString())) { + actualAnno = e.getAnnotation(BarInheritedContainer.class); + } + if (repeatableContainerInheritedAnnoContainer.contains( + e.getEnclosingElement().toString()) + || repeatableContainerInheritedAnnoContainer.contains( + e.getSimpleName().toString())) { + actualAnno = e.getAnnotation(BarInheritedContainerContainer.class); + } + if (unofficialAnnoContainer.contains( + e.getEnclosingElement().toString()) + || unofficialAnnoContainer.contains( + e.getSimpleName().toString())) { + actualAnno = e.getAnnotation(UnofficialContainer.class); + } + if (unofficialInheritedAnnoContainer.contains( + e.getEnclosingElement().toString()) + || unofficialInheritedAnnoContainer.contains( + e.getSimpleName().toString())) { + actualAnno = e.getAnnotation(UnofficialInheritedContainer.class); + } + return actualAnno; + } + + private Annotation[] getAnnotationsBase(Element e) { + Annotation[] actualAnnosArgs = specialAnnoArray; + + if (singularAnno.contains( + e.getEnclosingElement().toString()) + || singularAnno.contains( + e.getSimpleName().toString()) + || unofficialAnno.contains( + e.getEnclosingElement().toString()) + || unofficialAnno.contains( + e.getSimpleName().toString())) { + actualAnnosArgs = e.getAnnotationsByType(Foo.class); + } + if (singularInheritedAnno.contains( + e.getEnclosingElement().toString()) + || singularInheritedAnno.contains( + e.getSimpleName().toString()) + || unofficialInheritedAnno.contains( + e.getEnclosingElement().toString()) + || unofficialInheritedAnno.contains( + e.getSimpleName().toString())) { + actualAnnosArgs = e.getAnnotationsByType(FooInherited.class); + } + if (repeatableAnno.contains( + e.getEnclosingElement().toString()) + || repeatableAnno.contains( + e.getSimpleName().toString())) { + actualAnnosArgs = e.getAnnotationsByType(Bar.class); + } + if (repeatableInheritedAnno.contains( + e.getEnclosingElement().toString()) + || repeatableInheritedAnno.contains( + e.getSimpleName().toString())) { + actualAnnosArgs = e.getAnnotationsByType(BarInherited.class); + } + if (repeatableContainerInheritedAnno.contains( + e.getEnclosingElement().toString()) + || repeatableContainerInheritedAnno.contains( + e.getSimpleName().toString())) { + actualAnnosArgs = e.getAnnotationsByType(BarInheritedContainer.class); + } + return actualAnnosArgs; + } + + private Annotation[] getAnnotationsContainer(Element e) { + Annotation[] actualAnnosArgs = specialAnnoArray; + + if (repeatableAnnoContainer.contains( + e.getEnclosingElement().toString()) + || repeatableAnnoContainer.contains( + e.getSimpleName().toString())) { + actualAnnosArgs = e.getAnnotationsByType(BarContainer.class); + } + if (repeatableInheritedAnnoContainer.contains( + e.getEnclosingElement().toString()) + || repeatableInheritedAnnoContainer.contains( + e.getSimpleName().toString())) { + actualAnnosArgs = e.getAnnotationsByType(BarInheritedContainer.class); + } + if (repeatableContainerInheritedAnnoContainer.contains( + e.getEnclosingElement().toString()) + || repeatableContainerInheritedAnnoContainer.contains( + e.getSimpleName().toString())) { + actualAnnosArgs = e.getAnnotationsByType(BarInheritedContainerContainer.class); + } + if (unofficialAnnoContainer.contains( + e.getEnclosingElement().toString()) + || unofficialAnnoContainer.contains( + e.getSimpleName().toString())) { + actualAnnosArgs = e.getAnnotationsByType(UnofficialContainer.class); + } + if (unofficialInheritedAnnoContainer.contains( + e.getEnclosingElement().toString()) + || unofficialInheritedAnnoContainer.contains( + e.getSimpleName().toString())) { + actualAnnosArgs = e.getAnnotationsByType(UnofficialInheritedContainer.class); + } + return actualAnnosArgs; + } + + // Array comparison: Length should be same and all expected values + // should be present in actualAnnos[]. + private boolean compareArrVals(Annotation[] actualAnnos, String[] expectedAnnos) { + // Look if test case was run. + if (actualAnnos == specialAnnoArray) { + return false; // no testcase matches + } + if (actualAnnos.length != expectedAnnos.length) { + System.out.println("Length not same. " + + " actualAnnos length = " + actualAnnos.length + + " expectedAnnos length = " + expectedAnnos.length); + printArrContents(actualAnnos); + printArrContents(expectedAnnos); + return false; + } else { + int i = 0; + String[] actualArr = new String[actualAnnos.length]; + for (Annotation a : actualAnnos) { + actualArr[i++] = a.toString(); + } + List<String> actualList = Arrays.asList(actualArr); + List<String> expectedList = Arrays.asList(expectedAnnos); + + if (!actualList.containsAll(expectedList)) { + System.out.println("Array values are not same"); + printArrContents(actualAnnos); + printArrContents(expectedAnnos); + return false; + } + } + return true; + } + + // Array comparison: Length should be same and all expected values + // should be present in actualAnnos List<?>. + private boolean compareArrVals(List<? extends AnnotationMirror> actualAnnos, + String[] expectedAnnos) { + // Look if test case was run. + if (actualAnnos == specialAnnoMirrors) { + return false; //no testcase run + } + if (actualAnnos.size() != expectedAnnos.length) { + System.out.println("Length not same. " + + " actualAnnos length = " + actualAnnos.size() + + " expectedAnnos length = " + expectedAnnos.length); + printArrContents(actualAnnos); + printArrContents(expectedAnnos); + return false; + } else { + int i = 0; + String[] actualArr = new String[actualAnnos.size()]; + String annoTypeName = ""; + for (AnnotationMirror annotationMirror : actualAnnos) { + if (annotationMirror.getAnnotationType().toString().contains("Expected")) { + annoTypeName = annotationMirror.getAnnotationType().toString(); + } else { + annoTypeName = annotationMirror.toString(); + } + actualArr[i++] = annoTypeName; + } + List<String> actualList = Arrays.asList(actualArr); + List<String> expectedList = Arrays.asList(expectedAnnos); + + if (!actualList.containsAll(expectedList)) { + System.out.println("Array values are not same"); + printArrContents(actualAnnos); + printArrContents(expectedAnnos); + return false; + } + } + return true; + } + + private void printArrContents(Annotation[] actualAnnos) { + for (Annotation a : actualAnnos) { + System.out.println("actualAnnos values = " + a); + } + } + + private void printArrContents(String[] expectedAnnos) { + for (String s : expectedAnnos) { + System.out.println("expectedAnnos values = " + s); + } + } + + private void printArrContents(List<? extends AnnotationMirror> actualAnnos) { + for (AnnotationMirror annotationMirror : actualAnnos) { + System.out.println("actualAnnos values = " + annotationMirror); + } + } + + private boolean compareAnnotation(Annotation actualAnno, String expectedAnno) { + //String actualAnnoName = ""; + boolean isSame = true; + // Look if test case was run. + if (actualAnno == specialAnno) { + return false; //no testcase run + } + if (actualAnno != null) { + if (!actualAnno.toString().equalsIgnoreCase(expectedAnno)) { + System.out.println("Anno did not match. " + + " expectedAnno = " + expectedAnno + + " actualAnno = " + actualAnno); + isSame = false; + } else { + isSame = true; + } + } else { + if (expectedAnno.compareToIgnoreCase("null") == 0) { + isSame = true; + } else { + System.out.println("Actual anno is null"); + isSame = false; + } + } + return isSame; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerBasicTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,119 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only + * MixRepeatableAndOfficialContainerBasicTest.java + */ + +@ExpectedBase( + value = Bar.class, + getAnnotation = "@Bar(value=0)", + getAnnotationsByType = { + "@Bar(value=0)", + "@Bar(value=1)", + "@Bar(value=2)" + }, + getAllAnnotationMirrors = { + "@Bar(0)", + "@BarContainer({@Bar(1), @Bar(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@Bar(0)", + "@BarContainer({@Bar(1), @Bar(2)})", + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer( + value = BarContainer.class, + getAnnotation = "@BarContainer(value=[@Bar(value=1), @Bar(value=2)])", + getAnnotationsByType = {"@BarContainer(value=[@Bar(value=1), @Bar(value=2)])"}) +@Bar(value = 0) +@BarContainer(value = {@Bar(value = 1), @Bar(value = 2)}) +class MixRepeatableAndOfficialContainerBasicTest { + + @ExpectedBase( + value = Bar.class, + getAnnotation = "@Bar(value=0)", + getAnnotationsByType = { + "@Bar(value=0)", + "@Bar(value=1)", + "@Bar(value=2)" + }, + getAllAnnotationMirrors = { + "@Bar(0)", + "@BarContainer({@Bar(1), @Bar(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@Bar(0)", + "@BarContainer({@Bar(1), @Bar(2)})", + "ExpectedBase", + "ExpectedContainer" + }) + @ExpectedContainer( + value = BarContainer.class, + getAnnotation = "@BarContainer(value=[@Bar(value=1), @Bar(value=2)])", + getAnnotationsByType = {"@BarContainer(value=[@Bar(value=1), @Bar(value=2)])"}) + @Bar(value = 0) + @BarContainer(value = {@Bar(value = 1), @Bar(value = 2)}) + int testField = 0; + + @ExpectedBase( + value = Bar.class, + getAnnotation = "@Bar(value=0)", + getAnnotationsByType = { + "@Bar(value=0)", + "@Bar(value=1)", + "@Bar(value=2)" + }, + getAllAnnotationMirrors = { + "@Bar(0)", + "@BarContainer({@Bar(1), @Bar(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@Bar(0)", + "@BarContainer({@Bar(1), @Bar(2)})", + "ExpectedBase", + "ExpectedContainer" + }) + @ExpectedContainer( + value = BarContainer.class, + getAnnotation = "@BarContainer(value=[@Bar(value=1), @Bar(value=2)])", + getAnnotationsByType = {"@BarContainer(value=[@Bar(value=1), @Bar(value=2)])"}) + @Bar(value = 0) + @BarContainer(value = {@Bar(value = 1), @Bar(value = 2)}) + void testMethod() {} + }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA1Test.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,65 @@ +/* + * 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. + */ + +/* + * @ignore + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only + * MixRepeatableAndOfficialContainerInheritedA1Test.java + */ + +@BarInherited(value = 0) +class E {} + +@ExpectedBase( + value = BarInherited.class, + getAnnotation = "@BarInherited(value=0)", + getAnnotationsByType = { + "@BarInherited(value=1)", + "@BarInherited(value=2)" + }, + getAllAnnotationMirrors = { + "@BarInherited(0)", + "@BarInheritedContainer({@BarInherited(1), @BarInherited(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@BarInheritedContainer({@BarInherited(1), @BarInherited(2)})", + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer( + value = BarInheritedContainer.class, + getAnnotation = "@BarInheritedContainer(" + + "value=[@BarInherited(value=1), @BarInherited(value=2)])", + getAnnotationsByType = {"@BarInheritedContainer(" + + "value=[@BarInherited(value=1), @BarInherited(value=2)])"}) +@BarInheritedContainer(value = {@BarInherited(value = 1), @BarInherited(value = 2)}) +class MixRepeatableAndOfficialContainerInheritedA1Test extends E {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA2Test.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,67 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only + * MixRepeatableAndOfficialContainerInheritedA2Test.java + */ + +@BarInherited(value = 0) +class N {} + +@ExpectedBase( + value = BarInherited.class, + getAnnotation = "@BarInherited(value=3)", + getAnnotationsByType = { + "@BarInherited(value=1)", + "@BarInherited(value=2)", + "@BarInherited(value=3)" + }, + getAllAnnotationMirrors = { + "@BarInherited(3)", + "@BarInheritedContainer({@BarInherited(1), @BarInherited(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@BarInherited(3)", + "@BarInheritedContainer({@BarInherited(1), @BarInherited(2)})", + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer( + value = BarInheritedContainer.class, + getAnnotation = "@BarInheritedContainer(" + + "value=[@BarInherited(value=1), @BarInherited(value=2)])", + getAnnotationsByType = {"@BarInheritedContainer(" + + "value=[@BarInherited(value=1), @BarInherited(value=2)])"}) +@BarInheritedContainer(value = {@BarInherited(value = 1), @BarInherited(value = 2)}) +@BarInherited(value = 3) +class MixRepeatableAndOfficialContainerInheritedA2Test extends N {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB1Test.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,62 @@ +/* + * 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. + */ + +/* + * @ignore + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only + * MixRepeatableAndOfficialContainerInheritedB1Test.java + */ + +@BarInheritedContainer(value = {@BarInherited(value = 1), @BarInherited(value = 2)}) +class M {} + +@ExpectedBase( + value = BarInherited.class, + getAnnotation = "@BarInherited(value=0)", + getAnnotationsByType = {"@BarInherited(value=0)"}, + getAllAnnotationMirrors = { + "@BarInherited(0)", + "@BarInheritedContainer({@BarInherited(1), @BarInherited(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@BarInherited(0)", + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer( + value = BarInheritedContainer.class, + getAnnotation = "@BarInheritedContainer(" + + "value=[@BarInherited(value=1), @BarInherited(value=2)])", + getAnnotationsByType = {"@BarInheritedContainer(" + + "value=[@BarInherited(value=1), @BarInherited(value=2)])"}) +@BarInherited(value = 0) +class MixRepeatableAndOfficialContainerInheritedB1Test extends M {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB2Test.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,63 @@ +/* + * 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. + */ + +/* + * @ignore + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only + * MixRepeatableAndOfficialContainerInheritedB2Test.java + */ + +@BarInheritedContainer(value = {@BarInherited(value = 1), @BarInherited(value = 2)}) +@BarInherited(value = 3) +class H {} + +@ExpectedBase( + value = BarInherited.class, + getAnnotation = "@BarInherited(value=0)", + getAnnotationsByType = {"@BarInherited(value=0)"}, + getAllAnnotationMirrors = { + "@BarInherited(0)", + "@BarInheritedContainer({@BarInherited(1), @BarInherited(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@BarInherited(0)", + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer( + value = BarInheritedContainer.class, + getAnnotation = "@BarInheritedContainer(" + + "value=[@BarInherited(value=1), @BarInherited(value=2)])", + getAnnotationsByType = {"@BarInheritedContainer(" + + "value=[@BarInherited(value=1), @BarInherited(value=2)])"}) +@BarInherited(value = 0) +class MixRepeatableAndOfficialContainerInheritedB2Test extends H {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerBasicTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,112 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only MixSingularAndUnofficialContainerBasicTest.java + */ + +@ExpectedBase( + value = Foo.class, + getAnnotation = "@Foo(value=0)", + getAnnotationsByType = {"@Foo(value=0)"}, + getAllAnnotationMirrors = { + "@Foo(0)", + "@UnofficialContainer({@Foo(1), @Foo(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@Foo(0)", + "@UnofficialContainer({@Foo(1), @Foo(2)})", + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer( + value = UnofficialContainer.class, + getAnnotation = "@UnofficialContainer(" + + "value=[@Foo(value=1), @Foo(value=2)])", + getAnnotationsByType = {"@UnofficialContainer(" + + "value=[@Foo(value=1), @Foo(value=2)])"}) +@Foo(value = 0) +@UnofficialContainer(value = {@Foo(value = 1), @Foo(value = 2)}) +class MixSingularAndUnofficialContainerBasicTest { + + @ExpectedBase( + value = Foo.class, + getAnnotation = "@Foo(value=0)", + getAnnotationsByType = {"@Foo(value=0)"}, + getAllAnnotationMirrors = { + "@Foo(0)", + "@UnofficialContainer({@Foo(1), @Foo(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@Foo(0)", + "@UnofficialContainer({@Foo(1), @Foo(2)})", + "ExpectedBase", + "ExpectedContainer" + }) + @ExpectedContainer( + value = UnofficialContainer.class, + getAnnotation = "@UnofficialContainer(" + + "value=[@Foo(value=1), @Foo(value=2)])", + getAnnotationsByType = {"@UnofficialContainer(" + + "value=[@Foo(value=1), @Foo(value=2)])"}) + @Foo(value = 0) + @UnofficialContainer(value = {@Foo(value = 1), @Foo(value = 2)}) + int testField = 0; + + @ExpectedBase( + value = Foo.class, + getAnnotation = "@Foo(value=0)", + getAnnotationsByType = {"@Foo(value=0)"}, + getAllAnnotationMirrors = { + "@Foo(0)", + "@UnofficialContainer({@Foo(1), @Foo(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@Foo(0)", + "@UnofficialContainer({@Foo(1), @Foo(2)})", + "ExpectedBase", + "ExpectedContainer" + }) + @ExpectedContainer( + value = UnofficialContainer.class, + getAnnotation = "@UnofficialContainer(" + + "value=[@Foo(value=1), @Foo(value=2)])", + getAnnotationsByType = {"@UnofficialContainer(" + + "value=[@Foo(value=1), @Foo(value=2)])"}) + @Foo(value = 0) + @UnofficialContainer(value = {@Foo(value = 1), @Foo(value = 2)}) + void testMethod() {} +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA1Test.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,61 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only + * MixSingularAndUnofficialContainerInheritedA1Test.java + */ + +@FooInherited(value = 0) +class L {} + +@ExpectedBase( + value = FooInherited.class, + getAnnotation = "@FooInherited(value=0)", + getAnnotationsByType = {"@FooInherited(value=0)"}, + getAllAnnotationMirrors = { + "@FooInherited(0)", + "@UnofficialInheritedContainer({@FooInherited(1), @FooInherited(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@UnofficialInheritedContainer({@FooInherited(1), @FooInherited(2)})", + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer( + value = UnofficialInheritedContainer.class, + getAnnotation = "@UnofficialInheritedContainer(" + + "value=[@FooInherited(value=1), @FooInherited(value=2)])", + getAnnotationsByType = {"@UnofficialInheritedContainer(" + + "value=[@FooInherited(value=1), @FooInherited(value=2)])"}) +@UnofficialInheritedContainer(value = {@FooInherited(value = 1), @FooInherited(value = 2)}) +class MixSingularAndUnofficialContainerInheritedA1Test extends L {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA2Test.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,63 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only + * MixSingularAndUnofficialContainerInheritedA2Test.java + */ + +@FooInherited(value = 0) +class K {} + +@ExpectedBase( + value = FooInherited.class, + getAnnotation = "@FooInherited(value=3)", + getAnnotationsByType = {"@FooInherited(value=3)"}, + getAllAnnotationMirrors = { + "@FooInherited(3)", + "@UnofficialInheritedContainer({@FooInherited(1), @FooInherited(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@UnofficialInheritedContainer({@FooInherited(1), @FooInherited(2)})", + "@FooInherited(3)", + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer( + value = UnofficialInheritedContainer.class, + getAnnotation = "@UnofficialInheritedContainer(" + + "value=[@FooInherited(value=1), @FooInherited(value=2)])", + getAnnotationsByType = {"@UnofficialInheritedContainer(" + + "value=[@FooInherited(value=1), @FooInherited(value=2)])"}) +@UnofficialInheritedContainer(value = {@FooInherited(value = 1), @FooInherited(value = 2)}) +@FooInherited(value = 3) +class MixSingularAndUnofficialContainerInheritedA2Test extends K {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB1Test.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,61 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only + * MixSingularAndUnofficialContainerInheritedB1Test.java + */ + +@UnofficialInheritedContainer(value = {@FooInherited(value = 1),@FooInherited(value = 2)}) +class J {} + +@ExpectedBase( + value = FooInherited.class, + getAnnotation = "@FooInherited(value=0)", + getAnnotationsByType = {"@FooInherited(value=0)"}, + getAllAnnotationMirrors = { + "@FooInherited(0)", + "@UnofficialInheritedContainer({@FooInherited(1), @FooInherited(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@FooInherited(0)", + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer( + value = UnofficialInheritedContainer.class, + getAnnotation = "@UnofficialInheritedContainer(" + + "value=[@FooInherited(value=1), @FooInherited(value=2)])", + getAnnotationsByType = {"@UnofficialInheritedContainer(" + + "value=[@FooInherited(value=1), @FooInherited(value=2)])"}) +@FooInherited(value = 0) +class MixSingularAndUnofficialContainerInheritedB1Test extends J {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB2Test.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,62 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only + * MixSingularAndUnofficialContainerInheritedB2Test.java + */ + +@UnofficialInheritedContainer(value = {@FooInherited(value = 1), @FooInherited(value = 2)}) +@FooInherited(value = 3) +class G {} + +@ExpectedBase( + value = FooInherited.class, + getAnnotation = "@FooInherited(value=0)", + getAnnotationsByType = {"@FooInherited(value=0)"}, + getAllAnnotationMirrors = { + "@FooInherited(0)", + "@UnofficialInheritedContainer({@FooInherited(1), @FooInherited(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@FooInherited(0)", + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer( + value = UnofficialInheritedContainer.class, + getAnnotation = "@UnofficialInheritedContainer(" + + "value=[@FooInherited(value=1), @FooInherited(value=2)])", + getAnnotationsByType = {"@UnofficialInheritedContainer(" + + "value=[@FooInherited(value=1), @FooInherited(value=2)])"}) +@FooInherited(value = 0) +class MixSingularAndUnofficialContainerInheritedB2Test extends G{}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerBasicTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,106 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only OfficialContainerBasicTest.java + */ + +@ExpectedBase( + value = Bar.class, + getAnnotation = "null", + getAnnotationsByType = { + "@Bar(value=1)", + "@Bar(value=2)" + }, + getAllAnnotationMirrors = { + "@BarContainer({@Bar(1), @Bar(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@BarContainer({@Bar(1), @Bar(2)})", + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer( + value = BarContainer.class, + getAnnotation = "@BarContainer(value=[@Bar(value=1), @Bar(value=2)])", + getAnnotationsByType = {"@BarContainer(value=[@Bar(value=1), @Bar(value=2)])"}) +@BarContainer(value = {@Bar(value = 1), @Bar(value = 2)}) +class OfficialContainerBasicTest { + + @ExpectedBase( + value = Bar.class, + getAnnotation = "null", + getAnnotationsByType = { + "@Bar(value=1)", + "@Bar(value=2)" + }, + getAllAnnotationMirrors = { + "@BarContainer({@Bar(1), @Bar(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@BarContainer({@Bar(1), @Bar(2)})", + "ExpectedBase", + "ExpectedContainer" + }) + @ExpectedContainer( + value = BarContainer.class, + getAnnotation = "@BarContainer(value=[@Bar(value=1), @Bar(value=2)])", + getAnnotationsByType = {"@BarContainer(value=[@Bar(value=1), @Bar(value=2)])"}) + @BarContainer(value = {@Bar(value = 1), @Bar(value = 2)}) + int testField = 0; + + @ExpectedBase( + value = Bar.class, + getAnnotation = "null", + getAnnotationsByType = { + "@Bar(value=1)", + "@Bar(value=2)" + }, + getAllAnnotationMirrors = { + "@BarContainer({@Bar(1), @Bar(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@BarContainer({@Bar(1), @Bar(2)})", + "ExpectedBase", + "ExpectedContainer" + }) + @ExpectedContainer( + value = BarContainer.class, + getAnnotation = "@BarContainer(value=[@Bar(value=1), @Bar(value=2)])", + getAnnotationsByType = {"@BarContainer(value=[@Bar(value=1), @Bar(value=2)])"}) + @BarContainer(value = {@Bar(value = 1), @Bar(value = 2)}) + void testMethod() {} +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerInheritedTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,60 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only OfficialContainerInheritedTest.java + */ + +@BarInheritedContainer(value = {@BarInherited(value = 1), @BarInherited(value = 2)}) +class D {} + +@ExpectedBase( + value = BarInherited.class, + getAnnotation = "null", + getAnnotationsByType = { + "@BarInherited(value=1)", + "@BarInherited(value=2)" + }, + getAllAnnotationMirrors = { + "@BarInheritedContainer({@BarInherited(1), @BarInherited(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer( + value = BarInheritedContainer.class, + getAnnotation = "@BarInheritedContainer(" + + "value=[@BarInherited(value=1), @BarInherited(value=2)])", + getAnnotationsByType = {"@BarInheritedContainer(" + + "value=[@BarInherited(value=1), @BarInherited(value=2)])"}) +class OfficialContainerInheritedTest extends D {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableBasicTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,109 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only RepeatableBasicTest.java + */ + +@ExpectedBase( + value = Bar.class, + getAnnotation = "null", + getAnnotationsByType = { + "@Bar(value=1)", + "@Bar(value=2)" + }, + getAllAnnotationMirrors = { + "@BarContainer({@Bar(1), @Bar(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@BarContainer({@Bar(1), @Bar(2)})", + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer( + value = BarContainer.class, + getAnnotation = "@BarContainer(value=[@Bar(value=1), @Bar(value=2)])", + getAnnotationsByType = {"@BarContainer(value=[@Bar(value=1), @Bar(value=2)])"}) +@Bar(value = 1) +@Bar(value = 2) +class RepeatableBasicTest { + + @ExpectedBase( + value = Bar.class, + getAnnotation = "null", + getAnnotationsByType = { + "@Bar(value=1)", + "@Bar(value=2)" + }, + getAllAnnotationMirrors = { + "@BarContainer({@Bar(1), @Bar(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@BarContainer({@Bar(1), @Bar(2)})", + "ExpectedBase", + "ExpectedContainer" + }) + @ExpectedContainer( + value = BarContainer.class, + getAnnotation = "@BarContainer(value=[@Bar(value=1), @Bar(value=2)])", + getAnnotationsByType = {"@BarContainer(value=[@Bar(value=1), @Bar(value=2)])"}) + @Bar(value = 1) + @Bar(value = 2) + int testField = 0; + + @ExpectedBase( + value = Bar.class, + getAnnotation = "null", + getAnnotationsByType = { + "@Bar(value=1)", + "@Bar(value=2)" + }, + getAllAnnotationMirrors = { + "@BarContainer({@Bar(1), @Bar(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@BarContainer({@Bar(1), @Bar(2)})", + "ExpectedBase", + "ExpectedContainer" + }) + @ExpectedContainer( + value = BarContainer.class, + getAnnotation = "@BarContainer(value=[@Bar(value=1), @Bar(value=2)])", + getAnnotationsByType = {"@BarContainer(value=[@Bar(value=1), @Bar(value=2)])"}) + @Bar(value = 1) + @Bar(value = 2) + void testMethod() {} +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableInheritedTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,61 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only RepeatableInheritedTest.java + */ + +@BarInherited(value = 1) +@BarInherited(value = 2) +class I {} + +@ExpectedBase( + value = BarInherited.class, + getAnnotation = "null", + getAnnotationsByType = { + "@BarInherited(value=1)", + "@BarInherited(value=2)" + }, + getAllAnnotationMirrors = { + "@BarInheritedContainer({@BarInherited(1), @BarInherited(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer( + value = BarInheritedContainer.class, + getAnnotation = "@BarInheritedContainer(" + + "value=[@BarInherited(value=1), @BarInherited(value=2)])", + getAnnotationsByType = {"@BarInheritedContainer(" + + "value=[@BarInherited(value=1), @BarInherited(value=2)])"}) +class RepeatableInheritedTest extends I {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerBasicTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,106 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only RepeatableOfficialContainerBasicTest.java + */ + +@ExpectedBase( + value = Bar.class, + getAnnotation = "null", + getAnnotationsByType = {}, + getAllAnnotationMirrors = { + "@BarContainerContainer({@BarContainer({@Bar(1)}), @BarContainer({@Bar(2)})})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@BarContainerContainer({@BarContainer({@Bar(1)}), @BarContainer({@Bar(2)})})", + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer( + value = BarContainer.class, + getAnnotation = "null", + getAnnotationsByType = { + "@BarContainer(value=[@Bar(value=1)])", + "@BarContainer(value=[@Bar(value=2)])"}) +@BarContainer(value = {@Bar(value = 1)}) +@BarContainer(value = {@Bar(value = 2)}) +class RepeatableOfficialContainerBasicTest { + + @ExpectedBase( + value = Bar.class, + getAnnotation = "null", + getAnnotationsByType = {}, + getAllAnnotationMirrors = { + "@BarContainerContainer({@BarContainer({@Bar(1)}), @BarContainer({@Bar(2)})})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@BarContainerContainer({@BarContainer({@Bar(1)}), @BarContainer({@Bar(2)})})", + "ExpectedBase", + "ExpectedContainer" + }) + @ExpectedContainer( + value = BarContainer.class, + getAnnotation = "null", + getAnnotationsByType = { + "@BarContainer(value=[@Bar(value=1)])", + "@BarContainer(value=[@Bar(value=2)])"}) + @BarContainer(value = {@Bar(value = 1)}) + @BarContainer(value = {@Bar(value = 2)}) + int testField = 0; + + @ExpectedBase( + value = Bar.class, + getAnnotation = "null", + getAnnotationsByType = {}, + getAllAnnotationMirrors = { + "@BarContainerContainer({@BarContainer({@Bar(1)}), @BarContainer({@Bar(2)})})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@BarContainerContainer({@BarContainer({@Bar(1)}), @BarContainer({@Bar(2)})})", + "ExpectedBase", + "ExpectedContainer" + }) + @ExpectedContainer( + value = BarContainer.class, + getAnnotation = "null", + getAnnotationsByType = { + "@BarContainer(value=[@Bar(value=1)])", + "@BarContainer(value=[@Bar(value=2)])"}) + @BarContainer(value = {@Bar(value = 1)}) + @BarContainer(value = {@Bar(value = 2)}) + void testMethod() {} +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerInheritedTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,66 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only + * RepeatableOfficialContainerInheritedTest.java + */ + +@BarInheritedContainer(value = {@BarInherited(value = 1)}) +@BarInheritedContainer(value = {@BarInherited(value = 2)}) +class O {} + +@ExpectedBase( + value = BarInheritedContainer.class, + getAnnotation = "null", + getAnnotationsByType = { + "@BarInheritedContainer(value=[@BarInherited(value=1)])", + "@BarInheritedContainer(value=[@BarInherited(value=2)])" + }, + getAllAnnotationMirrors = { + "@BarInheritedContainerContainer(" + + "{@BarInheritedContainer({@BarInherited(1)})," + + " @BarInheritedContainer({@BarInherited(2)})})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer( + value = BarInheritedContainerContainer.class, + getAnnotation = "@BarInheritedContainerContainer(" + + "value=[@BarInheritedContainer(value=[@BarInherited(value=1)])," + + " @BarInheritedContainer(value=[@BarInherited(value=2)])])", + getAnnotationsByType = {"@BarInheritedContainerContainer(" + + "value=[@BarInheritedContainer(value=[@BarInherited(value=1)])," + + " @BarInheritedContainer(value=[@BarInherited(value=2)])])"}) +class RepeatableOfficialContainerInheritedTest extends O {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideATest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,62 @@ +/* + * 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. + */ + +/* + * @ignore + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only RepeatableOverrideATest.java + */ + +@BarInherited(value = 1) +@BarInherited(value = 2) +class B {} + +@ExpectedBase( + value = BarInherited.class, + getAnnotation = "@BarInherited(value=3)", + getAnnotationsByType = {"@BarInherited(value=3)"}, + getAllAnnotationMirrors = { + "@BarInherited(3)", + "@BarInheritedContainer({@BarInherited(1), @BarInherited(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@BarInherited(3)", + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer( + value = BarInheritedContainer.class, + getAnnotation = "@BarInheritedContainer(" + + "value=[@BarInherited(value=1), @BarInherited(value=2)])", + getAnnotationsByType = {"@BarInheritedContainer(" + + "value=[@BarInherited(value=1), @BarInherited(value=2)])"}) +@BarInherited(value = 3) +class RepeatableOverrideATest extends B {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideBTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,65 @@ +/* + * 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. + */ + +/* + * @ignore + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only RepeatableOverrideBTest.java + */ + +@BarInherited(value = 0) +class C {} + +@ExpectedBase( + value = BarInherited.class, + getAnnotation = "@BarInherited(value=0)", + getAnnotationsByType = { + "@BarInherited(value=1)", + "@BarInherited(value=2)" + }, + getAllAnnotationMirrors = { + "@BarInherited(0)", + "@BarInheritedContainer({@BarInherited(1), @BarInherited(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@BarInheritedContainer({@BarInherited(1), @BarInherited(2)})", + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer( + value = BarInheritedContainer.class, + getAnnotation = "@BarInheritedContainer(" + + "value=[@BarInherited(value=1), @BarInherited(value=2)])", + getAnnotationsByType = {"@BarInheritedContainer(" + + "value=[@BarInherited(value=1), @BarInherited(value=2)])"}) +@BarInherited(value = 1) +@BarInherited(value = 2) +class RepeatableOverrideBTest extends C {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/SingularBasicTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,89 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only SingularBasicTest.java + */ + +@ExpectedBase( + value = Foo.class, + getAnnotation = "@Foo(value=0)", + getAnnotationsByType = {"@Foo(value=0)"}, + getAllAnnotationMirrors = { + "@Foo(0)", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@Foo(0)", + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer +@Foo(value = 0) +public class SingularBasicTest { + + @ExpectedBase( + value = Foo.class, + getAnnotation = "@Foo(value=0)", + getAnnotationsByType = {"@Foo(value=0)"}, + getAllAnnotationMirrors = { + "@Foo(0)", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@Foo(0)", + "ExpectedBase", + "ExpectedContainer" + }) + @ExpectedContainer + @Foo(value = 0) + int testField = 0; + + @ExpectedBase( + value = Foo.class, + getAnnotation = "@Foo(value=0)", + getAnnotationsByType = {"@Foo(value=0)"}, + getAllAnnotationMirrors = { + "@Foo(0)", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@Foo(0)", + "ExpectedBase", + "ExpectedContainer" + }) + @ExpectedContainer + @Foo(value = 0) + void testMethod() { + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/SingularInheritedATest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,52 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only SingularInheritedATest.java + */ + +@FooInherited(value = 0) +class A {} + +@ExpectedBase( + value = FooInherited.class, + getAnnotation = "@FooInherited(value=0)", + getAnnotationsByType = {"@FooInherited(value=0)"}, + getAllAnnotationMirrors = { + "@FooInherited(0)", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer +class SingularInheritedATest extends A {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/SingularInheritedBTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,57 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only SingularInheritedBTest.java + */ + +@FooInherited(value = 1) +class P {} + +@ExpectedBase( + value = FooInherited.class, + getAnnotation = "@FooInherited(value=2)", + getAnnotationsByType = {"@FooInherited(value=2)"}, + getAllAnnotationMirrors = { + "@FooInherited(2)", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@FooInherited(2)", + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer( + value = UnofficialInheritedContainer.class, + getAnnotation = "null", + getAnnotationsByType = {}) +@FooInherited(value = 2) +class SingularInheritedBTest extends P {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerBasicTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,97 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only UnofficialContainerBasicTest.java + */ + +@ExpectedBase( + value = Foo.class, + getAnnotation = "null", + getAnnotationsByType = {}, + getAllAnnotationMirrors = { + "@UnofficialContainer({@Foo(1), @Foo(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@UnofficialContainer({@Foo(1), @Foo(2)})", + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer( + value = UnofficialContainer.class, + getAnnotation = "@UnofficialContainer(value=[@Foo(value=1), @Foo(value=2)])", + getAnnotationsByType = {"@UnofficialContainer(value=[@Foo(value=1), @Foo(value=2)])"}) +@UnofficialContainer(value = {@Foo(value = 1), @Foo(value = 2)}) +class UnofficialContainerBasicTest { + + @ExpectedBase( + value = Foo.class, + getAnnotation = "null", + getAnnotationsByType = {}, + getAllAnnotationMirrors = { + "@UnofficialContainer({@Foo(1), @Foo(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@UnofficialContainer({@Foo(1), @Foo(2)})", + "ExpectedBase", + "ExpectedContainer" + }) + @ExpectedContainer( + value = UnofficialContainer.class, + getAnnotation = "@UnofficialContainer(value=[@Foo(value=1), @Foo(value=2)])", + getAnnotationsByType = {"@UnofficialContainer(value=[@Foo(value=1), @Foo(value=2)])"}) + @UnofficialContainer(value = {@Foo(value = 1), @Foo(value = 2)}) + int testField = 0; + + @ExpectedBase( + value = Foo.class, + getAnnotation = "null", + getAnnotationsByType = {}, + getAllAnnotationMirrors = { + "@UnofficialContainer({@Foo(1), @Foo(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "@UnofficialContainer({@Foo(1), @Foo(2)})", + "ExpectedBase", + "ExpectedContainer" + }) + @ExpectedContainer( + value = UnofficialContainer.class, + getAnnotation = "@UnofficialContainer(value=[@Foo(value=1), @Foo(value=2)])", + getAnnotationsByType = {"@UnofficialContainer(value=[@Foo(value=1), @Foo(value=2)])"}) + @UnofficialContainer(value = {@Foo(value = 1), @Foo(value = 2)}) + void testMethod() {} +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerInheritedTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,58 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8004822 + * @author mnunez + * @summary Language model api test basics for repeating annotations + * @library /tools/javac/lib + * @library supportingAnnotations + * @build JavacTestingAbstractProcessor ElementRepAnnoTester + * @compile -processor ElementRepAnnoTester -proc:only + * UnofficialContainerInheritedTest.java + */ + +@UnofficialInheritedContainer(value = {@FooInherited(value = 1),@FooInherited(value = 2)}) +class F {} + +@ExpectedBase( + value = FooInherited.class, + getAnnotation = "null", + getAnnotationsByType = {}, + getAllAnnotationMirrors = { + "@UnofficialInheritedContainer({@FooInherited(1), @FooInherited(2)})", + "ExpectedBase", + "ExpectedContainer" + }, + getAnnotationMirrors = { + "ExpectedBase", + "ExpectedContainer" + }) +@ExpectedContainer( + value = UnofficialInheritedContainer.class, + getAnnotation = "@UnofficialInheritedContainer(" + + "value=[@FooInherited(value=1), @FooInherited(value=2)])", + getAnnotationsByType = {"@UnofficialInheritedContainer(" + + "value=[@FooInherited(value=1), @FooInherited(value=2)])"}) +class UnofficialContainerInheritedTest extends F {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/Bar.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,32 @@ +/* + * 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. + */ + +import java.lang.annotation.*; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +@Repeatable(BarContainer.class) +public @interface Bar { + int value(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarContainer.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,32 @@ +/* + * 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. + */ + +import java.lang.annotation.*; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +@Repeatable(BarContainerContainer.class) +public @interface BarContainer { + Bar[] value(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarContainerContainer.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,32 @@ +/* + * 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. + */ + +import java.lang.annotation.*; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +@Inherited +public @interface BarContainerContainer { + BarContainer[] value(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarInherited.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,33 @@ +/* + * 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. + */ + +import java.lang.annotation.*; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +@Inherited +@Repeatable(BarInheritedContainer.class) +public @interface BarInherited { + int value(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarInheritedContainer.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,33 @@ +/* + * 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. + */ + +import java.lang.annotation.*; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +@Inherited +@Repeatable(BarInheritedContainerContainer.class) +public @interface BarInheritedContainer { + BarInherited[] value(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarInheritedContainerContainer.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,32 @@ +/* + * 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. + */ + +import java.lang.annotation.*; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +@Inherited +public @interface BarInheritedContainerContainer { + BarInheritedContainer[] value(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/ExpectedBase.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,36 @@ +/* + * 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. + */ + +import java.lang.annotation.Annotation; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface ExpectedBase { + Class<? extends Annotation> value() default Annotation.class; + String getAnnotation() default ""; + String[] getAllAnnotationMirrors() default {}; + String[] getAnnotationMirrors() default {}; + // Java SE 8 methods. + String[] getAnnotationsByType() default {}; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/ExpectedContainer.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,34 @@ +/* + * 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. + */ + +import java.lang.annotation.Annotation; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface ExpectedContainer { + Class<? extends Annotation> value() default Annotation.class; + String getAnnotation() default ""; + // Java SE 8 methods. + String[] getAnnotationsByType() default {}; + }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/Foo.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,30 @@ +/* + * 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. + */ + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface Foo { + int value(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/FooInherited.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,32 @@ +/* + * 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. + */ + +import java.lang.annotation.*; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +@Inherited +public @interface FooInherited { + int value(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/UnofficialContainer.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,30 @@ +/* + * 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. + */ + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface UnofficialContainer { + Foo[] value(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/UnofficialInheritedContainer.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,32 @@ +/* + * 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. + */ + +import java.lang.annotation.*; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +@Inherited +public @interface UnofficialInheritedContainer { + FooInherited[] value(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/processing/model/util/elements/TestIsFunctionalInterface.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,115 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8007574 + * @summary Test Elements.isFunctionalInterface + * @author Joseph D. Darcy + * @library /tools/javac/lib + * @build JavacTestingAbstractProcessor TestIsFunctionalInterface + * @compile -processor TestIsFunctionalInterface TestIsFunctionalInterface.java + */ + +import java.util.Set; +import javax.annotation.processing.*; +import javax.lang.model.SourceVersion; +import static javax.lang.model.SourceVersion.*; +import javax.lang.model.element.*; +import javax.lang.model.util.*; +import static javax.lang.model.util.ElementFilter.*; +import static javax.tools.Diagnostic.Kind.*; +import static javax.tools.StandardLocation.*; +import java.io.*; + +/** + * Test basic workings of Elements.isFunctionalInterface + */ +public class TestIsFunctionalInterface extends JavacTestingAbstractProcessor { + private int count = 0; + public boolean process(Set<? extends TypeElement> annotations, + RoundEnvironment roundEnv) { + if (!roundEnv.processingOver()) { + for(TypeElement type : typesIn(roundEnv.getElementsAnnotatedWith(ExpectedIsFunInt.class))) { + count++; + System.out.println(type); + if (elements.isFunctionalInterface(type) != + type.getAnnotation(ExpectedIsFunInt.class).value()) { + messager.printMessage(ERROR, + "Mismatch between expected and computed isFunctionalInterface", + type); + } + } + } else { + if (count <= 0) + messager.printMessage(ERROR, "No types with ExpectedIsFunInt processed."); + } + return true; + } +} + +@interface ExpectedIsFunInt { + boolean value(); +} + +// Examples below from the lambda specification documents. + +@ExpectedIsFunInt(false) // Equals is already an implicit member +interface Foo1 { boolean equals(Object obj); } + +@ExpectedIsFunInt(true) // Bar has one abstract non-Object method +interface Bar1 extends Foo1 { int compare(String o1, String o2); } + + +@ExpectedIsFunInt(true) // Comparator has one abstract non-Object method +interface LocalComparator<T> { + boolean equals(Object obj); + int compare(T o1, T o2); +} + +@ExpectedIsFunInt(false) // Method Object.clone is not public +interface Foo2 { + int m(); + Object clone(); +} + +interface X1 { int m(Iterable<String> arg); } +interface Y1 { int m(Iterable<String> arg); } +@ExpectedIsFunInt(true) // Two methods, but they have the same signature +interface Z1 extends X1, Y1 {} + +interface X2 { Iterable m(Iterable<String> arg); } +interface Y2 { Iterable<String> m(Iterable arg); } +@ExpectedIsFunInt(true) // Y.m is a subsignature & return-type-substitutable +interface Z2 extends X2, Y2 {} + +interface Action<T> { + T doit(); +} +@ExpectedIsFunInt(true) +interface LocalExecutor { <T> T execute(Action<T> a); } + +interface X5 { <T> T execute(Action<T> a); } +interface Y5 { <S> S execute(Action<S> a); } +@ExpectedIsFunInt(true) // Functional: signatures are "the same" +interface Exec5 extends X5, Y5 {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/profiles/ProfileOptionTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,267 @@ +/* + * Copyright (c) 2011, 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. + */ + +/* + * @test + * @bug 8004182 + * @summary Add support for profiles in javac + */ + +import java.io.PrintWriter; +import java.io.StringWriter; +import java.lang.annotation.Annotation; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.net.URI; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; + +import javax.tools.Diagnostic; +import javax.tools.DiagnosticCollector; +import javax.tools.JavaCompiler; +import javax.tools.JavaFileObject; +import javax.tools.SimpleJavaFileObject; +import javax.tools.StandardJavaFileManager; + +import com.sun.source.util.JavacTask; +import com.sun.tools.javac.api.JavacTool; +import com.sun.tools.javac.jvm.Profile; +import com.sun.tools.javac.jvm.Target; + + +public class ProfileOptionTest { + public static void main(String... args) throws Exception { + new ProfileOptionTest().run(); + } + + private final JavaCompiler javac = JavacTool.create(); + private final StandardJavaFileManager fm = javac.getStandardFileManager(null, null, null); + + + // ---------- Test cases, invoked reflectively via run. ---------- + + @Test + void testInvalidProfile_CommandLine() throws Exception { + JavaFileObject fo = new StringJavaFileObject("Test.java", "class Test { }"); + String badName = "foo"; + List<String> opts = Arrays.asList("-profile", badName); + StringWriter sw = new StringWriter(); + try { + JavacTask task = (JavacTask) javac.getTask(sw, fm, null, opts, null, + Arrays.asList(fo)); + throw new Exception("expected exception not thrown"); + } catch (IllegalArgumentException e) { + // expected + } + } + + @Test + void testInvalidProfile_API() throws Exception { + String badName = "foo"; + String[] opts = { "-profile", badName }; + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + int rc = com.sun.tools.javac.Main.compile(opts, pw); + + // sadly, command line errors are not (yet?) reported to + // the diag listener + String out = sw.toString(); + if (!out.isEmpty()) + System.err.println(out.trim()); + + if (!out.contains("invalid profile: " + badName)) { + error("expected message not found"); + } + } + + @Test + void testTargetProfileCombinations() throws Exception { + JavaFileObject fo = new StringJavaFileObject("Test.java", "class Test { }"); + for (Target t: Target.values()) { + switch (t) { + case JDK1_1: case JDK1_2: // no equivalent -source + continue; + } + + for (Profile p: Profile.values()) { + List<String> opts = new ArrayList<String>(); + opts.addAll(Arrays.asList("-source", t.name, "-target", t.name)); + opts.add("-Xlint:-options"); // dont warn about no -bootclasspath + if (p != Profile.DEFAULT) + opts.addAll(Arrays.asList("-profile", p.name)); + StringWriter sw = new StringWriter(); + JavacTask task = (JavacTask) javac.getTask(sw, fm, null, opts, null, + Arrays.asList(fo)); + task.analyze(); + + // sadly, command line errors are not (yet?) reported to + // the diag listener + String out = sw.toString(); + if (!out.isEmpty()) + System.err.println(out.trim()); + + switch (t) { + case JDK1_8: + if (!out.isEmpty()) + error("unexpected output from compiler"); + break; + default: + if (p != Profile.DEFAULT + && !out.contains("profile " + p.name + + " is not valid for target release " + t.name)) { + error("expected message not found"); + } + } + } + } + } + + @Test + void testClassesInProfiles() throws Exception { + for (Profile p: Profile.values()) { + for (Map.Entry<Profile, List<JavaFileObject>> e: testClasses.entrySet()) { + for (JavaFileObject fo: e.getValue()) { + DiagnosticCollector<JavaFileObject> dl = + new DiagnosticCollector<JavaFileObject>(); + List<String> opts = (p == Profile.DEFAULT) + ? Collections.<String>emptyList() + : Arrays.asList("-profile", p.name); + JavacTask task = (JavacTask) javac.getTask(null, fm, dl, opts, null, + Arrays.asList(fo)); + task.analyze(); + + List<String> expectDiagCodes = (p.value >= e.getKey().value) + ? Collections.<String>emptyList() + : Arrays.asList("compiler.err.not.in.profile"); + + checkDiags(opts + " " + fo.getName(), dl.getDiagnostics(), expectDiagCodes); + } + } + } + } + + Map<Profile, List<JavaFileObject>> testClasses = + new EnumMap<Profile, List<JavaFileObject>>(Profile.class); + + void initTestClasses() { + // The following table assumes the existence of specific classes + // in specific profiles, as defined in the Java SE 8 spec. + init(Profile.COMPACT1, + java.lang.String.class); + + init(Profile.COMPACT2, + javax.xml.XMLConstants.class); + + init(Profile.COMPACT3, + javax.script.Bindings.class, + com.sun.security.auth.PolicyFile.class); // specifically included in 3 + + init(Profile.DEFAULT, + java.beans.BeanInfo.class, + javax.management.remote.rmi._RMIServer_Stub.class); // specifically excluded in 3 + } + + void init(Profile p, Class<?>... classes) { + List<JavaFileObject> srcs = new ArrayList<JavaFileObject>(); + for (Class<?> c: classes) { + String name = "T" + c.getSimpleName(); + String src = + "class T" + name + "{" + "\n" + + " Class<?> c = " + c.getName() + ".class;\n" + + "}"; + srcs.add(new StringJavaFileObject(name + ".java", src)); + } + testClasses.put(p, srcs); + } + + void checkDiags(String msg, List<Diagnostic<? extends JavaFileObject>> diags, List<String> expectDiagCodes) { + System.err.print(msg); + if (diags.isEmpty()) + System.err.println(" OK"); + else { + System.err.println(); + System.err.println(diags); + } + + List<String> foundDiagCodes = new ArrayList<String>(); + for (Diagnostic<? extends JavaFileObject> d: diags) + foundDiagCodes.add(d.getCode()); + + if (!foundDiagCodes.equals(expectDiagCodes)) { + System.err.println("Found diag codes: " + foundDiagCodes); + System.err.println("Expected diag codes: " + expectDiagCodes); + error("expected diagnostics not found"); + } + } + + /** Marker annotation for test cases. */ + @Retention(RetentionPolicy.RUNTIME) + @interface Test { } + + /** Run all test cases. */ + void run() throws Exception { + initTestClasses(); + + for (Method m: getClass().getDeclaredMethods()) { + Annotation a = m.getAnnotation(Test.class); + if (a != null) { + System.err.println(m.getName()); + try { + m.invoke(this, new Object[] { }); + } catch (InvocationTargetException e) { + Throwable cause = e.getCause(); + throw (cause instanceof Exception) ? ((Exception) cause) : e; + } + System.err.println(); + } + } + + if (errors > 0) + throw new Exception(errors + " errors occurred"); + } + + void error(String msg) { + System.err.println("Error: " + msg); + errors++; + } + + int errors; + + private static class StringJavaFileObject extends SimpleJavaFileObject { + StringJavaFileObject(String name, String text) { + super(URI.create(name), JavaFileObject.Kind.SOURCE); + this.text = text; + } + @Override + public CharSequence getCharContent(boolean b) { + return text; + } + private String text; + } +}
--- a/test/tools/javac/resolve/Pos.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/resolve/Pos.java Tue May 07 17:14:17 2013 -0700 @@ -28,4 +28,4 @@ long line() default -1; long col() default -1; boolean userDefined() default true; -} \ No newline at end of file +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/resolve/tests/InnerOverOuter.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,40 @@ +/* + * 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. + */ + +@TraceResolve +class Test { + + //no annotation here - this should NOT even be considered! + void m(Integer i1, Integer i2) { } + + //no annotation here - this should NOT even be considered! + void m(Object... o) { } + + @TraceResolve(keys={"compiler.err.cant.apply.symbol"}) + class Inner { + @Candidate + void m(String s) { + m(1, 1); //should fail + } + } +}
--- a/test/tools/javac/scope/7017664/CompoundScopeTest.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/scope/7017664/CompoundScopeTest.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -147,7 +147,7 @@ Scope createScope(int nelems) { Scope s = new Scope(symtab.noSymbol); for (int i = 0 ; i < nelems ; i++) { - Symbol sym = new TypeSymbol(0, names.fromString("s" + i), null, null); + Symbol sym = new TypeVariableSymbol(0, names.fromString("s" + i), null, null); s.enter(sym); elems = elems.prepend(sym); List<Symbol> shadowed = shadowedMap.get(sym.name);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/stackmap/StackMapTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,65 @@ +/* + * 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. + */ + +/* + * @test + * @bug 4955930 + * @summary The "method0" StackMap attribute should have two entries instead of three + * @library /tools/javac/lib + * @build ToolBox + * @run compile -source 6 -target 6 StackMapTest.java + * @run main StackMapTest + */ + +import java.nio.file.Path; +import java.nio.file.Paths; + +//original test: test/tools/javac/stackmap/T4955930.sh +public class StackMapTest { + + class Test { + void method0(boolean aboolean) throws Exception { + label_0: + while (true) { + if (aboolean) ; + else break label_0; + } + } + } + + public static void main(String args[]) throws Exception { +// "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -source 6 -target 6 T4955930.java + +// "${TESTJAVA}${FS}bin${FS}javap" ${TESTTOOLVMOPTS} -verbose T4955930 > ${TMP1} + Path pathToClass = Paths.get(System.getProperty("test.classes"), + "StackMapTest$Test.class"); + ToolBox.JavaToolArgs javapArgs = + new ToolBox.JavaToolArgs().setAllArgs("-v", pathToClass.toString()); + +// grep "StackMapTable: number_of_entries = 2" ${TMP1} + if (!ToolBox.javap(javapArgs).contains("StackMapTable: number_of_entries = 2")) + throw new AssertionError("The number of entries of the stack map " + + "table should be equal to 2"); + } + +}
--- a/test/tools/javac/stackmap/T4955930.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2005, 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. - */ - -/* - * @test - * @bug 4955930 - * @summary The "method0" StackMap attribute should have two entries instead of three - * @author wtao - * - * @run shell T4955930.sh - */ - -public class T4955930 { - - void method0(boolean aboolean) throws Exception { - label_0: - while (true) { - if (aboolean) { - ; - } - else { - break label_0; - } - System.out.println(""); - } - } -}
--- a/test/tools/javac/stackmap/T4955930.sh Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,76 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 2005, 2009, 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. -# - - -if [ "${TESTSRC}" = "" ] -then - echo "TESTSRC not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTSRC=${TESTSRC}" -if [ "${TESTJAVA}" = "" ] -then - echo "TESTJAVA not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTJAVA=${TESTJAVA}" -echo "CLASSPATH=${CLASSPATH}" - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin | CYGWIN* ) - FS="/" - ;; - Windows_95 | Windows_98 | Windows_NT ) - FS="\\" - ;; - * ) - echo "Unrecognized system!" - exit 1; - ;; -esac - -TMP1=T4955930.javap - -cp "${TESTSRC}${FS}T4955930.java" . -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -source 6 -target 6 T4955930.java -result=$? -if [ $result -ne 0 ] -then - exit $result -fi - -"${TESTJAVA}${FS}bin${FS}javap" ${TESTTOOLVMOPTS} -verbose T4955930 > ${TMP1} -grep "StackMapTable: number_of_entries = 2" ${TMP1} -result=$? - -if [ $result -eq 0 ] -then - echo "Passed" -else - echo "Failed" -fi -exit $result
--- a/test/tools/javac/types/TypeHarness.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/types/TypeHarness.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 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 @@ -309,7 +309,7 @@ } public TypeVar TypeVariable(Type bound) { - TypeSymbol tvsym = new TypeSymbol(0, syntheticName(), null, predef.noSymbol); + TypeSymbol tvsym = new TypeVariableSymbol(0, syntheticName(), null, predef.noSymbol); tvsym.type = new TypeVar(tvsym, bound, null); return (TypeVar)tvsym.type; }
--- a/test/tools/javac/unicode/SupplementaryJavaID6.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javac/unicode/SupplementaryJavaID6.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -21,12 +21,20 @@ * questions. */ +/* + * @test + * @bug 4914724 4973116 5014511 + * @summary Ensure that a supplementary character can be used as part/whole of a + * class name on platforms that have Unicode aware filesystems. + * @run main SupplementaryJavaID6 + */ + public class SupplementaryJavaID6 { public static void main(String[] s) { - new SupplementaryJavaID6(); + new SupplementaryJavaID6().test(); } - public SupplementaryJavaID6() { + void test() { \ud801\udc00 instance = new \ud801\udc00(); instance.\ud801\udc01(); }
--- a/test/tools/javac/unicode/SupplementaryJavaID6.sh Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,114 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 2004, 2009, 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. -# - -# -# @test -# @bug 4914724 4973116 5014511 -# @summary Ensure that a supplementary character can be used as part/whole of a class -# name on platforms that have Unicode aware filesystems. -# @author Naoto Sato -# @run shell SupplementaryJavaID6.sh SupplementaryJavaID6 - - -if [ "${TESTSRC}" = "" ] -then - echo "TESTSRC not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTSRC=${TESTSRC}" -if [ "${TESTJAVA}" = "" ] -then - echo "TESTJAVA not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTJAVA=${TESTJAVA}" -if [ "${TESTCLASSES}" = "" ] -then - echo "TESTCLASSES not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTCLASSES=${TESTCLASSES}" -echo "CLASSPATH=${CLASSPATH}" - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin ) - if [ -d /usr/lib/locale/en_US.UTF-8 -o -d /usr/lib/locale/en_US.utf8 ] - then - ENV="env LANG=en_US.UTF-8" - PS=":" - FS="/" - else - echo "As there is no en_US.UTF-8 locale available on this system, the compilation of the test case may or may not fail. Ignoring this test." - exit 0; - fi - ;; - Windows_98 | Windows_ME ) - echo "As Windows 98/Me do not provide Unicode-aware file system, the compilation of the test case is expected to fail on these platforms. Ignoring this test." - exit 0; - ;; - Windows* ) - ENV="" - PS=";" - FS="\\" - ;; - CYGWIN* ) - ENV="" - PS=";" # platform PS, not cygwin PS - FS="/" - ;; - * ) - echo "Unrecognized system!" - exit 1; - ;; -esac - -# compile -cp "${TESTSRC}${FS}$1.java" . -${ENV} "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . -classpath ".${PS}${TESTSRC}" $1.java -result=$? - -if [ $result -ne 0 ] -then - echo "Failed" - exit $result -fi - -# run -${ENV} "${TESTJAVA}${FS}bin${FS}java" ${TESTVMOPTS} $1 -result=$? - -if [ $result -eq 0 ] -then - echo "Passed" -else - echo "Failed" -fi - -# Cleanup -${ENV} rm -f ./$1*.class - -exit $result
--- a/test/tools/javadoc/api/basic/RunTest.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javadoc/api/basic/RunTest.java Tue May 07 17:14:17 2013 -0700 @@ -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 6493690 + * @bug 6493690 8007490 * @summary javadoc should have a javax.tools.Tool service provider * @build APITest * @run main RunTest @@ -31,6 +31,7 @@ import java.io.ByteArrayOutputStream; import java.io.File; +import java.io.PrintStream; import javax.tools.DocumentationTool; import javax.tools.ToolProvider; @@ -46,7 +47,7 @@ * Verify that run method can be invoked. */ @Test - public void testRun() throws Exception { + public void testRunOK() throws Exception { File testSrc = new File(System.getProperty("test.src")); File srcFile = new File(testSrc, "pkg/C.java"); File outDir = getOutDir(); @@ -77,7 +78,7 @@ * Verify that run method can be invoked. */ @Test - public void testRun2() throws Exception { + public void testRunFail() throws Exception { File outDir = getOutDir(); String badfile = "badfile.java"; String[] args = { "-d", outDir.getPath(), badfile }; @@ -100,5 +101,48 @@ } } + /** + * Verify that null args are accepted. + */ + @Test + public void testNullArgs() throws Exception { + File testSrc = new File(System.getProperty("test.src")); + File srcFile = new File(testSrc, "pkg/C.java"); + File outDir = getOutDir(); + String[] args = { "-d", outDir.getPath(), srcFile.getPath() }; + + ByteArrayOutputStream stdout = new ByteArrayOutputStream(); + PrintStream prevStdout = System.out; + System.setOut(new PrintStream(stdout)); + + ByteArrayOutputStream stderr = new ByteArrayOutputStream(); + PrintStream prevStderr = System.err; + System.setErr(new PrintStream(stderr)); + + int rc ; + try { + DocumentationTool tool = ToolProvider.getSystemDocumentationTool(); + rc = tool.run(null, null, null, args); + } finally { + System.setOut(prevStdout); + System.setErr(prevStderr); + } + + System.err.println("stdout >>" + stdout.toString() + "<<"); + System.err.println("stderr >>" + stderr.toString() + "<<"); + + if (rc == 0) { + System.err.println("call succeeded"); + checkFiles(outDir, standardExpectFiles); + String out = stdout.toString(); + for (String f: standardExpectFiles) { + String f1 = f.replace('/', File.separatorChar); + if (f1.endsWith(".html") && !out.contains(f1)) + error("expected string not found: " + f1); + } + } else { + error("call failed"); + } + } }
--- a/test/tools/javadoc/doclint/DocLintTest.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javadoc/doclint/DocLintTest.java Tue May 07 17:14:17 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 8004834 + * @bug 8004834 8007610 * @summary Add doclint support into javadoc */ @@ -157,6 +157,10 @@ Main.Result.OK, EnumSet.of(Message.DL_WRN12)); + test(Arrays.asList(rawDiags, "-private"), + Main.Result.ERROR, + EnumSet.of(Message.DL_ERR6, Message.DL_ERR9, Message.DL_WRN12)); + test(Arrays.asList(rawDiags, "-Xdoclint:syntax", "-private"), Main.Result.ERROR, EnumSet.of(Message.DL_ERR6, Message.DL_WRN12));
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javadoc/doclint/ImplicitHeadersTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,45 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8006346 + * @summary doclint should make allowance for headers generated by standard doclet + */ + +import java.io.File; + +/** + * <h3> Header </h3> + */ +public class ImplicitHeadersTest { + public static void main(String... args) { + File testSrc = new File(System.getProperty("test.src")); + File testFile = new File(testSrc, ImplicitHeadersTest.class.getSimpleName() + ".java"); + String[] javadocArgs = { "-d", "out", testFile.getPath() }; + int rc = com.sun.tools.javadoc.Main.execute(javadocArgs); + if (rc != 0) + throw new Error("unexpected exit: rc=" + rc); + } +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javah/6257087/T6257087.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,76 @@ +/* + * 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. + */ + +/* + * @test + * @bug 6257087 + * @summary javah doesn't produce proper signatures for inner class native methods + * @library /tools/javac/lib + * @build ToolBox + * @run main T6257087 + */ + +import java.nio.file.Paths; + +public class T6257087 { + + private static final String fooBarGoldenFile = + "/* DO NOT EDIT THIS FILE - it is machine generated */\n" + + "#include <jni.h>\n" + + "/* Header for class foo_bar */\n" + + "\n" + + "#ifndef _Included_foo_bar\n" + + "#define _Included_foo_bar\n" + + "#ifdef __cplusplus\n" + + "extern \"C\" {\n" + + "#endif\n" + + "/*\n" + + " * Class: foo_bar\n" + + " * Method: aardvark\n" + + " * Signature: ()V\n" + + " */\n" + + "JNIEXPORT void JNICALL Java_foo_00024bar_aardvark\n" + + " (JNIEnv *, jobject);\n" + + "\n" + + "#ifdef __cplusplus\n" + + "}\n" + + "#endif\n" + + "#endif"; + + public static void main(String[] args) throws Exception { + ToolBox.JavaToolArgs javahArgs = + new ToolBox.JavaToolArgs() + .setAllArgs("-cp", System.getProperty("test.classes"), "foo"); + ToolBox.javah(javahArgs); + + ToolBox.compareLines(Paths.get("foo_bar.h"), + ToolBox.splitLines(fooBarGoldenFile, "\n"), null, true); + } + +} + +class foo { + class bar { + public native void aardvark(); + } +}
--- a/test/tools/javah/6257087/foo.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2006, 2007, 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. - */ - - -class foo { - class bar { - public native void aardvark(); - } -}
--- a/test/tools/javah/6257087/foo.sh Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,74 +0,0 @@ -#! /bin/sh -f - -# -# Copyright (c) 2006, 2009, 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. -# - -# -# @test -# @bug 6257087 -# @run shell foo.sh - - -TS=${TESTSRC-.} -TC=${TESTCLASSES-.} - -if [ "${TESTJAVA}" = "" ] -then - echo "TESTJAVA not set. Test cannot execute. Failed." - exit 1 -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin ) - PS=":" - FS="/" - ;; - CYGWIN* ) - PS=":" - FS="/" - DIFFOPTS="--strip-trailing-cr" - ;; - Windows* ) - PS=";" - FS="\\" - ;; - * ) - echo "Unrecognized system!" - exit 1; - ;; -esac - -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d "${TC}" "${TS}${FS}foo.java" -"${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} -classpath "${TC}" -d "${TC}" foo -diff ${DIFFOPTS} -c "${TS}${FS}foo_bar.h" "${TC}${FS}foo_bar.h" -result=$? - -if [ $result -eq 0 ] -then - echo "Passed" -else - echo "Failed" -fi -exit $result
--- a/test/tools/javah/6257087/foo_bar.h Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include <jni.h> -/* Header for class foo_bar */ - -#ifndef _Included_foo_bar -#define _Included_foo_bar -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: foo_bar - * Method: aardvark - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_foo_00024bar_aardvark - (JNIEnv *, jobject); - -#ifdef __cplusplus -} -#endif -#endif
--- a/test/tools/javah/ConstMacroTest.sh Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,102 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 2003, 2009, 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. -# - -# @test -# -# @bug 4786406 4781221 4780341 6214324 - -# Validates rewritten javah handling of class defined constants -# and ensures that the appropriate macro definitions are placed -# in the generated header file. - -if [ "${TESTSRC}" = "" ] -then - echo "TESTSRC not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTSRC=${TESTSRC}" -if [ "${TESTJAVA}" = "" ] -then - echo "TESTJAVA not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTJAVA=${TESTJAVA}" -if [ "${TESTCLASSES}" = "" ] -then - echo "TESTCLASSES not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTCLASSES=${TESTCLASSES}" -echo "CLASSPATH=${CLASSPATH}" - -EXPECTED_JAVAH_OUT_FILE=SubClassConsts.out - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin ) - PS=":" - FS="/" - ;; - CYGWIN* ) - PS=":" - FS="/" - DIFFOPTS="--strip-trailing-cr" - EXPECTED_JAVAH_OUT_FILE=SubClassConsts.win - ;; - Windows* ) - PS=";" - FS="\\" - EXPECTED_JAVAH_OUT_FILE=SubClassConsts.win - ;; - * ) - echo "Unrecognized system!" - exit 1; - ;; - esac - -GENERATED_HEADER_FILE=SubClassConsts.h -HEADER_FILE_FILTERED=SubClassConsts.h.linefeed-filtered - -rm -rf SuperClassConsts.class SubClassConsts.class - -cp "${TESTSRC}${FS}SuperClassConsts.java" . -cp "${TESTSRC}${FS}SubClassConsts.java" . - -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . "${TESTSRC}${FS}SubClassConsts.java" - -"${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} SubClassConsts - -diff ${DIFFOPTS} "${TESTSRC}${FS}${EXPECTED_JAVAH_OUT_FILE}" "${GENERATED_HEADER_FILE}" -result=$? -rm ${GENERATED_HEADER_FILE} - -if [ $result -eq 0 ] -then - echo "Passed" -else - echo "Failed" -fi -exit $result
--- a/test/tools/javah/MissingParamClassException.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2003, 2007, 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. - */ - - -/* - * ParamClassTest has a native method param which subclasses - * this class - * - */ - -public class MissingParamClassException extends Exception { - public MissingParamClassException() { - System.out.println("MissingParamClassException constructor called"); - } -}
--- a/test/tools/javah/MissingParamClassTest.sh Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,124 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 2003, 2009, 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. -# - -# @test -# -# @bug 4942232 - -# -# Verifies that javah won't attempt to generate a header file -# if a native method in a supplied class contains a parameter -# type whose corresponding class is missing or not in the -# classpath - -TMP1=OUTPUT.txt - -if [ "${TESTSRC}" = "" ] -then - echo "TESTSRC not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTSRC=${TESTSRC}" -if [ "${TESTJAVA}" = "" ] -then - echo "TESTJAVA not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTJAVA=${TESTJAVA}" -if [ "${TESTCLASSES}" = "" ] -then - echo "TESTCLASSES not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTCLASSES=${TESTCLASSES}" -echo "CLASSPATH=${CLASSPATH}" - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin | CYGWIN* ) - PS=":" - FS="/" - ;; - Windows* ) - PS=";" - FS="\\" - ;; - * ) - echo "Unrecognized system!" - exit 1; - ;; - esac - -GENERATED_HEADER_FILE=ParamClassTest.h - -rm -f ParamClassTest.class MissingParamClassException.class ParamClassTest.h -rm -f ${TMP1} - -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . "${TESTSRC}${FS}ParamClassTest.java" "${TESTSRC}${FS}MissingParamClassException.java" - -# Before running javah remove dependent class file -rm -f MissingParamClassException.class - -"${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} ParamClassTest 2>${TMP1} - -if [ -f $GENERATED_HEADER_FILE ]; then - echo "1-- Failed: $GENERATED_HEADER_FILE found" - rc=1 -fi -if [ ! -s ${TMP1} ]; then - echo "1-- Failed: ${TMP1} is empty" - rc=1 -fi - -# Clean out work dir -rm -f MissingParamClassException.class ParamClassTest.class -rm -f $GENERATED_HEADER_FILE $TMP1 - -# Re-compile everything - -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . "${TESTSRC}${FS}ParamClassTest.java" "${TESTSRC}${FS}MissingParamClassException.java" - - -# Before re-run of javah remove dependent class file Param.class -rm -f Param.class - -"${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} ParamClassTest 2>${TMP1} - -if [ -f $GENERATED_HEADER_FILE ]; then - echo "2-- Failed: $GENERATED_HEADER_FILE found" - rc=1 -fi -if [ ! -s ${TMP1} ]; then - echo "2-- Failed: ${TMP1} is empty" - rc=1 -fi - -if [ "$rc" = "" ]; then - echo Passed -else - echo Failed - exit 1 -fi
--- a/test/tools/javah/ParamClassTest.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2003, 2007, 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. - */ - - -/* - * Class containing a native method which contains a native - * method with non primitive type - */ - -public class ParamClassTest { - public native void method(Param s); - - public static void main(String args[]) { - } -} - -class Param extends MissingParamClassException { - Param() { - System.out.println("Param constructor"); - } -}
--- a/test/tools/javah/SubClassConsts.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2003, 2007, 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. - */ - - -/* - * Subclass defines its own set of constants - * It is itself serializable by virtue of extending SuperClassConsts - * - */ -public class SubClassConsts extends SuperClassConsts { - - private final static int SUB_INT_CONSTANT = 2; - private final static double SUB_DOUBLE_CONSTANT = 2.25; - private final static float SUB_FLOAT_CONSTANT = 7.90f; - private final static boolean SUB_BOOLEAN_CONSTANT = true; - - public SubClassConsts(String p) { - super(p); - } -}
--- a/test/tools/javah/SubClassConsts.out Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include <jni.h> -/* Header for class SubClassConsts */ - -#ifndef _Included_SubClassConsts -#define _Included_SubClassConsts -#ifdef __cplusplus -extern "C" { -#endif -#undef SubClassConsts_serialVersionUID -#define SubClassConsts_serialVersionUID 6733861379283244755LL -#undef SubClassConsts_SUPER_INT_CONSTANT -#define SubClassConsts_SUPER_INT_CONSTANT 3L -#undef SubClassConsts_SUPER_FLOAT_CONSTANT -#define SubClassConsts_SUPER_FLOAT_CONSTANT 99.3f -#undef SubClassConsts_SUPER_DOUBLE_CONSTANT -#define SubClassConsts_SUPER_DOUBLE_CONSTANT 33.2 -#undef SubClassConsts_SUPER_BOOLEAN_CONSTANT -#define SubClassConsts_SUPER_BOOLEAN_CONSTANT 0L -#undef SubClassConsts_SUB_INT_CONSTANT -#define SubClassConsts_SUB_INT_CONSTANT 2L -#undef SubClassConsts_SUB_DOUBLE_CONSTANT -#define SubClassConsts_SUB_DOUBLE_CONSTANT 2.25 -#undef SubClassConsts_SUB_FLOAT_CONSTANT -#define SubClassConsts_SUB_FLOAT_CONSTANT 7.9f -#undef SubClassConsts_SUB_BOOLEAN_CONSTANT -#define SubClassConsts_SUB_BOOLEAN_CONSTANT 1L -#ifdef __cplusplus -} -#endif -#endif
--- a/test/tools/javah/SubClassConsts.win Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include <jni.h> -/* Header for class SubClassConsts */ - -#ifndef _Included_SubClassConsts -#define _Included_SubClassConsts -#ifdef __cplusplus -extern "C" { -#endif -#undef SubClassConsts_serialVersionUID -#define SubClassConsts_serialVersionUID 6733861379283244755i64 -#undef SubClassConsts_SUPER_INT_CONSTANT -#define SubClassConsts_SUPER_INT_CONSTANT 3L -#undef SubClassConsts_SUPER_FLOAT_CONSTANT -#define SubClassConsts_SUPER_FLOAT_CONSTANT 99.3f -#undef SubClassConsts_SUPER_DOUBLE_CONSTANT -#define SubClassConsts_SUPER_DOUBLE_CONSTANT 33.2 -#undef SubClassConsts_SUPER_BOOLEAN_CONSTANT -#define SubClassConsts_SUPER_BOOLEAN_CONSTANT 0L -#undef SubClassConsts_SUB_INT_CONSTANT -#define SubClassConsts_SUB_INT_CONSTANT 2L -#undef SubClassConsts_SUB_DOUBLE_CONSTANT -#define SubClassConsts_SUB_DOUBLE_CONSTANT 2.25 -#undef SubClassConsts_SUB_FLOAT_CONSTANT -#define SubClassConsts_SUB_FLOAT_CONSTANT 7.9f -#undef SubClassConsts_SUB_BOOLEAN_CONSTANT -#define SubClassConsts_SUB_BOOLEAN_CONSTANT 1L -#ifdef __cplusplus -} -#endif -#endif
--- a/test/tools/javah/SuperClassConsts.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2003, 2007, 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. - */ - - -/* - * Parent class implements serializable and provides static initializers - * for a bunch of primitive type class constants - * (required for regtest 4786406, 4780341) - */ - -import java.io.*; - -public class SuperClassConsts implements Serializable { - - // Define class constant values, base class is serializable - - private static final long serialVersionUID = 6733861379283244755L; - public static final int SUPER_INT_CONSTANT = 3; - public final static float SUPER_FLOAT_CONSTANT = 99.3f; - public final static double SUPER_DOUBLE_CONSTANT = 33.2; - public final static boolean SUPER_BOOLEAN_CONSTANT = false; - - // A token instance field - int instanceField; - - public SuperClassConsts(String p) { - } - - public native int numValues(); - - private void writeObject(ObjectOutputStream s) - throws IOException - { - System.err.println("writing state"); - } - - /** - * readObject is called to restore the state of the FilePermission from - * a stream. - */ - private void readObject(ObjectInputStream s) - throws IOException, ClassNotFoundException - { - System.err.println("reading back state"); - } -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javah/T4942232/MissingParamClassTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,89 @@ +/* + * 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. + */ + +/* + * @test + * @bug 4942232 + * @summary Verifies that javah won't attempt to generate a header file if a + * native method in a supplied class contains a parameter type whose corresponding + * class is missing or not in the classpath + * @library /tools/javac/lib + * @build ToolBox + * @run compile MissingParamClassTest.java + * @clean MissingParamClassException + * @run main MissingParamClassTest + * @run compile MissingParamClassTest.java + * @clean Param + * @run main MissingParamClassTest + */ + +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; + +//original test: test/tools/javah/MissingParamClassTest.sh +public class MissingParamClassTest { + + public static void main(String[] args) throws Exception { + //first steps done now by jtreg +//"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . "${TESTSRC}${FS}ParamClassTest.java" "${TESTSRC}${FS}MissingParamClassException.java" +//rm -f MissingParamClassException.class + +//"${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} ParamClassTest 2>${TMP1} + List<String> errOutput = new ArrayList<>(); + ToolBox.JavaToolArgs javahParams = + new ToolBox.JavaToolArgs(ToolBox.Expect.FAIL) + .setAllArgs("-classpath", System.getProperty("test.classes"), "ParamClassTest") + .setErrOutput(errOutput); + ToolBox.javah(javahParams); + +//if [ -f $GENERATED_HEADER_FILE ]; then fail +//if [ ! -s ${TMP1} ]; then fail + if (Files.exists(Paths.get("ParamClassTest.h")) || errOutput.size() == 0) + throw new AssertionError("The only output generated by javah must be an error message"); + //jtreg again +//rm -f MissingParamClassException.class ParamClassTest.class +//rm -f $GENERATED_HEADER_FILE $TMP1 + } + +} + +class MissingParamClassException extends Exception { + public MissingParamClassException() { + System.out.println("MissingParamClassException constructor called"); + } +} + +class ParamClassTest { + public native void method(Param s); + + public static void main(String args[]) { + } +} + +class Param extends MissingParamClassException { + Param() { + System.out.println("Param constructor"); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javah/constMacroTest/ConstMacroTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,117 @@ +/* + * 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. + */ + +/* + * @test + * @bug 4786406 4781221 4780341 6214324 + * @summary Validates rewritten javah handling of class defined constants and + * ensures that the appropriate macro definitions are placed in the generated + * header file. + * @library /tools/javac/lib + * @build ToolBox + * @run main ConstMacroTest + */ + +import java.io.*; +import java.nio.file.Paths; + +//original test: test/tools/javah/ConstMacroTest.sh +public class ConstMacroTest { + + private static final String subClassConstsGoldenFileTemplate = + "/* DO NOT EDIT THIS FILE - it is machine generated */\n" + + "#include <jni.h>\n" + + "/* Header for class SubClassConsts */\n" + + "\n" + + "#ifndef _Included_SubClassConsts\n" + + "#define _Included_SubClassConsts\n" + + "#ifdef __cplusplus\n" + + "extern \"C\" {\n" + + "#endif\n" + + "#undef SubClassConsts_serialVersionUID\n" + + "#define SubClassConsts_serialVersionUID 6733861379283244755%s\n" + + "#undef SubClassConsts_SUPER_INT_CONSTANT\n" + + "#define SubClassConsts_SUPER_INT_CONSTANT 3L\n" + + "#undef SubClassConsts_SUPER_FLOAT_CONSTANT\n" + + "#define SubClassConsts_SUPER_FLOAT_CONSTANT 99.3f\n" + + "#undef SubClassConsts_SUPER_DOUBLE_CONSTANT\n" + + "#define SubClassConsts_SUPER_DOUBLE_CONSTANT 33.2\n" + + "#undef SubClassConsts_SUPER_BOOLEAN_CONSTANT\n" + + "#define SubClassConsts_SUPER_BOOLEAN_CONSTANT 0L\n" + + "#undef SubClassConsts_SUB_INT_CONSTANT\n" + + "#define SubClassConsts_SUB_INT_CONSTANT 2L\n" + + "#undef SubClassConsts_SUB_DOUBLE_CONSTANT\n" + + "#define SubClassConsts_SUB_DOUBLE_CONSTANT 2.25\n" + + "#undef SubClassConsts_SUB_FLOAT_CONSTANT\n" + + "#define SubClassConsts_SUB_FLOAT_CONSTANT 7.9f\n" + + "#undef SubClassConsts_SUB_BOOLEAN_CONSTANT\n" + + "#define SubClassConsts_SUB_BOOLEAN_CONSTANT 1L\n" + + "#ifdef __cplusplus\n" + + "}\n" + + "#endif\n" + + "#endif"; + + private static final String serialVersionUIDSuffix = + ToolBox.isWindows() ? "i64" : "LL"; ; + + public static void main(String[] args) throws Exception { + //first steps are now done by jtreg +// cp "${TESTSRC}${FS}SuperClassConsts.java" . +// cp "${TESTSRC}${FS}SubClassConsts.java" . + +// "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . "${TESTSRC}${FS}SubClassConsts.java" + +// "${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} SubClassConsts + ToolBox.JavaToolArgs successParams = + new ToolBox.JavaToolArgs() + .setAllArgs("-cp", System.getProperty("test.classes"), "SubClassConsts"); + ToolBox.javah(successParams); + +// diff ${DIFFOPTS} "${TESTSRC}${FS}${EXPECTED_JAVAH_OUT_FILE}" "${GENERATED_HEADER_FILE}" + String subClassConstGoldenFile = String.format(subClassConstsGoldenFileTemplate, + serialVersionUIDSuffix); + ToolBox.compareLines(Paths.get("SubClassConsts.h"), + ToolBox.splitLines(subClassConstGoldenFile, "\n"), null, true); + } + +} + +class SuperClassConsts implements Serializable { + // Define class constant values, base class is serializable + private static final long serialVersionUID = 6733861379283244755L; + public static final int SUPER_INT_CONSTANT = 3; + public final static float SUPER_FLOAT_CONSTANT = 99.3f; + public final static double SUPER_DOUBLE_CONSTANT = 33.2; + public final static boolean SUPER_BOOLEAN_CONSTANT = false; + // A token instance field + int instanceField; + + public native int numValues(); +} + +class SubClassConsts extends SuperClassConsts { + private final static int SUB_INT_CONSTANT = 2; + private final static double SUB_DOUBLE_CONSTANT = 2.25; + private final static float SUB_FLOAT_CONSTANT = 7.90f; + private final static boolean SUB_BOOLEAN_CONSTANT = true; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javap/4798312/JavapShouldLoadClassesFromRTJarTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,43 @@ +/* + * 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. + */ + +/* + * @test + * @bug 4798312 + * @summary In Windows, javap doesnt load classes from rt.jar + * @library /tools/javac/lib + * @build ToolBox + * @run main JavapShouldLoadClassesFromRTJarTest + */ +public class JavapShouldLoadClassesFromRTJarTest { + + public static void main(String[] args) throws Exception { +// "${TESTJAVA}${FS}bin${FS}javap" ${TESTTOOLVMOPTS} java.lang.String + ToolBox.JavaToolArgs params = + new ToolBox.JavaToolArgs(). + setAllArgs("-v", "java.lang.String"); + if (ToolBox.javap(params).isEmpty()) + throw new AssertionError("javap generated no output"); + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javap/4866831/PublicInterfaceTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,52 @@ + +import java.nio.file.Path; +import java.nio.file.Paths; + +/* + * 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. + */ + +/* + * @test + * @bug 4866831 + * @summary Verify that javap marks public interfaces as public + * @library /tools/javac/lib + * @build ToolBox + * @run main PublicInterfaceTest + */ + +//original test: test/tools/javap/PublicInterfaceTest.sh +public class PublicInterfaceTest { + public interface Test {} + + public static void main(String[] args) throws Exception { +// "$JAVAP" ${TESTTOOLVMOPTS} -classpath "${TESTCLASSES}" NotPackagePrivateInterface | grep public + Path pathToClass = Paths.get(System.getProperty("test.classes"), + "PublicInterfaceTest$Test.class"); + ToolBox.JavaToolArgs javapParams = + new ToolBox.JavaToolArgs() + .setAllArgs(pathToClass.toString()); + if (!ToolBox.javap(javapParams).contains("public")) + throw new AssertionError("The javap output does not contain \"public\""); + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javap/8006334/JavapTaskCtorFailWithNPE.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,85 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8006334 + * @summary javap: JavapTask constructor breaks with null pointer exception if + * parameter options is null + */ + +import java.io.File; +import java.util.Arrays; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.List; +import java.util.Locale; +import javax.tools.Diagnostic; +import javax.tools.DiagnosticCollector; +import javax.tools.JavaFileManager; +import javax.tools.JavaFileObject; +import com.sun.tools.javap.JavapFileManager; +import com.sun.tools.javap.JavapTask; + +public class JavapTaskCtorFailWithNPE { + + //we will also check the output just to confirm that we get the expected one + private static final String expOutput = + "Compiled from \"JavapTaskCtorFailWithNPE.java\"\n" + + "public class JavapTaskCtorFailWithNPE {\n" + + " public JavapTaskCtorFailWithNPE();\n" + + " public static void main(java.lang.String[]);\n" + + "}\n"; + + public static void main(String[] args) { + new JavapTaskCtorFailWithNPE().run(); + } + + private void run() { + File classToCheck = new File(System.getProperty("test.classes"), + getClass().getSimpleName() + ".class"); + + DiagnosticCollector<JavaFileObject> dc = + new DiagnosticCollector<JavaFileObject>(); + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + JavaFileManager fm = JavapFileManager.create(dc, pw); + JavapTask t = new JavapTask(pw, fm, dc, null, + Arrays.asList(classToCheck.getPath())); + boolean ok = t.run(); + if (!ok) + throw new Error("javap failed unexpectedly"); + + List<Diagnostic<? extends JavaFileObject>> diags = dc.getDiagnostics(); + for (Diagnostic<? extends JavaFileObject> d: diags) { + if (d.getKind() == Diagnostic.Kind.ERROR) + throw new AssertionError(d.getMessage(Locale.ENGLISH)); + } + String lineSep = System.getProperty("line.separator"); + String out = sw.toString().replace(lineSep, "\n"); + if (!out.equals(expOutput)) { + throw new AssertionError("The output is not equal to the one expected"); + } + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javap/DescriptorTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,91 @@ +/* + * 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. + */ + +/** + * @test + * @bug 8007052 + * @summary javap should include the descriptor for a method in verbose mode + */ + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.regex.Pattern; + +public class DescriptorTest { + public static void main(String... args) throws Exception { + new DescriptorTest().run(); + } + + void run() throws Exception { + File srcDir = new File("src"); + srcDir.mkdirs(); + File classesDir = new File("classes"); + classesDir.mkdirs(); + + File f = writeFile(new File(srcDir, "E.java"), "enum E { A, B }"); + javac("-d", classesDir.getPath(), f.getPath()); + String out = javap("-p", "-v", new File(classesDir, "E.class").getPath()); + Pattern expect = Pattern.compile("\\Qprivate E();\\E\\s+\\Qdescriptor: (Ljava/lang/String;I)V\\E"); + checkContains(out, expect); + } + + File writeFile(File f, String body) throws IOException { + try (FileWriter out = new FileWriter(f)) { + out.write(body); + } + return f; + } + + void javac(String... args) throws Exception { + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + int rc = com.sun.tools.javac.Main.compile(args, pw); + pw.flush(); + String out = sw.toString(); + if (!out.isEmpty()) + System.err.println(out); + if (rc != 0) + throw new Exception("compilation failed"); + } + + String javap(String... args) throws Exception { + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + int rc = com.sun.tools.javap.Main.run(args, pw); + pw.flush(); + String out = sw.toString(); + if (!out.isEmpty()) + System.err.println(out); + if (rc != 0) + throw new Exception("javap failed"); + return out; + } + + void checkContains(String s, Pattern p) throws Exception { + if (!p.matcher(s).find()) + throw new Exception("expected pattern not found: " + p); + } +}
--- a/test/tools/javap/MethodParameters.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/javap/MethodParameters.java Tue May 07 17:14:17 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 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 @@ -40,8 +40,10 @@ " void foo0() {}\n" + " void foo2(int j, int k) {}\n" + "}").replaceAll(" +", " "); + static final String Init0_expected = (" Foo();\n" + + " descriptor: ()V\n" + " flags: \n" + " Code:\n" + " stack=1, locals=1, args_size=1\n" + @@ -50,8 +52,10 @@ " 4: return \n" + " LineNumberTable:\n" + " line 2: 0").replaceAll(" +", " "); + static final String Init1_expected = (" Foo(int);\n" + + " descriptor: (I)V\n" + " flags: \n" + " Code:\n" + " stack=1, locals=2, args_size=2\n" + @@ -63,16 +67,20 @@ " MethodParameters:\n" + " Name Flags\n" + " i").replaceAll(" +", " "); + static final String foo0_expected = (" void foo0();\n" + + " descriptor: ()V\n" + " flags: \n" + " Code:\n" + " stack=0, locals=1, args_size=1\n" + " 0: return \n" + " LineNumberTable:\n" + " line 4: 0").replaceAll(" +", " "); + static final String foo2_expected = (" void foo2(int, int);\n" + + " descriptor: (II)V\n" + " flags: \n" + " Code:\n" + " stack=0, locals=3, args_size=3\n" +
--- a/test/tools/javap/NotPackagePrivateInterface.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2003, 2007, 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. - */ - - -/* - * This class is used by PublicInterfaceTest.sh to generate a class - * file with a public interface to verify javap will output the - * "public" modifier for such interfaces. (At the vm level, the only - * access control properties an interface can can have are public and - * package private.) - */ - -public interface NotPackagePrivateInterface { -}
--- a/test/tools/javap/PublicInterfaceTest.sh Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,62 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 2003, 2007, 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. -# - -# @test -# @bug 4866831 -# @build NotPackagePrivateInterface -# @run shell PublicInterfaceTest.sh -# @summary Verify that javap marks public interfaces as public -# @author Joseph D. Darcy - -# Verify directory context variables are set -if [ "${TESTJAVA}" = "" ] -then - echo "TESTJAVA not set. Test cannot execute. Failed." - exit 1 -fi - -if [ "${TESTCLASSES}" = "" ] -then - echo "TESTCLASSES not set. Test cannot execute. Failed." - exit 1 -fi - -JAVAP="${TESTJAVA}/bin/javap" - -"$JAVAP" ${TESTTOOLVMOPTS} -classpath "${TESTCLASSES}" NotPackagePrivateInterface | grep public - -# If the exit status of grep is 0, then "public" was correctly found -# in the output of javap. - -RESULT=$? -case "$RESULT" in - 0 ) - exit 0; - ;; - - * ) - echo "The javap tool did not output \"public\" for a public interface." - exit 1 -esac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javap/output/RepeatingTypeAnnotations.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,400 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8005220 + * @summary javap must display repeating annotations + */ +import java.io.*; +import java.util.*; + +/** + * This class extends the abstract {@link Tester} test-driver, and + * encapusulates a number of test-case classes (i.e. classes extending + * this class and annotated with {@code TestCase}). + * <p> + * By default (no argument), this test runs all test-cases, except + * if annotated with {@code ignore}. + * <p> + * Individual test cases can be executed using a run action. + * <p> + * Example: @run main RepeatingTypeAnnotations RepeatingTypeAnnotations$TC4 + * <p> + * Note: when specific test-cases are run, additional debug output is + * produced to help debugging. Test annotated with {@code ignore} + * can be executed explicitly. + */ +public class RepeatingTypeAnnotations extends Tester { + + /** + * Main method instantiates test and run test-cases. + */ + public static void main(String... args) throws Exception { + Tester tester = new RepeatingTypeAnnotations(); + tester.run(args); + } + + /** + * Testcases are classes extending {@code RepeatingTypeAnnotations}, + * and calling {@link setSrc}, followed by one or more invocations + * of {@link verify} in the body of the constructor. + */ + public RepeatingTypeAnnotations() { + setSrc(new TestSource(template)); + } + + /** + * Common template for test cases. The line TESTCASE is + * replaced with the specific lines of individual tests. + */ + private static final String[] template = { + "import java.lang.annotation.*;", + "class Test {", + " @Repeatable(As.class)", + " @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})", + " @Retention(RetentionPolicy.CLASS)", + " @interface A {", + " Class f() default int.class;", + " }", + + " @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})", + " @Retention(RetentionPolicy.CLASS)", + " @interface As { A[] value(); }", + + " @Repeatable(Bs.class)", + " @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})", + " @Retention(RetentionPolicy.CLASS)", + " @interface B {", + " Class f() default int.class;", + " }", + + " @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})", + " @Retention(RetentionPolicy.CLASS)", + " @interface Bs { B[] value(); }", + + " @Repeatable(Cs.class)", + " @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})", + " @Retention(RetentionPolicy.RUNTIME)", + " @interface C {", + " Class f() default int.class;", + " }", + + " @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})", + " @Retention(RetentionPolicy.RUNTIME)", + " @interface Cs { C[] value(); }", + "TESTCASE", + "}" + }; + + /* + * The test cases covers annotation in the following locations: + * - static and non-static fields + * - local variables + * - constructor and method return type and parameter types + * - casts in class and method contexts. + * For the above locations the test-cases covers: + * - single annotation type + * - two annotation types with same retention + * - two annotation types with different retention + * - three annotation types, two of same retention, one different. + */ + + @TestCase + @ignore // 8008082:missing type annotation for cast + public static class TC1 extends RepeatingTypeAnnotations { + public TC1() { + setSrc(" static String so = \"hello world\";", + " public @A @A @A Object o = (@A @A @A String) Test.so;"); + verify("RuntimeInvisibleTypeAnnotations", + "0: #25(#26=[@#27(),@#27(),@#27()]): FIELD", + "1: #25(#26=[@#27(),@#27(),@#27()]): CAST, offset=5"); + } + } + + @TestCase + public static class TC2 extends RepeatingTypeAnnotations { + public TC2() { + setSrc(" static String so = \"hello world\";", + " public @A @B @A Object o = (@B @A @B String) Test.so;"); + verify("RuntimeInvisibleTypeAnnotations", + "0: #25(#26=[@#27(),@#27()]): FIELD", + "1: #28(): FIELD", + "2: #29(#26=[@#28(),@#28()]): CAST, offset=5", + "3: #27(): CAST, offset=5"); + } + } + + @TestCase + public static class TC3 extends RepeatingTypeAnnotations { + public TC3() { + setSrc(" static String so = \"hello world\";", + " public @A @A @C Object o = (@B @C @B String) Test.so;"); + verify("RuntimeInvisibleTypeAnnotations", + "0: #25(): FIELD", + "1: #25(): CAST, offset=5", + "RuntimeVisibleTypeAnnotations", + "0: #27(#28=[@#29(),@#29()]): FIELD", + "1: #30(#28=[@#31(),@#31()]): CAST, offset=5"); + } + } + + @TestCase + public static class TC4 extends RepeatingTypeAnnotations { + public TC4() { + setSrc(" static String so = \"hello world\";", + " public @A @B @C Object o = (@C @B @A String) Test.so;"); + verify("RuntimeInvisibleTypeAnnotations", + "RuntimeVisibleTypeAnnotations", + "0: #25(): FIELD", + "1: #25(): CAST, offset=5", + "0: #27(): FIELD", + "1: #28(): FIELD", + "2: #28(): CAST, offset=5", + "3: #27(): CAST, offset=5"); + } + } + + @TestCase + @ignore // 8008082:missing type annotation for cast + public static class TC5 extends RepeatingTypeAnnotations { + public TC5() { + setSrc(" static String so = \"hello world\";", + " public static @A @A @A Object o = (@B @B @B String) Test.so;"); + verify("RuntimeInvisibleTypeAnnotations", + "0: #25(#26=[@#27(),@#27(),@#27()]): FIELD", + "1: #28(#26=[@#29(),@#29(),@#29()]): CAST, offset=5, type_index=0"); + } + } + + @TestCase + public static class TC6 extends RepeatingTypeAnnotations { + public TC6() { + setSrc(" static String so = \"hello world\";", + " public static @A @B @A Object o = (@B @A @B String) Test.so;"); + verify("RuntimeInvisibleTypeAnnotations", + "0: #25(#26=[@#27(),@#27()]): FIELD", + "1: #28(): FIELD", + "2: #29(#26=[@#28(),@#28()]): CAST, offset=5", + "3: #27(): CAST, offset=5"); + } + } + + @TestCase + public static class TC7 extends RepeatingTypeAnnotations { + public TC7() { + setSrc(" static String so = \"hello world\";", + " public static @A @A @C Object o = (@B @C @B String) Test.so;"); + verify("RuntimeInvisibleTypeAnnotations", + "RuntimeVisibleTypeAnnotations", + "0: #25(): FIELD", + "1: #25(): CAST, offset=5", + "0: #27(#28=[@#29(),@#29()]): FIELD", + "1: #30(#28=[@#31(),@#31()]): CAST, offset=5"); + } + } + + @TestCase + public static class TC8 extends RepeatingTypeAnnotations { + public TC8() { + setSrc(" static String so = \"hello world\";", + " public static @A @B @C Object o = (@C @B @A String) Test.so;"); + verify("RuntimeInvisibleTypeAnnotations", + "RuntimeVisibleTypeAnnotations", + "0: #25(): FIELD", + "1: #25(): CAST, offset=5", + "0: #27(): FIELD", + "1: #28(): FIELD", + "2: #28(): CAST, offset=5", + "3: #27(): CAST, offset=5"); + } + } + + @TestCase + @ignore // 8008082:missing type annotation for cast + public static class TC9 extends RepeatingTypeAnnotations { + public TC9() { + setSrc(" public Test(@A @A @A Object o, @A int i, long l) {", + " @A @A @A String ls = (@B @B @B String) o;", + " }"); + verify("RuntimeInvisibleTypeAnnotations", + "0: #34(#35=[@#36(),@#36(),@#36()]): METHOD_FORMAL_PARAMETER, param_index=0", + "1: #36(): METHOD_FORMAL_PARAMETER, param_index=1", + "2: #37(#35=[@#38(),@#38(),@#38()]): CAST, offset=4, type_index=0", + "3: #34(#35=[@#36(),@#36(),@#36()]): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}"); + } + } + + @TestCase + public static class TC10 extends RepeatingTypeAnnotations { + public TC10() { + setSrc(" public Test(@A @A @B Object o, @A @B int i, long l) {", + " @A @A @B String ls = (@B @A @B String) o;", + " }"); + verify("RuntimeInvisibleTypeAnnotations:", + "0: #34(#35=[@#36(),@#36()]): METHOD_FORMAL_PARAMETER, param_index=0", + "1: #37(): METHOD_FORMAL_PARAMETER, param_index=0", + "2: #36(): METHOD_FORMAL_PARAMETER, param_index=1", + "3: #37(): METHOD_FORMAL_PARAMETER, param_index=1", + "4: #38(#35=[@#37(),@#37()]): CAST, offset=4, type_index=0", + "5: #36(): CAST, offset=4, type_index=0", + "6: #34(#35=[@#36(),@#36()]): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}", + "7: #37(): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}"); + } + } + + @TestCase + public static class TC11 extends RepeatingTypeAnnotations { + public TC11() { + setSrc(" public Test(@C @C @A Object o, @A @B int i, long l) {", + " @C @C @A String ls = (@A @A @C String) o;", + " }"); + verify("RuntimeInvisibleTypeAnnotations", + "RuntimeVisibleTypeAnnotations", + "0: #34(#35=[@#36(),@#36()]): METHOD_FORMAL_PARAMETER, param_index=0", + "1: #36(): CAST, offset=4", + "2: #34(#35=[@#36(),@#36()]): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}", + "0: #38(): METHOD_FORMAL_PARAMETER, param_index=0", + "1: #38(): METHOD_FORMAL_PARAMETER, param_index=1", + "2: #39(): METHOD_FORMAL_PARAMETER, param_index=1", + "3: #40(#35=[@#38(),@#38()]): CAST, offset=4", + "4: #38(): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}"); + } + } + + @TestCase + public static class TC12 extends RepeatingTypeAnnotations { + public TC12() { + setSrc(" public Test(@A @B @C Object o, @A @C int i, long l) {", + " @A @B @C String ls = (@C @A @B String) o;", + " }"); + verify("RuntimeInvisibleTypeAnnotations", + "RuntimeVisibleTypeAnnotations", + "0: #34(): METHOD_FORMAL_PARAMETER, param_index=0", + "1: #34(): METHOD_FORMAL_PARAMETER, param_index=1", + "2: #34(): CAST, offset=4", + "3: #34(): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}", + "0: #36(): METHOD_FORMAL_PARAMETER, param_index=0", + "1: #37(): METHOD_FORMAL_PARAMETER, param_index=0", + "2: #36(): METHOD_FORMAL_PARAMETER, param_index=1", + "3: #36(): CAST, offset=4", + "4: #37(): CAST, offset=4", + "5: #36(): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}", + "6: #37(): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}"); + } + } + + @TestCase + @ignore // 8008082:missing type annotation for cast + public static class TC13 extends RepeatingTypeAnnotations { + public TC13() { + setSrc(" public @A @A @A String foo(@A @A @A Object o, @A int i, long l) {", + " @A @A @A String ls = (@B @B @B String) o;", + " return (@A @A @A String) o;", + " }"); + verify("RuntimeInvisibleTypeAnnotations", + "0: #36(#37=[@#38(),@#38(),@#38()]): METHOD_RETURN", + "1: #36(#37=[@#38(),@#38(),@#38()]): METHOD_FORMAL_PARAMETER, param_index=0", + "2: #38(): METHOD_FORMAL_PARAMETER, param_index=1", + "3: #39(#37=[@#40(),@#40(),@#40()]): CAST, offset=0, type_index=0", + "4: #36(#37=[@#38(),@#38(),@#38()]): CAST, offset=6, type_index=0", + "5: #36(#37=[@#38(),@#38(),@#38()]): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}"); + } + } + + @TestCase + public static class TC14 extends RepeatingTypeAnnotations { + public TC14() { + setSrc(" public @A @B @B String foo(@A @A @B Object o, @A @B int i, long l) {", + " @A @A @B String ls = (@B @A @B String) o;", + " return (@A @B @B String) o;", + " }"); + verify("RuntimeInvisibleTypeAnnotations", + "0: #36(): METHOD_RETURN", + "1: #37(#38=[@#39(),@#39()]): METHOD_RETURN", + "2: #40(#38=[@#36(),@#36()]): METHOD_FORMAL_PARAMETER, param_index=0", + "3: #39(): METHOD_FORMAL_PARAMETER, param_index=0", + "4: #36(): METHOD_FORMAL_PARAMETER, param_index=1", + "5: #39(): METHOD_FORMAL_PARAMETER, param_index=1", + "6: #37(#38=[@#39(),@#39()]): CAST, offset=0", + "7: #36(): CAST, offset=0", + "8: #36(): CAST, offset=6", + "9: #37(#38=[@#39(),@#39()]): CAST, offset=6", + "10: #40(#38=[@#36(),@#36()]): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}", + "11: #39(): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}"); + } + } + + @TestCase + public static class TC15 extends RepeatingTypeAnnotations { + public TC15() { + setSrc(" public @A @A @C String foo(@C @C @A Object o, @A @B int i, long l) {", + " @C @C @A String ls = (@A @A @C String) o;", + " return (@C @B @B String) o;", + " }"); + verify("RuntimeInvisibleTypeAnnotations", + "RuntimeVisibleTypeAnnotations", + "0: #36(): METHOD_RETURN", + "1: #37(#38=[@#36(),@#36()]): METHOD_FORMAL_PARAMETER, param_index=0", + "2: #36(): CAST, offset=0", + "3: #36(): CAST, offset=6", + "4: #37(#38=[@#36(),@#36()]): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}", + "0: #40(#38=[@#41(),@#41()]): METHOD_RETURN", + "1: #41(): METHOD_FORMAL_PARAMETER, param_index=0", + "2: #41(): METHOD_FORMAL_PARAMETER, param_index=1", + "3: #42(): METHOD_FORMAL_PARAMETER, param_index=1", + "4: #40(#38=[@#41(),@#41()]): CAST, offset=0", + "5: #43(#38=[@#42(),@#42()]): CAST, offset=6", + "6: #41(): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}"); + } + } + + @TestCase + public static class TC16 extends RepeatingTypeAnnotations { + public TC16() { + setSrc(" public @A @B @C String foo(@A @B @C Object o, @A @C int i, long l) {", + " @A @B @C String ls = (@C @A @B String) o;", + " return (@B @A @C String) o;", + " }"); + verify("RuntimeInvisibleTypeAnnotations", + "RuntimeVisibleTypeAnnotations", + "0: #36(): METHOD_RETURN", + "1: #36(): METHOD_FORMAL_PARAMETER, param_index=0", + "2: #36(): METHOD_FORMAL_PARAMETER, param_index=1", + "3: #36(): CAST, offset=0", + "4: #36(): CAST, offset=6", + "5: #36(): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}", + "0: #38(): METHOD_RETURN", + "1: #39(): METHOD_RETURN", + "2: #38(): METHOD_FORMAL_PARAMETER, param_index=0", + "3: #39(): METHOD_FORMAL_PARAMETER, param_index=0", + "4: #38(): METHOD_FORMAL_PARAMETER, param_index=1", + "5: #38(): CAST, offset=0", + "6: #39(): CAST, offset=0", + "7: #39(): CAST, offset=6", + "8: #38(): CAST, offset=6", + "9: #38(): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}", + "10: #39(): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}"); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javap/output/Tester.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,389 @@ +/* + * 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. + */ + +import java.io.*; +import java.util.*; +import java.lang.annotation.*; +import java.lang.reflect.InvocationTargetException; + +/** + * {@code Tester} is an abstract test-driver that provides the logic + * to execute test-cases, grouped by test classes. + * A test class is a main class extending this class, that instantiate + * itself, and calls the {@link run} method, passing any command line + * arguments. + * <p> + * The {@code run} method, expects arguments to identify test-case classes. + * A test-case class is a class extending the test class, and annotated + * with {@code TestCase}. + * <p> + * If no test-cases are specified, the test class directory is searched for + * co-located test-case classes (i.e. any class extending the test class, + * annotated with {@code TestCase}). + * <p> + * Besides serving to group test-cases, extending the driver allow + * setting up a test-case template, and possibly overwrite default + * test-driver behaviour. + */ +public abstract class Tester { + + private static boolean debug = false; + private static final PrintStream out = System.err; + private static final PrintStream err = System.err; + + + protected void run(String... args) throws Exception { + + final File classesdir = new File(System.getProperty("test.classes", ".")); + + String[] classNames = args; + + // If no test-cases are specified, we regard all co-located classes + // as potential test-cases. + if (args.length == 0) { + final String pattern = ".*\\.class"; + final File classFiles[] = classesdir.listFiles(new FileFilter() { + public boolean accept(File f) { + return f.getName().matches(pattern); + } + }); + ArrayList<String> names = new ArrayList<String>(classFiles.length); + for (File f : classFiles) { + String fname = f.getName(); + names.add(fname.substring(0, fname.length() -6)); + } + classNames = names.toArray(new String[names.size()]); + } else { + debug = true; + } + // Test-cases must extend the driver type, and be marked + // @TestCase. Other arguments (classes) are ignored. + // Test-cases are instantiated, and thereby executed. + for (String clname : classNames) { + try { + final Class tclass = Class.forName(clname); + if (!getClass().isAssignableFrom(tclass)) continue; + TestCase anno = (TestCase) tclass.getAnnotation(TestCase.class); + if (anno == null) continue; + if (!debug) { + ignore i = (ignore) tclass.getAnnotation(ignore.class); + if (i != null) { + out.println("Ignore: " + clname); + ignored++; + continue; + } + } + out.println("TestCase: " + clname); + cases++; + Tester tc = (Tester) tclass.getConstructor().newInstance(); + if (tc.errors > 0) { + error("" + tc.errors + " test points failed in " + clname); + errors += tc.errors - 1; + fcases++; + } + } catch(ReflectiveOperationException roe) { + error("Warning: " + clname + " - ReflectiveOperationException"); + roe.printStackTrace(err); + } catch(Exception unknown) { + error("Warning: " + clname + " - uncaught exception"); + unknown.printStackTrace(err); + } + } + + String imsg = ignored > 0 ? " (" + ignored + " ignored)" : ""; + if (errors > 0) + throw new Error(errors + " error, in " + fcases + " of " + cases + " test-cases" + imsg); + else + err.println("" + cases + " test-cases executed" + imsg + ", no errors"); + } + + + /** + * Test-cases must be marked with the {@code TestCase} annotation, + * as well as extend {@code Tester} (or an driver extension + * specified as the first argument to the {@code main()} method. + */ + @Retention(RetentionPolicy.RUNTIME) + @interface TestCase { } + + /** + * Individual test-cases failing due to product bugs, may temporarily + * be excluded by marking them like this: + * @ignore // 1234567:bug synopsis + */ + @Retention(RetentionPolicy.RUNTIME) + @interface ignore { } + + /** + * Test-cases are classes extending {@code Tester}, and + * calling {@link setSrc}, followed by one or more invocations + * of {@link verify} in the body of the constructor. + * <p> + * Sets a default test-case template, which is empty except + * for a key of {@code "TESTCASE"}. + * Subclasses will typically call {@code setSrc(TestSource)} + * to setup a useful test-case template. + */ + public Tester() { + this.testCase = this.getClass().getName(); + src = new TestSource("TESTCASE"); + } + + /** + * Set the top-level source template. + */ + protected Tester setSrc(TestSource src) { + this.src = src; + return this; + } + + /** + * Convenience method for calling {@code innerSrc("TESTCASE", ...)}. + */ + protected Tester setSrc(String... lines) { + return innerSrc("TESTCASE", lines); + } + + /** + * Convenience method for calling {@code innerSrc(key, new TestSource(...))}. + */ + protected Tester innerSrc(String key, String... lines) { + return innerSrc(key, new TestSource(lines)); + } + + /** + * Specialize the testcase template, setting replacement content + * for the specified key. + */ + protected Tester innerSrc(String key, TestSource content) { + if (src == null) { + src = new TestSource(key); + } + src.setInner(key, content); + return this; + } + + /** + * On the first invocation, call {@code execute()} to compile + * the test-case source and process the resulting class(se) + * into verifiable output. + * <p> + * Verify that the output matches each of the regular expressions + * given as argument. + * <p> + * Any failure to match constitutes a test failure, but doesn't + * abort the test-case. + * <p> + * Any exception (e.g. bad regular expression syntax) results in + * a test failure, and aborts the test-case. + */ + protected void verify(String... expect) { + if (!didExecute) { + try { + execute(); + } catch(Exception ue) { + throw new Error(ue); + } finally { + didExecute = true; + } + } + if (output == null) { + error("output is null"); + return; + } + for (String e: expect) { + // Escape regular expressions (to allow input to be literals). + // Notice, characters to be escaped are themselves identified + // using regular expressions + String rc[] = { "(", ")", "[", "]", "{", "}", "$" }; + for (String c : rc) { + e = e.replace(c, "\\" + c); + } + // DEBUG: Uncomment this to test modulo constant pool index. + // e = e.replaceAll("#[0-9]{2}", "#[0-9]{2}"); + if (!output.matches("(?s).*" + e + ".*")) { + if (!didPrint) { + out.println(output); + didPrint = true; + } + error("not matched: '" + e + "'"); + } else if(debug) { + out.println("matched: '" + e + "'"); + } + } + } + + /** + * Calls {@code writeTestFile()} to write out the test-case source + * content to a file, then call {@code compileTestFile()} to + * compile it, and finally run the {@link process} method to produce + * verifiable output. The default {@code process} method runs javap. + * <p> + * If an exception occurs, it results in a test failure, and + * aborts the test-case. + */ + protected void execute() throws IOException { + err.println("TestCase: " + testCase); + writeTestFile(); + compileTestFile(); + process(); + } + + /** + * Generate java source from test-case. + * TBD: change to use javaFileObject, possibly make + * this class extend JavaFileObject. + */ + protected void writeTestFile() throws IOException { + javaFile = new File("Test.java"); + FileWriter fw = new FileWriter(javaFile); + BufferedWriter bw = new BufferedWriter(fw); + PrintWriter pw = new PrintWriter(bw); + for (String line : src) { + pw.println(line); + if (debug) out.println(line); + } + pw.close(); + } + + /** + * Compile the Java source code. + */ + protected void compileTestFile() { + String path = javaFile.getPath(); + String params[] = { "-source", "1.8", "-g", path }; + int rc = com.sun.tools.javac.Main.compile(params); + if (rc != 0) + throw new Error("compilation failed. rc=" + rc); + classFile = new File(path.substring(0, path.length() - 5) + ".class"); + } + + + /** + * Process class file to generate output for verification. + * The default implementation simply runs javap. This might be + * overwritten to generate output in a different manner. + */ + protected void process() { + String testClasses = "."; //System.getProperty("test.classes", "."); + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + String[] args = { "-v", "-classpath", testClasses, "Test" }; + int rc = com.sun.tools.javap.Main.run(args, pw); + if (rc != 0) + throw new Error("javap failed. rc=" + rc); + pw.close(); + output = sw.toString(); + if (debug) { + out.println(output); + didPrint = true; + } + + } + + + private String testCase; + private TestSource src; + private File javaFile = null; + private File classFile = null; + private String output = null; + private boolean didExecute = false; + private boolean didPrint = false; + + + protected void error(String msg) { + err.println("Error: " + msg); + errors++; + } + + private int cases; + private int fcases; + private int errors; + private int ignored; + + /** + * The TestSource class provides a simple container for + * test cases. It contains an array of source code lines, + * where zero or more lines may be markers for nested lines. + * This allows representing templates, with specialization. + * <P> + * This may be generalized to support more advance combo + * tests, but presently it's only used with a static template, + * and one level of specialization. + */ + public class TestSource implements Iterable<String> { + + private String[] lines; + private Hashtable<String, TestSource> innerSrc; + + public TestSource(String... lines) { + this.lines = lines; + innerSrc = new Hashtable<String, TestSource>(); + } + + public void setInner(String key, TestSource inner) { + innerSrc.put(key, inner); + } + + public void setInner(String key, String... lines) { + innerSrc.put(key, new TestSource(lines)); + } + + public Iterator<String> iterator() { + return new LineIterator(); + } + + private class LineIterator implements Iterator<String> { + + int nextLine = 0; + Iterator<String> innerIt = null; + + public boolean hasNext() { + return nextLine < lines.length; + } + + public String next() { + if (!hasNext()) throw new NoSuchElementException(); + String str = lines[nextLine]; + TestSource inner = innerSrc.get(str); + if (inner == null) { + nextLine++; + return str; + } + if (innerIt == null) { + innerIt = inner.iterator(); + } + if (innerIt.hasNext()) { + return innerIt.next(); + } + innerIt = null; + nextLine++; + return next(); + } + + public void remove() { + throw new UnsupportedOperationException(); + } + } + } +}
--- a/test/tools/javap/pathsep.sh Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 2003, 2009, 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. -# - -# @test -# @bug 4798312 -# @summary In Windows, javap doesnt load classes from rt.jar -# @author gafter -# -# @run shell pathsep.sh - -if [ "${TESTJAVA}" = "" ] -then - echo "TESTJAVA not set. Test cannot execute. Failed." - exit 1 -fi -echo "TESTJAVA=${TESTJAVA}" - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin | CYGWIN* ) - FS="/" - ;; - Windows* ) - FS="\\" - ;; - * ) - echo "Unrecognized system!" - exit 1; - ;; -esac - -"${TESTJAVA}${FS}bin${FS}javap" ${TESTTOOLVMOPTS} java.lang.String -result=$? -if [ $result -eq 0 ] -then - echo "Passed" -else - echo "Failed" -fi -exit $result
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javap/stackmap/StackmapTest.java Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,98 @@ +/* + * 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. + */ + +/* + * @test + * @bug 6271292 + * @summary Verify that javap prints StackMapTable attribute contents + * @library /tools/javac/lib + * @build ToolBox + * @run main StackmapTest + */ + +import java.util.Arrays; +import java.util.List; + +//original test: test/tools/javap/stackmap/T6271292.sh +public class StackmapTest { + + private static final String TestSrc = + "public class Test extends SuperClass {\n" + + " public static void main(String[] args) {\n" + + " new SuperClass((args[0].equals(\"0\")) ? 0 : 1)\n" + + " .test();\n" + + " }\n" + + " Test(boolean b) {\n" + + " super(b ? 1 : 2);\n" + + " }\n" + + "}\n" + + "class SuperClass {\n" + + " double d;\n" + + " SuperClass(double dd) { d = dd; }\n" + + " double test() {\n" + + " if (d == 0)\n" + + " return d;\n" + + " else\n" + + " return d > 0 ? d++ : d--;\n" + + " }\n" + + "}\n"; + + private static final String goldenOut = + "frame_type = 255 /* full_frame */\n" + + "frame_type = 255 /* full_frame */\n" + + "frame_type = 73 /* same_locals_1_stack_item */\n" + + "frame_type = 255 /* full_frame */\n" + + "offset_delta = 19\n" + + "offset_delta = 0\n" + + "offset_delta = 2\n" + + "stack = [ uninitialized 0, uninitialized 0 ]\n" + + "stack = [ uninitialized 0, uninitialized 0, double ]\n" + + "stack = [ this ]\n" + + "stack = [ this, double ]\n" + + "locals = [ class \"[Ljava/lang/String;\" ]\n" + + "locals = [ class \"[Ljava/lang/String;\" ]\n" + + "locals = [ this, int ]\n"; + + public static void main(String[] args) throws Exception { + // @compile T6271292.java + ToolBox.JavaToolArgs javacParams = + new ToolBox.JavaToolArgs().setSources(TestSrc); + ToolBox.javac(javacParams); + +// "${TESTJAVA}${FS}bin${FS}javap" ${TESTTOOLVMOPTS} -classpath "${TESTCLASSES}" -verbose T6271292 > "${JAVAPFILE}" + ToolBox.JavaToolArgs javapParams = + new ToolBox.JavaToolArgs() + .setAllArgs("-v", "Test.class"); + String out = ToolBox.javap(javapParams); + List<String> grepResult = ToolBox.grep("frame_type", out, + ToolBox.lineSeparator); + grepResult.addAll(ToolBox.grep("offset_delta", out, ToolBox.lineSeparator)); + grepResult.addAll(ToolBox.grep("stack = ", out, ToolBox.lineSeparator)); + grepResult.addAll(ToolBox.grep("locals = ", out, ToolBox.lineSeparator)); + List<String> goldenList = Arrays.asList(goldenOut.split("\n")); + +// diff -w "${OUTFILE}" "${TESTSRC}${FS}T6271292.out" + ToolBox.compareLines(goldenList, grepResult, true); + } + +}
--- a/test/tools/javap/stackmap/T6271292.java Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2005, 2007, 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. - */ - - -public class T6271292 extends SuperClass { - - public static void main(String[] args) { - SuperClass s = new SuperClass((args[0].equals("0")) ? 0 : 1); - s.test(); - } - T6271292(boolean b) { - super(b ? 1 : 2); - } -} - -class SuperClass { - double d; - SuperClass(double dd) { d = dd; } - - double test() { - if (d == 0) { - return d; - } else if (d > 0) { - return d++; - } else { - return d--; - } - } -}
--- a/test/tools/javap/stackmap/T6271292.out Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ - frame_type = 255 /* full_frame */ - frame_type = 255 /* full_frame */ - frame_type = 73 /* same_locals_1_stack_item */ - frame_type = 255 /* full_frame */ - offset_delta = 19 - offset_delta = 0 - offset_delta = 2 - stack = [ uninitialized 0, uninitialized 0 ] - stack = [ uninitialized 0, uninitialized 0, double ] - stack = [ this ] - stack = [ this, double ] - locals = [ class "[Ljava/lang/String;" ] - locals = [ class "[Ljava/lang/String;" ] - locals = [ this, int ]
--- a/test/tools/javap/stackmap/T6271292.sh Wed Feb 13 15:38:52 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,88 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 2005, 2009, 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. -# - -# @test -# @bug 6271292 -# @compile T6271292.java -# @run shell T6271292.sh -# @summary Verify that javap prints StackMapTable attribute contents -# @author Wei Tao - -if [ "${TESTSRC}" = "" ] -then - echo "TESTSRC not set. Test cannot execute. Failed." - exit 1 -fi -printf 'TESTSRC="%s"' "${TESTSRC}" >&2 ; echo >&2 -if [ "${TESTJAVA}" = "" ] -then - echo "TESTJAVA not set. Test cannot execute. Failed." - exit 1 -fi -printf 'TESTJAVA="%s"' "${TESTJAVA}" >&2 ; echo >&2 -if [ "${TESTCLASSES}" = "" ] -then - echo "TESTCLASSES not set. Test cannot execute. Failed." - exit 1 -fi -printf 'TESTCLASSES="%s"' "${TESTCLASSES}" >&2 ; echo >&2 -printf 'CLASSPATH="%s"' "${CLASSPATH}" >&2 ; echo >&2 - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - Windows* ) - FS="\\" - ;; - * ) - FS="/" - ;; -esac - -JAVAPFILE=T6271292.javap -OUTFILE=outfile - -"${TESTJAVA}${FS}bin${FS}javap" ${TESTTOOLVMOPTS} -classpath "${TESTCLASSES}" -verbose T6271292 > "${JAVAPFILE}" -result="$?" -if [ "$result" -ne 0 ] -then - exit "$result" -fi - -grep "frame_type" "${JAVAPFILE}" > "${OUTFILE}" -grep "offset_delta" "${JAVAPFILE}" >> "${OUTFILE}" -grep "stack = " "${JAVAPFILE}" >> "${OUTFILE}" -grep "locals = " "${JAVAPFILE}" >> "${OUTFILE}" -diff -w "${OUTFILE}" "${TESTSRC}${FS}T6271292.out" -result="$?" -if [ "$result" -eq 0 ] -then - echo "Passed" -else - echo "Failed" -fi -exit "$result" - -
--- a/test/tools/jdeps/Basic.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/jdeps/Basic.java Tue May 07 17:14:17 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 8003562 + * @bug 8003562 8005428 * @summary Basic tests for jdeps tool * @build Test p.Foo * @run main Basic @@ -33,13 +33,35 @@ import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.*; import java.util.regex.*; public class Basic { + private static boolean symbolFileExist = initProfiles(); + private static boolean initProfiles() { + // check if ct.sym exists; if not use the profiles.properties file + Path home = Paths.get(System.getProperty("java.home")); + if (home.endsWith("jre")) { + home = home.getParent(); + } + Path ctsym = home.resolve("lib").resolve("ct.sym"); + boolean symbolExists = ctsym.toFile().exists(); + if (!symbolExists) { + Path testSrcProfiles = + Paths.get(System.getProperty("test.src", "."), "profiles.properties"); + if (!testSrcProfiles.toFile().exists()) + throw new Error(testSrcProfiles + " does not exist"); + System.out.format("%s doesn't exist.%nUse %s to initialize profiles info%n", + ctsym, testSrcProfiles); + System.setProperty("jdeps.profiles", testSrcProfiles.toString()); + } + return symbolExists; + } + public static void main(String... args) throws Exception { int errors = 0; - errors += new Basic().run(); if (errors > 0) throw new Exception(errors + " errors found"); @@ -49,50 +71,70 @@ File testDir = new File(System.getProperty("test.classes", ".")); // test a .class file test(new File(testDir, "Test.class"), - new String[] {"java.lang", "p"}); + new String[] {"java.lang", "p"}, + new String[] {"compact1", "not found"}); // test a directory test(new File(testDir, "p"), - new String[] {"java.lang", "java.util"}); + new String[] {"java.lang", "java.util", "java.lang.management"}, + new String[] {"compact1", "compact1", "compact3"}); // test class-level dependency output test(new File(testDir, "Test.class"), new String[] {"java.lang.Object", "p.Foo"}, + new String[] {"compact1", "not found"}, new String[] {"-V", "class"}); // test -p option test(new File(testDir, "Test.class"), new String[] {"p.Foo"}, + new String[] {"not found"}, new String[] {"--verbose-level=class", "-p", "p"}); // test -e option test(new File(testDir, "Test.class"), new String[] {"p.Foo"}, + new String[] {"not found"}, new String[] {"-V", "class", "-e", "p\\..*"}); test(new File(testDir, "Test.class"), new String[] {"java.lang"}, + new String[] {"compact1"}, new String[] {"-V", "package", "-e", "java\\.lang\\..*"}); - // test -classpath and -all options + // test -classpath and wildcard options test(null, new String[] {"com.sun.tools.jdeps", "java.lang", "java.util", - "java.util.regex", "java.io", "p"}, + "java.util.regex", "java.io", "java.nio.file", + "java.lang.management"}, + new String[] {(symbolFileExist? "not found" : "JDK internal API (classes)"), + "compact1", "compact1", "compact1", + "compact1", "compact1", "compact3"}, new String[] {"--classpath", testDir.getPath(), "*"}); + /* Temporary disable this test case. Test.class has a dependency + * on java.lang.String on certain windows machine (8008479). + // -v shows intra-dependency + test(new File(testDir, "Test.class"), + new String[] {"java.lang.Object", "p.Foo"}, + new String[] {"compact1", testDir.getName()}, + new String[] {"-v", "--classpath", testDir.getPath(), "Test.class"}); + */ return errors; } - void test(File file, String[] expect) { - test(file, expect, new String[0]); + void test(File file, String[] expect, String[] profiles) { + test(file, expect, profiles, new String[0]); } - void test(File file, String[] expect, String[] options) { - String[] args; + void test(File file, String[] expect, String[] profiles, String[] options) { + List<String> args = new ArrayList<>(Arrays.asList(options)); if (file != null) { - args = Arrays.copyOf(options, options.length+1); - args[options.length] = file.getPath(); - } else { - args = options; + args.add(file.getPath()); } - String[] deps = jdeps(args); - checkEqual("dependencies", expect, deps); + List<String> argsWithDashP = new ArrayList<>(); + argsWithDashP.add("-P"); + argsWithDashP.addAll(args); + // test without -P + checkResult("dependencies", expect, jdeps(args.toArray(new String[0])).keySet()); + // test with -P + checkResult("profiles", expect, profiles, jdeps(argsWithDashP.toArray(new String[0]))); } - String[] jdeps(String... args) { + Map<String,String> jdeps(String... args) { StringWriter sw = new StringWriter(); PrintWriter pw = new PrintWriter(sw); System.err.println("jdeps " + Arrays.toString(args)); @@ -108,12 +150,12 @@ // Pattern used to parse lines private static Pattern linePattern = Pattern.compile(".*\r?\n"); - private static Pattern pattern = Pattern.compile("\\s+ -> (\\S+) +.*"); + private static Pattern pattern = Pattern.compile("\\s+ -> (\\S+) +(.*)"); // Use the linePattern to break the given String into lines, applying // the pattern to each line to see if we have a match - private static String[] findDeps(String out) { - List<String> result = new ArrayList<>(); + private static Map<String,String> findDeps(String out) { + Map<String,String> result = new HashMap<>(); Matcher lm = linePattern.matcher(out); // Line matcher Matcher pm = null; // Pattern matcher int lines = 0; @@ -125,19 +167,41 @@ else pm.reset(cs); if (pm.find()) - result.add(pm.group(1)); + result.put(pm.group(1), pm.group(2).trim()); if (lm.end() == out.length()) break; } - return result.toArray(new String[0]); + return result; + } + + void checkResult(String label, String[] expect, Collection<String> found) { + List<String> list = Arrays.asList(expect); + if (!isEqual(list, found)) + error("Unexpected " + label + " found: '" + found + "', expected: '" + list + "'"); } - void checkEqual(String label, String[] expect, String[] found) { - Set<String> s1 = new HashSet<>(Arrays.asList(expect)); - Set<String> s2 = new HashSet<>(Arrays.asList(found)); + void checkResult(String label, String[] expect, String[] profiles, Map<String,String> result) { + if (expect.length != profiles.length) + error("Invalid expected names and profiles"); - if (!s1.equals(s2)) - error("Unexpected " + label + " found: '" + s2 + "', expected: '" + s1 + "'"); + // check the dependencies + checkResult(label, expect, result.keySet()); + // check profile information + checkResult(label, profiles, result.values()); + for (int i=0; i < expect.length; i++) { + String profile = result.get(expect[i]); + if (!profile.equals(profiles[i])) + error("Unexpected profile: '" + profile + "', expected: '" + profiles[i] + "'"); + } + } + + boolean isEqual(List<String> expected, Collection<String> found) { + if (expected.size() != found.size()) + return false; + + List<String> list = new ArrayList<>(found); + list.removeAll(expected); + return list.isEmpty(); } void error(String msg) {
--- a/test/tools/jdeps/p/Foo.java Wed Feb 13 15:38:52 2013 +0000 +++ b/test/tools/jdeps/p/Foo.java Tue May 07 17:14:17 2013 -0700 @@ -31,5 +31,7 @@ } public Foo() { + // compact3 + java.lang.management.ManagementFactory.getRuntimeMXBean(); } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/jdeps/profiles.properties Tue May 07 17:14:17 2013 -0700 @@ -0,0 +1,263 @@ +# This properties file is used for testing a JDK development build. +# No need to keep this properties file up to date as long as it covers +# the APIs used by the jdeps regression test. +profile.1.name = compact1 +profile.1.packages = \ + java.io \ + java.lang \ + java.lang.annotation \ + java.lang.invoke \ + java.lang.ref \ + java.lang.reflect \ + java.math \ + java.net \ + java.nio \ + java.nio.channels \ + java.nio.channels.spi \ + java.nio.charset \ + java.nio.charset.spi \ + java.nio.file \ + java.nio.file.attribute \ + java.nio.file.spi \ + java.security \ + java.security.cert \ + java.security.interfaces \ + java.security.spec \ + java.text \ + java.text.spi \ + java.util \ + java.util.concurrent \ + java.util.concurrent.atomic \ + java.util.concurrent.locks \ + java.util.jar \ + java.util.logging \ + java.util.regex \ + java.util.spi \ + java.util.zip \ + javax.crypto \ + javax.crypto.interfaces \ + javax.crypto.spec \ + javax.security.auth \ + javax.security.auth.callback \ + javax.security.auth.login \ + javax.security.auth.spi \ + javax.security.auth.x500 \ + javax.net \ + javax.net.ssl \ + javax.security.cert \ + \ + com.sun.net.ssl \ + com.sun.nio.file \ + com.sun.nio.sctp \ + com.sun.security.auth \ + com.sun.security.auth.login + +profile.2.name = compact2 +profile.2.packages = \ + java.sql \ + javax.sql \ + javax.xml \ + javax.xml.datatype \ + javax.xml.namespace \ + javax.xml.parsers \ + javax.xml.stream \ + javax.xml.stream.events \ + javax.xml.stream.util \ + javax.xml.transform \ + javax.xml.transform.dom \ + javax.xml.transform.sax \ + javax.xml.transform.stax \ + javax.xml.transform.stream \ + javax.xml.validation \ + javax.xml.xpath \ + org.w3c.dom \ + org.w3c.dom.bootstrap \ + org.w3c.dom.events \ + org.w3c.dom.ls \ + org.xml.sax \ + org.xml.sax.ext \ + org.xml.sax.helpers \ + java.rmi \ + java.rmi.activation \ + java.rmi.dgc \ + java.rmi.registry \ + java.rmi.server \ + javax.rmi.ssl \ + javax.transaction \ + javax.transaction.xa \ + \ + com.sun.net.httpserver \ + com.sun.net.httpserver.spi + +profile.3.name = compact3 +profile.3.packages = \ + java.lang.instrument \ + java.lang.management \ + java.security.acl \ + java.util.prefs \ + javax.management \ + javax.management.loading \ + javax.management.modelmbean \ + javax.management.monitor \ + javax.management.openmbean \ + javax.management.relation \ + javax.management.remote \ + javax.management.remote.rmi \ + javax.management.timer \ + javax.naming \ + javax.naming.directory \ + javax.naming.event \ + javax.naming.ldap \ + javax.naming.spi \ + javax.sql.rowset \ + javax.sql.rowset.serial \ + javax.sql.rowset.spi \ + javax.security.auth.kerberos \ + javax.security.sasl \ + javax.script \ + javax.smartcardio \ + javax.xml.crypto \ + javax.xml.crypto.dom \ + javax.xml.crypto.dsig \ + javax.xml.crypto.dsig.dom \ + javax.xml.crypto.dsig.keyinfo \ + javax.xml.crypto.dsig.spec \ + javax.annotation.processing \ + javax.lang.model \ + javax.lang.model.element \ + javax.lang.model.type \ + javax.lang.model.util \ + javax.tools \ + javax.tools.annotation \ + org.ietf.jgss \ + \ + com.sun.management \ + com.sun.security.auth.callback \ + com.sun.security.auth.module \ + com.sun.security.jgss + +profile.4.name = Full JRE +profile.4.packages = \ + java.applet \ + java.awt \ + java.awt.color \ + java.awt.datatransfer \ + java.awt.dnd \ + java.awt.dnd.peer \ + java.awt.event \ + java.awt.font \ + java.awt.geom \ + java.awt.im \ + java.awt.im.spi \ + java.awt.image \ + java.awt.image.renderable \ + java.awt.peer \ + java.awt.print \ + java.beans \ + java.beans.beancontext \ + javax.accessibility \ + javax.imageio \ + javax.imageio.event \ + javax.imageio.metadata \ + javax.imageio.plugins.bmp \ + javax.imageio.plugins.jpeg \ + javax.imageio.spi \ + javax.imageio.stream \ + javax.print \ + javax.print.attribute \ + javax.print.attribute.standard \ + javax.print.event \ + javax.sound.midi \ + javax.sound.midi.spi \ + javax.sound.sampled \ + javax.sound.sampled.spi \ + javax.swing \ + javax.swing.border \ + javax.swing.colorchooser \ + javax.swing.event \ + javax.swing.filechooser \ + javax.swing.plaf \ + javax.swing.plaf.basic \ + javax.swing.plaf.metal \ + javax.swing.plaf.multi \ + javax.swing.plaf.nimbus \ + javax.swing.plaf.synth \ + javax.swing.table \ + javax.swing.text \ + javax.swing.text.html \ + javax.swing.text.html.parser \ + javax.swing.text.rtf \ + javax.swing.tree \ + javax.swing.undo \ + javax.activation \ + javax.jws \ + javax.jws.soap \ + javax.rmi \ + javax.rmi.CORBA \ + javax.xml.bind \ + javax.xml.bind.annotation \ + javax.xml.bind.annotation.adapters \ + javax.xml.bind.attachment \ + javax.xml.bind.helpers \ + javax.xml.bind.util \ + javax.xml.soap \ + javax.xml.ws \ + javax.xml.ws.handler \ + javax.xml.ws.handler.soap \ + javax.xml.ws.http \ + javax.xml.ws.soap \ + javax.xml.ws.spi \ + javax.xml.ws.spi.http \ + javax.xml.ws.wsaddressing \ + javax.annotation \ + org.omg.CORBA \ + org.omg.CORBA.DynAnyPackage \ + org.omg.CORBA.ORBPackage \ + org.omg.CORBA.TypeCodePackage \ + org.omg.CORBA.portable \ + org.omg.CORBA_2_3 \ + org.omg.CORBA_2_3.portable \ + org.omg.CosNaming \ + org.omg.CosNaming.NamingContextExtPackage \ + org.omg.CosNaming.NamingContextPackage \ + org.omg.Dynamic \ + org.omg.DynamicAny \ + org.omg.DynamicAny.DynAnyFactoryPackage \ + org.omg.DynamicAny.DynAnyPackage \ + org.omg.IOP \ + org.omg.IOP.CodecFactoryPackage \ + org.omg.IOP.CodecPackage \ + org.omg.Messaging \ + org.omg.PortableInterceptor \ + org.omg.PortableInterceptor.ORBInitInfoPackage \ + org.omg.PortableServer \ + org.omg.PortableServer.CurrentPackage \ + org.omg.PortableServer.POAManagerPackage \ + org.omg.PortableServer.POAPackage \ + org.omg.PortableServer.ServantLocatorPackage \ + org.omg.PortableServer.portable \ + org.omg.SendingContext \ + org.omg.stub.java.rmi \ + org.omg.stub.javax.management.remote.rmi + +# Remaining JDK supported API +profile.5.name = JDK tools +profile.5.packages = \ + com.sun.jdi \ + com.sun.jdi.connect \ + com.sun.jdi.connect.spi \ + com.sun.jdi.event \ + com.sun.jdi.request \ + com.sun.javadoc \ + com.sun.tools.doclets \ + com.sun.tools.doctree \ + com.sun.source.tree \ + com.sun.source.util \ + com.sun.tools.attach \ + com.sun.tools.attach.spi \ + com.sun.tools.jconsole \ + com.sun.tools.javac \ + com.sun.tools.javah \ + com.sun.tools.javap \ + com.sun.tools.javadoc \ + com.sun.servicetag