diff --git a/langtools/make/tools/genstubs/GenStubs.java b/langtools/make/tools/genstubs/GenStubs.java index ff7cbbbf7df..5ff9f35789b 100644 --- a/langtools/make/tools/genstubs/GenStubs.java +++ b/langtools/make/tools/genstubs/GenStubs.java @@ -35,7 +35,7 @@ import com.sun.source.tree.CompilationUnitTree; import com.sun.source.util.JavacTask; import com.sun.tools.javac.api.JavacTool; import com.sun.tools.javac.code.Flags; -import com.sun.tools.javac.code.TypeTags; +import com.sun.tools.javac.code.TypeTag; import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.tree.JCTree.JCCompilationUnit; import com.sun.tools.javac.tree.JCTree.JCFieldAccess; @@ -244,23 +244,23 @@ public class GenStubs { else { String t = tree.vartype.toString(); if (t.equals("boolean")) - tree.init = new JCLiteral(TypeTags.BOOLEAN, 0) { }; + tree.init = new JCLiteral(TypeTag.BOOLEAN, 0) { }; else if (t.equals("byte")) - tree.init = new JCLiteral(TypeTags.BYTE, 0) { }; + tree.init = new JCLiteral(TypeTag.BYTE, 0) { }; else if (t.equals("char")) - tree.init = new JCLiteral(TypeTags.CHAR, 0) { }; + tree.init = new JCLiteral(TypeTag.CHAR, 0) { }; else if (t.equals("double")) - tree.init = new JCLiteral(TypeTags.DOUBLE, 0.d) { }; + tree.init = new JCLiteral(TypeTag.DOUBLE, 0.d) { }; else if (t.equals("float")) - tree.init = new JCLiteral(TypeTags.FLOAT, 0.f) { }; + tree.init = new JCLiteral(TypeTag.FLOAT, 0.f) { }; else if (t.equals("int")) - tree.init = new JCLiteral(TypeTags.INT, 0) { }; + tree.init = new JCLiteral(TypeTag.INT, 0) { }; else if (t.equals("long")) - tree.init = new JCLiteral(TypeTags.LONG, 0) { }; + tree.init = new JCLiteral(TypeTag.LONG, 0) { }; else if (t.equals("short")) - tree.init = new JCLiteral(TypeTags.SHORT, 0) { }; + tree.init = new JCLiteral(TypeTag.SHORT, 0) { }; else - tree.init = new JCLiteral(TypeTags.BOT, null) { }; + tree.init = new JCLiteral(TypeTag.BOT, null) { }; } } result = tree; diff --git a/langtools/src/share/classes/com/sun/javadoc/SerialFieldTag.java b/langtools/src/share/classes/com/sun/javadoc/SerialFieldTag.java index ad32c1a1d43..7f73936588f 100644 --- a/langtools/src/share/classes/com/sun/javadoc/SerialFieldTag.java +++ b/langtools/src/share/classes/com/sun/javadoc/SerialFieldTag.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -46,7 +46,7 @@ package com.sun.javadoc; public interface SerialFieldTag extends Tag, Comparable { /** - * Return the serialziable field name. + * Return the serializable field name. */ public String fieldName(); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java index 2e902b39e77..3db480cfcdf 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java @@ -56,32 +56,18 @@ public class AbstractIndexWriter extends HtmlDocletWriter { protected IndexBuilder indexbuilder; /** - * This constructor will be used by {@link SplitIndexWriter}. Initialises + * This constructor will be used by {@link SplitIndexWriter}. Initializes * path to this file and relative path from this file. * + * @param configuration The current configuration * @param path Path to the file which is getting generated. - * @param filename Name of the file which is getting genrated. - * @param relpath Relative path from this file to the current directory. * @param indexbuilder Unicode based Index from {@link IndexBuilder} */ protected AbstractIndexWriter(ConfigurationImpl configuration, - String path, String filename, - String relpath, IndexBuilder indexbuilder) + DocPath path, + IndexBuilder indexbuilder) throws IOException { - super(configuration, path, filename, relpath); - this.indexbuilder = indexbuilder; - } - - /** - * This Constructor will be used by {@link SingleIndexWriter}. - * - * @param filename Name of the file which is getting genrated. - * @param indexbuilder Unicode based Index form {@link IndexBuilder} - */ - protected AbstractIndexWriter(ConfigurationImpl configuration, - String filename, IndexBuilder indexbuilder) - throws IOException { - super(configuration, filename); + super(configuration, path); this.indexbuilder = indexbuilder; } diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java index 9667b0f1477..0a75cca2329 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java @@ -27,9 +27,11 @@ package com.sun.tools.doclets.formats.html; import java.io.*; import java.util.*; + 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.DocPath; /** * Abstract class to generate the overview files in @@ -52,14 +54,14 @@ public abstract class AbstractPackageIndexWriter extends HtmlDocletWriter { protected PackageDoc[] packages; /** - * Constructor. Also initialises the packages variable. + * Constructor. Also initializes the packages variable. * + * @param configuration The current configuration * @param filename Name of the package index file to be generated. */ public AbstractPackageIndexWriter(ConfigurationImpl configuration, - String filename) throws IOException { + DocPath filename) throws IOException { super(configuration, filename); - this.relativepathNoSlash = "."; packages = configuration.packages; } diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java index ccf82cf6be9..63786f474f0 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java @@ -56,45 +56,22 @@ public abstract class AbstractTreeWriter extends HtmlDocletWriter { private static final String LI_CIRCLE = "circle"; /** - * Constructor initilises classtree variable. This constructor will be used + * Constructor initializes classtree variable. This constructor will be used * while generating global tree file "overview-tree.html". * + * @param configuration The current configuration * @param filename File to be generated. * @param classtree Tree built by {@link ClassTree}. * @throws IOException * @throws DocletAbortException */ protected AbstractTreeWriter(ConfigurationImpl configuration, - String filename, ClassTree classtree) + DocPath filename, ClassTree classtree) throws IOException { super(configuration, filename); this.classtree = classtree; } - /** - * Create appropriate directory for the package and also initilise the - * relative path from this generated file to the current or - * the destination directory. This constructor will be used while - * generating "package tree" file. - * - * @param path Directories in this path will be created if they are not - * already there. - * @param filename Name of the package tree file to be generated. - * @param classtree The tree built using {@link ClassTree}. - * for the package pkg. - * @param pkg PackageDoc for which tree file will be generated. - * @throws IOException - * @throws DocletAbortException - */ - protected AbstractTreeWriter(ConfigurationImpl configuration, - String path, String filename, - ClassTree classtree, PackageDoc pkg) - throws IOException { - super(configuration, - path, filename, DirectoryManager.getRelativePath(pkg.name())); - this.classtree = classtree; - } - /** * Add each level of the class tree. For each sub-class or * sub-interface indents the next level information. diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java index adef39e1415..af0f4a24f81 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java @@ -50,16 +50,6 @@ import com.sun.tools.doclets.internal.toolkit.util.*; */ public class AllClassesFrameWriter extends HtmlDocletWriter { - /** - * The name of the output file with frames - */ - public static final String OUTPUT_FILE_NAME_FRAMES = "allclasses-frame.html"; - - /** - * The name of the output file without frames - */ - public static final String OUTPUT_FILE_NAME_NOFRAMES = "allclasses-noframe.html"; - /** * Index of all the classes. */ @@ -71,13 +61,16 @@ public class AllClassesFrameWriter extends HtmlDocletWriter { final HtmlTree BR = new HtmlTree(HtmlTag.BR); /** - * Construct AllClassesFrameWriter object. Also initilises the indexbuilder + * Construct AllClassesFrameWriter object. Also initializes the indexbuilder * variable in this class. + * @param configuration The current configuration + * @param filename Path to the file which is getting generated. + * @param indexbuilder Unicode based Index from {@link IndexBuilder} * @throws IOException * @throws DocletAbortException */ public AllClassesFrameWriter(ConfigurationImpl configuration, - String filename, IndexBuilder indexbuilder) + DocPath filename, IndexBuilder indexbuilder) throws IOException { super(configuration, filename); this.indexbuilder = indexbuilder; @@ -94,13 +87,13 @@ public class AllClassesFrameWriter extends HtmlDocletWriter { public static void generate(ConfigurationImpl configuration, IndexBuilder indexbuilder) { AllClassesFrameWriter allclassgen; - String filename = OUTPUT_FILE_NAME_FRAMES; + DocPath filename = DocPaths.ALLCLASSES_FRAME; try { allclassgen = new AllClassesFrameWriter(configuration, filename, indexbuilder); allclassgen.buildAllClassesFile(true); allclassgen.close(); - filename = OUTPUT_FILE_NAME_NOFRAMES; + filename = DocPaths.ALLCLASSES_NOFRAME; allclassgen = new AllClassesFrameWriter(configuration, filename, indexbuilder); allclassgen.buildAllClassesFile(false); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java index 66c51aa2696..03e04e79946 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java @@ -141,7 +141,7 @@ public class AnnotationTypeOptionalMemberWriterImpl extends */ protected Content getNavSummaryLink(ClassDoc cd, boolean link) { if (link) { - return writer.getHyperLink("", "annotation_type_optional_element_summary", + return writer.getHyperLink("annotation_type_optional_element_summary", writer.getResource("doclet.navAnnotationTypeOptionalMember")); } else { return writer.getResource("doclet.navAnnotationTypeOptionalMember"); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java index baa725d1809..2fe1f662c1e 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java @@ -260,7 +260,7 @@ public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter */ protected Content getNavSummaryLink(ClassDoc cd, boolean link) { if (link) { - return writer.getHyperLink("", "annotation_type_required_element_summary", + return writer.getHyperLink("annotation_type_required_element_summary", writer.getResource("doclet.navAnnotationTypeRequiredMember")); } else { return writer.getResource("doclet.navAnnotationTypeRequiredMember"); @@ -272,7 +272,7 @@ public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter */ protected void addNavDetailLink(boolean link, Content liNav) { if (link) { - liNav.addContent(writer.getHyperLink("", "annotation_type_element_detail", + liNav.addContent(writer.getHyperLink("annotation_type_element_detail", writer.getResource("doclet.navAnnotationTypeMember"))); } else { liNav.addContent(writer.getResource("doclet.navAnnotationTypeMember")); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java index bb228d2cb2a..636522e0cc3 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java @@ -65,13 +65,10 @@ public class AnnotationTypeWriterImpl extends SubWriterHolderWriter * @param prevType the previous class that was documented. * @param nextType the next class being documented. */ - public AnnotationTypeWriterImpl (AnnotationTypeDoc annotationType, + public AnnotationTypeWriterImpl(AnnotationTypeDoc annotationType, Type prevType, Type nextType) - throws Exception { - super(ConfigurationImpl.getInstance(), - DirectoryManager.getDirectoryPath(annotationType.containingPackage()), - annotationType.name() + ".html", - DirectoryManager.getRelativePath(annotationType.containingPackage().name())); + throws Exception { + super(ConfigurationImpl.getInstance(), DocPath.forClass(annotationType)); this.annotationType = annotationType; configuration.currentcd = annotationType.asClassDoc(); this.prev = prevType; @@ -84,7 +81,7 @@ public class AnnotationTypeWriterImpl extends SubWriterHolderWriter * @return a content tree for the package link */ protected Content getNavLinkPackage() { - Content linkContent = getHyperLink("package-summary.html", "", + Content linkContent = getHyperLink(DocPaths.PACKAGE_SUMMARY, packageLabel); Content li = HtmlTree.LI(linkContent); return li; @@ -106,7 +103,7 @@ public class AnnotationTypeWriterImpl extends SubWriterHolderWriter * @return a content tree for the class use link */ protected Content getNavLinkClassUse() { - Content linkContent = getHyperLink("class-use/" + filename, "", useLabel); + Content linkContent = getHyperLink(DocPaths.CLASS_USE.resolve(filename), useLabel); Content li = HtmlTree.LI(linkContent); return li; } @@ -289,8 +286,8 @@ public class AnnotationTypeWriterImpl extends SubWriterHolderWriter * {@inheritDoc} */ protected Content getNavLinkTree() { - Content treeLinkContent = getHyperLink("package-tree.html", - "", treeLabel, "", ""); + Content treeLinkContent = getHyperLink(DocPaths.PACKAGE_TREE, + treeLabel, "", ""); Content li = HtmlTree.LI(treeLinkContent); return li; } diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java index 69edcde9796..5f8001b6fb4 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java @@ -82,7 +82,6 @@ public class ClassUseWriter extends SubWriterHolderWriter { final String methodUseTableSummary; final String constructorUseTableSummary; - /** * Constructor. * @@ -91,10 +90,9 @@ public class ClassUseWriter extends SubWriterHolderWriter { * @throws DocletAbortException */ public ClassUseWriter(ConfigurationImpl configuration, - ClassUseMapper mapper, String path, - String filename, String relpath, + ClassUseMapper mapper, DocPath filename, ClassDoc classdoc) throws IOException { - super(configuration, path, filename, relpath); + super(configuration, filename); this.classdoc = classdoc; if (mapper.classToPackageAnnotations.containsKey(classdoc.qualifiedName())) pkgToPackageAnnotations = new HashSet(mapper.classToPackageAnnotations.get(classdoc.qualifiedName())); @@ -199,23 +197,19 @@ public class ClassUseWriter extends SubWriterHolderWriter { public static void generate(ConfigurationImpl configuration, ClassUseMapper mapper, ClassDoc classdoc) { ClassUseWriter clsgen; - String path = DirectoryManager.getDirectoryPath(classdoc. - containingPackage()); - path += "class-use" + DirectoryManager.URL_FILE_SEPARATOR; - String filename = classdoc.name() + ".html"; - String pkgname = classdoc.containingPackage().name(); - pkgname += (pkgname.length() > 0)? ".class-use": "class-use"; - String relpath = DirectoryManager.getRelativePath(pkgname); + DocPath path = DocPath.forPackage(classdoc) + .resolve(DocPaths.CLASS_USE) + .resolve(DocPath.forName(classdoc)); try { clsgen = new ClassUseWriter(configuration, - mapper, path, filename, - relpath, classdoc); + mapper, path, + classdoc); clsgen.generateClassUseFile(); clsgen.close(); } catch (IOException exc) { configuration.standardmessage. error("doclet.exception_encountered", - exc.toString(), filename); + exc.toString(), path.getPath()); throw new DocletAbortException(); } } @@ -359,7 +353,7 @@ public class ClassUseWriter extends SubWriterHolderWriter { */ protected void addPackageUse(PackageDoc pkg, Content contentTree) throws IOException { Content tdFirst = HtmlTree.TD(HtmlStyle.colFirst, - getHyperLink("", pkg.name(), new StringContent(Util.getPackageName(pkg)))); + getHyperLink(pkg.name(), new StringContent(Util.getPackageName(pkg)))); contentTree.addContent(tdFirst); HtmlTree tdLast = new HtmlTree(HtmlTag.TD); tdLast.addStyle(HtmlStyle.colLast); @@ -470,8 +464,8 @@ public class ClassUseWriter extends SubWriterHolderWriter { * @return a content tree for the package link */ protected Content getNavLinkPackage() { - Content linkContent = getHyperLink("../package-summary.html", "", - packageLabel); + Content linkContent = + getHyperLink(DocPath.parent.resolve(DocPaths.PACKAGE_SUMMARY), packageLabel); Content li = HtmlTree.LI(linkContent); return li; } @@ -506,8 +500,8 @@ public class ClassUseWriter extends SubWriterHolderWriter { */ protected Content getNavLinkTree() { Content linkContent = classdoc.containingPackage().isIncluded() ? - getHyperLink("../package-tree.html", "", treeLabel) : - getHyperLink(relativePath + "overview-tree.html", "", treeLabel); + getHyperLink(DocPath.parent.resolve(DocPaths.PACKAGE_TREE), treeLabel) : + getHyperLink(pathToRoot.resolve(DocPaths.OVERVIEW_TREE), treeLabel); Content li = HtmlTree.LI(linkContent); return li; } diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java index 5db9e65b8dd..78d8ca88b2c 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java @@ -72,11 +72,8 @@ public class ClassWriterImpl extends SubWriterHolderWriter */ public ClassWriterImpl (ClassDoc classDoc, ClassDoc prevClass, ClassDoc nextClass, ClassTree classTree) - throws Exception { - super(ConfigurationImpl.getInstance(), - DirectoryManager.getDirectoryPath(classDoc.containingPackage()), - classDoc.name() + ".html", - DirectoryManager.getRelativePath(classDoc.containingPackage().name())); + throws Exception { + super(ConfigurationImpl.getInstance(), DocPath.forClass(classDoc)); this.classDoc = classDoc; configuration.currentcd = classDoc; this.classtree = classTree; @@ -90,7 +87,7 @@ public class ClassWriterImpl extends SubWriterHolderWriter * @return a content tree for the package link */ protected Content getNavLinkPackage() { - Content linkContent = getHyperLink("package-summary.html", "", + Content linkContent = getHyperLink(DocPaths.PACKAGE_SUMMARY, packageLabel); Content li = HtmlTree.LI(linkContent); return li; @@ -112,7 +109,7 @@ public class ClassWriterImpl extends SubWriterHolderWriter * @return a content tree for the class use link */ protected Content getNavLinkClassUse() { - Content linkContent = getHyperLink("class-use/" + filename, "", useLabel); + Content linkContent = getHyperLink(DocPaths.CLASS_USE.resolve(filename), useLabel); Content li = HtmlTree.LI(linkContent); return li; } @@ -567,8 +564,8 @@ public class ClassWriterImpl extends SubWriterHolderWriter * {@inheritDoc} */ protected Content getNavLinkTree() { - Content treeLinkContent = getHyperLink("package-tree.html", - "", treeLabel, "", ""); + Content treeLinkContent = getHyperLink(DocPaths.PACKAGE_TREE, + treeLabel, "", ""); Content li = HtmlTree.LI(treeLinkContent); return li; } diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java index 7c214429b7d..fb6966b890a 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java @@ -25,7 +25,6 @@ package com.sun.tools.doclets.formats.html; -import java.io.*; import java.net.*; import java.util.*; @@ -46,6 +45,11 @@ import com.sun.tools.doclets.internal.toolkit.util.*; * use "-helpfile" option when already "-nohelp" option is used. *

* + *

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. + * * @author Robert Field. * @author Atul Dambalkar. * @author Jamie Ho @@ -61,11 +65,6 @@ public class ConfigurationImpl extends Configuration { */ public static final String BUILD_DATE = System.getProperty("java.version"); - /** - * The name of the constant values file. - */ - public static final String CONSTANTS_FILE_NAME = "constant-values.html"; - /** * Argument for command line option "-header". */ @@ -179,7 +178,7 @@ public class ConfigurationImpl extends Configuration { * First file to appear in the right-hand frame in the generated * documentation. */ - public String topFile = ""; + public DocPath topFile = DocPath.empty; /** * The classdoc for the class file getting generated. @@ -367,7 +366,7 @@ public class ConfigurationImpl extends Configuration { "-helpfile")); return false; } - File help = new File(os[1]); + DocFile help = DocFile.createFileForInput(this, os[1]); if (!help.exists()) { reporter.printError(getText("doclet.File_not_found", os[1])); return false; @@ -447,18 +446,17 @@ public class ConfigurationImpl extends Configuration { return; } if (createoverview) { - topFile = "overview-summary.html"; + topFile = DocPaths.OVERVIEW_SUMMARY; } else { if (packages.length == 1 && packages[0].name().equals("")) { if (root.classes().length > 0) { ClassDoc[] classarr = root.classes(); Arrays.sort(classarr); ClassDoc cd = getValidClass(classarr); - topFile = DirectoryManager.getPathToClass(cd); + topFile = DocPath.forClass(cd); } } else { - topFile = DirectoryManager.getPathToPackage(packages[0], - "package-summary.html"); + topFile = DocPath.forPackage(packages[0]).resolve(DocPaths.PACKAGE_SUMMARY); } } } diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java index d6902610c02..ec98f180410 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java @@ -69,7 +69,7 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter */ public ConstantsSummaryWriterImpl(ConfigurationImpl configuration) throws IOException { - super(configuration, ConfigurationImpl.CONSTANTS_FILE_NAME); + super(configuration, DocPaths.CONSTANT_VALUES); this.configuration = configuration; constantsTableSummary = configuration.getText("doclet.Constants_Table_Summary", configuration.getText("doclet.Constants_Summary")); @@ -107,13 +107,13 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter //add link to summary Content link; if (packageName.length() == 0) { - link = getHyperLink("#" + DocletConstants.UNNAMED_PACKAGE_ANCHOR, - "", defaultPackageLabel, "", ""); + link = getHyperLink(DocLink.fragment(DocletConstants.UNNAMED_PACKAGE_ANCHOR), + defaultPackageLabel, "", ""); } else { Content packageNameContent = getPackageLabel(parsedPackageName); packageNameContent.addContent(".*"); - link = getHyperLink("#" + parsedPackageName, - "", packageNameContent, "", ""); + link = getHyperLink(DocLink.fragment(parsedPackageName), + packageNameContent, "", ""); printedPackageHeaders.add(parsedPackageName); } contentListTree.addContent(HtmlTree.LI(link)); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java index 22a52a41409..6e2a5ec5284 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java @@ -280,7 +280,7 @@ public class ConstructorWriterImpl extends AbstractExecutableMemberWriter */ protected Content getNavSummaryLink(ClassDoc cd, boolean link) { if (link) { - return writer.getHyperLink("", "constructor_summary", + return writer.getHyperLink("constructor_summary", writer.getResource("doclet.navConstructor")); } else { return writer.getResource("doclet.navConstructor"); @@ -292,7 +292,7 @@ public class ConstructorWriterImpl extends AbstractExecutableMemberWriter */ protected void addNavDetailLink(boolean link, Content liNav) { if (link) { - liNav.addContent(writer.getHyperLink("", "constructor_detail", + liNav.addContent(writer.getHyperLink("constructor_detail", writer.getResource("doclet.navConstructor"))); } else { liNav.addContent(writer.getResource("doclet.navConstructor")); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java index 5d852171964..bb989452b85 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java @@ -95,7 +95,7 @@ public class DeprecatedListWriter extends SubWriterHolderWriter { * @param filename the file to be generated. */ public DeprecatedListWriter(ConfigurationImpl configuration, - String filename) throws IOException { + DocPath filename) throws IOException { super(configuration, filename); this.configuration = configuration; NestedClassWriterImpl classW = new NestedClassWriterImpl(this); @@ -116,7 +116,7 @@ public class DeprecatedListWriter extends SubWriterHolderWriter { * @param configuration the current configuration of the doclet. */ public static void generate(ConfigurationImpl configuration) { - String filename = "deprecated-list.html"; + DocPath filename = DocPaths.DEPRECATED_LIST; try { DeprecatedListWriter depr = new DeprecatedListWriter(configuration, filename); @@ -180,7 +180,7 @@ public class DeprecatedListWriter extends SubWriterHolderWriter { private void addIndexLink(DeprecatedAPIListBuilder builder, int type, Content contentTree) { if (builder.hasDocumentation(type)) { - Content li = HtmlTree.LI(getHyperLink("#" + ANCHORS[type], + Content li = HtmlTree.LI(getHyperLink(ANCHORS[type], getResource(HEADING_KEYS[type]))); contentTree.addContent(li); } diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java index 7e1a977ddb9..b06255ad9a6 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java @@ -263,7 +263,7 @@ public class EnumConstantWriterImpl extends AbstractMemberWriter */ protected Content getNavSummaryLink(ClassDoc cd, boolean link) { if (link) { - return writer.getHyperLink("", (cd == null)? + return writer.getHyperLink((cd == null)? "enum_constant_summary": "enum_constants_inherited_from_class_" + configuration().getClassName(cd), @@ -278,7 +278,7 @@ public class EnumConstantWriterImpl extends AbstractMemberWriter */ protected void addNavDetailLink(boolean link, Content liNav) { if (link) { - liNav.addContent(writer.getHyperLink("", "enum_constant_detail", + liNav.addContent(writer.getHyperLink("enum_constant_detail", writer.getResource("doclet.navEnum"))); } else { liNav.addContent(writer.getResource("doclet.navEnum")); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java index 3f00063060d..10f076a08af 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java @@ -293,7 +293,7 @@ public class FieldWriterImpl extends AbstractMemberWriter */ protected Content getNavSummaryLink(ClassDoc cd, boolean link) { if (link) { - return writer.getHyperLink("", (cd == null)? + return writer.getHyperLink((cd == null)? "field_summary": "fields_inherited_from_class_" + configuration().getClassName(cd), @@ -308,7 +308,7 @@ public class FieldWriterImpl extends AbstractMemberWriter */ protected void addNavDetailLink(boolean link, Content liNav) { if (link) { - liNav.addContent(writer.getHyperLink("", "field_detail", + liNav.addContent(writer.getHyperLink("field_detail", writer.getResource("doclet.navField"))); } else { liNav.addContent(writer.getResource("doclet.navField")); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java index 006e8e2a1c7..6a39cedee6d 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java @@ -63,7 +63,7 @@ public class FrameOutputWriter extends HtmlDocletWriter { * @param filename File to be generated. */ public FrameOutputWriter(ConfigurationImpl configuration, - String filename) throws IOException { + DocPath filename) throws IOException { super(configuration, filename); noOfPackages = configuration.packages.length; } @@ -77,9 +77,9 @@ public class FrameOutputWriter extends HtmlDocletWriter { */ public static void generate(ConfigurationImpl configuration) { FrameOutputWriter framegen; - String filename = ""; + DocPath filename = DocPath.empty; try { - filename = "index.html"; + filename = DocPaths.INDEX; framegen = new FrameOutputWriter(configuration, filename); framegen.generateFrameFile(); framegen.close(); @@ -92,7 +92,7 @@ public class FrameOutputWriter extends HtmlDocletWriter { } /** - * Generate the contants in the "index.html" file. Print the frame details + * Generate the constants in the "index.html" file. Print the frame details * as well as warning if browser is not supporting the Html frames. */ protected void generateFrameFile() throws IOException { @@ -155,8 +155,8 @@ public class FrameOutputWriter extends HtmlDocletWriter { * @param contentTree the content tree to which the information will be added */ private void addAllPackagesFrameTag(Content contentTree) { - HtmlTree frame = HtmlTree.FRAME("overview-frame.html", "packageListFrame", - configuration.getText("doclet.All_Packages")); + HtmlTree frame = HtmlTree.FRAME(DocPaths.OVERVIEW_FRAME.getPath(), + "packageListFrame", configuration.getText("doclet.All_Packages")); contentTree.addContent(frame); } @@ -166,8 +166,8 @@ public class FrameOutputWriter extends HtmlDocletWriter { * @param contentTree the content tree to which the information will be added */ private void addAllClassesFrameTag(Content contentTree) { - HtmlTree frame = HtmlTree.FRAME("allclasses-frame.html", "packageFrame", - configuration.getText("doclet.All_classes_and_interfaces")); + HtmlTree frame = HtmlTree.FRAME(DocPaths.ALLCLASSES_FRAME.getPath(), + "packageFrame", configuration.getText("doclet.All_classes_and_interfaces")); contentTree.addContent(frame); } @@ -177,7 +177,7 @@ public class FrameOutputWriter extends HtmlDocletWriter { * @param contentTree the content tree to which the information will be added */ private void addClassFrameTag(Content contentTree) { - HtmlTree frame = HtmlTree.FRAME(configuration.topFile, "classFrame", + HtmlTree frame = HtmlTree.FRAME(configuration.topFile.getPath(), "classFrame", configuration.getText("doclet.Package_class_and_interface_descriptions"), SCROLL_YES); contentTree.addContent(frame); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java index b5e6ac3bb2d..9d14671f3d2 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java @@ -49,7 +49,7 @@ public class HelpWriter extends HtmlDocletWriter { * @param filename File to be generated. */ public HelpWriter(ConfigurationImpl configuration, - String filename) throws IOException { + DocPath filename) throws IOException { super(configuration, filename); } @@ -62,9 +62,9 @@ public class HelpWriter extends HtmlDocletWriter { */ public static void generate(ConfigurationImpl configuration) { HelpWriter helpgen; - String filename = ""; + DocPath filename = DocPath.empty; try { - filename = "help-doc.html"; + filename = DocPaths.HELP_DOC; helpgen = new HelpWriter(configuration, filename); helpgen.generateHelpFile(); helpgen.close(); @@ -113,7 +113,7 @@ public class HelpWriter extends HtmlDocletWriter { getResource("doclet.Overview")); Content liOverview = HtmlTree.LI(HtmlStyle.blockList, overviewHeading); Content line3 = getResource("doclet.Help_line_3", - getHyperLinkString("overview-summary.html", + getHyperLinkString(DocPaths.OVERVIEW_SUMMARY, configuration.getText("doclet.Overview"))); Content overviewPara = HtmlTree.P(line3); liOverview.addContent(overviewPara); @@ -234,7 +234,7 @@ public class HelpWriter extends HtmlDocletWriter { getResource("doclet.Help_line_16")); Content liTree = HtmlTree.LI(HtmlStyle.blockList, treeHead); Content line17 = getResource("doclet.Help_line_17_with_tree_link", - getHyperLinkString("overview-tree.html", + getHyperLinkString(DocPaths.OVERVIEW_TREE, configuration.getText("doclet.Class_Hierarchy"))); Content treePara = HtmlTree.P(line17); liTree.addContent(treePara); @@ -252,7 +252,7 @@ public class HelpWriter extends HtmlDocletWriter { getResource("doclet.Deprecated_API")); Content liDeprecated = HtmlTree.LI(HtmlStyle.blockList, dHead); Content line20 = getResource("doclet.Help_line_20_with_deprecated_api_link", - getHyperLinkString("deprecated-list.html", + getHyperLinkString(DocPaths.DEPRECATED_LIST, configuration.getText("doclet.Deprecated_API"))); Content dPara = HtmlTree.P(line20); liDeprecated.addContent(dPara); @@ -261,10 +261,10 @@ public class HelpWriter extends HtmlDocletWriter { if (configuration.createindex) { String indexlink; if (configuration.splitindex) { - indexlink = getHyperLinkString("index-files/index-1.html", + indexlink = getHyperLinkString(DocPaths.INDEX_FILES.resolve(DocPaths.indexN(1)), configuration.getText("doclet.Index")); } else { - indexlink = getHyperLinkString("index-all.html", + indexlink = getHyperLinkString(DocPaths.INDEX_ALL, configuration.getText("doclet.Index")); } Content indexHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING, @@ -293,7 +293,7 @@ public class HelpWriter extends HtmlDocletWriter { getResource("doclet.All_Classes")); Content liAllClasses = HtmlTree.LI(HtmlStyle.blockList, allclassesHead); Content line27 = getResource("doclet.Help_line_27", - getHyperLinkString("allclasses-noframe.html", + getHyperLinkString(DocPaths.ALLCLASSES_NOFRAME, configuration.getText("doclet.All_Classes"))); Content allclassesPara = HtmlTree.P(line27); liAllClasses.addContent(allclassesPara); @@ -309,7 +309,7 @@ public class HelpWriter extends HtmlDocletWriter { getResource("doclet.Constants_Summary")); Content liConst = HtmlTree.LI(HtmlStyle.blockList, constHead); Content line29 = getResource("doclet.Help_line_29", - getHyperLinkString("constant-values.html", + getHyperLinkString(DocPaths.CONSTANT_VALUES, configuration.getText("doclet.Constants_Summary"))); Content constPara = HtmlTree.P(line29); liConst.addContent(constPara); @@ -325,6 +325,7 @@ public class HelpWriter extends HtmlDocletWriter { * * @return a content tree for the help label */ + @Override protected Content getNavLinkHelp() { Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, helpLabel); return li; diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java index ef5bb2477de..6a9f691cedd 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java @@ -94,31 +94,22 @@ public class HtmlDoclet extends AbstractDoclet { throws Exception { super.generateOtherFiles(root, classtree); if (configuration.linksource) { - if (configuration.destDirName.length() > 0) { - SourceToHTMLConverter.convertRoot(configuration, - root, configuration.destDirName + File.separator - + DocletConstants.SOURCE_OUTPUT_DIR_NAME); - } else { - SourceToHTMLConverter.convertRoot(configuration, - root, DocletConstants.SOURCE_OUTPUT_DIR_NAME); - } + SourceToHTMLConverter.convertRoot(configuration, + root, DocPaths.SOURCE_OUTPUT); } - if (configuration.topFile.length() == 0) { + if (configuration.topFile.isEmpty()) { configuration.standardmessage. error("doclet.No_Non_Deprecated_Classes_To_Document"); return; } boolean nodeprecated = configuration.nodeprecated; - String configdestdir = configuration.destDirName; - String confighelpfile = configuration.helpfile; - String configstylefile = configuration.stylesheetfile; - performCopy(configdestdir, confighelpfile); - performCopy(configdestdir, configstylefile); - Util.copyResourceFile(configuration, "background.gif", false); - Util.copyResourceFile(configuration, "tab.gif", false); - Util.copyResourceFile(configuration, "titlebar.gif", false); - Util.copyResourceFile(configuration, "titlebar_end.gif", false); + performCopy(configuration.helpfile); + performCopy(configuration.stylesheetfile); + copyResourceFile("background.gif"); + copyResourceFile("tab.gif"); + copyResourceFile("titlebar.gif"); + copyResourceFile("titlebar_end.gif"); // do early to reduce memory footprint if (configuration.classuse) { ClassUseWriter.generate(configuration, classtree); @@ -155,9 +146,8 @@ public class HtmlDoclet extends AbstractDoclet { // If a stylesheet file is not specified, copy the default stylesheet // and replace newline with platform-specific newline. if (configuration.stylesheetfile.length() == 0) { - Util.copyFile(configuration, "stylesheet.css", Util.RESOURCESDIR, - (configdestdir.isEmpty()) ? - System.getProperty("user.dir") : configdestdir, false, true); + DocFile f = DocFile.createFileForOutput(configuration, DocPaths.STYLESHEET); + f.copyResource(DocPaths.RESOURCES.resolve(DocPaths.STYLESHEET), false, true); } } @@ -258,29 +248,33 @@ public class HtmlDoclet extends AbstractDoclet { return (ConfigurationImpl.getInstance()).validOptions(options, reporter); } - private void performCopy(String configdestdir, String filename) { + /** + * Copy a file in the resources directory to the destination directory. + * @param resource The name of the resource file to copy + */ + private void copyResourceFile(String resource) { + DocPath p = DocPaths.RESOURCES.resolve(resource); + DocFile f = DocFile.createFileForOutput(configuration, p); + f.copyResource(p, false, false); + } + + private void performCopy(String filename) { + if (filename.isEmpty()) + return; + try { - String destdir = (configdestdir.length() > 0) ? - configdestdir + File.separatorChar: ""; - if (filename.length() > 0) { - File helpstylefile = new File(filename); - String parent = helpstylefile.getParent(); - String helpstylefilename = (parent == null)? - filename: - filename.substring(parent.length() + 1); - File desthelpfile = new File(destdir + helpstylefilename); - if (!desthelpfile.getCanonicalPath().equals( - helpstylefile.getCanonicalPath())) { - configuration.message. - notice((SourcePosition) null, - "doclet.Copying_File_0_To_File_1", - helpstylefile.toString(), desthelpfile.toString()); - Util.copyFile(desthelpfile, helpstylefile); - } - } + DocFile fromfile = DocFile.createFileForInput(configuration, filename); + DocPath path = DocPath.create(fromfile.getName()); + DocFile toFile = DocFile.createFileForOutput(configuration, path); + if (toFile.isSameFile(fromfile)) + return; + + configuration.message.notice((SourcePosition) null, + "doclet.Copying_File_0_To_File_1", + fromfile.toString(), path.getPath()); + toFile.copyFile(fromfile); } catch (IOException exc) { - configuration.message. - error((SourcePosition) null, + configuration.message.error((SourcePosition) null, "doclet.perform_copy_exception_encountered", exc.toString()); throw new DocletAbortException(); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java index c5bd281e82f..0531db15abd 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java @@ -55,32 +55,24 @@ public class HtmlDocletWriter extends HtmlDocWriter { /** * Relative path from the file getting generated to the destination * directory. For example, if the file getting generated is - * "java/lang/Object.html", then the relative path string is "../../". + * "java/lang/Object.html", then the path to the root is "../..". * This string can be empty if the file getting generated is in * the destination directory. */ - public String relativePath = ""; + public final DocPath pathToRoot; /** - * Same as relativepath, but normalized to never be empty or - * end with a slash. - */ - public String relativepathNoSlash = ""; - - /** - * Platform-dependent directory path from the current or the + * Platform-independent path from the current or the * destination directory to the file getting generated. * Used when creating the file. - * For example, if the file getting generated is - * "java/lang/Object.html", then the path string is "java/lang". */ - public String path = ""; + public final DocPath path; /** * Name of the file getting generated. If the file getting generated is * "java/lang/Object.html", then the filename is "Object.html". */ - public String filename = ""; + public final DocPath filename; /** * The display length used for indentation while generating the class page. @@ -100,33 +92,15 @@ public class HtmlDocletWriter extends HtmlDocWriter { /** * Constructor to construct the HtmlStandardWriter object. * - * @param filename File to be generated. + * @param path File to be generated. */ - public HtmlDocletWriter(ConfigurationImpl configuration, - String filename) throws IOException { - super(configuration, filename); - this.configuration = configuration; - this.filename = filename; - } - - /** - * Constructor to construct the HtmlStandardWriter object. - * - * @param path Platform-dependent {@link #path} used when - * creating file. - * @param filename Name of file to be generated. - * @param relativePath Value for the variable {@link #relativePath}. - */ - public HtmlDocletWriter(ConfigurationImpl configuration, - String path, String filename, - String relativePath) throws IOException { - super(configuration, path, filename); + public HtmlDocletWriter(ConfigurationImpl configuration, DocPath path) + throws IOException { + super(configuration, path); this.configuration = configuration; this.path = path; - this.relativePath = relativePath; - this.relativepathNoSlash = - DirectoryManager.getPathNoTrailingSlash(this.relativePath); - this.filename = filename; + this.pathToRoot = path.parent().invert(); + this.filename = path.basename(); } /** @@ -165,8 +139,9 @@ public class HtmlDocletWriter extends HtmlDocWriter { int previndex = 0; while (true) { if (configuration.docrootparent.length() > 0) { + final String docroot_parent = "{@docroot}/.."; // Search for lowercase version of {@docRoot}/.. - index = lowerHtml.indexOf("{@docroot}/..", previndex); + index = lowerHtml.indexOf(docroot_parent, previndex); // If next {@docRoot}/.. pattern not found, append rest of htmlstr and exit loop if (index < 0) { buf.append(htmlstr.substring(previndex)); @@ -174,17 +149,18 @@ public class HtmlDocletWriter extends HtmlDocWriter { } // If next {@docroot}/.. pattern found, append htmlstr up to start of tag buf.append(htmlstr.substring(previndex, index)); - previndex = index + 13; // length for {@docroot}/.. string + previndex = index + docroot_parent.length(); // Insert docrootparent absolute path where {@docRoot}/.. was located buf.append(configuration.docrootparent); // Append slash if next character is not a slash if (previndex < htmlstr.length() && htmlstr.charAt(previndex) != '/') { - buf.append(DirectoryManager.URL_FILE_SEPARATOR); + buf.append('/'); } } else { + final String docroot = "{@docroot}"; // Search for lowercase version of {@docRoot} - index = lowerHtml.indexOf("{@docroot}", previndex); + index = lowerHtml.indexOf(docroot, previndex); // If next {@docRoot} tag not found, append rest of htmlstr and exit loop if (index < 0) { buf.append(htmlstr.substring(previndex)); @@ -192,13 +168,12 @@ public class HtmlDocletWriter extends HtmlDocWriter { } // If next {@docroot} tag found, append htmlstr up to start of tag buf.append(htmlstr.substring(previndex, index)); - previndex = index + 10; // length for {@docroot} string + previndex = index + docroot.length(); // Insert relative path where {@docRoot} was located - buf.append(relativepathNoSlash); + buf.append(pathToRoot.isEmpty() ? "." : pathToRoot.getPath()); // Append slash if next character is not a slash - if (relativepathNoSlash.length() > 0 && previndex < htmlstr.length() && - htmlstr.charAt(previndex) != '/') { - buf.append(DirectoryManager.URL_FILE_SEPARATOR); + if (previndex < htmlstr.length() && htmlstr.charAt(previndex) != '/') { + buf.append('/'); } } } @@ -312,7 +287,7 @@ public class HtmlDocletWriter extends HtmlDocWriter { */ public Content getTargetPackageLink(PackageDoc pd, String target, Content label) { - return getHyperLink(pathString(pd, "package-summary.html"), "", label, "", target); + return getHyperLink(pathString(pd, DocPaths.PACKAGE_SUMMARY), label, "", target); } /** @@ -432,9 +407,10 @@ public class HtmlDocletWriter extends HtmlDocWriter { allClassesId += "navbar_top"; Content a = getMarkerAnchor("navbar_top"); navDiv.addContent(a); - Content skipLinkContent = getHyperLink("", - "skip-navbar_top", HtmlTree.EMPTY, configuration.getText( - "doclet.Skip_navigation_links"), ""); + Content skipLinkContent = getHyperLink(DocLink.fragment("skip-navbar_top"), + HtmlTree.EMPTY, + configuration.getText("doclet.Skip_navigation_links"), + ""); navDiv.addContent(skipLinkContent); } else { body.addContent(HtmlConstants.START_OF_BOTTOM_NAVBAR); @@ -442,9 +418,10 @@ public class HtmlDocletWriter extends HtmlDocWriter { allClassesId += "navbar_bottom"; Content a = getMarkerAnchor("navbar_bottom"); navDiv.addContent(a); - Content skipLinkContent = getHyperLink("", - "skip-navbar_bottom", HtmlTree.EMPTY, configuration.getText( - "doclet.Skip_navigation_links"), ""); + Content skipLinkContent = getHyperLink(DocLink.fragment("skip-navbar_bottom"), + HtmlTree.EMPTY, + configuration.getText("doclet.Skip_navigation_links"), + ""); navDiv.addContent(skipLinkContent); } if (header) { @@ -539,8 +516,8 @@ public class HtmlDocletWriter extends HtmlDocWriter { * @return a content tree for the link */ protected Content getNavLinkContents() { - Content linkContent = getHyperLink(relativePath + - "overview-summary.html", "", overviewLabel, "", ""); + Content linkContent = getHyperLink(pathToRoot.resolve(DocPaths.OVERVIEW_SUMMARY), + overviewLabel, "", ""); Content li = HtmlTree.LI(linkContent); return li; } @@ -584,10 +561,10 @@ public class HtmlDocletWriter extends HtmlDocWriter { * @param prev File name for the prev link * @return a content tree for the link */ - public Content getNavLinkPrevious(String prev) { + public Content getNavLinkPrevious(DocPath prev) { Content li; if (prev != null) { - li = HtmlTree.LI(getHyperLink(prev, "", prevLabel, "", "")); + li = HtmlTree.LI(getHyperLink(prev, prevLabel, "", "")); } else li = HtmlTree.LI(prevLabel); @@ -601,10 +578,10 @@ public class HtmlDocletWriter extends HtmlDocWriter { * @param next File name for the next link * @return a content tree for the link */ - public Content getNavLinkNext(String next) { + public Content getNavLinkNext(DocPath next) { Content li; if (next != null) { - li = HtmlTree.LI(getHyperLink(next, "", nextLabel, "", "")); + li = HtmlTree.LI(getHyperLink(next, nextLabel, "", "")); } else li = HtmlTree.LI(nextLabel); @@ -617,9 +594,9 @@ public class HtmlDocletWriter extends HtmlDocWriter { * @param link File to be linked, "index.html" * @return a content tree for the link */ - protected Content getNavShowLists(String link) { - Content framesContent = getHyperLink(link + "?" + path + - filename, "", framesLabel, "", "_top"); + protected Content getNavShowLists(DocPath link) { + DocLink dl = new DocLink(link, path.getPath(), null); + Content framesContent = getHyperLink(dl, framesLabel, "", "_top"); Content li = HtmlTree.LI(framesContent); return li; } @@ -630,7 +607,7 @@ public class HtmlDocletWriter extends HtmlDocWriter { * @return a content tree for the link */ protected Content getNavShowLists() { - return getNavShowLists(relativePath + "index.html"); + return getNavShowLists(pathToRoot.resolve(DocPaths.INDEX)); } /** @@ -639,8 +616,8 @@ public class HtmlDocletWriter extends HtmlDocWriter { * @param link File to be linked * @return a content tree for the link */ - protected Content getNavHideLists(String link) { - Content noFramesContent = getHyperLink(link, "", noframesLabel, "", "_top"); + protected Content getNavHideLists(DocPath link) { + Content noFramesContent = getHyperLink(link, noframesLabel, "", "_top"); Content li = HtmlTree.LI(noFramesContent); return li; } @@ -658,11 +635,11 @@ public class HtmlDocletWriter extends HtmlDocWriter { PackageDoc[] packages = configuration.root.specifiedPackages(); if (packages.length == 1 && configuration.root.specifiedClasses().length == 0) { treeLinkContent = getHyperLink(pathString(packages[0], - "package-tree.html"), "", treeLabel, + DocPaths.PACKAGE_TREE), treeLabel, "", ""); } else { - treeLinkContent = getHyperLink(relativePath + "overview-tree.html", - "", treeLabel, "", ""); + treeLinkContent = getHyperLink(pathToRoot.resolve(DocPaths.OVERVIEW_TREE), + treeLabel, "", ""); } Content li = HtmlTree.LI(treeLinkContent); return li; @@ -675,7 +652,7 @@ public class HtmlDocletWriter extends HtmlDocWriter { * @return a content tree for the link */ protected Content getNavLinkMainTree(String label) { - Content mainTreeContent = getHyperLink(relativePath + "overview-tree.html", + Content mainTreeContent = getHyperLink(pathToRoot.resolve(DocPaths.OVERVIEW_TREE), new StringContent(label)); Content li = HtmlTree.LI(mainTreeContent); return li; @@ -697,8 +674,8 @@ public class HtmlDocletWriter extends HtmlDocWriter { * @return a content tree for the link */ protected Content getNavLinkDeprecated() { - Content linkContent = getHyperLink(relativePath + - "deprecated-list.html", "", deprecatedLabel, "", ""); + Content linkContent = getHyperLink(pathToRoot.resolve(DocPaths.DEPRECATED_LIST), + deprecatedLabel, "", ""); Content li = HtmlTree.LI(linkContent); return li; } @@ -711,8 +688,8 @@ public class HtmlDocletWriter extends HtmlDocWriter { * @return a content tree for the link */ protected Content getNavLinkClassIndex() { - Content allClassesContent = getHyperLink(relativePath + - AllClassesFrameWriter.OUTPUT_FILE_NAME_NOFRAMES, "", + Content allClassesContent = getHyperLink(pathToRoot.resolve( + DocPaths.ALLCLASSES_NOFRAME), allclassesLabel, "", ""); Content li = HtmlTree.LI(allClassesContent); return li; @@ -724,9 +701,10 @@ public class HtmlDocletWriter extends HtmlDocWriter { * @return a content tree for the link */ protected Content getNavLinkIndex() { - Content linkContent = getHyperLink(relativePath +(configuration.splitindex? - DirectoryManager.getPath("index-files") + fileseparator: "") + - (configuration.splitindex?"index-1.html" : "index-all.html"), "", + Content linkContent = getHyperLink(pathToRoot.resolve( + (configuration.splitindex + ? DocPaths.INDEX_FILES.resolve(DocPaths.indexN(1)) + : DocPaths.INDEX_ALL)), indexLabel, "", ""); Content li = HtmlTree.LI(linkContent); return li; @@ -740,16 +718,15 @@ public class HtmlDocletWriter extends HtmlDocWriter { * @return a content tree for the link */ protected Content getNavLinkHelp() { - String helpfilenm = configuration.helpfile; - if (helpfilenm.equals("")) { - helpfilenm = "help-doc.html"; + String helpfile = configuration.helpfile; + DocPath helpfilenm; + if (helpfile.isEmpty()) { + helpfilenm = DocPaths.HELP_DOC; } else { - int lastsep; - if ((lastsep = helpfilenm.lastIndexOf(File.separatorChar)) != -1) { - helpfilenm = helpfilenm.substring(lastsep + 1); - } + DocFile file = DocFile.createFileForInput(configuration, helpfile); + helpfilenm = DocPath.create(file.getName()); } - Content linkContent = getHyperLink(relativePath + helpfilenm, "", + Content linkContent = getHyperLink(pathToRoot.resolve(helpfilenm), helpLabel, "", ""); Content li = HtmlTree.LI(linkContent); return li; @@ -884,25 +861,12 @@ public class HtmlDocletWriter extends HtmlDocWriter { } /** - * Return path to the class page for a classdoc. For example, the class - * name is "java.lang.Object" and if the current file getting generated is - * "java/io/File.html", then the path string to the class, returned is - * "../../java/lang.Object.html". - * - * @param cd Class to which the path is requested. - */ - protected String pathToClass(ClassDoc cd) { - return pathString(cd.containingPackage(), cd.name() + ".html"); - } - - /** - * Return the path to the class page for a classdoc. Works same as - * {@link #pathToClass(ClassDoc)}. + * Return the path to the class page for a classdoc. * * @param cd Class to which the path is requested. * @param name Name of the file(doesn't include path). */ - protected String pathString(ClassDoc cd, String name) { + protected DocPath pathString(ClassDoc cd, DocPath name) { return pathString(cd.containingPackage(), name); } @@ -915,10 +879,8 @@ public class HtmlDocletWriter extends HtmlDocWriter { * @param pd Package in which the file name is assumed to be. * @param name File name, to which path string is. */ - protected String pathString(PackageDoc pd, String name) { - StringBuilder buf = new StringBuilder(relativePath); - buf.append(DirectoryManager.getPathToPackage(pd, name)); - return buf.toString(); + protected DocPath pathString(PackageDoc pd, DocPath name) { + return pathToRoot.resolve(DocPath.forPackage(pd).resolve(name)); } /** @@ -956,12 +918,12 @@ public class HtmlDocletWriter extends HtmlDocWriter { } } if (included || pkg == null) { - return getHyperLinkString(pathString(pkg, "package-summary.html"), - "", label, isStrong, style); + return getHyperLinkString(pathString(pkg, DocPaths.PACKAGE_SUMMARY), + label, isStrong, style); } else { - String crossPkgLink = getCrossPackageLink(Util.getPackageName(pkg)); + DocLink crossPkgLink = getCrossPackageLink(Util.getPackageName(pkg)); if (crossPkgLink != null) { - return getHyperLinkString(crossPkgLink, "", label, isStrong, style); + return getHyperLinkString(crossPkgLink, label, isStrong, style); } else { return label; } @@ -987,12 +949,12 @@ public class HtmlDocletWriter extends HtmlDocWriter { } } if (included || pkg == null) { - return getHyperLink(pathString(pkg, "package-summary.html"), - "", label); + return getHyperLink(pathString(pkg, DocPaths.PACKAGE_SUMMARY), + label); } else { - String crossPkgLink = getCrossPackageLink(Util.getPackageName(pkg)); + DocLink crossPkgLink = getCrossPackageLink(Util.getPackageName(pkg)); if (crossPkgLink != null) { - return getHyperLink(crossPkgLink, "", label); + return getHyperLink(crossPkgLink, label); } else { return label; } @@ -1020,10 +982,10 @@ public class HtmlDocletWriter extends HtmlDocWriter { //d must be a class doc since in has no containing class. cd = (ClassDoc) doc; } - String href = relativePath + DocletConstants.SOURCE_OUTPUT_DIR_NAME - + DirectoryManager.getDirectoryPath(cd.containingPackage()) - + cd.name() + ".html#" + SourceToHTMLConverter.getAnchorName(doc); - Content linkContent = getHyperLink(href, "", label, "", ""); + DocPath href = pathToRoot + .resolve(DocPaths.SOURCE_OUTPUT) + .resolve(DocPath.forClass(cd)); + Content linkContent = getHyperLink(href.fragment(SourceToHTMLConverter.getAnchorName(doc)), label, "", ""); htmltree.addContent(linkContent); } @@ -1036,7 +998,7 @@ public class HtmlDocletWriter extends HtmlDocWriter { */ public String getLink(LinkInfoImpl linkInfo) { LinkFactoryImpl factory = new LinkFactoryImpl(this); - String link = ((LinkOutputImpl) factory.getLinkOutput(linkInfo)).toString(); + String link = factory.getLinkOutput(linkInfo).toString(); displayLength += linkInfo.displayLength; return link; } @@ -1049,8 +1011,7 @@ public class HtmlDocletWriter extends HtmlDocWriter { */ public String getTypeParameterLinks(LinkInfoImpl linkInfo) { LinkFactoryImpl factory = new LinkFactoryImpl(this); - return ((LinkOutputImpl) - factory.getTypeParameterLinks(linkInfo, false)).toString(); + return factory.getTypeParameterLinks(linkInfo, false).toString(); } /************************************************************* @@ -1070,10 +1031,10 @@ public class HtmlDocletWriter extends HtmlDocWriter { public String getCrossClassLink(String qualifiedClassName, String refMemName, String label, boolean strong, String style, boolean code) { - String className = "", - packageName = qualifiedClassName == null ? "" : qualifiedClassName; + String className = ""; + String packageName = qualifiedClassName == null ? "" : qualifiedClassName; int periodIndex; - while((periodIndex = packageName.lastIndexOf('.')) != -1) { + while ((periodIndex = packageName.lastIndexOf('.')) != -1) { className = packageName.substring(periodIndex + 1, packageName.length()) + (className.length() > 0 ? "." + className : ""); String defaultLabel = code ? codeText(className) : className; @@ -1084,11 +1045,12 @@ public class HtmlDocletWriter extends HtmlDocWriter { //the -link option. There are ways to determine if an external package //exists, but no way to determine if the external class exists. We just //have to assume that it does. - return getHyperLinkString( - configuration.extern.getExternalLink(packageName, relativePath, - className + ".html?is-external=true"), - refMemName == null ? "" : refMemName, - label == null || label.length() == 0 ? defaultLabel : label, + DocLink link = configuration.extern.getExternalLink(packageName, pathToRoot, + className + ".html", refMemName); + return getHyperLinkString(link, + (label == null) || label.length() == 0 ? defaultLabel : label, + + strong, style, configuration.getText("doclet.Href_Class_Or_Interface_Title", packageName), ""); @@ -1104,9 +1066,9 @@ public class HtmlDocletWriter extends HtmlDocWriter { return configuration.extern.isExternal(cd); } - public String getCrossPackageLink(String pkgName) { - return configuration.extern.getExternalLink(pkgName, relativePath, - "package-summary.html?is-external=true"); + public DocLink getCrossPackageLink(String pkgName) { + return configuration.extern.getExternalLink(pkgName, pathToRoot, + DocPaths.PACKAGE_SUMMARY.getPath()); } /** @@ -1134,7 +1096,7 @@ public class HtmlDocletWriter extends HtmlDocWriter { /** * Retrieve the class link with the package portion of the label in - * plain text. If the qualifier is excluded, it willnot be included in the + * plain text. If the qualifier is excluded, it will not be included in the * link label. * * @param cd the class to link to. @@ -1318,10 +1280,11 @@ public class HtmlDocletWriter extends HtmlDocWriter { return getPackageLinkString(refPackage, label, false); } else { //@see is not referencing an included class or package. Check for cross links. - String classCrossLink, packageCrossLink = getCrossPackageLink(refClassName); + String classCrossLink; + DocLink packageCrossLink = getCrossPackageLink(refClassName); if (packageCrossLink != null) { //Package cross link found - return getHyperLinkString(packageCrossLink, "", + return getHyperLinkString(packageCrossLink, (label.isEmpty() ? text : label), false); } else if ((classCrossLink = getCrossClassLink(refClassName, refMemName, label, false, "", !plain)) != null) { @@ -1450,7 +1413,7 @@ public class HtmlDocletWriter extends HtmlDocWriter { * @param doc the doc for which the comment tags will be generated * @param tags the first sentence tags for the doc * @param depr true if it is deprecated - * @param first true if the first sentenge tags should be added + * @param first true if the first sentence tags should be added * @param htmltree the documentation tree to which the comment tags will be added */ private void addCommentTags(Doc doc, Tag[] tags, boolean depr, @@ -1561,7 +1524,7 @@ public class HtmlDocletWriter extends HtmlDocWriter { /** * Suppose a piece of documentation has a relative link. When you copy - * that documetation to another place such as the index or class-use page, + * that documentation to another place such as the index or class-use page, * that relative link will no longer work. We should redirect those links * so that they will work again. *

@@ -1587,21 +1550,17 @@ public class HtmlDocletWriter extends HtmlDocWriter { return text; } - String redirectPathFromRoot; + DocPath redirectPathFromRoot; if (doc instanceof ClassDoc) { - redirectPathFromRoot = DirectoryManager.getDirectoryPath(((ClassDoc) doc).containingPackage()); + redirectPathFromRoot = DocPath.forPackage(((ClassDoc) doc).containingPackage()); } else if (doc instanceof MemberDoc) { - redirectPathFromRoot = DirectoryManager.getDirectoryPath(((MemberDoc) doc).containingPackage()); + redirectPathFromRoot = DocPath.forPackage(((MemberDoc) doc).containingPackage()); } else if (doc instanceof PackageDoc) { - redirectPathFromRoot = DirectoryManager.getDirectoryPath((PackageDoc) doc); + redirectPathFromRoot = DocPath.forPackage((PackageDoc) doc); } else { return text; } - if (! redirectPathFromRoot.endsWith(DirectoryManager.URL_FILE_SEPARATOR)) { - redirectPathFromRoot += DirectoryManager.URL_FILE_SEPARATOR; - } - //Redirect all relative links. int end, begin = text.toLowerCase().indexOf("= 0){ @@ -1627,22 +1586,21 @@ public class HtmlDocletWriter extends HtmlDocWriter { //might be missing '>' character because the href has an inline tag. break; } - if(textBuff.substring(begin, end).indexOf("\"") != -1){ + if (textBuff.substring(begin, end).indexOf("\"") != -1){ begin = textBuff.indexOf("\"", begin) + 1; end = textBuff.indexOf("\"", begin +1); - if(begin == 0 || end == -1){ + if (begin == 0 || end == -1){ //Link is missing a quote. break; } } String relativeLink = textBuff.substring(begin, end); - if(!(relativeLink.toLowerCase().startsWith("mailto:") || - relativeLink.toLowerCase().startsWith("http:") || - relativeLink.toLowerCase().startsWith("https:") || - relativeLink.toLowerCase().startsWith("file:"))){ - relativeLink = "{@"+(new DocRootTaglet()).getName() + "}" - + redirectPathFromRoot - + relativeLink; + if (!(relativeLink.toLowerCase().startsWith("mailto:") || + relativeLink.toLowerCase().startsWith("http:") || + relativeLink.toLowerCase().startsWith("https:") || + relativeLink.toLowerCase().startsWith("file:"))) { + relativeLink = "{@"+(new DocRootTaglet()).getName() + "}/" + + redirectPathFromRoot.resolve(relativeLink).getPath(); textBuff.replace(begin, end, relativeLink); } begin = textBuff.toString().toLowerCase().indexOf(" 0) { - File stylefile = new File(filename); - String parent = stylefile.getParent(); - filename = (parent == null)? - filename: - filename.substring(parent.length() + 1); + String stylesheetfile = configuration.stylesheetfile; + DocPath stylesheet; + if (stylesheetfile.isEmpty()) { + stylesheet = DocPaths.STYLESHEET; } else { - filename = "stylesheet.css"; + DocFile file = DocFile.createFileForInput(configuration, stylesheetfile); + stylesheet = DocPath.create(file.getName()); } - filename = relativePath + filename; - HtmlTree link = HtmlTree.LINK("stylesheet", "text/css", filename, "Style"); + HtmlTree link = HtmlTree.LINK("stylesheet", "text/css", + pathToRoot.resolve(stylesheet).getPath(), + "Style"); return link; } diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java index dac765d925c..f0d0707be0d 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java @@ -78,11 +78,12 @@ public class LinkFactoryImpl extends LinkFactory { LinkOutputImpl linkOutput = new LinkOutputImpl(); if (classDoc.isIncluded()) { if (configuration.isGeneratedDoc(classDoc)) { - String filename = pathString(classLinkInfo); + DocPath filename = getPath(classLinkInfo); if (linkInfo.linkToSelf || - !(linkInfo.classDoc.name() + ".html").equals(m_writer.filename)) { - linkOutput.append(m_writer.getHyperLinkString(filename, - classLinkInfo.where, label.toString(), + !(DocPath.forName(classDoc)).equals(m_writer.filename)) { + linkOutput.append(m_writer.getHyperLinkString( + filename.fragment(classLinkInfo.where), + label.toString(), classLinkInfo.isStrong, classLinkInfo.styleName, title, classLinkInfo.target)); if (noLabel && !classLinkInfo.excludeTypeParameterLinks) { @@ -161,16 +162,12 @@ public class LinkFactoryImpl extends LinkFactory { * * @param linkInfo the information about the link. */ - private String pathString(LinkInfoImpl linkInfo) { + private DocPath getPath(LinkInfoImpl linkInfo) { if (linkInfo.context == LinkInfoImpl.PACKAGE_FRAME) { //Not really necessary to do this but we want to be consistent //with 1.4.2 output. - return linkInfo.classDoc.name() + ".html"; + return DocPath.forName(linkInfo.classDoc); } - StringBuilder buf = new StringBuilder(m_writer.relativePath); - buf.append(DirectoryManager.getPathToPackage( - linkInfo.classDoc.containingPackage(), - linkInfo.classDoc.name() + ".html")); - return buf.toString(); + return m_writer.pathToRoot.resolve(DocPath.forClass(linkInfo.classDoc)); } } diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java index 467859d740b..6b9ff239511 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java @@ -400,7 +400,7 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter */ protected Content getNavSummaryLink(ClassDoc cd, boolean link) { if (link) { - return writer.getHyperLink("", (cd == null)? + return writer.getHyperLink((cd == null)? "method_summary": "methods_inherited_from_class_" + configuration().getClassName(cd), @@ -415,7 +415,7 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter */ protected void addNavDetailLink(boolean link, Content liNav) { if (link) { - liNav.addContent(writer.getHyperLink("", "method_detail", + liNav.addContent(writer.getHyperLink("method_detail", writer.getResource("doclet.navMethod"))); } else { liNav.addContent(writer.getResource("doclet.navMethod")); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java index ec9a50f52fa..5b9cda91b33 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java @@ -203,9 +203,8 @@ public class NestedClassWriterImpl extends AbstractMemberWriter */ protected Content getNavSummaryLink(ClassDoc cd, boolean link) { if (link) { - return writer.getHyperLink("", (cd == null) ? "nested_class_summary": - "nested_classes_inherited_from_class_" + - cd.qualifiedName(), + return writer.getHyperLink((cd == null) ? "nested_class_summary": + "nested_classes_inherited_from_class_" + cd.qualifiedName(), writer.getResource("doclet.navNested")); } else { return writer.getResource("doclet.navNested"); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java index 6c9f3770b00..e218a273d47 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java @@ -59,18 +59,13 @@ public class PackageFrameWriter extends HtmlDocletWriter { */ private Set documentedClasses; - /** - * The name of the output file. - */ - public static final String OUTPUT_FILE_NAME = "package-frame.html"; - /** * Constructor to construct PackageFrameWriter object and to generate * "package-frame.html" file in the respective package directory. * For example for package "java.lang" this will generate file * "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 doesen't exist. + * if it doesn't exist. * * @param configuration the configuration of the doclet. * @param packageDoc PackageDoc under consideration. @@ -78,7 +73,7 @@ public class PackageFrameWriter extends HtmlDocletWriter { public PackageFrameWriter(ConfigurationImpl configuration, PackageDoc packageDoc) throws IOException { - super(configuration, DirectoryManager.getDirectoryPath(packageDoc), OUTPUT_FILE_NAME, DirectoryManager.getRelativePath(packageDoc)); + super(configuration, DocPath.forPackage(packageDoc).resolve(DocPaths.PACKAGE_FRAME)); this.packageDoc = packageDoc; if (configuration.root.specifiedPackages().length == 0) { documentedClasses = new HashSet(Arrays.asList(configuration.root.classes())); @@ -113,7 +108,7 @@ public class PackageFrameWriter extends HtmlDocletWriter { } catch (IOException exc) { configuration.standardmessage.error( "doclet.exception_encountered", - exc.toString(), OUTPUT_FILE_NAME); + exc.toString(), DocPaths.PACKAGE_FRAME.getPath()); throw new DocletAbortException(); } } diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java index 2928983b61d..6e066a8a3a0 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java @@ -52,7 +52,7 @@ public class PackageIndexFrameWriter extends AbstractPackageIndexWriter { * @param filename Name of the package index file to be generated. */ public PackageIndexFrameWriter(ConfigurationImpl configuration, - String filename) throws IOException { + DocPath filename) throws IOException { super(configuration, filename); } @@ -62,7 +62,7 @@ public class PackageIndexFrameWriter extends AbstractPackageIndexWriter { */ public static void generate(ConfigurationImpl configuration) { PackageIndexFrameWriter packgen; - String filename = "overview-frame.html"; + DocPath filename = DocPaths.OVERVIEW_FRAME; try { packgen = new PackageIndexFrameWriter(configuration, filename); packgen.buildPackageIndexFile("doclet.Window_Overview", false); @@ -109,12 +109,12 @@ public class PackageIndexFrameWriter extends AbstractPackageIndexWriter { if (pd.name().length() > 0) { packageLabel = getPackageLabel(pd.name()); packageLinkContent = getHyperLink(pathString(pd, - "package-frame.html"), "", packageLabel, "", + DocPaths.PACKAGE_FRAME), packageLabel, "", "packageFrame"); } else { packageLabel = new RawHtml("<unnamed package>"); - packageLinkContent = getHyperLink("package-frame.html", - "", packageLabel, "", "packageFrame"); + packageLinkContent = getHyperLink(DocPaths.PACKAGE_FRAME, + packageLabel, "", "packageFrame"); } Content li = HtmlTree.LI(packageLinkContent); return li; @@ -148,7 +148,7 @@ public class PackageIndexFrameWriter extends AbstractPackageIndexWriter { * @param body the Content object to which the all classes link should be added */ protected void addAllClassesLink(Content body) { - Content linkContent = getHyperLink("allclasses-frame.html", "", + Content linkContent = getHyperLink(DocPaths.ALLCLASSES_FRAME, allclassesLabel, "", "packageFrame"); Content div = HtmlTree.DIV(HtmlStyle.indexHeader, linkContent); body.addContent(div); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java index b1400f4bdd1..77d2bae2fe4 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java @@ -36,7 +36,7 @@ import com.sun.tools.doclets.internal.toolkit.util.*; /** * Generate the package index page "overview-summary.html" for the right-hand * frame. A click on the package name on this page will update the same frame - * with the "pacakge-summary.html" file for the clicked package. + * with the "package-summary.html" file for the clicked package. * *

This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. @@ -73,7 +73,7 @@ public class PackageIndexWriter extends AbstractPackageIndexWriter { * @see Group */ public PackageIndexWriter(ConfigurationImpl configuration, - String filename) + DocPath filename) throws IOException { super(configuration, filename); this.root = configuration.root; @@ -88,7 +88,7 @@ public class PackageIndexWriter extends AbstractPackageIndexWriter { */ public static void generate(ConfigurationImpl configuration) { PackageIndexWriter packgen; - String filename = "overview-summary.html"; + DocPath filename = DocPaths.OVERVIEW_SUMMARY; try { packgen = new PackageIndexWriter(configuration, filename); packgen.buildPackageIndexFile("doclet.Window_Overview_Summary", true); @@ -178,7 +178,7 @@ public class PackageIndexWriter extends AbstractPackageIndexWriter { Content see = seeLabel; see.addContent(" "); Content descPara = HtmlTree.P(see); - Content descLink = getHyperLink("", "overview_description", + Content descLink = getHyperLink(DocLink.fragment("overview_description"), descriptionLabel, "", ""); descPara.addContent(descLink); div.addContent(descPara); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java index 5895015f210..e95c370502c 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java @@ -67,15 +67,14 @@ public class PackageTreeWriter extends AbstractTreeWriter { * @throws DocletAbortException */ public PackageTreeWriter(ConfigurationImpl configuration, - String path, String filename, + DocPath path, PackageDoc packagedoc, PackageDoc prev, PackageDoc next) throws IOException { - super(configuration, path, filename, + super(configuration, path, new ClassTree( configuration.classDocCatalog.allClasses(packagedoc), - configuration), - packagedoc); + configuration)); this.packagedoc = packagedoc; this.prev = prev; this.next = next; @@ -96,17 +95,16 @@ public class PackageTreeWriter extends AbstractTreeWriter { PackageDoc pkg, PackageDoc prev, PackageDoc next, boolean noDeprecated) { PackageTreeWriter packgen; - String path = DirectoryManager.getDirectoryPath(pkg); - String filename = "package-tree.html"; + DocPath path = DocPath.forPackage(pkg).resolve(DocPaths.PACKAGE_TREE); try { - packgen = new PackageTreeWriter(configuration, path, filename, pkg, + packgen = new PackageTreeWriter(configuration, path, pkg, prev, next); packgen.generatePackageTreeFile(); packgen.close(); } catch (IOException exc) { configuration.standardmessage.error( "doclet.exception_encountered", - exc.toString(), filename); + exc.toString(), path.getPath()); throw new DocletAbortException(); } } @@ -175,9 +173,8 @@ public class PackageTreeWriter extends AbstractTreeWriter { if (prev == null) { return getNavLinkPrevious(null); } else { - String path = DirectoryManager.getRelativePath(packagedoc.name(), - prev.name()); - return getNavLinkPrevious(path + "package-tree.html"); + DocPath path = DocPath.relativePath(packagedoc, prev); + return getNavLinkPrevious(path.resolve(DocPaths.PACKAGE_TREE)); } } @@ -190,9 +187,8 @@ public class PackageTreeWriter extends AbstractTreeWriter { if (next == null) { return getNavLinkNext(null); } else { - String path = DirectoryManager.getRelativePath(packagedoc.name(), - next.name()); - return getNavLinkNext(path + "package-tree.html"); + DocPath path = DocPath.relativePath(packagedoc, next); + return getNavLinkNext(path.resolve(DocPaths.PACKAGE_TREE)); } } @@ -202,7 +198,7 @@ public class PackageTreeWriter extends AbstractTreeWriter { * @return a content tree for the package link */ protected Content getNavLinkPackage() { - Content linkContent = getHyperLink("package-summary.html", "", + Content linkContent = getHyperLink(DocPaths.PACKAGE_SUMMARY, packageLabel); Content li = HtmlTree.LI(linkContent); return li; diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java index 1bf61a55ca8..4545484e451 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java @@ -57,11 +57,9 @@ public class PackageUseWriter extends SubWriterHolderWriter { * @throws DocletAbortException */ public PackageUseWriter(ConfigurationImpl configuration, - ClassUseMapper mapper, String filename, + ClassUseMapper mapper, DocPath filename, PackageDoc pkgdoc) throws IOException { - super(configuration, DirectoryManager.getDirectoryPath(pkgdoc), - filename, - DirectoryManager.getRelativePath(pkgdoc.name())); + super(configuration, DocPath.forPackage(pkgdoc).resolve(filename)); this.pkgdoc = pkgdoc; // by examining all classes in this package, find what packages @@ -98,7 +96,7 @@ public class PackageUseWriter extends SubWriterHolderWriter { public static void generate(ConfigurationImpl configuration, ClassUseMapper mapper, PackageDoc pkgdoc) { PackageUseWriter pkgusegen; - String filename = "package-use.html"; + DocPath filename = DocPaths.PACKAGE_USE; try { pkgusegen = new PackageUseWriter(configuration, mapper, filename, pkgdoc); @@ -232,10 +230,10 @@ public class PackageUseWriter extends SubWriterHolderWriter { */ protected void addClassRow(ClassDoc usedClass, String packageName, Content contentTree) { - String path = pathString(usedClass, - "class-use/" + usedClass.name() + ".html"); + DocPath dp = pathString(usedClass, + DocPaths.CLASS_USE.resolve(DocPath.forName(usedClass))); Content td = HtmlTree.TD(HtmlStyle.colOne, - getHyperLink(path, packageName, new StringContent(usedClass.name()))); + getHyperLink(dp.fragment(packageName), new StringContent(usedClass.name()))); addIndexComment(usedClass, td); contentTree.addContent(td); } @@ -248,7 +246,7 @@ public class PackageUseWriter extends SubWriterHolderWriter { */ protected void addPackageUse(PackageDoc pkg, Content contentTree) throws IOException { Content tdFirst = HtmlTree.TD(HtmlStyle.colFirst, - getHyperLink("", Util.getPackageName(pkg), + getHyperLink(Util.getPackageName(pkg), new RawHtml(Util.getPackageName(pkg)))); contentTree.addContent(tdFirst); HtmlTree tdLast = new HtmlTree(HtmlTag.TD); @@ -288,7 +286,7 @@ public class PackageUseWriter extends SubWriterHolderWriter { * @return a content tree for the package link */ protected Content getNavLinkPackage() { - Content linkContent = getHyperLink("package-summary.html", "", + Content linkContent = getHyperLink(DocPaths.PACKAGE_SUMMARY, packageLabel); Content li = HtmlTree.LI(linkContent); return li; @@ -310,7 +308,7 @@ public class PackageUseWriter extends SubWriterHolderWriter { * @return a content tree for the tree link */ protected Content getNavLinkTree() { - Content linkContent = getHyperLink("package-tree.html", "", + Content linkContent = getHyperLink(DocPaths.PACKAGE_TREE, treeLabel); Content li = HtmlTree.LI(linkContent); return li; diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java index c91bf4d016c..64f367e62e3 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java @@ -64,18 +64,13 @@ public class PackageWriterImpl extends HtmlDocletWriter */ protected PackageDoc packageDoc; - /** - * The name of the output file. - */ - private static final String OUTPUT_FILE_NAME = "package-summary.html"; - /** * Constructor to construct PackageWriter object and to generate * "package-summary.html" file in the respective package directory. * For example for package "java.lang" this will generate file * "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 doesen't exist. + * if it doesn't exist. * * @param configuration the configuration of the doclet. * @param packageDoc PackageDoc under consideration. @@ -83,24 +78,14 @@ public class PackageWriterImpl extends HtmlDocletWriter * @param next Next package in the sorted array. */ public PackageWriterImpl(ConfigurationImpl configuration, - PackageDoc packageDoc, PackageDoc prev, PackageDoc next) - throws IOException { - super(configuration, DirectoryManager.getDirectoryPath(packageDoc), OUTPUT_FILE_NAME, - DirectoryManager.getRelativePath(packageDoc.name())); + PackageDoc packageDoc, PackageDoc prev, PackageDoc next) + throws IOException { + super(configuration, DocPath.forPackage(packageDoc).resolve(DocPaths.PACKAGE_SUMMARY)); this.prev = prev; this.next = next; this.packageDoc = packageDoc; } - /** - * Return the name of the output file. - * - * @return the name of the output file. - */ - public String getOutputFileName() { - return OUTPUT_FILE_NAME; - } - /** * {@inheritDoc} */ @@ -127,7 +112,7 @@ public class PackageWriterImpl extends HtmlDocletWriter addSummaryComment(packageDoc, docSummaryDiv); div.addContent(docSummaryDiv); Content space = getSpace(); - Content descLink = getHyperLink("", "package_description", + Content descLink = getHyperLink(DocLink.fragment("package_description"), descriptionLabel, "", ""); Content descPara = new HtmlTree(HtmlTag.P, seeLabel, space, descLink); div.addContent(descPara); @@ -265,7 +250,7 @@ public class PackageWriterImpl extends HtmlDocletWriter * @return a content tree for the class use link */ protected Content getNavLinkClassUse() { - Content useLink = getHyperLink("package-use.html", "", + Content useLink = getHyperLink(DocPaths.PACKAGE_USE, useLabel, "", ""); Content li = HtmlTree.LI(useLink); return li; @@ -281,9 +266,8 @@ public class PackageWriterImpl extends HtmlDocletWriter if (prev == null) { li = HtmlTree.LI(prevpackageLabel); } else { - String path = DirectoryManager.getRelativePath(packageDoc.name(), - prev.name()); - li = HtmlTree.LI(getHyperLink(path + "package-summary.html", "", + DocPath path = DocPath.relativePath(packageDoc, prev); + li = HtmlTree.LI(getHyperLink(path.resolve(DocPaths.PACKAGE_SUMMARY), prevpackageLabel, "", "")); } return li; @@ -299,9 +283,8 @@ public class PackageWriterImpl extends HtmlDocletWriter if (next == null) { li = HtmlTree.LI(nextpackageLabel); } else { - String path = DirectoryManager.getRelativePath(packageDoc.name(), - next.name()); - li = HtmlTree.LI(getHyperLink(path + "package-summary.html", "", + DocPath path = DocPath.relativePath(packageDoc, next); + li = HtmlTree.LI(getHyperLink(path.resolve(DocPaths.PACKAGE_SUMMARY), nextpackageLabel, "", "")); } return li; @@ -314,7 +297,7 @@ public class PackageWriterImpl extends HtmlDocletWriter * @return a content tree for the tree link */ protected Content getNavLinkTree() { - Content useLink = getHyperLink("package-tree.html", "", + Content useLink = getHyperLink(DocPaths.PACKAGE_TREE, treeLabel, "", ""); Content li = HtmlTree.LI(useLink); return li; diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java index f7cb4feff81..c1df94a8728 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java @@ -29,6 +29,7 @@ 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.DocPaths; import com.sun.tools.doclets.internal.toolkit.util.DocletAbortException; /** @@ -44,14 +45,12 @@ import com.sun.tools.doclets.internal.toolkit.util.DocletAbortException; public class SerializedFormWriterImpl extends SubWriterHolderWriter implements SerializedFormWriter { - private static final String FILE_NAME = "serialized-form.html"; - /** * @throws IOException * @throws DocletAbortException */ public SerializedFormWriterImpl() throws IOException { - super(ConfigurationImpl.getInstance(), FILE_NAME); + super(ConfigurationImpl.getInstance(), DocPaths.SERIALIZED_FORM); } /** diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java index a0ce80f928b..924557c95df 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java @@ -55,11 +55,9 @@ public class SingleIndexWriter extends AbstractIndexWriter { * @param indexbuilder Unicode based Index from {@link IndexBuilder} */ public SingleIndexWriter(ConfigurationImpl configuration, - String filename, + DocPath filename, IndexBuilder indexbuilder) throws IOException { super(configuration, filename, indexbuilder); - relativepathNoSlash = "."; - relativePath = "./"; } /** @@ -71,7 +69,7 @@ public class SingleIndexWriter extends AbstractIndexWriter { public static void generate(ConfigurationImpl configuration, IndexBuilder indexbuilder) { SingleIndexWriter indexgen; - String filename = "index-all.html"; + DocPath filename = DocPaths.INDEX_ALL; try { indexgen = new SingleIndexWriter(configuration, filename, indexbuilder); @@ -117,7 +115,7 @@ public class SingleIndexWriter extends AbstractIndexWriter { for (int i = 0; i < indexbuilder.elements().length; i++) { String unicode = (indexbuilder.elements())[i].toString(); contentTree.addContent( - getHyperLink("#_" + unicode + "_", new StringContent(unicode))); + getHyperLink("_" + unicode + "_", new StringContent(unicode))); contentTree.addContent(getSpace()); } } diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java index c560bb8711c..299f4f53313 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java @@ -26,11 +26,13 @@ package com.sun.tools.doclets.formats.html; import java.io.*; + import javax.tools.FileObject; + 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.*; -import com.sun.tools.doclets.formats.html.markup.*; /** * Converts Java Source Code to HTML. @@ -62,7 +64,7 @@ public class SourceToHTMLConverter { * Relative path from the documentation root to the file that is being * generated. */ - private static String relativePath = ""; + private static DocPath relativePath = DocPath.empty; /** * Source is converted to HTML using static methods below. @@ -77,7 +79,7 @@ public class SourceToHTMLConverter { * @param outputdir the name of the directory to output to. */ public static void convertRoot(ConfigurationImpl configuration, RootDoc rd, - String outputdir) { + DocPath outputdir) { if (rd == null || outputdir == null) { return; } @@ -95,8 +97,7 @@ public class SourceToHTMLConverter { // package files to HTML. if (!(configuration.nodeprecated && (Util.isDeprecated(cds[i]) || Util.isDeprecated(cds[i].containingPackage())))) - convertClass(configuration, cds[i], - getPackageOutputDir(outputdir, cds[i].containingPackage())); + convertClass(configuration, cds[i], outputdir); } } @@ -108,11 +109,10 @@ public class SourceToHTMLConverter { * @param outputdir the name of the directory to output to. */ public static void convertPackage(ConfigurationImpl configuration, PackageDoc pd, - String outputdir) { - if (pd == null || outputdir == null) { + DocPath outputdir) { + if (pd == null) { return; } - String classOutputdir = getPackageOutputDir(outputdir, pd); ClassDoc[] cds = pd.allClasses(); for (int i = 0; i < cds.length; i++) { // If -nodeprecated option is set and the class is marked as deprecated, @@ -120,22 +120,10 @@ public class SourceToHTMLConverter { // containing package deprecation since it is already check in // the calling method above. if (!(configuration.nodeprecated && Util.isDeprecated(cds[i]))) - convertClass(configuration, cds[i], classOutputdir); + convertClass(configuration, cds[i], outputdir); } } - /** - * Return the directory write output to for the given package. - * - * @param outputDir the directory to output to. - * @param pd the Package to generate output for. - * @return the package output directory as a String. - */ - private static String getPackageOutputDir(String outputDir, PackageDoc pd) { - return outputDir + File.separator + - DirectoryManager.getDirectoryPath(pd) + File.separator; - } - /** * Convert the given Class to an HTML. * @@ -144,8 +132,8 @@ public class SourceToHTMLConverter { * @param outputdir the name of the directory to output to. */ public static void convertClass(ConfigurationImpl configuration, ClassDoc cd, - String outputdir) { - if (cd == null || outputdir == null) { + DocPath outputdir) { + if (cd == null) { return; } try { @@ -168,8 +156,9 @@ public class SourceToHTMLConverter { LineNumberReader reader = new LineNumberReader(r); int lineno = 1; String line; - relativePath = DirectoryManager.getRelativePath(DocletConstants.SOURCE_OUTPUT_DIR_NAME) + - DirectoryManager.getRelativePath(cd.containingPackage()); + relativePath = DocPaths.SOURCE_OUTPUT + .resolve(DocPath.forPackage(cd)) + .invert(); Content body = getHeader(); Content pre = new HtmlTree(HtmlTag.PRE); try { @@ -184,8 +173,8 @@ public class SourceToHTMLConverter { addBlankLines(pre); Content div = HtmlTree.DIV(HtmlStyle.sourceContainer, pre); body.addContent(div); - writeToFile(body, outputdir, cd.name(), configuration); - } catch (Exception e){ + writeToFile(body, outputdir.resolve(DocPath.forClass(cd)), configuration); + } catch (IOException e) { e.printStackTrace(); } } @@ -194,12 +183,11 @@ public class SourceToHTMLConverter { * Write the output to the file. * * @param body the documentation content to be written to the file. - * @param outputDir the directory to output to. - * @param className the name of the class that I am converting to HTML. + * @param path the path for the file. * @param configuration the Doclet configuration to pass notices to. */ - private static void writeToFile(Content body, String outputDir, - String className, ConfigurationImpl configuration) throws IOException { + private static void writeToFile(Content body, DocPath path, + ConfigurationImpl configuration) throws IOException { Content htmlDocType = DocType.Transitional(); Content head = new HtmlTree(HtmlTag.HEAD); head.addContent(HtmlTree.TITLE(new StringContent( @@ -208,15 +196,15 @@ public class SourceToHTMLConverter { Content htmlTree = HtmlTree.HTML(configuration.getLocale().getLanguage(), head, body); Content htmlDocument = new HtmlDocument(htmlDocType, htmlTree); - File dir = new File(outputDir); - dir.mkdirs(); - File newFile = new File(dir, className + ".html"); - configuration.message.notice("doclet.Generating_0", newFile.getPath()); - FileOutputStream fout = new FileOutputStream(newFile); - BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(fout)); - bw.write(htmlDocument.toString()); - bw.close(); - fout.close(); + configuration.message.notice("doclet.Generating_0", path.getPath()); + DocFile df = DocFile.createFileForOutput(configuration, path); + Writer w = df.openWriter(); + try { + htmlDocument.write(w, true); + } finally { + w.close(); + } + } /** @@ -227,17 +215,15 @@ public class SourceToHTMLConverter { */ public static HtmlTree getStyleSheetProperties(ConfigurationImpl configuration) { String filename = configuration.stylesheetfile; + DocPath stylesheet; if (filename.length() > 0) { - File stylefile = new File(filename); - String parent = stylefile.getParent(); - filename = (parent == null)? - filename: - filename.substring(parent.length() + 1); + DocFile file = DocFile.createFileForInput(configuration, filename); + stylesheet = DocPath.create(file.getName()); } else { - filename = "stylesheet.css"; + stylesheet = DocPaths.STYLESHEET; } - filename = relativePath + filename; - HtmlTree link = HtmlTree.LINK("stylesheet", "text/css", filename, "Style"); + DocPath p = relativePath.resolve(stylesheet); + HtmlTree link = HtmlTree.LINK("stylesheet", "text/css", p.getPath(), "Style"); return link; } diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java index e6249f29ddb..69f273e7f69 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java @@ -62,15 +62,13 @@ public class SplitIndexWriter extends AbstractIndexWriter { * from this file. * * @param path Path to the file which is getting generated. - * @param filename Name of the file which is getting genrated. - * @param relpath Relative path from this file to the current directory. * @param indexbuilder Unicode based Index from {@link IndexBuilder} */ public SplitIndexWriter(ConfigurationImpl configuration, - String path, String filename, - String relpath, IndexBuilder indexbuilder, + DocPath path, + IndexBuilder indexbuilder, int prev, int next) throws IOException { - super(configuration, path, filename, relpath, indexbuilder); + super(configuration, path, indexbuilder); this.prev = prev; this.next = next; } @@ -85,17 +83,16 @@ public class SplitIndexWriter extends AbstractIndexWriter { public static void generate(ConfigurationImpl configuration, IndexBuilder indexbuilder) { SplitIndexWriter indexgen; - String filename = ""; - String path = DirectoryManager.getPath("index-files"); - String relpath = DirectoryManager.getRelativePath("index-files"); + DocPath filename = DocPath.empty; + DocPath path = DocPaths.INDEX_FILES; try { for (int i = 0; i < indexbuilder.elements().length; i++) { int j = i + 1; int prev = (j == 1)? -1: i; int next = (j == indexbuilder.elements().length)? -1: j + 1; - filename = "index-" + j +".html"; + filename = DocPaths.indexN(j); indexgen = new SplitIndexWriter(configuration, - path, filename, relpath, + path.resolve(filename), indexbuilder, prev, next); indexgen.generateIndexFile((Character)indexbuilder. elements()[i]); @@ -104,7 +101,7 @@ public class SplitIndexWriter extends AbstractIndexWriter { } catch (IOException exc) { configuration.standardmessage.error( "doclet.exception_encountered", - exc.toString(), filename); + exc.toString(), filename.getPath()); throw new DocletAbortException(); } } @@ -142,7 +139,7 @@ public class SplitIndexWriter extends AbstractIndexWriter { Object[] unicodeChars = indexbuilder.elements(); for (int i = 0; i < unicodeChars.length; i++) { int j = i + 1; - contentTree.addContent(getHyperLink("index-" + j + ".html", + contentTree.addContent(getHyperLink(DocPaths.indexN(j), new StringContent(unicodeChars[i].toString()))); contentTree.addContent(getSpace()); } @@ -159,7 +156,7 @@ public class SplitIndexWriter extends AbstractIndexWriter { return HtmlTree.LI(prevletterLabel); } else { - Content prevLink = getHyperLink("index-" + prev + ".html", "", + Content prevLink = getHyperLink(DocPaths.indexN(prev), prevletterLabel); return HtmlTree.LI(prevLink); } @@ -176,7 +173,7 @@ public class SplitIndexWriter extends AbstractIndexWriter { return HtmlTree.LI(nextletterLabel); } else { - Content nextLink = getHyperLink("index-" + next + ".html","", + Content nextLink = getHyperLink(DocPaths.indexN(next), nextletterLabel); return HtmlTree.LI(nextLink); } diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java index 424c55dfd8f..8f00a359a83 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java @@ -54,18 +54,11 @@ import com.sun.tools.doclets.internal.toolkit.util.*; */ public abstract class SubWriterHolderWriter extends HtmlDocletWriter { - public SubWriterHolderWriter(ConfigurationImpl configuration, - String filename) throws IOException { + public SubWriterHolderWriter(ConfigurationImpl configuration, DocPath filename) + throws IOException { super(configuration, filename); } - - public SubWriterHolderWriter(ConfigurationImpl configuration, - String path, String filename, String relpath) - throws IOException { - super(configuration, path, filename, relpath); - } - /** * Add the summary header. * diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java index 92478e2f6ce..ce158d443d0 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java @@ -66,8 +66,10 @@ public class TagletWriterImpl extends TagletWriter { public TagletOutput getDocRootOutput() { if (htmlWriter.configuration.docrootparent.length() > 0) return new TagletOutputImpl(htmlWriter.configuration.docrootparent); + else if (htmlWriter.pathToRoot.isEmpty()) + return new TagletOutputImpl("."); else - return new TagletOutputImpl(htmlWriter.relativepathNoSlash); + return new TagletOutputImpl(htmlWriter.pathToRoot.getPath()); } /** @@ -170,19 +172,24 @@ public class TagletWriterImpl extends TagletWriter { htmlWriter instanceof ClassWriterImpl) { //Automatically add link to constant values page for constant fields. result = addSeeHeader(result); - result += htmlWriter.getHyperLinkString(htmlWriter.relativePath + - ConfigurationImpl.CONSTANTS_FILE_NAME - + "#" + ((ClassWriterImpl) htmlWriter).getClassDoc().qualifiedName() - + "." + ((FieldDoc) holder).name(), - htmlWriter.configuration.getText("doclet.Constants_Summary")); + DocPath constantsPath = + htmlWriter.pathToRoot.resolve(DocPaths.CONSTANT_VALUES); + String whichConstant = + ((ClassWriterImpl) htmlWriter).getClassDoc().qualifiedName() + "." + ((FieldDoc) holder).name(); + DocLink link = constantsPath.fragment(whichConstant); + result += htmlWriter.getHyperLinkString(link, + htmlWriter.configuration.getText("doclet.Constants_Summary"), + false); } if (holder.isClass() && ((ClassDoc)holder).isSerializable()) { //Automatically add link to serialized form page for serializable classes. if ((SerializedFormBuilder.serialInclude(holder) && SerializedFormBuilder.serialInclude(((ClassDoc)holder).containingPackage()))) { result = addSeeHeader(result); - result += htmlWriter.getHyperLinkString(htmlWriter.relativePath + "serialized-form.html", - ((ClassDoc)holder).qualifiedName(), htmlWriter.configuration.getText("doclet.Serialized_Form"), false); + DocPath serialPath = htmlWriter.pathToRoot.resolve(DocPaths.SERIALIZED_FORM); + DocLink link = serialPath.fragment(((ClassDoc)holder).qualifiedName()); + result += htmlWriter.getHyperLinkString(link, + htmlWriter.configuration.getText("doclet.Serialized_Form"), false); } } return result.equals("") ? null : new TagletOutputImpl(result + ""); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java index 7dab45c6cb0..f51a834db81 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java @@ -67,7 +67,7 @@ public class TreeWriter extends AbstractTreeWriter { * @param classtree the tree being built. */ public TreeWriter(ConfigurationImpl configuration, - String filename, ClassTree classtree) + DocPath filename, ClassTree classtree) throws IOException { super(configuration, filename, classtree); packages = configuration.packages; @@ -84,7 +84,7 @@ public class TreeWriter extends AbstractTreeWriter { public static void generate(ConfigurationImpl configuration, ClassTree classtree) { TreeWriter treegen; - String filename = "overview-tree.html"; + DocPath filename = DocPaths.OVERVIEW_TREE; try { treegen = new TreeWriter(configuration, filename, classtree); treegen.generateTreeFile(); @@ -144,9 +144,9 @@ public class TreeWriter extends AbstractTreeWriter { (configuration.nodeprecated && Util.isDeprecated(packages[i]))) { continue; } - String link = pathString(packages[i], "package-tree.html"); + DocPath link = pathString(packages[i], DocPaths.PACKAGE_TREE); Content li = HtmlTree.LI(getHyperLink( - link, "", new StringContent(packages[i].name()))); + link, new StringContent(packages[i].name()))); if (i < packages.length - 1) { li.addContent(", "); } diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java index 4af650d601a..376bfdcfeb2 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java @@ -31,6 +31,9 @@ import java.util.*; import com.sun.javadoc.*; import com.sun.tools.doclets.formats.html.ConfigurationImpl; import com.sun.tools.doclets.internal.toolkit.*; +import com.sun.tools.doclets.internal.toolkit.util.DocLink; +import com.sun.tools.doclets.internal.toolkit.util.DocPath; +import com.sun.tools.doclets.internal.toolkit.util.DocPaths; /** @@ -56,25 +59,11 @@ public abstract class HtmlDocWriter extends HtmlWriter { * * @param filename String file name. */ - public HtmlDocWriter(Configuration configuration, - String filename) throws IOException { - super(configuration, - null, configuration.destDirName + filename, - configuration.docencoding); - // use File to normalize file separators + public HtmlDocWriter(Configuration configuration, DocPath filename) + throws IOException { + super(configuration, filename); configuration.message.notice("doclet.Generating_0", - new File(configuration.destDirName, filename)); - } - - public HtmlDocWriter(Configuration configuration, - String path, String filename) throws IOException { - super(configuration, - configuration.destDirName + path, filename, - configuration.docencoding); - // use File to normalize file separators - configuration.message.notice("doclet.Generating_0", - new File(configuration.destDirName, - ((path.length() > 0)? path + File.separator: "") + filename)); + filename.resolveAgainst(configuration.destDirName)); } /** @@ -86,77 +75,99 @@ public abstract class HtmlDocWriter extends HtmlWriter { * Return Html Hyper Link string. * * @param link String name of the file. - * @param where Position of the link in the file. Character '#' is not - * needed. * @param label Tag for the link. * @param strong Boolean that sets label to strong. * @return String Hyper Link. */ - public String getHyperLinkString(String link, String where, + public String getHyperLinkString(DocPath link, String label, boolean strong) { - return getHyperLinkString(link, where, label, strong, "", "", ""); + return getHyperLinkString(link, label, strong, "", "", ""); + } + + public String getHyperLinkString(DocLink link, + String label, boolean strong) { + return getHyperLinkString(link, label, strong, "", "", ""); } /** * Get Html Hyper Link string. * * @param link String name of the file. - * @param where Position of the link in the file. Character '#' is not - * needed. * @param label Tag for the link. * @param strong Boolean that sets label to strong. * @param stylename String style of text defined in style sheet. * @return String Hyper Link. */ - public String getHyperLinkString(String link, String where, + public String getHyperLinkString(DocPath link, String label, boolean strong, String stylename) { - return getHyperLinkString(link, where, label, strong, stylename, "", ""); + return getHyperLinkString(link, label, strong, stylename, "", ""); + } + + public String getHyperLinkString(DocLink link, + String label, boolean strong, + String stylename) { + return getHyperLinkString(link, label, strong, stylename, "", ""); } /** * Get Html Hyper Link string. * - * @param link String name of the file. * @param where Position of the link in the file. Character '#' is not * needed. * @param label Tag for the link. * @return a content tree for the hyper link */ - public Content getHyperLink(String link, String where, + public Content getHyperLink(String where, Content label) { - return getHyperLink(link, where, label, "", ""); + return getHyperLink(DocLink.fragment(where), label, "", ""); + } + + /** + * Get Html Hyper Link string. + * + * @param link String name of the file. + * @param label Tag for the link. + * @return a content tree for the hyper link + */ + public Content getHyperLink(DocPath link, + Content label) { + return getHyperLink(link, label, "", ""); + } + + public Content getHyperLink(DocLink link, + Content label) { + return getHyperLink(link, label, "", ""); } /** * Get Html Hyper Link string. * * @param link String name of the file. - * @param where Position of the link in the file. Character '#' is not - * needed. * @param label Tag for the link. * @param strong Boolean that sets label to strong. * @param stylename String style of text defined in style sheet. - * @param title String that describes the link's content for accessibility. + * @param title String that describes the links content for accessibility. * @param target Target frame. * @return String Hyper Link. */ - public String getHyperLinkString(String link, String where, + public String getHyperLinkString(DocPath link, + String label, boolean strong, + String stylename, String title, String target) { + return getHyperLinkString(new DocLink(link), label, strong, + stylename, title, target); + } + + public String getHyperLinkString(DocLink link, String label, boolean strong, String stylename, String title, String target) { StringBuilder retlink = new StringBuilder(); - retlink.append(""); if (stylename != null && stylename.length() != 0) { @@ -182,19 +193,19 @@ public abstract class HtmlDocWriter extends HtmlWriter { * Get Html Hyper Link. * * @param link String name of the file. - * @param where Position of the link in the file. Character '#' is not - * needed. * @param label Tag for the link. * @param title String that describes the link's content for accessibility. * @param target Target frame. * @return a content tree for the hyper link. */ - public Content getHyperLink(String link, String where, + public Content getHyperLink(DocPath link, Content label, String title, String target) { - if (where != null && where.length() != 0) { - link += "#" + where; - } - HtmlTree anchor = HtmlTree.A(link, label); + return getHyperLink(new DocLink(link), label, title, target); + } + + public Content getHyperLink(DocLink link, + Content label, String title, String target) { + HtmlTree anchor = HtmlTree.A(link.toString(), label); if (title != null && title.length() != 0) { anchor.addAttr(HtmlAttr.TITLE, title); } @@ -204,17 +215,6 @@ public abstract class HtmlDocWriter extends HtmlWriter { return anchor; } - /** - * Get a hyperlink to a file. - * - * @param link String name of the file - * @param label Label for the link - * @return a content for the hyperlink to the file - */ - public Content getHyperLink(String link, Content label) { - return getHyperLink(link, "", label); - } - /** * Get link string without positioning in the file. * @@ -222,8 +222,8 @@ public abstract class HtmlDocWriter extends HtmlWriter { * @param label Tag for the link. * @return Strign Hyper link. */ - public String getHyperLinkString(String link, String label) { - return getHyperLinkString(link, "", label, false); + public String getHyperLinkString(DocPath link, String label) { + return getHyperLinkString(link, label, false); } /** diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java index 64ea8760612..bd6be7a5c36 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java @@ -46,22 +46,11 @@ import com.sun.tools.doclets.internal.toolkit.util.*; */ public class HtmlWriter { - /** - * Name of the file, to which this writer is writing to. - */ - protected final String htmlFilename; - /** * The window title of this file */ protected String winTitle; - /** - * URL file separator string("/"). - */ - public static final String fileseparator = - DirectoryManager.URL_FILE_SEPARATOR; - /** * The configuration */ @@ -160,20 +149,15 @@ public class HtmlWriter { * * @param path The directory path to be created for this file * or null if none to be created. - * @param filename File Name to which the PrintWriter will - * do the Output. - * @param docencoding Encoding to be used for this file. * @exception IOException Exception raised by the FileWriter is passed on * to next level. * @exception UnsupportedEncodingException Exception raised by the * OutputStreamWriter is passed on to next level. */ - public HtmlWriter(Configuration configuration, - String path, String filename, String docencoding) - throws IOException, UnsupportedEncodingException { - writer = Util.genWriter(configuration, path, filename, docencoding); + public HtmlWriter(Configuration configuration, DocPath path) + throws IOException, UnsupportedEncodingException { + writer = DocFile.createFileForOutput(configuration, path).openWriter(); this.configuration = configuration; - htmlFilename = filename; this.memberDetailsListPrinted = false; packageTableHeader = new String[] { configuration.getText("doclet.Package"), diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java index 7f38f38564c..4ae4cce1722 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java @@ -106,7 +106,7 @@ public abstract class AbstractDoclet { /** * Start the generation of files. Call generate methods in the individual - * writers, which will in turn genrate the documentation files. Call the + * writers, which will in turn generate the documentation files. Call the * TreeWriter generation first to ensure the Class Hierarchy is built * first and then can be used in the later generation. * @@ -124,17 +124,7 @@ public abstract class AbstractDoclet { ClassTree classtree = new ClassTree(configuration, configuration.nodeprecated); generateClassFiles(root, classtree); - if (configuration.sourcepath != null && configuration.sourcepath.length() > 0) { - StringTokenizer pathTokens = new StringTokenizer(configuration.sourcepath, - String.valueOf(File.pathSeparatorChar)); - boolean first = true; - while(pathTokens.hasMoreTokens()){ - Util.copyDocFiles(configuration, - pathTokens.nextToken() + File.separator, - DocletConstants.DOC_FILES_DIR_NAME, first); - first = false; - } - } + Util.copyDocFiles(configuration, DocPaths.DOC_FILES); PackageListWriter.generate(configuration); generatePackageFiles(classtree); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java index d3cf97c5c4e..d94b7bef826 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java @@ -408,11 +408,11 @@ public abstract class Configuration { group.checkPackageGroups(os[1], os[2]); } else if (opt.equals("-link")) { String url = os[1]; - extern.url(url, url, root, false); + extern.link(url, url, root, false); } else if (opt.equals("-linkoffline")) { String url = os[1]; String pkglisturl = os[2]; - extern.url(url, pkglisturl, root, true); + extern.link(url, pkglisturl, root, true); } } if (sourcepath.length() == 0) { @@ -456,7 +456,7 @@ public abstract class Configuration { tagletManager.addCustomTag(args[1], tagletpath); continue; } - String[] tokens = Util.tokenize(args[1], + String[] tokens = tokenize(args[1], TagletManager.SIMPLE_TAGLET_OPT_SEPERATOR, 3); if (tokens.length == 1) { String tagName = args[1]; @@ -480,6 +480,47 @@ public abstract class Configuration { } } + /** + * Given a string, return an array of tokens. The separator can be escaped + * with the '\' character. The '\' character may also be escaped by the + * '\' character. + * + * @param s the string to tokenize. + * @param separator the separator char. + * @param maxTokens the maximum number of tokens returned. If the + * max is reached, the remaining part of s is appended + * to the end of the last token. + * + * @return an array of tokens. + */ + private String[] tokenize(String s, char separator, int maxTokens) { + List tokens = new ArrayList(); + StringBuilder token = new StringBuilder (); + boolean prevIsEscapeChar = false; + for (int i = 0; i < s.length(); i += Character.charCount(i)) { + int currentChar = s.codePointAt(i); + if (prevIsEscapeChar) { + // Case 1: escaped character + token.appendCodePoint(currentChar); + prevIsEscapeChar = false; + } else if (currentChar == separator && tokens.size() < maxTokens-1) { + // Case 2: separator + tokens.add(token.toString()); + token = new StringBuilder(); + } else if (currentChar == '\\') { + // Case 3: escape character + prevIsEscapeChar = true; + } else { + // Case 4: regular character + token.appendCodePoint(currentChar); + } + } + if (token.length() > 0) { + tokens.add(token.toString()); + } + return tokens.toArray(new String[] {}); + } + private void addToSet(Set s, String str){ StringTokenizer st = new StringTokenizer(str, ":"); String current; @@ -532,12 +573,12 @@ public abstract class Configuration { String opt = os[0].toLowerCase(); if (opt.equals("-d")) { String destdirname = addTrailingFileSep(os[1]); - File destDir = new File(destdirname); + 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)); - (new File(destdirname)).mkdirs(); + destDir.mkdirs(); } else if (!destDir.isDirectory()) { reporter.printError(getText( "doclet.destination_directory_not_directory_0", @@ -711,7 +752,7 @@ public abstract class Configuration { public InputStream getBuilderXML() throws FileNotFoundException { return builderXMLPath == null ? Configuration.class.getResourceAsStream(DEFAULT_BUILDER_XML) : - new FileInputStream(new File(builderXMLPath)); + DocFile.createFileForInput(this, builderXMLPath).openInputStream(); } /** diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java index 001335168fa..e6ce1ff4fe1 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java @@ -44,13 +44,6 @@ import com.sun.javadoc.*; public interface PackageSummaryWriter { - /** - * Return the name of the output file. - * - * @return the name of the output file. - */ - public abstract String getOutputFileName(); - /** * Get the header for the summary. * diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java index dbb7e4ab8d0..acde3af8d2f 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java @@ -140,12 +140,7 @@ public class AnnotationTypeBuilder extends AbstractBuilder { //Only copy doc files dir if the containing package is not //documented AND if we have not documented a class from the same //package already. Otherwise, we are making duplicate copies. - Util.copyDocFiles(configuration, - Util.getPackageSourcePath(configuration, - annotationTypeDoc.containingPackage()) + - DirectoryManager.getDirectoryPath( - annotationTypeDoc.containingPackage()) - + File.separator, DocletConstants.DOC_FILES_DIR_NAME, true); + Util.copyDocFiles(configuration, containingPackage); containingPackagesSeen.add(containingPackage.name()); } } diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java index 9f5d095edf4..83b0b85dd4d 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java @@ -266,11 +266,7 @@ public class ClassBuilder extends AbstractBuilder { //Only copy doc files dir if the containing package is not //documented AND if we have not documented a class from the same //package already. Otherwise, we are making duplicate copies. - Util.copyDocFiles(configuration, - Util.getPackageSourcePath(configuration, - classDoc.containingPackage()) + - DirectoryManager.getDirectoryPath(classDoc.containingPackage()) - + File.separator, DocletConstants.DOC_FILES_DIR_NAME, true); + Util.copyDocFiles(configuration, containingPackage); containingPackagesSeen.add(containingPackage.name()); } } diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java index b6dcab6c97c..290d1fbc24f 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java @@ -119,13 +119,7 @@ public class PackageSummaryBuilder extends AbstractBuilder { packageWriter.addPackageFooter(contentTree); packageWriter.printDocument(contentTree); packageWriter.close(); - Util.copyDocFiles( - configuration, - Util.getPackageSourcePath(configuration, packageDoc), - DirectoryManager.getDirectoryPath(packageDoc) - + File.separator - + DocletConstants.DOC_FILES_DIR_NAME, - true); + Util.copyDocFiles(configuration, packageDoc); } /** diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java index 66e8478d940..3b50d6c00e7 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java @@ -474,6 +474,8 @@ public class SerializedFormBuilder extends AbstractBuilder { Arrays.sort(tags); int tagsLength = tags.length; for (int i = 0; i < tagsLength; i++) { + if (tags[i].fieldName() == null || tags[i].fieldType() == null) // ignore malformed @serialField tags + continue; Content fieldsContentTree = fieldWriter.getFieldsContentHeader( (i == tagsLength - 1)); fieldWriter.addMemberHeader(tags[i].fieldTypeDoc(), diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java index 040c9ea2368..4637b92a9ca 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java @@ -161,7 +161,7 @@ public class TagletManager { * @param message the message retriever to print warnings. */ public TagletManager(boolean nosince, boolean showversion, - boolean showauthor, MessageRetriever message){ + boolean showauthor, MessageRetriever message) { overridenStandardTags = new HashSet(); potentiallyConflictingTags = new HashSet(); standardTags = new HashSet(); @@ -253,47 +253,17 @@ public class TagletManager { * @param path the search path string * @return the resulting array of directory and JAR file URLs */ - private static URL[] pathToURLs(String path) { - StringTokenizer st = new StringTokenizer(path, File.pathSeparator); - URL[] urls = new URL[st.countTokens()]; - int count = 0; - while (st.hasMoreTokens()) { - URL url = fileToURL(new File(st.nextToken())); - if (url != null) { - urls[count++] = url; + private URL[] pathToURLs(String path) { + Set urls = new LinkedHashSet(); + for (String s: path.split(File.pathSeparator)) { + if (s.isEmpty()) continue; + try { + urls.add(new File(s).getAbsoluteFile().toURI().toURL()); + } catch (MalformedURLException e) { + message.error("doclet.MalformedURL", s); } } - urls = Arrays.copyOf(urls, count); - return urls; - } - - /** - * Returns the directory or JAR file URL corresponding to the specified - * local file name. - * - * @param file the File object - * @return the resulting directory or JAR file URL, or null if unknown - */ - private static URL fileToURL(File file) { - String name; - try { - name = file.getCanonicalPath(); - } catch (IOException e) { - name = file.getAbsolutePath(); - } - name = name.replace(File.separatorChar, '/'); - if (!name.startsWith("/")) { - name = "/" + name; - } - // If the file does not exist, then assume that it's a directory - if (!file.isFile()) { - name = name + "/"; - } - try { - return new URL("file", "", name); - } catch (MalformedURLException e) { - throw new IllegalArgumentException("file"); - } + return urls.toArray(new URL[urls.size()]); } diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DirectoryManager.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DirectoryManager.java deleted file mode 100644 index a91a1b72e06..00000000000 --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DirectoryManager.java +++ /dev/null @@ -1,317 +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. 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.util; - -import com.sun.tools.doclets.internal.toolkit.*; -import com.sun.javadoc.*; -import java.io.*; - - -/** - * Handle the directory creations and the path string generations. - * All static - never instaniated. - * - * This code is not part of an API. - * It is implementation that is subject to change. - * Do not use it as an API - * - * @since 1.2 - * @author Atul M Dambalkar - */ -public class DirectoryManager { - - /** - * The file separator string, "/", used in the formation of the URL path. - */ - public static final String URL_FILE_SEPARATOR = "/"; - - /** - * Never instaniated. - */ - private DirectoryManager() { - } - - /** - * Given a PackageDoc, return its URL path string. - * - * @param pd PackageDoc - * @see #getPath(String) - */ - public static String createPathString(PackageDoc pd) { - if (pd == null) { - return ""; - } - return getPath(pd.name()); - } - - /** - * Given a ClassDoc, return its URL path string. - * - * @param cd ClassDoc - * @see #getPath(String) - */ - public static String createPathString(ClassDoc cd) { - if (cd == null) { - return ""; - } - PackageDoc pd = cd.containingPackage(); - return (pd == null)? "": getPath(pd.name()); - } - - /** - * Given a PackageDoc, return the corresponding directory name - * with the platform-dependent file separator between subdirectory names. - * For example, if name of the package is "java.lang" , then it - * returns "java/lang" on Unix and "java\lang" on Windows. - * If name of the package contains no dot, then the value - * will be returned unchanged. Because package names cannot - * end in a dot, the return value will never end with a slash. - *

- * Also see getPath for the URL separator version of this method - * that takes a string instead of a PackageDoc. - * - * @param pd the PackageDoc - * @return the platform-dependent directory path for the package - */ - public static String getDirectoryPath(PackageDoc pd) { - return pd == null || pd.name().length() == 0 ? "" : getDirectoryPath(pd.name()); - } - - /** - * Given a package name, return the corresponding directory name - * with the platform-dependent file separator between subdirectory names. - * For example, if name of the package is "java.lang" , then it - * returns "java/lang" on Unix and "java\lang" on Windows. - * If name of the package contains no dot, then the value - * will be returned unchanged. Because package names cannot - * end in a dot, the return value will never end with a slash. - *

- * Also see getPath for the URL separator version of this method - * that takes a string instead of a PackageDoc. - * - * @param packageName the name of the package - * @return the platform-dependent directory path for the package - */ - public static String getDirectoryPath(String packageName) { - if (packageName == null || packageName.length() == 0) { - return ""; - } - StringBuilder pathstr = new StringBuilder(); - for (int i = 0; i < packageName.length(); i++) { - char ch = packageName.charAt(i); - if (ch == '.') { - pathstr.append(URL_FILE_SEPARATOR); - } else { - pathstr.append(ch); - } - } - if (pathstr.length() > 0 && ! pathstr.toString().endsWith(URL_FILE_SEPARATOR)) { - pathstr.append(URL_FILE_SEPARATOR); - } - return pathstr.toString(); - } - - /** - * Given a package name (a string), return the path string, - * with the URL separator "/" separating the subdirectory names. - * If name of the package contains no dot, then the value - * will be returned unchanged. Because package names cannot - * end in a dot, the return value will never end with a slash. - *

- * For example if the string is "com.sun.javadoc" then the URL - * path string will be "com/sun/javadoc". - * - * @param name the package name as a String - * @return the String URL path - */ - public static String getPath(String name) { - if (name == null || name.length() == 0) { - return ""; - } - StringBuilder pathstr = new StringBuilder(); - for (int i = 0; i < name.length(); i++) { - char ch = name.charAt(i); - if (ch == '.') { - pathstr.append(URL_FILE_SEPARATOR); - } else { - pathstr.append(ch); - } - } - return pathstr.toString(); - } - - /** - * Given two package names as strings, return the relative path - * from the package directory corresponding to the first string - * to the package directory corresponding to the second string, - * with the URL file separator "/" separating subdirectory names. - *

- * For example, if the parameter "from" is "java.lang" - * and parameter "to" is "java.applet", return string - * "../../java/applet". - * - * @param from the package name from which path is calculated - * @param to the package name to which path is calculated - * @return relative path between "from" and "to" with URL - * separators - * @see #getRelativePath(String) - * @see #getPath(String) - */ - public static String getRelativePath(String from, String to) { - StringBuilder pathstr = new StringBuilder(); - pathstr.append(getRelativePath(from)); - pathstr.append(getPath(to)); - pathstr.append(URL_FILE_SEPARATOR); - return pathstr.toString(); - } - - /** - * Given a package name as a string, return relative path string - * from the corresponding package directory to the root of - * the documentation, using the URL separator "/" between - * subdirectory names. - *

- * For example, if the string "from" is "java.lang", - * return "../../" - * - * @param from the package - * @return String relative path from "from". - * @see #getRelativePath(String, String) - */ - public static String getRelativePath(PackageDoc from) { - return from == null || from.name().length() == 0 ? "" : getRelativePath(from.name()); - } - - /** - * Given a package name as a string, return relative path string - * from the corresponding package directory to the root of - * the documentation, using the URL separator "/" between - * subdirectory names. - *

- * For example, if the string "from" is "java.lang", - * return "../../" - * - * @param from the package name - * @return String relative path from "from". - * @see #getRelativePath(String, String) - */ - public static String getRelativePath(String from) { - if (from == null || from.length() == 0) { - return ""; - } - StringBuilder pathstr = new StringBuilder(); - for (int i = 0; i < from.length(); i++) { - char ch = from.charAt(i); - if (ch == '.') { - pathstr.append(".." + URL_FILE_SEPARATOR); - } - } - pathstr.append(".." + URL_FILE_SEPARATOR); - return pathstr.toString(); - } - - /** - * Given a relative or absolute path that might be empty, - * convert it to a path that does not end with a - * URL separator "/". Used for converting - * HtmlStandardWriter.relativepath when replacing {@docRoot}. - * - * @param path the path to convert. An empty path represents - * the current directory. - */ - public static String getPathNoTrailingSlash(String path) { - if ( path.equals("") ) { - return "."; - } - if ( path.equals("/") ) { - return "/."; - } - if ( path.endsWith("/") ) { - // Remove trailing slash - path = path.substring(0, path.length() -1); - } - return path; - } - - /** - * Given a path string create all the directories in the path. For example, - * if the path string is "java/applet", the method will create directory - * "java" and then "java/applet" if they don't exist. The file separator - * string "/" is platform dependent system property. - * - * @param path Directory path string. - */ - public static void createDirectory(Configuration configuration, - String path) { - if (path == null || path.length() == 0) { - return; - } - File dir = new File(path); - if (dir.exists()) { - return; - } else { - if (dir.mkdirs()) { - return; - } else { - configuration.message.error( - "doclet.Unable_to_create_directory_0", path); - throw new DocletAbortException(); - } - } - } - - /** - * Given a package name and a file name, return the full path to that file. - * For example, if PackageDoc passed is for "java.lang" and the filename - * passed is "package-summary.html", then the string returned is - * "java/lang/package-summary.html". - * - * @param pd PackageDoc. - * @param filename File name to be appended to the path of the package. - */ - public static String getPathToPackage(PackageDoc pd, String filename) { - StringBuilder buf = new StringBuilder(); - String pathstr = createPathString(pd); - if (pathstr.length() > 0) { - buf.append(pathstr); - buf.append(URL_FILE_SEPARATOR); - } - buf.append(filename); - return buf.toString(); - } - - /** - * Given a class name return the full path to the class file. - * For example, if ClassDoc passed is for "java.lang.Object" then the - * string returned is "java/lang/Object.html". - * - * @param cd ClassDoc. - */ - public static String getPathToClass(ClassDoc cd) { - return getPathToPackage(cd.containingPackage(), cd.name() + ".html"); - } - -} diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java new file mode 100644 index 00000000000..33781c73174 --- /dev/null +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java @@ -0,0 +1,399 @@ +/* + * 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. 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.util; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.UnsupportedEncodingException; +import java.io.Writer; +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; + +import javax.tools.JavaFileManager.Location; +import javax.tools.StandardLocation; + +import com.sun.tools.doclets.internal.toolkit.Configuration; + +/** + * Abstraction for handling files, which may be specified directly + * (e.g. via a path on the command line) or relative to a Location. + * + *

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. + * + * @since 8 + */ +public class DocFile { + + /** + * The doclet configuration. + * Provides access to options such as docencoding, output directory, etc. + */ + private final Configuration configuration; + + /** + * The location for this file. Maybe null if the file was created without + * a location or path. + */ + private final Location location; + + /** + * The path relative to the (output) location. Maybe null if the file was + * created without a location or path. + */ + private final DocPath path; + + /** + * The file object itself. + * This is temporary, until we create different subtypes of DocFile. + */ + private final File file; + + /** Create a DocFile for a directory. */ + public static DocFile createFileForDirectory(Configuration configuration, String file) { + return new DocFile(configuration, new File(file)); + } + + /** Create a DocFile for a file that will be opened for reading. */ + public static DocFile createFileForInput(Configuration configuration, String file) { + return new DocFile(configuration, new File(file)); + } + + /** Create a DocFile for a file that will be opened for writing. */ + public static DocFile createFileForOutput(Configuration configuration, DocPath path) { + return new DocFile(configuration, StandardLocation.CLASS_OUTPUT, path); + } + + /** + * List the directories and files found in subdirectories along the + * elements of the given location. + * @param configuration the doclet configuration + * @param location currently, only {@link StandardLocation#SOURCE_PATH} is supported. + * @param path the subdirectory of the directories of the location for which to + * list files + */ + public static Iterable list(Configuration configuration, Location location, DocPath path) { + if (location != StandardLocation.SOURCE_PATH) + throw new IllegalArgumentException(); + + Set files = new LinkedHashSet(); + for (String s : configuration.sourcepath.split(File.pathSeparator)) { + if (s.isEmpty()) + continue; + File f = new File(s); + if (f.isDirectory()) { + f = new File(f, path.getPath()); + if (f.exists()) + files.add(new DocFile(configuration, f)); + } + } + return files; + } + + /** Create a DocFile for a given file. */ + private DocFile(Configuration configuration, File file) { + this.configuration = configuration; + this.location = null; + this.path = null; + this.file = file; + } + + /** Create a DocFile for a given location and relative path. */ + private DocFile(Configuration configuration, Location location, DocPath path) { + this.configuration = configuration; + this.location = location; + this.path = path; + this.file = path.resolveAgainst(configuration.destDirName); + } + + /** Open an input stream for the file. */ + public InputStream openInputStream() throws FileNotFoundException { + return new BufferedInputStream(new FileInputStream(file)); + } + + /** + * Open an output stream for the file. + * The file must have been created with a location of + * {@link StandardLocation#CLASS_OUTPUT} and a corresponding relative path. + */ + public OutputStream openOutputStream() throws IOException, UnsupportedEncodingException { + if (location != StandardLocation.CLASS_OUTPUT) + throw new IllegalStateException(); + + createDirectoryForFile(file); + return new BufferedOutputStream(new FileOutputStream(file)); + } + + /** + * Open an writer for the file, using the encoding (if any) given in the + * doclet configuration. + * The file must have been created with a location of + * {@link StandardLocation#CLASS_OUTPUT} and a corresponding relative path. + */ + public Writer openWriter() throws IOException, UnsupportedEncodingException { + if (location != StandardLocation.CLASS_OUTPUT) + throw new IllegalStateException(); + + createDirectoryForFile(file); + FileOutputStream fos = new FileOutputStream(file); + if (configuration.docencoding == null) { + return new BufferedWriter(new OutputStreamWriter(fos)); + } else { + return new BufferedWriter(new OutputStreamWriter(fos, configuration.docencoding)); + } + } + + /** + * Copy the contents of another file directly to this file. + */ + public void copyFile(DocFile fromFile) throws IOException { + if (location != StandardLocation.CLASS_OUTPUT) + throw new IllegalStateException(); + + createDirectoryForFile(file); + + InputStream input = fromFile.openInputStream(); + OutputStream output = openOutputStream(); + try { + byte[] bytearr = new byte[1024]; + int len; + while ((len = input.read(bytearr)) != -1) { + output.write(bytearr, 0, len); + } + } catch (FileNotFoundException exc) { + } catch (SecurityException exc) { + } finally { + input.close(); + output.close(); + } + } + + /** + * Copy the contents of a resource file to this file. + * @param resource the path of the resource, relative to the package of this class + * @param overwrite whether or not to overwrite the file if it already exists + * @param replaceNewLine if false, the file is copied as a binary file; + * if true, the file is written line by line, using the platform line + * separator + */ + public void copyResource(DocPath resource, boolean overwrite, boolean replaceNewLine) { + if (location != StandardLocation.CLASS_OUTPUT) + throw new IllegalStateException(); + + if (file.exists() && !overwrite) + return; + + createDirectoryForFile(file); + + try { + InputStream in = Configuration.class.getResourceAsStream(resource.getPath()); + if (in == null) + return; + + OutputStream out = new FileOutputStream(file); + try { + if (!replaceNewLine) { + byte[] buf = new byte[2048]; + int n; + while((n = in.read(buf))>0) out.write(buf,0,n); + } else { + BufferedReader reader = new BufferedReader(new InputStreamReader(in)); + BufferedWriter writer; + if (configuration.docencoding == null) { + writer = new BufferedWriter(new OutputStreamWriter(out)); + } else { + writer = new BufferedWriter(new OutputStreamWriter(out, + configuration.docencoding)); + } + try { + String line; + while ((line = reader.readLine()) != null) { + writer.write(line); + writer.write(DocletConstants.NL); + } + } finally { + reader.close(); + writer.close(); + } + } + } finally { + in.close(); + out.close(); + } + } catch (IOException e) { + e.printStackTrace(System.err); + throw new DocletAbortException(); + } + } + + /** Return true if the file can be read. */ + public boolean canRead() { + return file.canRead(); + } + + /** Return true if the file can be written. */ + public boolean canWrite() { + return file.canRead(); + } + + /** Return true if the file exists. */ + public boolean exists() { + return file.exists(); + } + + /** Return the base name (last component) of the file name. */ + public String getName() { + return file.getName(); + } + + /** Return the file system path for this file. */ + public String getPath() { + return file.getPath(); + } + + /** Return true is file has an absolute path name. */ + boolean isAbsolute() { + return file.isAbsolute(); + } + + /** Return true is file identifies a directory. */ + public boolean isDirectory() { + return file.isDirectory(); + } + + /** Return true is file identifies a file. */ + public boolean isFile() { + return file.isFile(); + } + + /** Return true if this file is the same as another. */ + public boolean isSameFile(DocFile other) { + try { + return file.exists() + && file.getCanonicalFile().equals(other.file.getCanonicalFile()); + } catch (IOException e) { + return false; + } + } + + /** If the file is a directory, list its contents. */ + public Iterable list() { + List files = new ArrayList(); + for (File f: file.listFiles()) { + files.add(new DocFile(configuration, f)); + } + return files; + } + + /** Create the file as a directory, including any parent directories. */ + public boolean mkdirs() { + return file.mkdirs(); + } + + /** + * Derive a new file by resolving a relative path against this file. + * The new file will inherit the configuration and location of this file + * If this file has a path set, the new file will have a corresponding + * new path. + */ + public DocFile resolve(DocPath p) { + return resolve(p.getPath()); + } + + /** + * Derive a new file by resolving a relative path against this file. + * The new file will inherit the configuration and location of this file + * If this file has a path set, the new file will have a corresponding + * new path. + */ + public DocFile resolve(String p) { + if (location == null && path == null) { + return new DocFile(configuration, new File(file, p)); + } else { + return new DocFile(configuration, location, path.resolve(p)); + } + } + + /** + * Resolve a relative file against the given output location. + * @param locn Currently, only SOURCE_OUTPUT is supported. + */ + public DocFile resolveAgainst(StandardLocation locn) { + if (locn != StandardLocation.CLASS_OUTPUT) + throw new IllegalArgumentException(); + return new DocFile(configuration, + new File(configuration.destDirName, file.getPath())); + } + + /** + * Given a path string create all the directories in the path. For example, + * if the path string is "java/applet", the method will create directory + * "java" and then "java/applet" if they don't exist. The file separator + * string "/" is platform dependent system property. + * + * @param path Directory path string. + */ + private void createDirectoryForFile(File file) { + File dir = file.getParentFile(); + if (dir == null || dir.exists() || dir.mkdirs()) + return; + + configuration.message.error( + "doclet.Unable_to_create_directory_0", dir.getPath()); + throw new DocletAbortException(); + } + + /** Return a string to identify the contents of this object, + * for debugging purposes. + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("DocFile["); + if (location != null) + sb.append("locn:").append(location).append(","); + if (path != null) + sb.append("path:").append(path.getPath()).append(","); + sb.append("file:").append(file); + sb.append("]"); + return sb.toString(); + } +} diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocLink.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocLink.java new file mode 100644 index 00000000000..48ff3d492bd --- /dev/null +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocLink.java @@ -0,0 +1,97 @@ +/* + * 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. 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.util; + +/** + * Abstraction for simple relative URIs, consisting of a path, + * an optional query, and an optional fragment. DocLink objects can + * be created by the constructors below or from a DocPath using the + * convenience methods, {@link DocPath#fragment fragment} and + * {@link DocPath#query query}. + * + *

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. + * + */ +public class DocLink { + final String path; + final String query; + final String fragment; + + /** Create a DocLink representing the URI {@code #fragment}. */ + public static DocLink fragment(String fragment) { + return new DocLink((String) null, (String) null, fragment); + } + + /** Create a DocLink representing the URI {@code path}. */ + public DocLink(DocPath path) { + this(path.getPath(), null, null); + } + + /** + * Create a DocLink representing the URI {@code path?query#fragment}. + * query and fragment may be null. + */ + public DocLink(DocPath path, String query, String fragment) { + this(path.getPath(), query, fragment); + } + + /** + * Create a DocLink representing the URI {@code path?query#fragment}. + * Any of the component parts may be null. + */ + public DocLink(String path, String query, String fragment) { + this.path = path; + this.query = query; + this.fragment = fragment; + } + + /** + * Return the link in the form "path?query#fragment", omitting any empty + * components. + */ + @Override + public String toString() { + // common fast path + if (path != null && isEmpty(query) && isEmpty(fragment)) + return path; + + StringBuilder sb = new StringBuilder(); + if (path != null) + sb.append(path); + if (!isEmpty(query)) + sb.append("?").append(query); + if (!isEmpty(fragment)) + sb.append("#").append(fragment); + return sb.toString(); + } + + private static boolean isEmpty(String s) { + return (s == null) || s.isEmpty(); + } +} diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPath.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPath.java new file mode 100644 index 00000000000..fb7d1fa96d7 --- /dev/null +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPath.java @@ -0,0 +1,201 @@ +/* + * 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. 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.util; + +import com.sun.javadoc.ClassDoc; +import com.sun.javadoc.PackageDoc; +import java.io.File; + +/** + * Abstraction for immutable relative paths. + * Paths always use '/' as a separator, and never begin or end with '/'. + * + *

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. + */ +public class DocPath { + private final String path; + + /** The empty path. */ + public static final DocPath empty = new DocPath(""); + + /** The empty path. */ + public static final DocPath parent = new DocPath(".."); + + /** + * Create a path from a string. + */ + public static DocPath create(String p) { + return (p == null) || p.isEmpty() ? empty : new DocPath(p); + } + + /** + * Return the path for a class. + * For example, if the class is java.lang.Object, + * the path is java/lang/Object.html. + */ + public static DocPath forClass(ClassDoc cd) { + return (cd == null) ? empty : + forPackage(cd.containingPackage()).resolve(forName(cd)); + } + + /** + * Return the path for the simple name of the class. + * For example, if the class is java.lang.Object, + * the path is Object.html. + */ + public static DocPath forName(ClassDoc cd) { + return (cd == null) ? empty : new DocPath(cd.name() + ".html"); + } + + /** + * Return the path for the package of a class. + * For example, if the class is java.lang.Object, + * the path is java/lang. + */ + public static DocPath forPackage(ClassDoc cd) { + return (cd == null) ? empty : forPackage(cd.containingPackage()); + } + + /** + * Return the path for a package. + * For example, if the package is java.lang, + * the path is java/lang. + */ + public static DocPath forPackage(PackageDoc pd) { + return (pd == null) ? empty : DocPath.create(pd.name().replace('.', '/')); + } + + /** + * Return the inverse path for a package. + * For example, if the package is java.lang, + * the inverse path is ../... + */ + public static DocPath forRoot(PackageDoc pd) { + String name = (pd == null) ? "" : pd.name(); + if (name.isEmpty()) + return empty; + return new DocPath(name.replace('.', '/').replaceAll("[^/]+", "..")); + } + + /** + * Return the relative path from one package to another. + */ + public static DocPath relativePath(PackageDoc from, PackageDoc to) { + return forRoot(from).resolve(forPackage(to)); + } + + protected DocPath(String p) { + path = (p.endsWith("/") ? p.substring(0, p.length() - 1) : p); + } + + /** {@inheritDoc} */ + @Override + public boolean equals(Object other) { + return (other instanceof DocPath) && path.equals(((DocPath)other).path); + } + + /** {@inheritDoc} */ + @Override + public int hashCode() { + return path.hashCode(); + } + + public DocPath basename() { + int sep = path.lastIndexOf("/"); + return (sep == -1) ? this : new DocPath(path.substring(sep + 1)); + } + + public DocPath parent() { + int sep = path.lastIndexOf("/"); + return (sep == -1) ? empty : new DocPath(path.substring(0, sep)); + } + + /** + * Return the path formed by appending the specified string to the current path. + */ + public DocPath resolve(String p) { + if (p == null || p.isEmpty()) + return this; + if (path.isEmpty()) + return new DocPath(p); + return new DocPath(path + "/" + p); + } + + /** + * Return the path by appending the specified path to the current path. + */ + public DocPath resolve(DocPath p) { + if (p == null || p.isEmpty()) + return this; + if (path.isEmpty()) + return p; + return new DocPath(path + "/" + p.getPath()); + } + + /** + * Get the file created by evaluating the path against a specified directory. + */ + // Temporary: this signature should not use String for dir. + // Eventually, this should involve javax.tools.Location. + public File resolveAgainst(String dir) { + return dir.isEmpty() ? new File(path) : new File(dir, path); + } + + /** + * Return the inverse path for this path. + * For example, if the path is a/b/c, the inverse path is ../../.. + */ + public DocPath invert() { + return new DocPath(path.replaceAll("[^/]+", "..")); + } + + /** + * Return true if this path is empty. + */ + public boolean isEmpty() { + return path.isEmpty(); + } + + public DocLink fragment(String fragment) { + return new DocLink(path, null, fragment); + } + + public DocLink query(String query) { + return new DocLink(path, query, null); + } + + /** + * Return this path as a string. + */ + // This is provided instead of using toString() to help catch + // unintended use of toString() in string concatenation sequences. + public String getPath() { + return path; + } +} diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java new file mode 100644 index 00000000000..9625be7b346 --- /dev/null +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java @@ -0,0 +1,115 @@ +/* + * 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. 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.util; + +/** + * Standard DocPath objects. + * + *

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. + * + * @since 8 + */ +public class DocPaths { + + /** The name of the file for all classes, using frames. */ + public static final DocPath ALLCLASSES_FRAME = DocPath.create("allclasses-frame.html"); + + /** The name of the file for all classes, without using frames. */ + public static final DocPath ALLCLASSES_NOFRAME = DocPath.create("allclasses-noframe.html"); + + /** The name of the sub-directory for storing class usage info. */ + public static final DocPath CLASS_USE = DocPath.create("class-use"); + + /** The name of the file for constant values. */ + public static final DocPath CONSTANT_VALUES = DocPath.create("constant-values.html"); + + /** The name of the fie for deprecated elements. */ + public static final DocPath DEPRECATED_LIST = DocPath.create("deprecated-list.html"); + + /** The name of the subdirectory for user-provided additional documentation files. */ + public static final DocPath DOC_FILES = DocPath.create("doc-files"); + + /** The name of the file for help info. */ + public static final DocPath HELP_DOC = DocPath.create("help-doc.html"); + + /** The name of the main index file. */ + public static final DocPath INDEX = DocPath.create("index.html"); + + /** The name of the single index file for all classes. */ + public static final DocPath INDEX_ALL = DocPath.create("index-all.html"); + + /** The name of the directory for the split index files. */ + public static final DocPath INDEX_FILES = DocPath.create("index-files"); + + /** Generate the name of one of the files in the split index. */ + public static final DocPath indexN(int n) { + return DocPath.create("index-" + n + ".html"); + } + + /** The name of the file for the overview frame. */ + public static final DocPath OVERVIEW_FRAME = DocPath.create("overview-frame.html"); + + /** The name of the file for the overview summary. */ + public static final DocPath OVERVIEW_SUMMARY = DocPath.create("overview-summary.html"); + + /** The name of the file for the overview tree. */ + public static final DocPath OVERVIEW_TREE = DocPath.create("overview-tree.html"); + + /** 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 package list. */ + public static final DocPath PACKAGE_LIST = DocPath.create("package-list"); + + /** The name of the file for the package summary. */ + public static final DocPath PACKAGE_SUMMARY = DocPath.create("package-summary.html"); + + /** The name of the file for the package tree. */ + public static final DocPath PACKAGE_TREE = DocPath.create("package-tree.html"); + + /** 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 directory in which resources are generated. + * Also the name of the sub-package from which resources are read. + */ + public static final DocPath RESOURCES = DocPath.create("resources"); + + /** The name of the file for the serialized form info. */ + public static final DocPath SERIALIZED_FORM = DocPath.create("serialized-form.html"); + + /** The name of the directory in which HTML versions of the source code + * are generated. + */ + public static final DocPath SOURCE_OUTPUT = DocPath.create("src-html"); + + /** The name of the default stylesheet. */ + public static final DocPath STYLESHEET = DocPath.create("stylesheet.css"); + +} diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java index 8f0fd4c446e..878a06bcb3c 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java @@ -39,6 +39,16 @@ package com.sun.tools.doclets.internal.toolkit.util; */ public class DocletConstants { + /** + * The default amount of space between tab stops. + */ + public static final int DEFAULT_TAB_STOP_LENGTH = 8; + + /** + * The line separator for the current operating system. + */ + public static final String NL = System.getProperty("line.separator"); + /** * The default package name. */ @@ -53,34 +63,4 @@ public class DocletConstants { * The anchor for the default package. */ public static final String UNNAMED_PACKAGE_ANCHOR = "unnamed_package"; - - /** - * The name of the doc files directory. - */ - public static final String DOC_FILES_DIR_NAME = "doc-files"; - - /** - * The default amount of space between tab stops. - */ - public static final int DEFAULT_TAB_STOP_LENGTH = 8; - - /** - * The name of the directory where we will copy resource files to. - */ - public static final String RESOURE_DIR_NAME = "resources"; - - /** - * The source output directory name - */ - public static final String SOURCE_OUTPUT_DIR_NAME = "src-html/"; - - /** - * The name of the package list file. - */ - public static final String PACKAGE_LIST_FILE_NAME = "package-list"; - - /** - * The line seperator for the current operating system. - */ - public static final String NL = System.getProperty("line.separator"); } diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java index 5c1cf1bec24..5aa768876d7 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java @@ -30,6 +30,8 @@ import java.net.*; import java.util.HashMap; import java.util.Map; +import javax.tools.StandardLocation; + import com.sun.javadoc.*; import com.sun.tools.doclets.internal.toolkit.*; @@ -138,21 +140,25 @@ public class Extern { * * @param pkgName The package name. * @param relativepath The relative path. - * @param link The link to convert. + * @param filename The link to convert. * @return if external return converted link else return null */ - public String getExternalLink(String pkgName, - String relativepath, String link) { + public DocLink getExternalLink(String pkgName, + DocPath relativepath, String filename) { + return getExternalLink(pkgName, relativepath, filename, null); + } + + public DocLink getExternalLink(String pkgName, + DocPath relativepath, String filename, String memberName) { Item fnd = findPackageItem(pkgName); - if (fnd != null) { - String externlink = fnd.path + link; - if (fnd.relative) { // it's a relative path. - return relativepath + externlink; - } else { - return externlink; - } - } - return null; + if (fnd == null) + return null; + + DocPath p = fnd.relative ? + relativepath.resolve(fnd.path).resolve(filename) : + DocPath.create(fnd.path).resolve(filename); + + return new DocLink(p, "is-external=true", memberName); } /** @@ -163,17 +169,38 @@ public class Extern { * @param pkglisturl This can be another URL for "package-list" or ordinary * file. * @param reporter The DocErrorReporter used to report errors. - * @param linkoffline True if -linkoffline isused and false if -link is used. + * @param linkoffline True if -linkoffline is used and false if -link is used. */ - public boolean url(String url, String pkglisturl, + public boolean link(String url, String pkglisturl, DocErrorReporter reporter, boolean linkoffline) { this.linkoffline = linkoffline; - String errMsg = composeExternPackageList(url, pkglisturl); - if (errMsg != null) { - reporter.printWarning(errMsg); - return false; - } else { + try { + url = adjustEndFileSeparator(url); + if (isUrl(pkglisturl)) { + readPackageListFromURL(url, toURL(pkglisturl)); + } else { + readPackageListFromFile(url, DocFile.createFileForInput(configuration, pkglisturl)); + } return true; + } catch (Fault f) { + reporter.printWarning(f.getMessage()); + return false; + } + } + + private URL toURL(String url) throws Fault { + try { + return new URL(url); + } catch (MalformedURLException e) { + throw new Fault(configuration.getText("doclet.MalformedURL", url), e); + } + } + + private class Fault extends Exception { + private static final long serialVersionUID = 0; + + Fault(String msg, Exception cause) { + super(msg, cause); } } @@ -189,32 +216,11 @@ public class Extern { return packageToItemMap.get(pkgName); } - /** - * Adjusts the end file separator if it is missing from the URL or the - * directory path and depending upon the URL or file path, fetch or - * read the "package-list" file. - * - * @param urlOrDirPath URL or the directory path. - * @param pkgListUrlOrDirPath URL or directory path for the "package-list" file or the "package-list" - * file itself. - */ - private String composeExternPackageList(String urlOrDirPath, String pkgListUrlOrDirPath) { - urlOrDirPath = adjustEndFileSeparator(urlOrDirPath); - pkgListUrlOrDirPath = adjustEndFileSeparator(pkgListUrlOrDirPath); - return isUrl(pkgListUrlOrDirPath) ? - fetchURLComposeExternPackageList(urlOrDirPath, pkgListUrlOrDirPath) : - readFileComposeExternPackageList(urlOrDirPath, pkgListUrlOrDirPath); - } - /** * If the URL or Directory path is missing end file separator, add that. */ private String adjustEndFileSeparator(String url) { - String filesep = "/"; - if (!url.endsWith(filesep)) { - url += filesep; - } - return url; + return url.endsWith("/") ? url : url + '/'; } /** @@ -223,17 +229,18 @@ public class Extern { * @param urlpath Path to the packages. * @param pkglisturlpath URL or the path to the "package-list" file. */ - private String fetchURLComposeExternPackageList(String urlpath, - String pkglisturlpath) { - String link = pkglisturlpath + "package-list"; + private void readPackageListFromURL(String urlpath, URL pkglisturlpath) + throws Fault { try { - readPackageList((new URL(link)).openStream(), urlpath, false); + URL link = pkglisturlpath.toURI().resolve(DocPaths.PACKAGE_LIST.getPath()).toURL(); + readPackageList(link.openStream(), urlpath, false); + } catch (URISyntaxException exc) { + throw new Fault(configuration.getText("doclet.MalformedURL", pkglisturlpath.toString()), exc); } catch (MalformedURLException exc) { - return configuration.getText("doclet.MalformedURL", link); + throw new Fault(configuration.getText("doclet.MalformedURL", pkglisturlpath.toString()), exc); } catch (IOException exc) { - return configuration.getText("doclet.URL_error", link); + throw new Fault(configuration.getText("doclet.URL_error", pkglisturlpath.toString()), exc); } - return null; } /** @@ -242,27 +249,24 @@ public class Extern { * @param path URL or directory path to the packages. * @param pkgListPath Path to the local "package-list" file. */ - private String readFileComposeExternPackageList(String path, - String pkgListPath) { - - String link = pkgListPath + "package-list"; - if (! ((new File(pkgListPath)).isAbsolute() || linkoffline)){ - link = configuration.destDirName + link; + private void readPackageListFromFile(String path, DocFile pkgListPath) + throws Fault { + DocFile file = pkgListPath.resolve(DocPaths.PACKAGE_LIST); + if (! (file.isAbsolute() || linkoffline)){ + file = file.resolveAgainst(StandardLocation.CLASS_OUTPUT); } try { - File file = new File(link); if (file.exists() && file.canRead()) { - readPackageList(new FileInputStream(file), path, - ! ((new File(path)).isAbsolute() || isUrl(path))); + boolean pathIsRelative = + !DocFile.createFileForInput(configuration, path).isAbsolute() + && !isUrl(path); + readPackageList(file.openInputStream(), path, pathIsRelative); } else { - return configuration.getText("doclet.File_error", link); + throw new Fault(configuration.getText("doclet.File_error", file.getPath()), null); } - } catch (FileNotFoundException exc) { - return configuration.getText("doclet.File_error", link); } catch (IOException exc) { - return configuration.getText("doclet.File_error", link); + throw new Fault(configuration.getText("doclet.File_error", file.getPath()), exc); } - return null; } /** diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java index 4586deea9ce..0d1b63e5679 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java @@ -52,8 +52,7 @@ public class PackageListWriter extends PrintWriter { * @param configuration the current configuration of the doclet. */ public PackageListWriter(Configuration configuration) throws IOException { - super(Util.genWriter(configuration, configuration.destDirName, - DocletConstants.PACKAGE_LIST_FILE_NAME, configuration.docencoding)); + super(DocFile.createFileForOutput(configuration, DocPaths.PACKAGE_LIST).openWriter()); this.configuration = configuration; } @@ -71,7 +70,7 @@ public class PackageListWriter extends PrintWriter { packgen.close(); } catch (IOException exc) { configuration.message.error("doclet.exception_encountered", - exc.toString(), DocletConstants.PACKAGE_LIST_FILE_NAME); + exc.toString(), DocPaths.PACKAGE_LIST); throw new DocletAbortException(); } } diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SourcePath.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SourcePath.java deleted file mode 100644 index 64c9d7e5fd5..00000000000 --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SourcePath.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute 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.util; - -import java.io.File; - -/** - * This class is used to represent a source path which can contain only - * directories no zip files. If a zip file is specified in the command line it - * will not get reflected in the SourcePath. - * - * This code is not part of an API. - * It is implementation that is subject to change. - * Do not use it as an API - * - * @author Atul M Dambalkar - */ -public - class SourcePath { - private final char dirSeparator = File.pathSeparatorChar; - - /** - * The original class path string - */ - private String pathstr; - - /** - * List of source path entries. Each entry is a directory. - */ - private File[] sourcePath; - - - /** - * Build a source path from the specified path string on the command line. - */ - public SourcePath(String pathstr) { - init(pathstr); - } - - /** - * Build a default source path from the path strings specified by - * the properties env.class.path. - */ - public SourcePath() { - init(System.getProperty("env.class.path")); - } - - /** - * Initialize the SourcePath File array, which will contain only the - * directory names from the given path string. - * - * @param pathstr Path String. - */ - private void init(String pathstr) { - if (pathstr == null || pathstr.length() == 0) { - pathstr = "."; - } - - int noOfFileSep = 0; - int index = 0; - this.pathstr = pathstr; // Save original class path string - - // Count the number of path separators - while ((index = pathstr.indexOf(dirSeparator, index)) != -1) { - noOfFileSep++; - index++; - } - // Build the source path - File[] tempPath = new File[noOfFileSep + 1]; - int tempPathIndex = 0; - int len = pathstr.length(); - int sepPos = 0; - for (index = 0; index < len; index = sepPos + 1) { - sepPos = pathstr.indexOf(dirSeparator, index); - if (sepPos < 0) { - sepPos = len; - } - File file = new File(pathstr.substring(index, sepPos)); - if (file.isDirectory()) { - tempPath[tempPathIndex++] = file; - } // if it is really a file, ignore it. - } - sourcePath = new File[tempPathIndex]; - System.arraycopy((Object)tempPath, 0, (Object)sourcePath, - 0, tempPathIndex); - } - - /** - * Find the specified directory in the source path. - * - * @param name Name of the directory to be searched for in the source path. - * @return File Return the directory if found else return null. - */ - public File getDirectory(String name) { - for (int i = 0; i < sourcePath.length; i++) { - File directoryNeeded = new File(sourcePath[i], name); - if (directoryNeeded.isDirectory()) { - return directoryNeeded; - } - } - return null; - } - - /** - * Return original source path string. - */ - public String toString() { - return pathstr; - } -} diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java index c01ac3e58f5..1e8da4906d8 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java @@ -30,6 +30,7 @@ import java.util.*; import com.sun.javadoc.*; import com.sun.tools.doclets.internal.toolkit.*; +import javax.tools.StandardLocation; /** * Utilities Class for Doclets. @@ -51,11 +52,6 @@ public class Util { public static final String[][] HTML_ESCAPE_CHARS = {{"&", "&"}, {"<", "<"}, {">", ">"}}; - /** - * Name of the resource directory. - */ - public static final String RESOURCESDIR = "resources"; - /** * Return array of class members whose documentation is to be generated. * If the member is deprecated do not include such a member in the @@ -196,32 +192,6 @@ public class Util { } } - /** - * Copy source file to destination file. - * - * @throws SecurityException - * @throws IOException - */ - public static void copyFile(File destfile, File srcfile) - throws IOException { - byte[] bytearr = new byte[512]; - int len = 0; - FileInputStream input = new FileInputStream(srcfile); - File destDir = destfile.getParentFile(); - destDir.mkdirs(); - FileOutputStream output = new FileOutputStream(destfile); - try { - while ((len = input.read(bytearr)) != -1) { - output.write(bytearr, 0, len); - } - } catch (FileNotFoundException exc) { - } catch (SecurityException exc) { - } finally { - input.close(); - output.close(); - } - } - /** * Copy the given directory contents from the source package directory * to the generated documentation directory. For example for a package @@ -235,45 +205,45 @@ public class Util { * @param dir The original directory name to copy from. * @param overwrite Overwrite files if true. */ - public static void copyDocFiles(Configuration configuration, - String path, String dir, boolean overwrite) { - if (checkCopyDocFilesErrors(configuration, path, dir)) { - return; - } - String destname = configuration.docFileDestDirName; - File srcdir = new File(path + dir); - if (destname.length() > 0 && !destname.endsWith( - DirectoryManager.URL_FILE_SEPARATOR)) { - destname += DirectoryManager.URL_FILE_SEPARATOR; - } - String dest = destname + dir; + public static void copyDocFiles(Configuration configuration, PackageDoc pd) { + copyDocFiles(configuration, DocPath.forPackage(pd).resolve(DocPaths.DOC_FILES)); + } + + public static void copyDocFiles(Configuration configuration, DocPath dir) { try { - File destdir = new File(dest); - DirectoryManager.createDirectory(configuration, dest); - String[] files = srcdir.list(); - for (int i = 0; i < files.length; i++) { - File srcfile = new File(srcdir, files[i]); - File destfile = new File(destdir, files[i]); - if (srcfile.isFile()) { - if(destfile.exists() && ! overwrite) { - configuration.message.warning((SourcePosition) null, - "doclet.Copy_Overwrite_warning", - srcfile.toString(), destdir.toString()); - } else { - configuration.message.notice( - "doclet.Copying_File_0_To_Dir_1", - srcfile.toString(), destdir.toString()); - Util.copyFile(destfile, srcfile); - } - } else if(srcfile.isDirectory()) { - if(configuration.copydocfilesubdirs - && ! configuration.shouldExcludeDocFileDir( - srcfile.getName())){ - copyDocFiles(configuration, path, dir + - DirectoryManager.URL_FILE_SEPARATOR + srcfile.getName(), - overwrite); + boolean first = true; + for (DocFile f : DocFile.list(configuration, StandardLocation.SOURCE_PATH, dir)) { + if (!f.isDirectory()) { + continue; + } + DocFile srcdir = f; + DocFile destdir = DocFile.createFileForOutput(configuration, dir); + if (srcdir.isSameFile(destdir)) { + continue; + } + + for (DocFile srcfile: srcdir.list()) { + DocFile destfile = destdir.resolve(srcfile.getName()); + if (srcfile.isFile()) { + if (destfile.exists() && !first) { + configuration.message.warning((SourcePosition) null, + "doclet.Copy_Overwrite_warning", + srcfile.getPath(), destdir.getPath()); + } else { + configuration.message.notice( + "doclet.Copying_File_0_To_Dir_1", + srcfile.getPath(), destdir.getPath()); + destfile.copyFile(srcfile); + } + } else if (srcfile.isDirectory()) { + if (configuration.copydocfilesubdirs + && !configuration.shouldExcludeDocFileDir(srcfile.getName())) { + copyDocFiles(configuration, dir.resolve(srcfile.getName())); + } } } + + first = false; } } catch (SecurityException exc) { throw new DocletAbortException(); @@ -282,142 +252,6 @@ public class Util { } } - /** - * Given the parameters for copying doc-files, check for errors. - * - * @param configuration The configuration of the current doclet. - * @param path The relative path to the directory to be copied. - * @param dirName The original directory name to copy from. - */ - private static boolean checkCopyDocFilesErrors (Configuration configuration, - String path, String dirName) { - if ((configuration.sourcepath == null || configuration.sourcepath.length() == 0) && - (configuration.destDirName == null || configuration.destDirName.length() == 0)) { - //The destination path and source path are definitely equal. - return true; - } - File sourcePath, destPath = new File(configuration.destDirName); - StringTokenizer pathTokens = new StringTokenizer( - configuration.sourcepath == null ? "" : configuration.sourcepath, - File.pathSeparator); - //Check if the destination path is equal to the source path. If yes, - //do not copy doc-file directories. - while(pathTokens.hasMoreTokens()){ - sourcePath = new File(pathTokens.nextToken()); - if(destPath.equals(sourcePath)){ - return true; - } - } - //Make sure the doc-file being copied exists. - File srcdir = new File(path + dirName); - if (! srcdir.exists()) { - return true; - } - return false; - } - - /** - * Copy a file in the resources directory to the destination - * directory (if it is not there already). If - * overwrite is true and the destination file - * already exists, overwrite it. - * - * @param configuration Holds the destination directory and error message - * @param resourcefile The name of the resource file to copy - * @param overwrite A flag to indicate whether the file in the - * destination directory will be overwritten if - * it already exists. - */ - public static void copyResourceFile(Configuration configuration, - String resourcefile, boolean overwrite) { - String destresourcesdir = configuration.destDirName + RESOURCESDIR; - copyFile(configuration, resourcefile, RESOURCESDIR, destresourcesdir, - overwrite, false); - } - - /** - * Copy a file from a source directory to a destination directory - * (if it is not there already). If overwrite is true and - * the destination file already exists, overwrite it. - * - * @param configuration Holds the error message - * @param file The name of the file to copy - * @param source The source directory - * @param destination The destination directory where the file needs to be copied - * @param overwrite A flag to indicate whether the file in the - * destination directory will be overwritten if - * it already exists. - * @param replaceNewLine true if the newline needs to be replaced with platform- - * specific newline. - */ - public static void copyFile(Configuration configuration, String file, String source, - String destination, boolean overwrite, boolean replaceNewLine) { - DirectoryManager.createDirectory(configuration, destination); - File destfile = new File(destination, file); - if(destfile.exists() && (! overwrite)) return; - try { - InputStream in = Configuration.class.getResourceAsStream( - source + DirectoryManager.URL_FILE_SEPARATOR + file); - if(in==null) return; - OutputStream out = new FileOutputStream(destfile); - try { - if (!replaceNewLine) { - byte[] buf = new byte[2048]; - int n; - while((n = in.read(buf))>0) out.write(buf,0,n); - } else { - BufferedReader reader = new BufferedReader(new InputStreamReader(in)); - BufferedWriter writer; - if (configuration.docencoding == null) { - writer = new BufferedWriter(new OutputStreamWriter(out)); - } else { - writer = new BufferedWriter(new OutputStreamWriter(out, - configuration.docencoding)); - } - try { - String line; - while ((line = reader.readLine()) != null) { - writer.write(line); - writer.write(DocletConstants.NL); - } - } finally { - reader.close(); - writer.close(); - } - } - } finally { - in.close(); - out.close(); - } - } catch (IOException ie) { - ie.printStackTrace(System.err); - throw new DocletAbortException(); - } - } - - /** - * Given a PackageDoc, return the source path for that package. - * @param configuration The Configuration for the current Doclet. - * @param pkgDoc The package to seach the path for. - * @return A string representing the path to the given package. - */ - public static String getPackageSourcePath(Configuration configuration, - PackageDoc pkgDoc){ - try{ - String pkgPath = DirectoryManager.getDirectoryPath(pkgDoc); - String completePath = new SourcePath(configuration.sourcepath). - getDirectory(pkgPath) + DirectoryManager.URL_FILE_SEPARATOR; - //Make sure that both paths are using the same separators. - completePath = Util.replaceText(completePath, File.separator, - DirectoryManager.URL_FILE_SEPARATOR); - pkgPath = Util.replaceText(pkgPath, File.separator, - DirectoryManager.URL_FILE_SEPARATOR); - return completePath.substring(0, completePath.lastIndexOf(pkgPath)); - } catch (Exception e){ - return ""; - } - } - /** * We want the list of types in alphabetical order. However, types are not * comparable. We need a comparator for now. @@ -552,7 +386,7 @@ public class Util { } /** - * Given a package, return it's name. + * Given a package, return its name. * @param packageDoc the package to check. * @return the name of the given package. */ @@ -562,7 +396,7 @@ public class Util { } /** - * Given a package, return it's file name without the extension. + * Given a package, return its file name without the extension. * @param packageDoc the package to check. * @return the file name of the given package. */ @@ -572,7 +406,7 @@ public class Util { } /** - * Given a string, replace all occurraces of 'newStr' with 'oldStr'. + * Given a string, replace all occurrences of 'newStr' with 'oldStr'. * @param originalStr the string to modify. * @param oldStr the string to replace. * @param newStr the string to insert in place of the old string. @@ -622,40 +456,6 @@ public class Util { return rawString.trim(); } - /** - * Create the directory path for the file to be generated, construct - * FileOutputStream and OutputStreamWriter depending upon docencoding. - * - * @param path The directory path to be created for this file. - * @param filename File Name to which the PrintWriter will do the Output. - * @param docencoding Encoding to be used for this file. - * @exception IOException Exception raised by the FileWriter is passed on - * to next level. - * @exception UnsupportedEncodingException Exception raised by the - * OutputStreamWriter is passed on to next level. - * @return Writer Writer for the file getting generated. - * @see java.io.FileOutputStream - * @see java.io.OutputStreamWriter - */ - public static Writer genWriter(Configuration configuration, - String path, String filename, - String docencoding) - throws IOException, UnsupportedEncodingException { - FileOutputStream fos; - if (path != null) { - DirectoryManager.createDirectory(configuration, path); - fos = new FileOutputStream(((path.length() > 0)? - path + File.separator: "") + filename); - } else { - fos = new FileOutputStream(filename); - } - if (docencoding == null) { - return new BufferedWriter(new OutputStreamWriter(fos)); - } else { - return new BufferedWriter(new OutputStreamWriter(fos, docencoding)); - } - } - /** * Given an annotation, return true if it should be documented and false * otherwise. @@ -675,47 +475,6 @@ public class Util { return false; } - /** - * Given a string, return an array of tokens. The separator can be escaped - * with the '\' character. The '\' character may also be escaped by the - * '\' character. - * - * @param s the string to tokenize. - * @param separator the separator char. - * @param maxTokens the maxmimum number of tokens returned. If the - * max is reached, the remaining part of s is appended - * to the end of the last token. - * - * @return an array of tokens. - */ - public static String[] tokenize(String s, char separator, int maxTokens) { - List tokens = new ArrayList(); - StringBuilder token = new StringBuilder (); - boolean prevIsEscapeChar = false; - for (int i = 0; i < s.length(); i += Character.charCount(i)) { - int currentChar = s.codePointAt(i); - if (prevIsEscapeChar) { - // Case 1: escaped character - token.appendCodePoint(currentChar); - prevIsEscapeChar = false; - } else if (currentChar == separator && tokens.size() < maxTokens-1) { - // Case 2: separator - tokens.add(token.toString()); - token = new StringBuilder(); - } else if (currentChar == '\\') { - // Case 3: escape character - prevIsEscapeChar = true; - } else { - // Case 4: regular character - token.appendCodePoint(currentChar); - } - } - if (token.length() > 0) { - tokens.add(token.toString()); - } - return tokens.toArray(new String[] {}); - } - /** * Return true if this class is linkable and false if we can't link to the * desired class. diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Attribute.java b/langtools/src/share/classes/com/sun/tools/javac/code/Attribute.java index 0460ac9aa1e..f827006a036 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/code/Attribute.java +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Attribute.java @@ -34,8 +34,6 @@ import javax.lang.model.type.DeclaredType; import com.sun.tools.javac.code.Symbol.*; import com.sun.tools.javac.util.*; -import static com.sun.tools.javac.code.TypeTags.*; - /** An annotation value. * *

This is NOT part of any supported API. diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java b/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java index d1601572998..8c9d9000af4 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java @@ -258,6 +258,12 @@ public class Flags { */ public static final long DEFAULT = 1L<<43; + /** + * Flag that marks class as auxiliary, ie a non-public class following + * the public class in a source file, that could block implicit compilation. + */ + public static final long AUXILIARY = 1L<<43; + /** Modifier masks. */ public static final int diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Kinds.java b/langtools/src/share/classes/com/sun/tools/javac/code/Kinds.java index dc0d52f34b6..12d3703d1fd 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/code/Kinds.java +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Kinds.java @@ -32,7 +32,9 @@ import com.sun.source.tree.MemberReferenceTree; import com.sun.tools.javac.api.Formattable; import com.sun.tools.javac.api.Messages; import static com.sun.tools.javac.code.Flags.*; -import static com.sun.tools.javac.code.TypeTags.*; +import static com.sun.tools.javac.code.TypeTag.CLASS; +import static com.sun.tools.javac.code.TypeTag.PACKAGE; +import static com.sun.tools.javac.code.TypeTag.TYPEVAR; /** Internal symbol kinds, which distinguish between elements of * different subclasses of Symbol. Symbol kinds are organized so they can be diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Lint.java b/langtools/src/share/classes/com/sun/tools/javac/code/Lint.java index e3ed0f35983..88573c593ca 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/code/Lint.java +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Lint.java @@ -128,6 +128,13 @@ public class Lint * Categories of warnings that can be generated by the compiler. */ public enum LintCategory { + /** + * Warn when code refers to a auxiliary class that is hidden in a source file (ie source file name is + * different from the class name, and the type is not properly nested) and the referring code + * is not located in the same source file. + */ + AUXILIARYCLASS("auxiliaryclass"), + /** * Warn about use of unnecessary casts. */ diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java b/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java index 5d7e430ffeb..3e6b15998c3 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java @@ -32,9 +32,12 @@ import com.sun.tools.javac.code.Symbol.*; import com.sun.tools.javac.code.Type.*; import com.sun.tools.javac.util.List; import com.sun.tools.javac.util.ListBuffer; + import static com.sun.tools.javac.code.BoundKind.*; import static com.sun.tools.javac.code.Flags.*; -import static com.sun.tools.javac.code.TypeTags.*; +import static com.sun.tools.javac.code.TypeTag.ARRAY; +import static com.sun.tools.javac.code.TypeTag.CLASS; +import static com.sun.tools.javac.code.TypeTag.FORALL; /** * A combined type/symbol visitor for generating non-trivial localized string diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java b/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java index 328cfcf6bfe..3c2dce90873 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java @@ -42,7 +42,9 @@ import com.sun.tools.javac.util.*; import com.sun.tools.javac.util.Name; import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.code.Kinds.*; -import static com.sun.tools.javac.code.TypeTags.*; +import static com.sun.tools.javac.code.TypeTag.CLASS; +import static com.sun.tools.javac.code.TypeTag.FORALL; +import static com.sun.tools.javac.code.TypeTag.TYPEVAR; /** Root class for Java symbols. It contains subclasses * for specific sorts of symbols, such as variables, methods and operators, @@ -161,7 +163,7 @@ public abstract class Symbol implements Element { if (owner.name == null || owner.name.isEmpty()) { return location(); } - if (owner.type.tag == CLASS) { + if (owner.type.hasTag(CLASS)) { Type ownertype = types.asOuterSuper(site, owner); if (ownertype != null) return ownertype.tsym; } @@ -256,7 +258,7 @@ public abstract class Symbol implements Element { /** A class is an inner class if it it has an enclosing instance class. */ public boolean isInner() { - return type.getEnclosingType().tag == CLASS; + return type.getEnclosingType().hasTag(CLASS); } /** An inner class has an outer instance if it is not an interface @@ -269,7 +271,7 @@ public abstract class Symbol implements Element { */ public boolean hasOuterInstance() { return - type.getEnclosingType().tag == CLASS && (flags() & (INTERFACE | NOOUTERTHIS)) == 0; + type.getEnclosingType().hasTag(CLASS) && (flags() & (INTERFACE | NOOUTERTHIS)) == 0; } /** The closest enclosing class of this symbol's declaration. @@ -277,7 +279,7 @@ public abstract class Symbol implements Element { public ClassSymbol enclClass() { Symbol c = this; while (c != null && - ((c.kind & TYP) == 0 || c.type.tag != CLASS)) { + ((c.kind & TYP) == 0 || !c.type.hasTag(CLASS))) { c = c.owner; } return (ClassSymbol)c; @@ -346,7 +348,7 @@ public abstract class Symbol implements Element { e = e.next(); } Type superType = types.supertype(clazz.type); - if (superType.tag != TypeTags.CLASS) return false; + if (!superType.hasTag(CLASS)) return false; clazz = (ClassSymbol)superType.tsym; } } @@ -373,7 +375,7 @@ public abstract class Symbol implements Element { for (Symbol sup = clazz; sup != null && sup != this.owner; sup = types.supertype(sup.type).tsym) { - while (sup.type.tag == TYPEVAR) + while (sup.type.hasTag(TYPEVAR)) sup = sup.type.getUpperBound().tsym; if (sup.type.isErroneous()) return true; // error recovery @@ -520,7 +522,7 @@ public abstract class Symbol implements Element { if (owner == null) return name; if (((owner.kind != ERR)) && ((owner.kind & (VAR | MTH)) != 0 - || (owner.kind == TYP && owner.type.tag == TYPEVAR) + || (owner.kind == TYP && owner.type.hasTag(TYPEVAR)) )) return name; Name prefix = owner.getQualifiedName(); if (prefix == null || prefix == prefix.table.names.empty) @@ -534,7 +536,7 @@ public abstract class Symbol implements Element { static public Name formFlatName(Name name, Symbol owner) { if (owner == null || (owner.kind & (VAR | MTH)) != 0 - || (owner.kind == TYP && owner.type.tag == TYPEVAR) + || (owner.kind == TYP && owner.type.hasTag(TYPEVAR)) ) return name; char sep = owner.kind == TYP ? '$' : '.'; Name prefix = owner.flatName(); @@ -553,16 +555,16 @@ public abstract class Symbol implements Element { if (this == that) return false; if (this.type.tag == that.type.tag) { - if (this.type.tag == CLASS) { + if (this.type.hasTag(CLASS)) { return types.rank(that.type) < types.rank(this.type) || types.rank(that.type) == types.rank(this.type) && that.getQualifiedName().compareTo(this.getQualifiedName()) < 0; - } else if (this.type.tag == TYPEVAR) { + } else if (this.type.hasTag(TYPEVAR)) { return types.isSubtype(this.type, that.type); } } - return this.type.tag == TYPEVAR; + return this.type.hasTag(TYPEVAR); } // For type params; overridden in subclasses. @@ -572,7 +574,7 @@ public abstract class Symbol implements Element { public java.util.List getEnclosedElements() { List list = List.nil(); - if (kind == TYP && type.tag == TYPEVAR) { + if (kind == TYP && type.hasTag(TYPEVAR)) { return list; } for (Scope.Entry e = members().elems; e != null; e = e.sibling) { @@ -591,7 +593,7 @@ public abstract class Symbol implements Element { } public R accept(ElementVisitor v, P p) { - Assert.check(type.tag == TYPEVAR); // else override will be invoked + Assert.check(type.hasTag(TYPEVAR)); // else override will be invoked return v.visitTypeParameter(this, p); } @@ -798,13 +800,13 @@ public abstract class Symbol implements Element { if (this == base) { return true; } else if ((base.flags() & INTERFACE) != 0) { - for (Type t = type; t.tag == CLASS; t = types.supertype(t)) + for (Type t = type; t.hasTag(CLASS); t = types.supertype(t)) for (List is = types.interfaces(t); is.nonEmpty(); is = is.tail) if (is.head.tsym.isSubClass(base, types)) return true; } else { - for (Type t = type; t.tag == CLASS; t = types.supertype(t)) + for (Type t = type; t.hasTag(CLASS); t = types.supertype(t)) if (t.tsym == base) return true; } return false; @@ -1048,7 +1050,7 @@ public abstract class Symbol implements Element { */ public MethodSymbol(long flags, Name name, Type type, Symbol owner) { super(MTH, flags, name, type, owner); - if (owner.type.tag == TYPEVAR) Assert.error(owner + "." + name); + if (owner.type.hasTag(TYPEVAR)) Assert.error(owner + "." + name); } /** Clone this symbol with new owner. @@ -1074,7 +1076,7 @@ public abstract class Symbol implements Element { ? owner.name.toString() : name.toString(); if (type != null) { - if (type.tag == FORALL) + if (type.hasTag(FORALL)) s = "<" + ((ForAll)type).getTypeArguments() + ">" + s; s += "(" + type.argtypes((flags() & VARARGS) != 0) + ")"; } diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java b/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java index 29ce859361d..3002a9dfc2d 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java @@ -37,6 +37,7 @@ import com.sun.tools.javac.util.*; import com.sun.tools.javac.util.List; import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.jvm.ByteCodes.*; +import static com.sun.tools.javac.code.TypeTag.*; /** A class that defines all predefined constants and operators * as well as special classes such as java.lang.Object, which need @@ -64,16 +65,16 @@ public class Symtab { /** Builtin types. */ - public final Type byteType = new Type(TypeTags.BYTE, null); - public final Type charType = new Type(TypeTags.CHAR, null); - public final Type shortType = new Type(TypeTags.SHORT, null); - public final Type intType = new Type(TypeTags.INT, null); - public final Type longType = new Type(TypeTags.LONG, null); - public final Type floatType = new Type(TypeTags.FLOAT, null); - public final Type doubleType = new Type(TypeTags.DOUBLE, null); - public final Type booleanType = new Type(TypeTags.BOOLEAN, null); + public final Type byteType = new Type(BYTE, null); + public final Type charType = new Type(CHAR, null); + public final Type shortType = new Type(SHORT, null); + public final Type intType = new Type(INT, null); + public final Type longType = new Type(LONG, null); + public final Type floatType = new Type(FLOAT, null); + public final Type doubleType = new Type(DOUBLE, null); + public final Type booleanType = new Type(BOOLEAN, null); public final Type botType = new BottomType(); - public final JCNoType voidType = new JCNoType(TypeTags.VOID); + public final JCNoType voidType = new JCNoType(VOID); private final Names names; private final ClassReader reader; @@ -126,6 +127,7 @@ public class Symtab { public final Type cloneableType; public final Type serializableType; public final Type methodHandleType; + public final Type methodHandleLookupType; public final Type methodTypeType; public final Type nativeHeaderType; public final Type throwableType; @@ -157,6 +159,7 @@ public class Symtab { public final Type systemType; public final Type autoCloseableType; public final Type trustMeType; + public final Type lambdaMetafactory; public final Type containedByType; public final Type containerForType; public final Type documentedType; @@ -177,11 +180,11 @@ public class Symtab { /** The predefined type that belongs to a tag. */ - public final Type[] typeOfTag = new Type[TypeTags.TypeTagCount]; + public final Type[] typeOfTag = new Type[TypeTag.getTypeTagCount()]; /** The name of the class that belongs to a basix type tag. */ - public final Name[] boxedName = new Name[TypeTags.TypeTagCount]; + public final Name[] boxedName = new Name[TypeTag.getTypeTagCount()]; /** A set containing all operator names. */ @@ -202,7 +205,7 @@ public class Symtab { public void initType(Type type, ClassSymbol c) { type.tsym = c; - typeOfTag[type.tag] = type; + typeOfTag[type.tag.ordinal()] = type; } public void initType(Type type, String name) { @@ -214,7 +217,7 @@ public class Symtab { public void initType(Type type, String name, String bname) { initType(type, name); - boxedName[type.tag] = names.fromString("java.lang." + bname); + boxedName[type.tag.ordinal()] = names.fromString("java.lang." + bname); } /** The class symbol that owns all predefined symbols. @@ -324,7 +327,7 @@ public class Symtab { } public void synthesizeBoxTypeIfMissing(final Type type) { - ClassSymbol sym = reader.enterClass(boxedName[type.tag]); + ClassSymbol sym = reader.enterClass(boxedName[type.tag.ordinal()]); final Completer completer = sym.completer; if (completer != null) { sym.completer = new Completer() { @@ -366,7 +369,7 @@ public class Symtab { target = Target.instance(context); // Create the unknown type - unknownType = new Type(TypeTags.UNKNOWN, null) { + unknownType = new Type(UNKNOWN, null) { @Override public R accept(TypeVisitor v, P p) { return v.visitUnknown(this, p); @@ -455,6 +458,7 @@ public class Symtab { throwableType = enterClass("java.lang.Throwable"); serializableType = enterClass("java.io.Serializable"); methodHandleType = enterClass("java.lang.invoke.MethodHandle"); + methodHandleLookupType = enterClass("java.lang.invoke.MethodHandles$Lookup"); methodTypeType = enterClass("java.lang.invoke.MethodType"); errorType = enterClass("java.lang.Error"); illegalArgumentExceptionType = enterClass("java.lang.IllegalArgumentException"); @@ -502,10 +506,12 @@ public class Symtab { autoCloseableType.tsym); trustMeType = enterClass("java.lang.SafeVarargs"); nativeHeaderType = enterClass("javax.tools.annotation.GenerateNativeHeader"); + lambdaMetafactory = enterClass("java.lang.invoke.LambdaMetafactory"); synthesizeEmptyInterfaceIfMissing(autoCloseableType); synthesizeEmptyInterfaceIfMissing(cloneableType); synthesizeEmptyInterfaceIfMissing(serializableType); + synthesizeEmptyInterfaceIfMissing(lambdaMetafactory); synthesizeBoxTypeIfMissing(doubleType); synthesizeBoxTypeIfMissing(floatType); synthesizeBoxTypeIfMissing(voidType); diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Type.java b/langtools/src/share/classes/com/sun/tools/javac/code/Type.java index 362bb426488..f75bbf3e8b6 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/code/Type.java +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Type.java @@ -38,7 +38,7 @@ import com.sun.tools.javac.util.*; import static com.sun.tools.javac.code.BoundKind.*; import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.code.Kinds.*; -import static com.sun.tools.javac.code.TypeTags.*; +import static com.sun.tools.javac.code.TypeTag.*; /** This class represents Java types. The class itself defines the behavior of * the following types: @@ -66,7 +66,7 @@ import static com.sun.tools.javac.code.TypeTags.*; * This code and its internal interfaces are subject to change or * deletion without notice. * - * @see TypeTags + * @see TypeTag */ public class Type implements PrimitiveType { @@ -83,14 +83,76 @@ public class Type implements PrimitiveType { /** The tag of this type. * - * @see TypeTags + * @see TypeTag */ - public int tag; + protected TypeTag tag; /** The defining class / interface / package / type variable */ public TypeSymbol tsym; + /** + * Checks if the current type tag is equal to the given tag. + * @return true if tag is equal to the current type tag. + */ + public boolean hasTag(TypeTag tag) { + return this.tag == tag; + } + + /** + * Returns the current type tag. + * @return the value of the current type tag. + */ + public TypeTag getTag() { + return tag; + } + + public boolean isNumeric() { + switch (tag) { + case BYTE: case CHAR: + case SHORT: + case INT: case LONG: + case FLOAT: case DOUBLE: + return true; + default: + return false; + } + } + + public boolean isPrimitive() { + return (isNumeric() || tag == BOOLEAN); + } + + public boolean isPrimitiveOrVoid() { + return (isPrimitive() || tag == VOID); + } + + public boolean isReference() { + switch (tag) { + case CLASS: + case ARRAY: + case TYPEVAR: + case WILDCARD: + case ERROR: + return true; + default: + return false; + } + } + + public boolean isNullOrReference() { + return (tag == BOT || isReference()); + } + + public boolean isPartial() { + switch(tag) { + case ERROR: case UNKNOWN: case UNDETVAR: + return true; + default: + return false; + } + } + /** * The constant value of this type, null if this type does not * have a constant value attribute. Only primitive types and @@ -121,7 +183,7 @@ public class Type implements PrimitiveType { /** Define a type given its tag and type symbol */ - public Type(int tag, TypeSymbol tsym) { + public Type(TypeTag tag, TypeSymbol tsym) { this.tag = tag; this.tsym = tsym; } @@ -162,7 +224,7 @@ public class Type implements PrimitiveType { */ public Type constType(Object constValue) { final Object value = constValue; - Assert.check(tag <= BOOLEAN); + Assert.check(isPrimitive()); return new Type(tag, tsym) { @Override public Object constValue() { @@ -352,10 +414,6 @@ public class Type implements PrimitiveType { return (tsym.flags() & FINAL) != 0; } - public boolean isPrimitive() { - return tag < VOID; - } - /** * Does this type contain occurrences of type t? */ @@ -808,7 +866,7 @@ public class Type implements PrimitiveType { } public int hashCode() { - return (ARRAY << 5) + elemtype.hashCode(); + return (ARRAY.ordinal() << 5) + elemtype.hashCode(); } public boolean isVarargs() { @@ -915,7 +973,7 @@ public class Type implements PrimitiveType { } public int hashCode() { - int h = METHOD; + int h = METHOD.ordinal(); for (List thisargs = this.argtypes; thisargs.tail != null; /*inlined: thisargs.nonEmpty()*/ thisargs = thisargs.tail) @@ -1099,7 +1157,7 @@ public class Type implements PrimitiveType { public static abstract class DelegatedType extends Type { public Type qtype; - public DelegatedType(int tag, Type qtype) { + public DelegatedType(TypeTag tag, Type qtype) { super(tag, qtype.tsym); this.qtype = qtype; } @@ -1285,7 +1343,7 @@ public class Type implements PrimitiveType { /** Represents VOID or NONE. */ static class JCNoType extends Type implements NoType { - public JCNoType(int tag) { + public JCNoType(TypeTag tag) { super(tag, null); } @@ -1307,7 +1365,7 @@ public class Type implements PrimitiveType { static class BottomType extends Type implements NullType { public BottomType() { - super(TypeTags.BOT, null); + super(BOT, null); } @Override diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/TypeTag.java b/langtools/src/share/classes/com/sun/tools/javac/code/TypeTag.java new file mode 100644 index 00000000000..da6affeec42 --- /dev/null +++ b/langtools/src/share/classes/com/sun/tools/javac/code/TypeTag.java @@ -0,0 +1,226 @@ +/* + * 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 + * 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.code; + +import com.sun.source.tree.Tree.Kind; + +import javax.lang.model.type.TypeKind; + +/** An interface for type tag values, which distinguish between different + * sorts of types. + * + *

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. + */ +public enum TypeTag { + /** The tag of the basic type `byte'. + */ + BYTE(1), + + /** The tag of the basic type `char'. + */ + CHAR(2), + + /** The tag of the basic type `short'. + */ + SHORT(3), + + /** The tag of the basic type `int'. + */ + INT(4), + + /** The tag of the basic type `long'. + */ + LONG(5), + + /** The tag of the basic type `float'. + */ + FLOAT(6), + + /** The tag of the basic type `double'. + */ + DOUBLE(7), + + /** The tag of the basic type `boolean'. + */ + BOOLEAN, + + /** The tag of the type `void'. + */ + VOID, + + /** The tag of all class and interface types. + */ + CLASS, + + /** The tag of all array types. + */ + ARRAY, + + /** The tag of all (monomorphic) method types. + */ + METHOD, + + /** The tag of all package "types". + */ + PACKAGE, + + /** The tag of all (source-level) type variables. + */ + TYPEVAR, + + /** The tag of all type arguments. + */ + WILDCARD, + + /** The tag of all polymorphic (method-) types. + */ + FORALL, + + /** The tag of deferred expression types in method context + */ + DEFERRED, + + /** The tag of the bottom type {@code }. + */ + BOT, + + /** The tag of a missing type. + */ + NONE, + + /** The tag of the error type. + */ + ERROR, + + /** The tag of an unknown type + */ + UNKNOWN, + + /** The tag of all instantiatable type variables. + */ + UNDETVAR, + + /** Pseudo-types, these are special tags + */ + UNINITIALIZED_THIS, + + UNINITIALIZED_OBJECT; + + /** This field will only be used for tags related with numeric types for + * optimization reasons. + */ + private int order = 0; + + private TypeTag() {} + + private TypeTag(int order) { + this.order = order; + } + + private static final int MIN_NUMERIC_TAG_ORDER = 1; + private static final int MAX_NUMERIC_TAG_ORDER = 7; + + /** Returns the number of type tags. + */ + public static int getTypeTagCount() { + // last two tags are not included in the total as long as they are pseudo-types + return (UNDETVAR.ordinal() + 1); + } + + public boolean isSubRangeOf(TypeTag range) { + return (this == range) || isStrictSubRangeOf(range); + } + + public boolean isStrictSubRangeOf(TypeTag range) { + if (this.order >= MIN_NUMERIC_TAG_ORDER && this.order <= MAX_NUMERIC_TAG_ORDER && + range.order >= MIN_NUMERIC_TAG_ORDER && this.order <= MAX_NUMERIC_TAG_ORDER) { + if (this == range) + return false; + switch (this) { + case BYTE: + return true; + case CHAR: case SHORT: case INT: + case LONG: case FLOAT: + return this.order < range.order && range.order <= MAX_NUMERIC_TAG_ORDER; + default: + return false; + } + } + else + return false; + } + + public Kind getKindLiteral() { + switch (this) { + case INT: + return Kind.INT_LITERAL; + case LONG: + return Kind.LONG_LITERAL; + case FLOAT: + return Kind.FLOAT_LITERAL; + case DOUBLE: + return Kind.DOUBLE_LITERAL; + case BOOLEAN: + return Kind.BOOLEAN_LITERAL; + case CHAR: + return Kind.CHAR_LITERAL; + case CLASS: + return Kind.STRING_LITERAL; + case BOT: + return Kind.NULL_LITERAL; + default: + throw new AssertionError("unknown literal kind " + this); + } + } + + public TypeKind getPrimitiveTypeKind() { + switch (this) { + case BOOLEAN: + return TypeKind.BOOLEAN; + case BYTE: + return TypeKind.BYTE; + case SHORT: + return TypeKind.SHORT; + case INT: + return TypeKind.INT; + case LONG: + return TypeKind.LONG; + case CHAR: + return TypeKind.CHAR; + case FLOAT: + return TypeKind.FLOAT; + case DOUBLE: + return TypeKind.DOUBLE; + case VOID: + return TypeKind.VOID; + default: + throw new AssertionError("unknown primitive type " + this); + } + } +} diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/TypeTags.java b/langtools/src/share/classes/com/sun/tools/javac/code/TypeTags.java deleted file mode 100644 index aecf93bb74f..00000000000 --- a/langtools/src/share/classes/com/sun/tools/javac/code/TypeTags.java +++ /dev/null @@ -1,140 +0,0 @@ -/* - * 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 - * 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.code; - - -/** An interface for type tag values, which distinguish between different - * sorts of types. - * - *

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. - */ -public class TypeTags { - - private TypeTags() {} // uninstantiable - - /** The tag of the basic type `byte'. - */ - public static final int BYTE = 1; - - /** The tag of the basic type `char'. - */ - public static final int CHAR = BYTE+1; - - /** The tag of the basic type `short'. - */ - public static final int SHORT = CHAR+1; - - /** The tag of the basic type `int'. - */ - public static final int INT = SHORT+1; - - /** The tag of the basic type `long'. - */ - public static final int LONG = INT+1; - - /** The tag of the basic type `float'. - */ - public static final int FLOAT = LONG+1; - - /** The tag of the basic type `double'. - */ - public static final int DOUBLE = FLOAT+1; - - /** The tag of the basic type `boolean'. - */ - public static final int BOOLEAN = DOUBLE+1; - - /** The tag of the type `void'. - */ - public static final int VOID = BOOLEAN+1; - - /** The tag of all class and interface types. - */ - public static final int CLASS = VOID+1; - - /** The tag of all array types. - */ - public static final int ARRAY = CLASS+1; - - /** The tag of all (monomorphic) method types. - */ - public static final int METHOD = ARRAY+1; - - /** The tag of all package "types". - */ - public static final int PACKAGE = METHOD+1; - - /** The tag of all (source-level) type variables. - */ - public static final int TYPEVAR = PACKAGE+1; - - /** The tag of all type arguments. - */ - public static final int WILDCARD = TYPEVAR+1; - - /** The tag of all polymorphic (method-) types. - */ - public static final int FORALL = WILDCARD+1; - - /** The tag of deferred expression types in method context - */ - public static final int DEFERRED = FORALL+1; - - /** The tag of the bottom type {@code }. - */ - public static final int BOT = DEFERRED+1; - - /** The tag of a missing type. - */ - public static final int NONE = BOT+1; - - /** The tag of the error type. - */ - public static final int ERROR = NONE+1; - - /** The tag of an unknown type - */ - public static final int UNKNOWN = ERROR+1; - - /** The tag of all instantiatable type variables. - */ - public static final int UNDETVAR = UNKNOWN+1; - - /** The number of type tags. - */ - public static final int TypeTagCount = UNDETVAR+1; - - /** The maximum tag of a basic type. - */ - public static final int lastBaseTag = BOOLEAN; - - /** The minimum tag of a partial type - */ - public static final int firstPartialTag = ERROR; -} diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java index 9bc13e56bbb..988a25d01ff 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java @@ -40,7 +40,7 @@ import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.code.Scope.*; import static com.sun.tools.javac.code.Symbol.*; import static com.sun.tools.javac.code.Type.*; -import static com.sun.tools.javac.code.TypeTags.*; +import static com.sun.tools.javac.code.TypeTag.*; import static com.sun.tools.javac.util.ListBuffer.lb; /** @@ -605,8 +605,8 @@ public class Types { } //where private boolean isSubtypeUncheckedInternal(Type t, Type s, Warner warn) { - if (t.tag == ARRAY && s.tag == ARRAY) { - if (((ArrayType)t).elemtype.tag <= lastBaseTag) { + if (t.hasTag(ARRAY) && s.hasTag(ARRAY)) { + if (((ArrayType)t).elemtype.isPrimitive()) { return isSameType(elemtype(t), elemtype(s)); } else { return isSubtypeUnchecked(elemtype(t), elemtype(s), warn); @@ -664,7 +664,7 @@ public class Types { if (t == s) return true; - if (s.tag >= firstPartialTag) + if (s.isPartial()) return isSuperType(s, t); if (s.isCompound()) { @@ -686,25 +686,27 @@ public class Types { { public Boolean visitType(Type t, Type s) { switch (t.tag) { - case BYTE: case CHAR: - return (t.tag == s.tag || - t.tag + 2 <= s.tag && s.tag <= DOUBLE); - case SHORT: case INT: case LONG: case FLOAT: case DOUBLE: - return t.tag <= s.tag && s.tag <= DOUBLE; - case BOOLEAN: case VOID: - return t.tag == s.tag; - case TYPEVAR: - return isSubtypeNoCapture(t.getUpperBound(), s); - case BOT: - return - s.tag == BOT || s.tag == CLASS || - s.tag == ARRAY || s.tag == TYPEVAR; - case WILDCARD: //we shouldn't be here - avoids crash (see 7034495) - case NONE: - return false; - default: - throw new AssertionError("isSubtype " + t.tag); - } + case BYTE: + return (!s.hasTag(CHAR) && t.getTag().isSubRangeOf(s.getTag())); + case CHAR: + return (!s.hasTag(SHORT) && t.getTag().isSubRangeOf(s.getTag())); + case SHORT: case INT: case LONG: + case FLOAT: case DOUBLE: + return t.getTag().isSubRangeOf(s.getTag()); + case BOOLEAN: case VOID: + return t.hasTag(s.getTag()); + case TYPEVAR: + return isSubtypeNoCapture(t.getUpperBound(), s); + case BOT: + return + s.hasTag(BOT) || s.hasTag(CLASS) || + s.hasTag(ARRAY) || s.hasTag(TYPEVAR); + case WILDCARD: //we shouldn't be here - avoids crash (see 7034495) + case NONE: + return false; + default: + throw new AssertionError("isSubtype " + t.tag); + } } private Set cache = new HashSet(); @@ -774,7 +776,7 @@ public class Types { @Override public Boolean visitArrayType(ArrayType t, Type s) { if (s.tag == ARRAY) { - if (t.elemtype.tag <= lastBaseTag) + if (t.elemtype.isPrimitive()) return isSameType(t.elemtype, elemtype(s)); else return isSubtypeNoCapture(t.elemtype, elemtype(s)); @@ -907,7 +909,7 @@ public class Types { if (t == s) return true; - if (s.tag >= firstPartialTag) + if (s.isPartial()) return visit(s, t); switch (t.tag) { @@ -936,7 +938,7 @@ public class Types { @Override public Boolean visitWildcardType(WildcardType t, Type s) { - if (s.tag >= firstPartialTag) + if (s.isPartial()) return visit(s, t); else return false; @@ -947,7 +949,7 @@ public class Types { if (t == s) return true; - if (s.tag >= firstPartialTag) + if (s.isPartial()) return visit(s, t); if (s.isSuperBound() && !s.isExtendsBound()) @@ -976,10 +978,10 @@ public class Types { if (t == s) return true; - if (s.tag >= firstPartialTag) + if (s.isPartial()) return visit(s, t); - return s.tag == ARRAY + return s.hasTag(ARRAY) && containsTypeEquivalent(t.elemtype, elemtype(s)); } @@ -1120,7 +1122,7 @@ public class Types { } public Boolean visitType(Type t, Type s) { - if (s.tag >= firstPartialTag) + if (s.isPartial()) return containedBy(s, t); else return isSameType(t, s); @@ -1142,7 +1144,7 @@ public class Types { @Override public Boolean visitWildcardType(WildcardType t, Type s) { - if (s.tag >= firstPartialTag) + if (s.isPartial()) return containedBy(s, t); else { // debugContainsType(t, s); @@ -1232,7 +1234,7 @@ public class Types { switch (t.tag) { case BYTE: case CHAR: case SHORT: case INT: case LONG: case FLOAT: case DOUBLE: - return s.tag <= DOUBLE; + return s.isNumeric(); case BOOLEAN: return s.tag == BOOLEAN; case VOID: @@ -1373,8 +1375,7 @@ public class Types { case CLASS: return isSubtype(t, s); case ARRAY: - if (elemtype(t).tag <= lastBaseTag || - elemtype(s).tag <= lastBaseTag) { + if (elemtype(t).isPrimitive() || elemtype(s).isPrimitive()) { return elemtype(t).tag == elemtype(s).tag; } else { return visit(elemtype(t), elemtype(s)); @@ -1648,8 +1649,8 @@ public class Types { */ public ArrayType makeArrayType(Type t) { if (t.tag == VOID || - t.tag >= PACKAGE) { - Assert.error("Type t must not be a a VOID or PACKAGE type, " + t.toString()); + t.tag == PACKAGE) { + Assert.error("Type t must not be a VOID or PACKAGE type, " + t.toString()); } return new ArrayType(t, syms.arrayClass); } @@ -1847,7 +1848,7 @@ public class Types { public boolean isAssignable(Type t, Type s, Warner warn) { if (t.tag == ERROR) return true; - if (t.tag <= INT && t.constValue() != null) { + if (t.tag.isSubRangeOf(INT) && t.constValue() != null) { int value = ((Number)t.constValue()).intValue(); switch (s.tag) { case BYTE: @@ -1891,11 +1892,11 @@ public class Types { // We don't want to erase primitive types and String type as that // operation is idempotent. Also, erasing these could result in loss // of information such as constant values attached to such types. - return (t.tag <= lastBaseTag) || (syms.stringType.tsym == t.tsym); + return (t.isPrimitive()) || (syms.stringType.tsym == t.tsym); } private Type erasure(Type t, boolean recurse) { - if (t.tag <= lastBaseTag) + if (t.isPrimitive()) return t; /* fast special case */ else return erasure.visit(t, recurse); @@ -1903,7 +1904,7 @@ public class Types { // where private SimpleVisitor erasure = new SimpleVisitor() { public Type visitType(Type t, Boolean recurse) { - if (t.tag <= lastBaseTag) + if (t.isPrimitive()) return t; /*fast special case*/ else return t.map(recurse ? erasureRecFun : erasureFun); @@ -3314,7 +3315,7 @@ public class Types { private static final UnaryVisitor hashCode = new UnaryVisitor() { public Integer visitType(Type t, Void ignored) { - return t.tag; + return t.tag.ordinal(); } @Override @@ -3430,7 +3431,7 @@ public class Types { * Return the class that boxes the given primitive. */ public ClassSymbol boxedClass(Type t) { - return reader.enterClass(syms.boxedName[t.tag]); + return reader.enterClass(syms.boxedName[t.tag.ordinal()]); } /** diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java index e9cad76d473..cc3ea1e2f96 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java @@ -34,6 +34,8 @@ import com.sun.tools.javac.code.Symbol.*; import com.sun.tools.javac.tree.*; import com.sun.tools.javac.tree.JCTree.*; +import static com.sun.tools.javac.code.TypeTag.ARRAY; +import static com.sun.tools.javac.code.TypeTag.CLASS; import static com.sun.tools.javac.tree.JCTree.Tag.*; /** Enter annotations on symbols. Annotations accumulate in a queue, @@ -289,7 +291,7 @@ public class Annotate { } return enterAnnotation((JCAnnotation)tree, expected, env); } - if (expected.tag == TypeTags.ARRAY) { // should really be isArray() + if (expected.hasTag(ARRAY)) { // should really be isArray() if (!tree.hasTag(NEWARRAY)) { tree = make.at(tree.pos). NewArray(null, List.nil(), List.of(tree)); @@ -309,7 +311,7 @@ public class Annotate { return new Attribute. Array(expected, buf.toArray(new Attribute[buf.length()])); } - if (expected.tag == TypeTags.CLASS && + if (expected.hasTag(CLASS) && (expected.tsym.flags() & Flags.ENUM) != 0) { attr.attribExpr(tree, env, expected); Symbol sym = TreeInfo.symbol(tree); diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java index 1274431269d..ca8d2a4fe87 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java @@ -56,8 +56,8 @@ import static com.sun.tools.javac.code.Flags.ANNOTATION; import static com.sun.tools.javac.code.Flags.BLOCK; import static com.sun.tools.javac.code.Kinds.*; import static com.sun.tools.javac.code.Kinds.ERRONEOUS; -import static com.sun.tools.javac.code.TypeTags.*; -import static com.sun.tools.javac.code.TypeTags.WILDCARD; +import static com.sun.tools.javac.code.TypeTag.*; +import static com.sun.tools.javac.code.TypeTag.WILDCARD; import static com.sun.tools.javac.tree.JCTree.Tag.*; /** This is the main context-dependent analysis phase in GJC. It @@ -227,14 +227,13 @@ public class Attr extends JCTree.Visitor { * are correct. * * @param tree The tree whose kind and type is checked - * @param owntype The computed type of the tree * @param ownkind The computed kind of the tree * @param resultInfo The expected result of the tree */ Type check(final JCTree tree, final Type found, final int ownkind, final ResultInfo resultInfo) { InferenceContext inferenceContext = resultInfo.checkContext.inferenceContext(); Type owntype = found; - if (owntype.tag != ERROR && resultInfo.pt.tag != METHOD && resultInfo.pt.tag != FORALL) { + if (!owntype.hasTag(ERROR) && !resultInfo.pt.hasTag(METHOD) && !resultInfo.pt.hasTag(FORALL)) { if (inferenceContext.free(found)) { inferenceContext.addFreeTypeListener(List.of(found, resultInfo.pt), new FreeTypeListener() { @Override @@ -606,7 +605,7 @@ public class Attr extends JCTree.Visitor { /** Derived visitor method: attribute an expression tree. */ public Type attribExpr(JCTree tree, Env env, Type pt) { - return attribTree(tree, env, new ResultInfo(VAL, pt.tag != ERROR ? pt : Type.noType)); + return attribTree(tree, env, new ResultInfo(VAL, !pt.hasTag(ERROR) ? pt : Type.noType)); } /** Derived visitor method: attribute an expression tree with @@ -806,7 +805,7 @@ public class Attr extends JCTree.Visitor { boolean checkExtensible) { if (t.isErroneous()) return t; - if (t.tag == TYPEVAR && !classExpected && !interfaceExpected) { + if (t.hasTag(TYPEVAR) && !classExpected && !interfaceExpected) { // check that type variable is already visible if (t.getUpperBound() == null) { log.error(tree.pos(), "illegal.forward.ref"); @@ -1208,7 +1207,7 @@ public class Attr extends JCTree.Visitor { } } else { Type pattype = attribExpr(c.pat, switchEnv, seltype); - if (pattype.tag != ERROR) { + if (!pattype.hasTag(ERROR)) { if (pattype.constValue() == null) { log.error(c.pat.pos(), (stringSwitch ? "string.const.req" : "const.expr.req")); @@ -1379,10 +1378,10 @@ public class Attr extends JCTree.Visitor { Type condtype = attribExpr(tree.cond, env, syms.booleanType); boolean standaloneConditional = !allowPoly || - pt().tag == NONE && pt() != Type.recoveryType || + pt().hasTag(NONE) && pt() != Type.recoveryType || isBooleanOrNumeric(env, tree); - if (!standaloneConditional && resultInfo.pt.tag == VOID) { + if (!standaloneConditional && resultInfo.pt.hasTag(VOID)) { //cannot get here (i.e. it means we are returning from void method - which is already an error) result = tree.type = types.createErrorType(resultInfo.pt); return; @@ -1416,7 +1415,8 @@ public class Attr extends JCTree.Visitor { @SuppressWarnings("fallthrough") private boolean isBooleanOrNumeric(Env env, JCExpression tree) { switch (tree.getTag()) { - case LITERAL: return ((JCLiteral)tree).typetag < CLASS; + case LITERAL: return ((JCLiteral)tree).typetag.isSubRangeOf(DOUBLE) || + ((JCLiteral)tree).typetag == BOOLEAN; case LAMBDA: case REFERENCE: return false; case PARENS: return isBooleanOrNumeric(env, ((JCParens)tree).expr); case CONDEXPR: @@ -1426,7 +1426,7 @@ public class Attr extends JCTree.Visitor { default: Type speculativeType = deferredAttr.attribSpeculative(tree, env, unknownExprInfo).type; speculativeType = types.unboxedTypeOrType(speculativeType); - return speculativeType.tag <= BOOLEAN; + return speculativeType.isPrimitive(); } } @@ -1459,16 +1459,19 @@ public class Attr extends JCTree.Visitor { // If one arm has an integer subrange type (i.e., byte, // short, or char), and the other is an integer constant // that fits into the subrange, return the subrange type. - if (thenUnboxed.tag < INT && elseUnboxed.tag == INT && + if (thenUnboxed.getTag().isStrictSubRangeOf(INT) && elseUnboxed.hasTag(INT) && types.isAssignable(elseUnboxed, thenUnboxed)) return thenUnboxed.baseType(); - if (elseUnboxed.tag < INT && thenUnboxed.tag == INT && + if (elseUnboxed.getTag().isStrictSubRangeOf(INT) && thenUnboxed.hasTag(INT) && types.isAssignable(thenUnboxed, elseUnboxed)) return elseUnboxed.baseType(); - for (int i = BYTE; i < VOID; i++) { - Type candidate = syms.typeOfTag[i]; - if (types.isSubtype(thenUnboxed, candidate) && + for (TypeTag tag : TypeTag.values()) { + if (tag.ordinal() >= TypeTag.getTypeTagCount()) break; + Type candidate = syms.typeOfTag[tag.ordinal()]; + if (candidate != null && + candidate.isPrimitive() && + types.isSubtype(thenUnboxed, candidate) && types.isSubtype(elseUnboxed, candidate)) return candidate; } @@ -1487,7 +1490,7 @@ public class Attr extends JCTree.Visitor { if (types.isSubtype(elsetype, thentype)) return thentype.baseType(); - if (!allowBoxing || thentype.tag == VOID || elsetype.tag == VOID) { + if (!allowBoxing || thentype.hasTag(VOID) || elsetype.hasTag(VOID)) { log.error(pos, "neither.conditional.subtype", thentype, elsetype); return thentype.baseType(); @@ -1601,12 +1604,12 @@ public class Attr extends JCTree.Visitor { // Attribute return expression, if it exists, and check that // it conforms to result type of enclosing method. if (tree.expr != null) { - if (env.info.returnResult.pt.tag == VOID) { + if (env.info.returnResult.pt.hasTag(VOID)) { log.error(tree.expr.pos(), "cant.ret.val.from.meth.decl.void"); } attribTree(tree.expr, env, env.info.returnResult); - } else if (env.info.returnResult.pt.tag != VOID) { + } else if (!env.info.returnResult.pt.hasTag(VOID)) { log.error(tree.pos(), "missing.ret.val"); } } @@ -1671,11 +1674,11 @@ public class Attr extends JCTree.Visitor { } } - if (site.tag == CLASS) { + if (site.hasTag(CLASS)) { Type encl = site.getEnclosingType(); - while (encl != null && encl.tag == TYPEVAR) + while (encl != null && encl.hasTag(TYPEVAR)) encl = encl.getUpperBound(); - if (encl.tag == CLASS) { + if (encl.hasTag(CLASS)) { // we are calling a nested class if (tree.meth.hasTag(SELECT)) { @@ -1740,7 +1743,7 @@ public class Attr extends JCTree.Visitor { // Compute the result type. Type restype = mtype.getReturnType(); - if (restype.tag == WILDCARD) + if (restype.hasTag(WILDCARD)) throw new AssertionError(mtype); Type qualifier = (tree.meth.hasTag(SELECT)) @@ -1870,7 +1873,7 @@ public class Attr extends JCTree.Visitor { } } } else if (!clazztype.tsym.isInterface() && - clazztype.getEnclosingType().tag == CLASS) { + clazztype.getEnclosingType().hasTag(CLASS)) { // Check for the existence of an apropos outer instance rs.resolveImplicitThis(tree.pos(), env, clazztype); } @@ -1880,7 +1883,7 @@ public class Attr extends JCTree.Visitor { List typeargtypes = attribTypes(tree.typeargs, localEnv); // If we have made no mistakes in the class type... - if (clazztype.tag == CLASS) { + if (clazztype.hasTag(CLASS)) { // Enums may not be instantiated except implicitly if (allowEnums && (clazztype.tsym.flags_field&Flags.ENUM) != 0 && @@ -2058,7 +2061,7 @@ public class Attr extends JCTree.Visitor { resultInfo.checkContext.inferenceContext().free(resultInfo.pt) ? Type.noType : pt()); Type inferred = deferredAttr.attribSpeculative(tree, env, findDiamondResult).type; if (!inferred.isErroneous() && - types.isAssignable(inferred, pt().tag == NONE ? syms.objectType : pt(), Warner.noWarnings)) { + types.isAssignable(inferred, pt().hasTag(NONE) ? syms.objectType : pt(), Warner.noWarnings)) { String key = types.isSameType(clazztype, inferred) ? "diamond.redundant.args" : "diamond.redundant.args.1"; @@ -2073,8 +2076,8 @@ public class Attr extends JCTree.Visitor { private void checkLambdaCandidate(JCNewClass tree, ClassSymbol csym, Type clazztype) { if (allowLambda && identifyLambdaCandidate && - clazztype.tag == CLASS && - pt().tag != NONE && + clazztype.hasTag(CLASS) && + !pt().hasTag(NONE) && types.isFunctionalInterface(clazztype.tsym)) { Symbol descriptor = types.findDescriptorSymbol(clazztype.tsym); int count = 0; @@ -2125,10 +2128,10 @@ public class Attr extends JCTree.Visitor { } else { // we are seeing an untyped aggregate { ... } // this is allowed only if the prototype is an array - if (pt().tag == ARRAY) { + if (pt().hasTag(ARRAY)) { elemtype = types.elemtype(pt()); } else { - if (pt().tag != ERROR) { + if (!pt().hasTag(ERROR)) { log.error(tree.pos(), "illegal.initializer.for.type", pt()); } @@ -2152,8 +2155,8 @@ public class Attr extends JCTree.Visitor { */ @Override public void visitLambda(final JCLambda that) { - if (pt().isErroneous() || (pt().tag == NONE && pt() != Type.recoveryType)) { - if (pt().tag == NONE) { + if (pt().isErroneous() || (pt().hasTag(NONE) && pt() != Type.recoveryType)) { + if (pt().hasTag(NONE)) { //lambda only allowed in assignment or method invocation/cast context log.error(that.pos(), "unexpected.lambda"); } @@ -2328,7 +2331,7 @@ public class Attr extends JCTree.Visitor { //this amounts at checking that, if a lambda body can complete normally, //the descriptor's return type must be void if (tree.getBodyKind() == JCLambda.BodyKind.STATEMENT && tree.canCompleteNormally && - returnType.tag != VOID && returnType != Type.recoveryType) { + !returnType.hasTag(VOID) && returnType != Type.recoveryType) { checkContext.report(tree, diags.fragment("incompatible.ret.type.in.lambda", diags.fragment("missing.ret.val", returnType))); } @@ -2363,8 +2366,8 @@ public class Attr extends JCTree.Visitor { @Override public void visitReference(final JCMemberReference that) { - if (pt().isErroneous() || (pt().tag == NONE && pt() != Type.recoveryType)) { - if (pt().tag == NONE) { + if (pt().isErroneous() || (pt().hasTag(NONE) && pt() != Type.recoveryType)) { + if (pt().hasTag(NONE)) { //method reference only allowed in assignment or method invocation/cast context log.error(that.pos(), "unexpected.mref"); } @@ -2465,7 +2468,7 @@ public class Attr extends JCTree.Visitor { ResultInfo checkInfo = resultInfo.dup(newMethodTemplate( - desc.getReturnType().tag == VOID ? Type.noType : desc.getReturnType(), + desc.getReturnType().hasTag(VOID) ? Type.noType : desc.getReturnType(), lookupHelper.argtypes, typeargtypes)); @@ -2510,11 +2513,11 @@ public class Attr extends JCTree.Visitor { Type incompatibleReturnType = resType; - if (returnType.tag == VOID) { + if (returnType.hasTag(VOID)) { incompatibleReturnType = null; } - if (returnType.tag != VOID && resType.tag != VOID) { + if (!returnType.hasTag(VOID) && !resType.hasTag(VOID)) { if (resType.isErroneous() || new LambdaReturnContext(checkContext).compatible(resType, returnType, Warner.noWarnings)) { incompatibleReturnType = null; @@ -2711,7 +2714,7 @@ public class Attr extends JCTree.Visitor { attribExpr(tree.index, env, syms.intType); if (types.isArray(atype)) owntype = types.elemtype(atype); - else if (atype.tag != ERROR) + else if (!atype.hasTag(ERROR)) log.error(tree.pos(), "array.req.but.found", atype); if ((pkind() & VAR) == 0) owntype = capture(owntype); result = check(tree, owntype, VAR, resultInfo); @@ -2721,7 +2724,7 @@ public class Attr extends JCTree.Visitor { Symbol sym; // Find symbol - if (pt().tag == METHOD || pt().tag == FORALL) { + if (pt().hasTag(METHOD) || pt().hasTag(FORALL)) { // If we are looking for a method, the prototype `pt' will be a // method type with the type of the call's arguments as parameters. env.info.pendingResolutionPhase = null; @@ -2811,9 +2814,9 @@ public class Attr extends JCTree.Visitor { // don't allow T.class T[].class, etc if (skind == TYP) { Type elt = site; - while (elt.tag == ARRAY) + while (elt.hasTag(ARRAY)) elt = ((ArrayType)elt).elemtype; - if (elt.tag == TYPEVAR) { + if (elt.hasTag(TYPEVAR)) { log.error(tree.pos(), "type.var.cant.be.deref"); result = types.createErrorType(tree.type); return; @@ -2839,8 +2842,8 @@ public class Attr extends JCTree.Visitor { boolean varArgs = env.info.lastResolveVarargs(); tree.sym = sym; - if (site.tag == TYPEVAR && !isType(sym) && sym.kind != ERR) { - while (site.tag == TYPEVAR) site = site.getUpperBound(); + if (site.hasTag(TYPEVAR) && !isType(sym) && sym.kind != ERR) { + while (site.hasTag(TYPEVAR)) site = site.getUpperBound(); site = capture(site); } @@ -2929,14 +2932,14 @@ public class Attr extends JCTree.Visitor { ResultInfo resultInfo) { DiagnosticPosition pos = tree.pos(); Name name = tree.name; - switch (site.tag) { + switch (site.getTag()) { case PACKAGE: return rs.accessBase( rs.findIdentInPackage(env, site.tsym, name, resultInfo.pkind), pos, location, site, name, true); case ARRAY: case CLASS: - if (resultInfo.pt.tag == METHOD || resultInfo.pt.tag == FORALL) { + if (resultInfo.pt.hasTag(METHOD) || resultInfo.pt.hasTag(FORALL)) { return rs.resolveQualifiedMethod( pos, env, location, site, name, resultInfo.pt.getParameterTypes(), resultInfo.pt.getTypeArguments()); } else if (name == names._this || name == names._super) { @@ -3029,7 +3032,7 @@ public class Attr extends JCTree.Visitor { Symbol sym, Env env, ResultInfo resultInfo) { - Type pt = resultInfo.pt.tag == FORALL || resultInfo.pt.tag == METHOD ? + Type pt = resultInfo.pt.hasTag(FORALL) || resultInfo.pt.hasTag(METHOD) ? resultInfo.pt.map(deferredAttr.new DeferredTypeMap(AttrMode.SPECULATIVE, sym, env.info.pendingResolutionPhase)) : resultInfo.pt; @@ -3046,7 +3049,8 @@ public class Attr extends JCTree.Visitor { // For types, the computed type equals the symbol's type, // except for two situations: owntype = sym.type; - if (owntype.tag == CLASS) { + if (owntype.hasTag(CLASS)) { + chk.checkForBadAuxiliaryClassAccess(tree.pos(), env, (ClassSymbol)sym); Type ownOuter = owntype.getEnclosingType(); // (a) If the symbol's type is parameterized, erase it @@ -3066,9 +3070,9 @@ public class Attr extends JCTree.Visitor { // // Then the type of the last expression above is // Tree.Visitor. - else if (ownOuter.tag == CLASS && site != ownOuter) { + else if (ownOuter.hasTag(CLASS) && site != ownOuter) { Type normOuter = site; - if (normOuter.tag == CLASS) + if (normOuter.hasTag(CLASS)) normOuter = types.asEnclosingSuper(site, ownOuter.tsym); if (normOuter == null) // perhaps from an import normOuter = types.erasure(ownOuter); @@ -3087,7 +3091,7 @@ public class Attr extends JCTree.Visitor { resultInfo.pkind == VAR && v.owner.kind == TYP && (v.flags() & STATIC) == 0 && - (site.tag == CLASS || site.tag == TYPEVAR)) { + (site.hasTag(CLASS) || site.hasTag(TYPEVAR))) { Type s = types.asOuterSuper(site, v.owner); if (s != null && s.isRaw() && @@ -3266,7 +3270,7 @@ public class Attr extends JCTree.Visitor { // an unchecked warning if its argument types change under erasure. if (allowGenerics && (sym.flags() & STATIC) == 0 && - (site.tag == CLASS || site.tag == TYPEVAR)) { + (site.hasTag(CLASS) || site.hasTag(TYPEVAR))) { Type s = types.asOuterSuper(site, sym.owner); if (s != null && s.isRaw() && !types.isSameTypes(sym.type.getParameterTypes(), @@ -3312,12 +3316,12 @@ public class Attr extends JCTree.Visitor { //where /** Return the type of a literal with given type tag. */ - Type litType(int tag) { - return (tag == TypeTags.CLASS) ? syms.stringType : syms.typeOfTag[tag]; + Type litType(TypeTag tag) { + return (tag == CLASS) ? syms.stringType : syms.typeOfTag[tag.ordinal()]; } public void visitTypeIdent(JCPrimitiveTypeTree tree) { - result = check(tree, syms.typeOfTag[tree.typetag], TYP, resultInfo); + result = check(tree, syms.typeOfTag[tree.typetag.ordinal()], TYP, resultInfo); } public void visitTypeArray(JCArrayTypeTree tree) { @@ -3339,7 +3343,7 @@ public class Attr extends JCTree.Visitor { // Attribute type parameters List actuals = attribTypes(tree.arguments, env); - if (clazztype.tag == CLASS) { + if (clazztype.hasTag(CLASS)) { List formals = clazztype.tsym.type.getTypeArguments(); if (actuals.isEmpty()) //diamond actuals = formals; @@ -3354,7 +3358,7 @@ public class Attr extends JCTree.Visitor { } // Compute the proper generic outer Type clazzOuter = clazztype.getEnclosingType(); - if (clazzOuter.tag == CLASS) { + if (clazzOuter.hasTag(CLASS)) { Type site; JCExpression clazz = TreeInfo.typeIn(tree.clazz); if (clazz.hasTag(IDENT)) { @@ -3362,8 +3366,8 @@ public class Attr extends JCTree.Visitor { } else if (clazz.hasTag(SELECT)) { site = ((JCFieldAccess) clazz).selected.type; } else throw new AssertionError(""+tree); - if (clazzOuter.tag == CLASS && site != clazzOuter) { - if (site.tag == CLASS) + if (clazzOuter.hasTag(CLASS) && site != clazzOuter) { + if (site.hasTag(CLASS)) site = types.asOuterSuper(site, clazzOuter.tsym); if (site == null) site = types.erasure(clazzOuter); @@ -3419,7 +3423,7 @@ public class Attr extends JCTree.Visitor { } } Type t = check(tree, types.lub(multicatchTypes.toList()), TYP, resultInfo); - if (t.tag == CLASS) { + if (t.hasTag(CLASS)) { List alternatives = ((all_multicatchTypes == null) ? multicatchTypes : all_multicatchTypes).toList(); t = new UnionClassType((ClassType) t, alternatives); @@ -3440,7 +3444,7 @@ public class Attr extends JCTree.Visitor { if (b.isErroneous()) { a.bound = b; } - else if (b.tag == TYPEVAR) { + else if (b.hasTag(TYPEVAR)) { // if first bound was a typevar, do not accept further bounds. if (tree.bounds.tail.nonEmpty()) { log.error(tree.bounds.tail.head.pos(), @@ -3456,7 +3460,7 @@ public class Attr extends JCTree.Visitor { Type i = checkBase(bs.head, bound, env, false, true, false); if (i.isErroneous()) a.bound = i; - else if (i.tag == CLASS) + else if (i.hasTag(CLASS)) chk.checkNotRepeated(bound.pos(), types.erasure(i), boundSet); } } @@ -3568,7 +3572,7 @@ public class Attr extends JCTree.Visitor { * @param c The class symbol whose definition will be attributed. */ void attribClass(ClassSymbol c) throws CompletionFailure { - if (c.type.tag == ERROR) return; + if (c.type.hasTag(ERROR)) return; // Check for cycles in the inheritance graph, which can arise from // ill-formed class files. @@ -3577,11 +3581,11 @@ public class Attr extends JCTree.Visitor { Type st = types.supertype(c.type); if ((c.flags_field & Flags.COMPOUND) == 0) { // First, attribute superclass. - if (st.tag == CLASS) + if (st.hasTag(CLASS)) attribClass((ClassSymbol)st.tsym); // Next attribute owner, if it is a class. - if (c.owner.kind == TYP && c.owner.type.tag == CLASS) + if (c.owner.kind == TYP && c.owner.type.hasTag(CLASS)) attribClass((ClassSymbol)c.owner); } @@ -3793,7 +3797,7 @@ public class Attr extends JCTree.Visitor { TreeInfo.diagnosticPositionFor(svuid, tree), "improper.SVUID", c); // check that it is long - else if (svuid.type.tag != TypeTags.LONG) + else if (!svuid.type.hasTag(LONG)) log.warning(LintCategory.SERIAL, TreeInfo.diagnosticPositionFor(svuid, tree), "long.SVUID", c); diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java index d1679293569..8e0d6aa7bdc 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java @@ -27,6 +27,7 @@ package com.sun.tools.javac.comp; import java.util.*; import java.util.Set; +import javax.tools.JavaFileManager; import com.sun.tools.javac.code.*; import com.sun.tools.javac.jvm.*; @@ -48,8 +49,8 @@ import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.code.Flags.ANNOTATION; import static com.sun.tools.javac.code.Flags.SYNCHRONIZED; import static com.sun.tools.javac.code.Kinds.*; -import static com.sun.tools.javac.code.TypeTags.*; -import static com.sun.tools.javac.code.TypeTags.WILDCARD; +import static com.sun.tools.javac.code.TypeTag.*; +import static com.sun.tools.javac.code.TypeTag.WILDCARD; import static com.sun.tools.javac.tree.JCTree.Tag.*; @@ -77,6 +78,7 @@ public class Check { private boolean suppressAbortOnBadClassFile; private boolean enableSunApiLintControl; private final TreeInfo treeinfo; + private final JavaFileManager fileManager; // 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 @@ -109,6 +111,7 @@ public class Check { Options options = Options.instance(context); lint = Lint.instance(context); treeinfo = TreeInfo.instance(context); + fileManager = context.get(JavaFileManager.class); Source source = Source.instance(context); allowGenerics = source.allowGenerics(); @@ -280,7 +283,7 @@ public class Check { Type typeTagError(DiagnosticPosition pos, Object required, Object found) { // this error used to be raised by the parser, // but has been delayed to this point: - if (found instanceof Type && ((Type)found).tag == VOID) { + if (found instanceof Type && ((Type)found).hasTag(VOID)) { log.error(pos, "illegal.start.of.type"); return syms.errType; } @@ -358,7 +361,7 @@ public class Check { for (Scope.Entry e = s.next.lookup(c.name); e.scope != null && e.sym.owner == c.owner; e = e.next()) { - if (e.sym.kind == TYP && e.sym.type.tag != TYPEVAR && + if (e.sym.kind == TYP && !e.sym.type.hasTag(TYPEVAR) && (e.sym.owner.kind & (VAR | MTH)) != 0 && c.name != names.error) { duplicateError(pos, e.sym); @@ -527,14 +530,14 @@ public class Check { } }); } - if (req.tag == ERROR) + if (req.hasTag(ERROR)) return req; - if (req.tag == NONE) + if (req.hasTag(NONE)) return found; if (checkContext.compatible(found, req, checkContext.checkWarner(pos, found, req))) { return found; } else { - if (found.tag <= DOUBLE && req.tag <= DOUBLE) { + if (found.getTag().isSubRangeOf(DOUBLE) && req.getTag().isSubRangeOf(DOUBLE)) { checkContext.report(pos, diags.fragment("possible.loss.of.precision", found, req)); return types.createErrorType(found); } @@ -594,7 +597,7 @@ public class Check { * type variables? */ boolean isTypeVar(Type t) { - return t.tag == TYPEVAR || t.tag == ARRAY && isTypeVar(types.elemtype(t)); + return t.hasTag(TYPEVAR) || t.hasTag(ARRAY) && isTypeVar(types.elemtype(t)); } /** Check that a type is within some bounds. @@ -607,7 +610,7 @@ public class Check { private boolean checkExtends(Type a, Type bound) { if (a.isUnbound()) { return true; - } else if (a.tag != WILDCARD) { + } else if (!a.hasTag(WILDCARD)) { a = types.upperBound(a); return types.isSubtype(a, bound); } else if (a.isExtendsBound()) { @@ -623,7 +626,7 @@ public class Check { * @param t The type to be checked. */ Type checkNonVoid(DiagnosticPosition pos, Type t) { - if (t.tag == VOID) { + if (t.hasTag(VOID)) { log.error(pos, "void.not.allowed.here"); return types.createErrorType(t); } else { @@ -636,10 +639,10 @@ public class Check { * @param t The type to be checked. */ Type checkClassType(DiagnosticPosition pos, Type t) { - if (t.tag != CLASS && t.tag != ERROR) + if (!t.hasTag(CLASS) && !t.hasTag(ERROR)) return typeTagError(pos, diags.fragment("type.req.class"), - (t.tag == TYPEVAR) + (t.hasTag(TYPEVAR)) ? diags.fragment("type.parameter", t) : t); else @@ -650,7 +653,7 @@ public class Check { */ Type checkConstructorRefType(DiagnosticPosition pos, Type t) { t = checkClassType(pos, t); - if (t.tag == CLASS) { + if (t.hasTag(CLASS)) { if ((t.tsym.flags() & (ABSTRACT | INTERFACE)) != 0) { log.error(pos, "abstract.cant.be.instantiated"); t = types.createErrorType(t); @@ -672,7 +675,7 @@ public class Check { if (noBounds && t.isParameterized()) { List args = t.getTypeArguments(); while (args.nonEmpty()) { - if (args.head.tag == WILDCARD) + if (args.head.hasTag(WILDCARD)) return typeTagError(pos, diags.fragment("type.req.exact"), args.head); @@ -687,7 +690,7 @@ public class Check { * @param t The type to be checked. */ Type checkReifiableReferenceType(DiagnosticPosition pos, Type t) { - if (t.tag != CLASS && t.tag != ARRAY && t.tag != ERROR) { + if (!t.hasTag(CLASS) && !t.hasTag(ARRAY) && !t.hasTag(ERROR)) { return typeTagError(pos, diags.fragment("type.req.class.array"), t); @@ -705,18 +708,12 @@ public class Check { * @param t The type to be checked. */ Type checkRefType(DiagnosticPosition pos, Type t) { - switch (t.tag) { - case CLASS: - case ARRAY: - case TYPEVAR: - case WILDCARD: - case ERROR: + if (t.isReference()) return t; - default: + else return typeTagError(pos, diags.fragment("type.req.ref"), t); - } } /** Check that each type is a reference type, i.e. a class, interface or array type @@ -738,19 +735,12 @@ public class Check { * @param t The type to be checked. */ Type checkNullOrRefType(DiagnosticPosition pos, Type t) { - switch (t.tag) { - case CLASS: - case ARRAY: - case TYPEVAR: - case WILDCARD: - case BOT: - case ERROR: + if (t.isNullOrReference()) return t; - default: + else return typeTagError(pos, diags.fragment("type.req.ref"), t); - } } /** Check that flag set does not contain elements of two conflicting sets. s @@ -1054,7 +1044,7 @@ public class Check { bounds = bounds_buf.toList(); for (Type arg : types.capture(type).getTypeArguments()) { - if (arg.tag == TYPEVAR && + if (arg.hasTag(TYPEVAR) && arg.getUpperBound().isErroneous() && !bounds.head.isErroneous() && !isTypeArgErroneous(args.head)) { @@ -1309,7 +1299,7 @@ public class Check { @Override public void visitTypeApply(JCTypeApply tree) { - if (tree.type.tag == CLASS) { + if (tree.type.hasTag(CLASS)) { List args = tree.arguments; List forms = tree.type.tsym.type.getTypeArguments(); @@ -1360,7 +1350,7 @@ public class Check { @Override public void visitSelect(JCFieldAccess tree) { - if (tree.type.tag == CLASS) { + if (tree.type.hasTag(CLASS)) { visitSelectInternal(tree); // Check that this type is either fully parameterized, or @@ -1409,7 +1399,7 @@ public class Check { void checkRaw(JCTree tree, Env env) { if (lint.isEnabled(LintCategory.RAW) && - tree.type.tag == CLASS && + tree.type.hasTag(CLASS) && !TreeInfo.isDiamond(tree) && !withinAnonConstr(env) && tree.type.isRaw()) { @@ -1511,9 +1501,9 @@ public class Check { */ boolean isUnchecked(Type exc) { return - (exc.tag == TYPEVAR) ? isUnchecked(types.supertype(exc)) : - (exc.tag == CLASS) ? isUnchecked((ClassSymbol)exc.tsym) : - exc.tag == BOT; + (exc.hasTag(TYPEVAR)) ? isUnchecked(types.supertype(exc)) : + (exc.hasTag(CLASS)) ? isUnchecked((ClassSymbol)exc.tsym) : + exc.hasTag(BOT); } /** Same, but handling completion failures. @@ -1759,7 +1749,7 @@ public class Check { // case, we will have dealt with when examining the supertype classes ClassSymbol mc = m.enclClass(); Type st = types.supertype(origin.type); - if (st.tag != CLASS) + if (!st.hasTag(CLASS)) return true; MethodSymbol stimpl = m.implementation((ClassSymbol)st.tsym, types, false); @@ -1782,7 +1772,7 @@ public class Check { */ public void checkCompatibleConcretes(DiagnosticPosition pos, Type site) { Type sup = types.supertype(site); - if (sup.tag != CLASS) return; + if (!sup.hasTag(CLASS)) return; for (Type t1 = sup; t1.tsym.type.isParameterized(); @@ -1803,7 +1793,7 @@ public class Check { if (st1 == s1.type) continue; for (Type t2 = sup; - t2.tag == CLASS; + t2.hasTag(CLASS); t2 = types.supertype(t2)) { for (Scope.Entry e2 = t2.tsym.members().lookup(s1.name); e2.scope != null; @@ -1876,7 +1866,7 @@ public class Check { /** Compute all the supertypes of t, indexed by type symbol. */ private void closure(Type t, Map typeMap) { - if (t.tag != CLASS) return; + if (!t.hasTag(CLASS)) return; if (typeMap.put(t.tsym, t) == null) { closure(types.supertype(t), typeMap); for (Type i : types.interfaces(t)) @@ -1886,7 +1876,7 @@ public class Check { /** Compute all the supertypes of t, indexed by type symbol (except thise in typesSkip). */ private void closure(Type t, Map typesSkip, Map typeMap) { - if (t.tag != CLASS) return; + if (!t.hasTag(CLASS)) return; if (typesSkip.get(t.tsym) != null) return; if (typeMap.put(t.tsym, t) == null) { closure(types.supertype(t), typesSkip, typeMap); @@ -1916,7 +1906,8 @@ public class Check { Type rt2 = types.subst(st2.getReturnType(), tvars2, tvars1); boolean compat = types.isSameType(rt1, rt2) || - rt1.tag >= CLASS && rt2.tag >= CLASS && + !rt1.isPrimitiveOrVoid() && + !rt2.isPrimitiveOrVoid() && (types.covariantReturnType(rt1, rt2, Warner.noWarnings) || types.covariantReturnType(rt2, rt1, Warner.noWarnings)) || checkCommonOverriderIn(s1,s2,site); @@ -1961,7 +1952,8 @@ public class Check { Type rt13 = types.subst(st3.getReturnType(), tvars3, tvars1); Type rt23 = types.subst(st3.getReturnType(), tvars3, tvars2); boolean compat = - rt13.tag >= CLASS && rt23.tag >= CLASS && + !rt13.isPrimitiveOrVoid() && + !rt23.isPrimitiveOrVoid() && (types.covariantReturnType(rt13, rt1, Warner.noWarnings) && types.covariantReturnType(rt23, rt2, Warner.noWarnings)); if (compat) @@ -1984,7 +1976,7 @@ public class Check { log.error(tree.pos(), "enum.no.finalize"); return; } - for (Type t = origin.type; t.tag == CLASS; + for (Type t = origin.type; t.hasTag(CLASS); t = types.supertype(t)) { if (t != origin.type) { checkOverride(tree, t, origin, m); @@ -2064,7 +2056,7 @@ public class Check { } if (undef == null) { Type st = types.supertype(c.type); - if (st.tag == CLASS) + if (st.hasTag(CLASS)) undef = firstUndef(impl, (ClassSymbol)st.tsym); } for (List l = types.interfaces(c.type); @@ -2155,7 +2147,7 @@ public class Check { } else if (!c.type.isErroneous()) { try { seenClasses = seenClasses.prepend(c); - if (c.type.tag == CLASS) { + if (c.type.hasTag(CLASS)) { if (supertypes.nonEmpty()) { scan(supertypes); } @@ -2200,13 +2192,13 @@ public class Check { private void checkNonCyclic1(DiagnosticPosition pos, Type t, List seen) { final TypeVar tv; - if (t.tag == TYPEVAR && (t.tsym.flags() & UNATTRIBUTED) != 0) + if (t.hasTag(TYPEVAR) && (t.tsym.flags() & UNATTRIBUTED) != 0) return; if (seen.contains(t)) { tv = (TypeVar)t; tv.bound = types.createErrorType(t); log.error(pos, "cyclic.inheritance", t); - } else if (t.tag == TYPEVAR) { + } else if (t.hasTag(TYPEVAR)) { tv = (TypeVar)t; seen = seen.prepend(tv); for (Type b : types.getBounds(tv)) @@ -2232,14 +2224,14 @@ public class Check { } else if (!c.type.isErroneous()) { try { c.flags_field |= LOCKED; - if (c.type.tag == CLASS) { + if (c.type.hasTag(CLASS)) { ClassType clazz = (ClassType)c.type; if (clazz.interfaces_field != null) for (List l=clazz.interfaces_field; l.nonEmpty(); l=l.tail) complete &= checkNonCyclicInternal(pos, l.head); if (clazz.supertype_field != null) { Type st = clazz.supertype_field; - if (st != null && st.tag == CLASS) + if (st != null && st.hasTag(CLASS)) complete &= checkNonCyclicInternal(pos, st); } if (c.owner.kind == TYP) @@ -2261,7 +2253,7 @@ public class Check { for (List l=types.interfaces(c.type); l.nonEmpty(); l=l.tail) l.head = types.createErrorType((ClassSymbol)l.head.tsym, Type.noType); Type st = types.supertype(c.type); - if (st.tag == CLASS) + if (st.hasTag(CLASS)) ((ClassType)c.type).supertype_field = types.createErrorType((ClassSymbol)st.tsym, Type.noType); c.type = types.createErrorType(c, c.type); c.flags_field |= ACYCLIC; @@ -2313,7 +2305,7 @@ public class Check { void checkCompatibleSupertypes(DiagnosticPosition pos, Type c) { List supertypes = types.interfaces(c); Type supertype = types.supertype(c); - if (supertype.tag == CLASS && + if (supertype.hasTag(CLASS) && (supertype.tsym.flags() & ABSTRACT) != 0) supertypes = supertypes.prepend(supertype); for (List l = supertypes; l.nonEmpty(); l = l.tail) { @@ -2542,7 +2534,7 @@ public class Check { * @jls 9.6 Annotation Types */ void validateAnnotationMethod(DiagnosticPosition pos, MethodSymbol m) { - for (Type sup = syms.annotationType; sup.tag == CLASS; sup = types.supertype(sup)) { + for (Type sup = syms.annotationType; sup.hasTag(CLASS); sup = types.supertype(sup)) { Scope s = sup.tsym.members(); for (Scope.Entry e = s.lookup(m.name); e.scope != null; e = e.next()) { if (e.sym.kind == MTH && @@ -2855,7 +2847,7 @@ public class Check { { if (s.kind == TYP || s.kind == VAR || (s.kind == MTH && !s.isConstructor() && - s.type.getReturnType().tag != VOID)) + !s.type.getReturnType().hasTag(VOID))) return true; } else @@ -3016,12 +3008,12 @@ public class Check { } void checkAnnotationResType(DiagnosticPosition pos, Type type) { - switch (type.tag) { - case TypeTags.CLASS: + switch (type.getTag()) { + case CLASS: if ((type.tsym.flags() & ANNOTATION) != 0) checkNonCyclicElementsInternal(pos, type.tsym); break; - case TypeTags.ARRAY: + case ARRAY: checkAnnotationResType(pos, types.elemtype(type)); break; default: @@ -3114,7 +3106,7 @@ public class Check { void checkDivZero(DiagnosticPosition pos, Symbol operator, Type operand) { if (operand.constValue() != null && lint.isEnabled(LintCategory.DIVZERO) - && operand.tag <= LONG + && (operand.getTag().isSubRangeOf(LONG)) && ((Number) (operand.constValue())).longValue() == 0) { int opc = ((OperatorSymbol)operator).opcode; if (opc == ByteCodes.idiv || opc == ByteCodes.imod @@ -3241,6 +3233,19 @@ public class Check { return true; } + /** Check that an auxiliary class is not accessed from any other file than its own. + */ + void checkForBadAuxiliaryClassAccess(DiagnosticPosition pos, Env env, ClassSymbol c) { + if (lint.isEnabled(Lint.LintCategory.AUXILIARYCLASS) && + (c.flags() & AUXILIARY) != 0 && + rs.isAccessible(env, c) && + !fileManager.isSameFile(c.sourcefile, env.toplevel.sourcefile)) + { + log.warning(pos, "auxiliary.class.accessed.from.outside.of.its.source.file", + c, c.sourcefile); + } + } + private class ConversionWarner extends Warner { final String uncheckedKey; final Type found; diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/ConstFold.java b/langtools/src/share/classes/com/sun/tools/javac/comp/ConstFold.java index cd017d4e5e6..a0f9ec1b04b 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/comp/ConstFold.java +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/ConstFold.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2006, 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 @@ -31,7 +31,8 @@ import com.sun.tools.javac.util.*; import com.sun.tools.javac.code.Type.*; -import static com.sun.tools.javac.code.TypeTags.*; +import static com.sun.tools.javac.code.TypeTag.BOOLEAN; + import static com.sun.tools.javac.jvm.ByteCodes.*; /** Helper class for constant folding, used by the attribution phase. @@ -176,19 +177,19 @@ strictfp class ConstFold { case imod: return syms.intType.constType(intValue(l) % intValue(r)); case iand: - return (left.tag == BOOLEAN + return (left.hasTag(BOOLEAN) ? syms.booleanType : syms.intType) .constType(intValue(l) & intValue(r)); case bool_and: return syms.booleanType.constType(b2i((intValue(l) & intValue(r)) != 0)); case ior: - return (left.tag == BOOLEAN + return (left.hasTag(BOOLEAN) ? syms.booleanType : syms.intType) .constType(intValue(l) | intValue(r)); case bool_or: return syms.booleanType.constType(b2i((intValue(l) | intValue(r)) != 0)); case ixor: - return (left.tag == BOOLEAN + return (left.hasTag(BOOLEAN) ? syms.booleanType : syms.intType) .constType(intValue(l) ^ intValue(r)); case ishl: case ishll: @@ -326,7 +327,7 @@ strictfp class ConstFold { /** Coerce constant type to target type. * @param etype The source type of the coercion, - * which is assumed to be a constant type compatble with + * which is assumed to be a constant type compatible with * ttype. * @param ttype The target type of the coercion. */ @@ -334,9 +335,9 @@ strictfp class ConstFold { // WAS if (etype.baseType() == ttype.baseType()) if (etype.tsym.type == ttype.tsym.type) return etype; - if (etype.tag <= DOUBLE) { + if (etype.isNumeric()) { Object n = etype.constValue(); - switch (ttype.tag) { + switch (ttype.getTag()) { case BYTE: return syms.byteType.constType(0 + (byte)intValue(n)); case CHAR: diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java b/langtools/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java index 2b6d0d72e51..d9ef24ffedc 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java @@ -44,7 +44,8 @@ import java.util.Queue; import java.util.Set; import java.util.WeakHashMap; -import static com.sun.tools.javac.code.TypeTags.*; +import static com.sun.tools.javac.code.TypeTag.DEFERRED; +import static com.sun.tools.javac.code.TypeTag.NONE; import static com.sun.tools.javac.tree.JCTree.Tag.*; /** @@ -203,7 +204,7 @@ public class DeferredAttr extends JCTree.Visitor { case SPECULATIVE: Assert.check(mode == null || (mode == AttrMode.SPECULATIVE && - speculativeType(deferredAttrContext.msym, deferredAttrContext.phase).tag == NONE)); + speculativeType(deferredAttrContext.msym, deferredAttrContext.phase).hasTag(NONE))); JCTree speculativeTree = attribSpeculative(tree, env, resultInfo); speculativeCache.put(deferredAttrContext.msym, speculativeTree, deferredAttrContext.phase); return speculativeTree.type; @@ -442,7 +443,7 @@ public class DeferredAttr extends JCTree.Visitor { @Override public Type apply(Type t) { - if (t.tag != DEFERRED) { + if (!t.hasTag(DEFERRED)) { return t.map(this); } else { DeferredType dt = (DeferredType)t; @@ -479,7 +480,7 @@ public class DeferredAttr extends JCTree.Visitor { @Override protected Type typeOf(DeferredType dt) { Type owntype = super.typeOf(dt); - return owntype.tag == NONE ? + return owntype.hasTag(NONE) ? recover(dt) : owntype; } @@ -516,7 +517,7 @@ public class DeferredAttr extends JCTree.Visitor { */ @SuppressWarnings("fallthrough") List stuckVars(JCTree tree, ResultInfo resultInfo) { - if (resultInfo.pt.tag == NONE || resultInfo.pt.isErroneous()) { + if (resultInfo.pt.hasTag(NONE) || resultInfo.pt.isErroneous()) { return List.nil(); } else { StuckChecker sc = new StuckChecker(resultInfo); diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java index 00534ce9c46..ccf7a82badd 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java @@ -49,7 +49,7 @@ import static com.sun.tools.javac.code.Kinds.*; * the symbol table. The pass consists of two phases, organized as * follows: * - *

In the first phase, all class symbols are intered into their + *

In the first phase, all class symbols are entered into their * enclosing scope, descending recursively down the tree for classes * which are members of other classes. The class symbols are given a * MemberEnter object as completer. diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java index e616097e4f0..3ea31c9b9e8 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java @@ -40,7 +40,8 @@ import com.sun.tools.javac.tree.JCTree.*; import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.code.Flags.BLOCK; import static com.sun.tools.javac.code.Kinds.*; -import static com.sun.tools.javac.code.TypeTags.*; +import static com.sun.tools.javac.code.TypeTag.BOOLEAN; +import static com.sun.tools.javac.code.TypeTag.VOID; import static com.sun.tools.javac.tree.JCTree.Tag.*; /** This pass implements dataflow analysis for Java programs though @@ -473,7 +474,7 @@ public class Flow { alive = true; scanStat(tree.body); - if (alive && tree.sym.type.getReturnType().tag != VOID) + if (alive && !tree.sym.type.getReturnType().hasTag(VOID)) log.error(TreeInfo.diagEndPos(tree.body), "missing.ret.stmt"); List exits = pendingExits.toList(); @@ -1976,8 +1977,8 @@ public class Flow { Bits uninitsBeforeElse = uninitsWhenFalse; inits = initsWhenTrue; uninits = uninitsWhenTrue; - if (tree.truepart.type.tag == BOOLEAN && - tree.falsepart.type.tag == BOOLEAN) { + if (tree.truepart.type.hasTag(BOOLEAN) && + tree.falsepart.type.hasTag(BOOLEAN)) { // if b and c are boolean valued, then // v is (un)assigned after a?b:c when true iff // v is (un)assigned after b when true and diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java index bfd3c4eefeb..31e7ade9185 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java @@ -42,7 +42,7 @@ import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; import java.util.HashMap; import java.util.Map; -import static com.sun.tools.javac.code.TypeTags.*; +import static com.sun.tools.javac.code.TypeTag.*; /** Helper class for type parameter inference, used by the attribution phase. * @@ -145,7 +145,7 @@ public class Infer { private Filter boundFilter = new Filter() { @Override public boolean accepts(Type t) { - return !t.isErroneous() && t.tag != BOT; + return !t.isErroneous() && !t.hasTag(BOT); } }; @@ -163,7 +163,7 @@ public class Infer { else { that.inst = types.lub(lobounds); } - if (that.inst == null || that.inst.tag == ERROR) + if (that.inst == null || that.inst.hasTag(ERROR)) throw inferenceException .setMessage("no.unique.minimal.instance.exists", that.qtype, lobounds); @@ -189,13 +189,13 @@ public class Infer { Attr.ResultInfo resultInfo, Warner warn) throws InferenceException { Type to = resultInfo.pt; - if (to.tag == NONE || resultInfo.checkContext.inferenceContext().free(resultInfo.pt)) { - to = mtype.getReturnType().tag <= VOID ? + if (to.hasTag(NONE) || resultInfo.checkContext.inferenceContext().free(resultInfo.pt)) { + to = mtype.getReturnType().isPrimitiveOrVoid() ? mtype.getReturnType() : syms.objectType; } Type qtype1 = inferenceContext.asFree(mtype.getReturnType(), types); if (!types.isSubtype(qtype1, - qtype1.tag == UNDETVAR ? types.boxedTypeOrType(to) : to)) { + qtype1.hasTag(UNDETVAR) ? types.boxedTypeOrType(to) : to)) { throw inferenceException .setMessage("infer.no.conforming.instance.exists", inferenceContext.restvars(), mtype.getReturnType(), to); @@ -515,7 +515,7 @@ public class Infer { //for remaining uninferred type-vars in the functional interface type, //simply replace the wildcards with its bound for (Type t : formalInterface.getTypeArguments()) { - if (actualTypeargs.head.tag == WILDCARD) { + if (actualTypeargs.head.hasTag(WILDCARD)) { WildcardType wt = (WildcardType)actualTypeargs.head; typeargs.append(wt.type); } else { @@ -592,7 +592,7 @@ public class Infer { public Type apply(Type t) { t = types.erasure(super.apply(t)); - if (t.tag == BOT) + if (t.hasTag(BOT)) // nulls type as the marker type Null (which has no instances) // infer as java.lang.Void for now t = types.boxedClass(syms.voidType).type; @@ -614,7 +614,7 @@ public class Infer { } public Type apply(Type t) { - if (t.tag == TYPEVAR) return new UndetVar((TypeVar)t, types, includeBounds); + if (t.hasTag(TYPEVAR)) return new UndetVar((TypeVar)t, types, includeBounds); else return t.map(this); } }; diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/langtools/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java new file mode 100644 index 00000000000..faf421af560 --- /dev/null +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java @@ -0,0 +1,1398 @@ +/* + * Copyright (c) 2010, 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.comp; + +import com.sun.tools.javac.tree.*; +import com.sun.tools.javac.tree.JCTree; +import com.sun.tools.javac.tree.JCTree.*; +import com.sun.tools.javac.tree.JCTree.JCMemberReference.ReferenceKind; +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.Symbol; +import com.sun.tools.javac.code.Symbol.ClassSymbol; +import com.sun.tools.javac.code.Symbol.DynamicMethodSymbol; +import com.sun.tools.javac.code.Symbol.MethodSymbol; +import com.sun.tools.javac.code.Symbol.VarSymbol; +import com.sun.tools.javac.code.Symtab; +import com.sun.tools.javac.code.Type; +import com.sun.tools.javac.code.Type.ClassType; +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.jvm.*; +import com.sun.tools.javac.util.*; +import com.sun.tools.javac.util.List; +import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; +import com.sun.source.tree.MemberReferenceTree.ReferenceMode; + +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; + +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.tree.JCTree.Tag.*; + +/** + * This pass desugars lambda expressions into static methods + * + *

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. + */ +public class LambdaToMethod extends TreeTranslator { + + private Names names; + private Symtab syms; + private Resolve rs; + private TreeMaker make; + private Types types; + private TransTypes transTypes; + private Env attrEnv; + + /** the analyzer scanner */ + private LambdaAnalyzer analyzer; + + /** map from lambda trees to translation contexts */ + private Map> contextMap; + + /** current translation context (visitor argument) */ + private TranslationContext context; + + /** list of translated methods + **/ + private ListBuffer translatedMethodList; + + // + private static final Context.Key unlambdaKey = + new Context.Key(); + + public static LambdaToMethod instance(Context context) { + LambdaToMethod instance = context.get(unlambdaKey); + if (instance == null) { + instance = new LambdaToMethod(context); + } + return instance; + } + + private LambdaToMethod(Context 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(); + } + // + + // + @Override + public T translate(T tree) { + TranslationContext newContext = contextMap.get(tree); + return translate(tree, newContext != null ? newContext : context); + } + + public T translate(T tree, TranslationContext newContext) { + TranslationContext prevContext = context; + try { + context = newContext; + return super.translate(tree); + } + finally { + context = prevContext; + } + } + + public List translate(List trees, TranslationContext newContext) { + ListBuffer buf = ListBuffer.lb(); + for (T tree : trees) { + buf.append(translate(tree, newContext)); + } + return buf.toList(); + } + + public JCTree translateTopLevelClass(Env env, JCTree cdef, TreeMaker make) { + this.make = make; + this.attrEnv = env; + this.context = null; + this.contextMap = new HashMap>(); + return translate(cdef); + } + // + + // + /** + * Visit a class. + * Maintain the translatedMethodList across nested classes. + * Append the translatedMethodList to the class after it is translated. + * @param tree + */ + @Override + public void visitClassDef(JCClassDecl tree) { + if (tree.sym.owner.kind == PCK) { + //analyze class + analyzer.analyzeClass(tree); + } + ListBuffer prevTranslated = translatedMethodList; + try { + translatedMethodList = ListBuffer.lb(); + super.visitClassDef(tree); + //add all translated instance methods here + tree.defs = tree.defs.appendList(translatedMethodList.toList()); + for (JCTree lambda : translatedMethodList) { + tree.sym.members().enter(((JCMethodDecl)lambda).sym); + } + result = tree; + } finally { + translatedMethodList = prevTranslated; + } + } + + /** + * Translate a lambda into a method to be inserted into the class. + * Then replace the lambda site with an invokedynamic call of to lambda + * meta-factory, which will use the lambda method. + * @param tree + */ + @Override + public void visitLambda(JCLambda tree) { + LambdaTranslationContext localContext = (LambdaTranslationContext)context; + MethodSymbol sym = (MethodSymbol)localContext.translatedSym; + MethodType lambdaType = (MethodType) sym.type; + + //create the method declaration hoisting the lambda body + JCMethodDecl lambdaDecl = make.MethodDef(make.Modifiers(sym.flags_field), + sym.name, + make.QualIdent(lambdaType.getReturnType().tsym), + List.nil(), + localContext.syntheticParams, + lambdaType.getThrownTypes() == null ? + List.nil() : + make.Types(lambdaType.getThrownTypes()), + null, + null); + lambdaDecl.sym = sym; + lambdaDecl.type = lambdaType; + + //translate lambda body + //As the lambda body is translated, all references to lambda locals, + //captured variables, enclosing members are adjusted accordingly + //to refer to the static method parameters (rather than i.e. acessing to + //captured members directly). + lambdaDecl.body = translate(makeLambdaBody(tree, lambdaDecl)); + + //Add the method to the list of methods to be added to this class. + translatedMethodList = translatedMethodList.prepend(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 + //created method. + // + //Note that we need to adjust the method handle so that it will match the + //signature of the SAM descriptor - this means that the method reference + //should be added the following synthetic arguments: + // + // * the "this" argument if it is an instance method + // * enclosing locals captured by the lambda expression + + ListBuffer syntheticInits = ListBuffer.lb(); + + if (!sym.isStatic()) { + syntheticInits.append(makeThis( + sym.owner.asType(), + localContext.owner.enclClass())); + } + + //add captured locals + for (Symbol fv : localContext.getSymbolMap(CAPTURED_VAR).keySet()) { + if (fv != localContext.self) { + JCTree captured_local = make.Ident(fv).setType(fv.type); + syntheticInits.append((JCExpression) captured_local); + } + } + + //then, determine the arguments to the indy call + List indy_args = translate(syntheticInits.toList(), localContext.prev); + + //build a sam instance using an indy call to the meta-factory + int refKind = referenceKind(sym); + + //convert to an invokedynamic call + result = makeMetaFactoryIndyCall(tree, tree.targetType, refKind, sym, indy_args); + } + + private JCIdent makeThis(Type type, Symbol owner) { + VarSymbol _this = new VarSymbol(PARAMETER | FINAL | SYNTHETIC, + names._this, + type, + owner); + return make.Ident(_this); + } + + /** + * Translate a method reference into an invokedynamic call to the + * meta-factory. + * @param tree + */ + @Override + public void visitReference(JCMemberReference tree) { + ReferenceTranslationContext localContext = (ReferenceTranslationContext)context; + + //first determine the method symbol to be used to generate the sam instance + //this is either the method reference symbol, or the bridged reference symbol + Symbol refSym = localContext.needsBridge() ? + localContext.bridgeSym : + tree.sym; + + //build the bridge method, if needed + if (localContext.needsBridge()) { + bridgeMemberReference(tree, localContext); + } + + //the qualifying expression is treated as a special captured arg + JCExpression init; + switch(tree.kind) { + + case IMPLICIT_INNER: /** Inner # new */ + case SUPER: /** super # instMethod */ + init = makeThis( + localContext.owner.owner.asType(), + localContext.owner); + break; + + case BOUND: /** Expr # instMethod */ + init = tree.getQualifierExpression(); + break; + + case STATIC_EVAL: /** Expr # staticMethod */ + case UNBOUND: /** Type # instMethod */ + case STATIC: /** Type # staticMethod */ + case TOPLEVEL: /** Top level # new */ + init = null; + break; + + default: + throw new InternalError("Should not have an invalid kind"); + } + + List indy_args = init==null? List.nil() : translate(List.of(init), localContext.prev); + + + //build a sam instance using an indy call to the meta-factory + result = makeMetaFactoryIndyCall(tree, tree.targetType, localContext.referenceKind(), refSym, indy_args); + + //if we had a static reference with non-static qualifier, add a let + //expression to force the evaluation of the qualifier expr + if (tree.hasKind(ReferenceKind.STATIC_EVAL)) { + VarSymbol rec = new VarSymbol(0, names.fromString("rec$"), tree.getQualifierExpression().type, localContext.owner); + JCVariableDecl recDef = make.VarDef(rec, tree.getQualifierExpression()); + result = make.LetExpr(recDef, result).setType(tree.type); + } + } + + /** + * Translate identifiers within a lambda to the mapped identifier + * @param tree + */ + @Override + public void visitIdent(JCIdent tree) { + if (context == null || !analyzer.lambdaIdentSymbolFilter(tree.sym)) { + super.visitIdent(tree); + } else { + LambdaTranslationContext lambdaContext = (LambdaTranslationContext) context; + if (lambdaContext.getSymbolMap(PARAM).containsKey(tree.sym)) { + Symbol translatedSym = lambdaContext.getSymbolMap(PARAM).get(tree.sym); + result = make.Ident(translatedSym).setType(tree.type); + } 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(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 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); + } + } + } + + @Override + public void visitVarDef(JCVariableDecl tree) { + LambdaTranslationContext lambdaContext = (LambdaTranslationContext)context; + 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 { + super.visitVarDef(tree); + } + } + + // + + // + + private JCBlock makeLambdaBody(JCLambda tree, JCMethodDecl lambdaMethodDecl) { + return tree.getBodyKind() == JCLambda.BodyKind.EXPRESSION ? + makeLambdaExpressionBody((JCExpression)tree.body, lambdaMethodDecl) : + makeLambdaStatementBody((JCBlock)tree.body, lambdaMethodDecl, tree.canCompleteNormally); + } + + private JCBlock makeLambdaExpressionBody(JCExpression expr, JCMethodDecl lambdaMethodDecl) { + Type restype = lambdaMethodDecl.type.getReturnType(); + boolean isLambda_void = expr.type.hasTag(VOID); + boolean isTarget_void = restype.hasTag(VOID); + boolean isTarget_Void = types.isSameType(restype, types.boxedClass(syms.voidType).type); + if (isTarget_void) { + //target is void: + // BODY; + JCStatement stat = make.Exec(expr); + return make.Block(0, List.of(stat)); + } else if (isLambda_void && isTarget_Void) { + //void to Void conversion: + // BODY; return null; + ListBuffer stats = ListBuffer.lb(); + stats.append(make.Exec(expr)); + stats.append(make.Return(make.Literal(BOT, null).setType(syms.botType))); + return make.Block(0, stats.toList()); + } else { + //non-void to non-void conversion: + // return (TYPE)BODY; + JCExpression retExpr = transTypes.coerce(attrEnv, expr, restype); + return make.Block(0, List.of(make.Return(retExpr))); + } + } + + private JCBlock makeLambdaStatementBody(JCBlock block, final JCMethodDecl lambdaMethodDecl, boolean completeNormally) { + final Type restype = lambdaMethodDecl.type.getReturnType(); + final boolean isTarget_void = restype.hasTag(VOID); + boolean isTarget_Void = types.isSameType(restype, types.boxedClass(syms.voidType).type); + + class LambdaBodyTranslator extends TreeTranslator { + + @Override + public void visitClassDef(JCClassDecl tree) { + //do NOT recurse on any inner classes + result = tree; + } + + @Override + public void visitLambda(JCLambda tree) { + //do NOT recurse on any nested lambdas + result = tree; + } + + @Override + public void visitReturn(JCReturn tree) { + boolean isLambda_void = tree.expr == null; + if (isTarget_void && !isLambda_void) { + //Void to void conversion: + // { TYPE $loc = RET-EXPR; return; } + VarSymbol loc = makeSyntheticVar(0, names.fromString("$loc"), tree.expr.type, lambdaMethodDecl.sym); + JCVariableDecl varDef = make.VarDef(loc, tree.expr); + result = make.Block(0, List.of(varDef, make.Return(null))); + } else if (!isTarget_void || !isLambda_void) { + //non-void to non-void conversion: + // return (TYPE)RET-EXPR; + tree.expr = transTypes.coerce(attrEnv, tree.expr, restype); + result = tree; + } else { + result = tree; + } + + } + } + + JCBlock trans_block = new LambdaBodyTranslator().translate(block); + if (completeNormally && isTarget_Void) { + //there's no return statement and the lambda (possibly inferred) + //return type is java.lang.Void; emit a synthetic return statement + trans_block.stats = trans_block.stats.append(make.Return(make.Literal(BOT, null).setType(syms.botType))); + } + return trans_block; + } + + /** + * Create new synthetic method with given flags, name, type, owner + */ + private MethodSymbol makeSyntheticMethod(long flags, Name name, Type type, Symbol owner) { + return new MethodSymbol(flags | SYNTHETIC, name, type, owner); + } + + /** + * Create new synthetic variable with given flags, name, type, owner + */ + private VarSymbol makeSyntheticVar(long flags, String name, Type type, Symbol owner) { + return makeSyntheticVar(flags, names.fromString(name), type, owner); + } + + /** + * Create new synthetic variable with given flags, name, type, owner + */ + private VarSymbol makeSyntheticVar(long flags, Name name, Type type, Symbol owner) { + return new VarSymbol(flags | SYNTHETIC, name, type, owner); + } + + /** + * Set varargsElement field on a given tree (must be either a new class tree + * or a method call tree) + */ + private void setVarargsIfNeeded(JCTree tree, Type varargsElement) { + if (varargsElement != null) { + switch (tree.getTag()) { + case APPLY: ((JCMethodInvocation)tree).varargsElement = varargsElement; break; + case NEWCLASS: ((JCNewClass)tree).varargsElement = varargsElement; break; + default: throw new AssertionError(); + } + } + } + + /** + * Convert method/constructor arguments by inserting appropriate cast + * as required by type-erasure - this is needed when bridging a lambda/method + * reference, as the bridged signature might require downcast to be compatible + * with the generated signature. + */ + private List convertArgs(Symbol meth, List args, Type varargsElement) { + Assert.check(meth.kind == Kinds.MTH); + List formals = types.erasure(meth.type).getParameterTypes(); + if (varargsElement != null) { + Assert.check((meth.flags() & VARARGS) != 0); + } + return transTypes.translateArgs(args, formals, varargsElement, attrEnv); + } + + // + + private MethodSymbol makeSamDescriptor(Type targetType) { + return (MethodSymbol)types.findDescriptorSymbol(targetType.tsym); + } + + private Type makeFunctionalDescriptorType(Type targetType, MethodSymbol samDescriptor, boolean erased) { + Type descType = types.memberType(targetType, samDescriptor); + return erased ? types.erasure(descType) : descType; + } + + private Type makeFunctionalDescriptorType(Type targetType, boolean erased) { + return makeFunctionalDescriptorType(targetType, makeSamDescriptor(targetType), erased); + } + + /** + * Generate an adapter method "bridge" for a method reference which cannot + * be used directly. + */ + private class MemberReferenceBridger { + + private final JCMemberReference tree; + private final ReferenceTranslationContext localContext; + private final ListBuffer args = ListBuffer.lb(); + private final ListBuffer params = ListBuffer.lb(); + + MemberReferenceBridger(JCMemberReference tree, ReferenceTranslationContext localContext) { + this.tree = tree; + this.localContext = localContext; + } + + /** + * Generate the bridge + */ + JCMethodDecl bridge() { + int prevPos = make.pos; + try { + make.at(tree); + Type samDesc = localContext.bridgedRefSig(); + List samPTypes = samDesc.getParameterTypes(); + + //an extra argument is prepended to the signature of the bridge in case + //the member reference is an instance method reference (in which case + //the receiver expression is passed to the bridge itself). + Type recType = null; + switch (tree.kind) { + case IMPLICIT_INNER: + recType = tree.sym.owner.type.getEnclosingType(); + break; + case BOUND: + recType = tree.getQualifierExpression().type; + break; + case UNBOUND: + recType = samPTypes.head; + samPTypes = samPTypes.tail; + break; + } + + //generate the parameter list for the bridged member reference - the + //bridge signature will match the signature of the target sam descriptor + + VarSymbol rcvr = (recType == null) + ? null + : addParameter("rec$", recType, false); + + List 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 + + List l = refPTypes; + // Use parameter types of the referenced method, excluding final var args + for (int i = 0; l.nonEmpty() && i < last; ++i) { + addParameter("x$" + i, l.head, true); + l = l.tail; + } + // Flatten out the var args + for (int i = last; i < samSize; ++i) { + addParameter("xva$" + i, tree.varargsElement, true); + } + + //generate the bridge method declaration + JCMethodDecl bridgeDecl = make.MethodDef(make.Modifiers(localContext.bridgeSym.flags()), + localContext.bridgeSym.name, + make.QualIdent(samDesc.getReturnType().tsym), + List.nil(), + params.toList(), + tree.sym.type.getThrownTypes() == null + ? List.nil() + : make.Types(tree.sym.type.getThrownTypes()), + null, + null); + bridgeDecl.sym = (MethodSymbol) localContext.bridgeSym; + 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) + : bridgeExpressionNew(); + + //the body is either a return expression containing a method call, + //or the method call itself, depending on whether the return type of + //the bridge is non-void/void. + bridgeDecl.body = makeLambdaExpressionBody(bridgeExpr, bridgeDecl); + + return bridgeDecl; + } finally { + make.at(prevPos); + } + } + + /** + * determine the receiver of the bridged method call - the receiver can + * be either the synthetic receiver parameter or a type qualifier; the + * 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) { + JCExpression qualifier = + tree.sym.isStatic() ? + make.Type(tree.sym.owner.type) : + (rcvr != null) ? + make.Ident(rcvr) : + tree.getQualifierExpression(); + + //create the qualifier expression + JCFieldAccess select = make.Select(qualifier, tree.sym.name); + select.sym = tree.sym; + select.type = tree.sym.erasure(types); + + //create the method call expression + JCExpression apply = make.Apply(List.nil(), select, + convertArgs(tree.sym, args.toList(), tree.varargsElement)).setType(tree.sym.erasure(types).getReturnType()); + + apply = transTypes.coerce(apply, localContext.generatedRefSig().getReturnType()); + setVarargsIfNeeded(apply, tree.varargsElement); + return apply; + } + + /** + * the enclosing expression is either 'null' (no enclosing type) or set + * to the first bridge synthetic parameter + */ + private JCExpression bridgeExpressionNew() { + JCExpression encl = null; + switch (tree.kind) { + case UNBOUND: + case IMPLICIT_INNER: + encl = make.Ident(params.first()); + } + + //create the instance creation expression + JCNewClass newClass = make.NewClass(encl, + List.nil(), + make.Type(tree.getQualifierExpression().type), + convertArgs(tree.sym, args.toList(), tree.varargsElement), + null); + newClass.constructor = tree.sym; + newClass.constructorType = tree.sym.erasure(types); + newClass.type = tree.getQualifierExpression().type; + setVarargsIfNeeded(newClass, tree.varargsElement); + return newClass; + } + + private VarSymbol addParameter(String name, Type p, boolean genArg) { + VarSymbol vsym = new VarSymbol(0, names.fromString(name), p, localContext.bridgeSym); + params.append(make.VarDef(vsym, null)); + if (genArg) { + args.append(make.Ident(vsym)); + } + return vsym; + } + } + + /** + * Bridges a member reference - this is needed when: + * * Var args in the referenced method need to be flattened away + * * super is used + */ + private void bridgeMemberReference(JCMemberReference tree, ReferenceTranslationContext localContext) { + JCMethodDecl bridgeDecl = (new MemberReferenceBridger(tree, localContext).bridge()); + translatedMethodList = translatedMethodList.prepend(bridgeDecl); + } + + /** + * Generate an indy method call to the meta factory + */ + private JCExpression makeMetaFactoryIndyCall(JCExpression tree, Type targetType, int refKind, Symbol refSym, List indy_args) { + //determine the static bsm args + Type mtype = makeFunctionalDescriptorType(targetType, true); + List staticArgs = List.of( + new Pool.MethodHandle(ClassFile.REF_invokeInterface, types.findDescriptorSymbol(targetType.tsym)), + new Pool.MethodHandle(refKind, refSym), + new MethodType(mtype.getParameterTypes(), + mtype.getReturnType(), + mtype.getThrownTypes(), + syms.methodClass)); + + //computed indy arg types + ListBuffer indy_args_types = ListBuffer.lb(); + for (JCExpression arg : indy_args) { + indy_args_types.append(arg.type); + } + + //finally, compute the type of the indy call + MethodType indyType = new MethodType(indy_args_types.toList(), + tree.type, + List.nil(), + syms.methodClass); + + return makeIndyCall(tree, syms.lambdaMetafactory, names.metaFactory, 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 staticArgs, MethodType indyType, List indyArgs) { + int prevPos = make.pos; + try { + make.at(pos); + List bsm_staticArgs = List.of(syms.methodHandleLookupType, + syms.stringType, + syms.methodTypeType).appendList(bsmStaticArgToTypes(staticArgs)); + + Symbol bsm = rs.resolveInternalMethod(pos, attrEnv, site, + bsmName, bsm_staticArgs, List.nil()); + + DynamicMethodSymbol dynSym = + new DynamicMethodSymbol(names.lambda, + syms.noSymbol, + bsm.isStatic() ? ClassFile.REF_invokeStatic : ClassFile.REF_invokeVirtual, + (MethodSymbol)bsm, + indyType, + staticArgs.toArray()); + + JCFieldAccess qualifier = make.Select(make.QualIdent(site.tsym), bsmName); + qualifier.sym = dynSym; + qualifier.type = indyType.getReturnType(); + + JCMethodInvocation proxyCall = make.Apply(List.nil(), qualifier, indyArgs); + proxyCall.type = indyType.getReturnType(); + return proxyCall; + } finally { + make.at(prevPos); + } + } + //where + private List bsmStaticArgToTypes(List args) { + ListBuffer argtypes = ListBuffer.lb(); + for (Object arg : args) { + argtypes.append(bsmStaticArgToType(arg)); + } + return argtypes.toList(); + } + + private Type bsmStaticArgToType(Object arg) { + Assert.checkNonNull(arg); + if (arg instanceof ClassSymbol) { + return syms.classType; + } else if (arg instanceof Integer) { + return syms.intType; + } else if (arg instanceof Long) { + return syms.longType; + } else if (arg instanceof Float) { + return syms.floatType; + } else if (arg instanceof Double) { + return syms.doubleType; + } else if (arg instanceof String) { + return syms.stringType; + } else if (arg instanceof Pool.MethodHandle) { + return syms.methodHandleType; + } else if (arg instanceof MethodType) { + return syms.methodTypeType; + } else { + Assert.error("bad static arg " + arg.getClass()); + return null; + } + } + + /** + * Get the opcode associated with this method reference + */ + private int referenceKind(Symbol refSym) { + if (refSym.isConstructor()) { + return ClassFile.REF_newInvokeSpecial; + } else { + if (refSym.isStatic()) { + return ClassFile.REF_invokeStatic; + } else if (refSym.enclClass().isInterface()) { + return ClassFile.REF_invokeInterface; + } else { + return ClassFile.REF_invokeVirtual; + } + } + } + // + + // \ + /** + * This visitor collects information about translation of a lambda expression. + * More specifically, it keeps track of the enclosing contexts and captured locals + * accessed by the lambda being translated (as well as other useful info). + */ + class LambdaAnalyzer extends TreeScanner { + + /** the frame stack - used to reconstruct translation info about enclosing scopes */ + private List frameStack; + + /** + * keep the count of lambda expression (used to generate unambiguous + * names) + */ + private int lambdaCount = 0; + + private void analyzeClass(JCClassDecl tree) { + frameStack = List.nil(); + scan(tree); + } + + @Override + public void visitBlock(JCBlock tree) { + List prevStack = frameStack; + try { + if (frameStack.nonEmpty() && frameStack.head.tree.hasTag(CLASSDEF)) { + frameStack = frameStack.prepend(new Frame(tree)); + } + super.visitBlock(tree); + } + finally { + frameStack = prevStack; + } + } + + @Override + public void visitClassDef(JCClassDecl tree) { + List prevStack = frameStack; + try { + if (frameStack.nonEmpty() && enclosingLambda() != 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); + } + } + frameStack = frameStack.prepend(new Frame(tree)); + super.visitClassDef(tree); + } + finally { + frameStack = prevStack; + } + if (frameStack.nonEmpty() && enclosingLambda() != null) { + // Any 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); + } + } + + @Override + public void visitIdent(JCIdent tree) { + if (context() == null || !lambdaIdentSymbolFilter(tree.sym)) { + super.visitIdent(tree); + } else { + if (tree.sym.kind == VAR && + tree.sym.owner.kind == MTH && + tree.type.constValue() == null) { + TranslationContext localContext = context(); + while (localContext != null) { + if (localContext.tree.getTag() == LAMBDA) { + JCTree block = capturedDecl(localContext.depth, tree.sym); + if (block == null) break; + ((LambdaTranslationContext)localContext).addSymbol(tree.sym, CAPTURED_VAR); + } + localContext = localContext.prev; + } + } else if (tree.sym.owner.kind == TYP) { + TranslationContext localContext = context(); + while (localContext != null) { + if (localContext.tree.hasTag(LAMBDA)) { + JCTree block = capturedDecl(localContext.depth, tree.sym); + if (block == null) break; + switch (block.getTag()) { + case CLASSDEF: + JCClassDecl cdecl = (JCClassDecl)block; + ((LambdaTranslationContext)localContext).addSymbol(cdecl.sym, CAPTURED_THIS); + break; + default: + Assert.error("bad block kind"); + } + } + localContext = localContext.prev; + } + } + } + } + + @Override + public void visitLambda(JCLambda tree) { + List prevStack = frameStack; + try { + LambdaTranslationContext context = (LambdaTranslationContext)makeLambdaContext(tree); + frameStack = frameStack.prepend(new Frame(tree)); + for (JCVariableDecl param : tree.params) { + context.addSymbol(param.sym, PARAM); + frameStack.head.addLocal(param.sym); + } + contextMap.put(tree, context); + scan(tree.body); + context.complete(); + } + finally { + frameStack = prevStack; + } + } + + @Override + public void visitMethodDef(JCMethodDecl tree) { + List prevStack = frameStack; + try { + frameStack = frameStack.prepend(new Frame(tree)); + super.visitMethodDef(tree); + } + finally { + frameStack = prevStack; + } + } + + @Override + public void visitNewClass(JCNewClass tree) { + if (lambdaNewClassFilter(context(), tree)) { + ((LambdaTranslationContext) context()).addSymbol(tree.type.getEnclosingType().tsym, CAPTURED_THIS); + } + super.visitNewClass(tree); + } + + @Override + public void visitReference(JCMemberReference tree) { + scan(tree.getQualifierExpression()); + contextMap.put(tree, makeReferenceContext(tree)); + } + + @Override + public void visitSelect(JCFieldAccess tree) { + if (context() != null && lambdaSelectSymbolFilter(tree.sym)) { + TranslationContext localContext = context(); + while (localContext != null) { + if (localContext.tree.hasTag(LAMBDA)) { + JCClassDecl clazz = (JCClassDecl)capturedDecl(localContext.depth, tree.sym); + if (clazz == null) break; + ((LambdaTranslationContext)localContext).addSymbol(clazz.sym, CAPTURED_THIS); + } + localContext = localContext.prev; + } + scan(tree.selected); + } else { + super.visitSelect(tree); + } + } + + @Override + public void visitVarDef(JCVariableDecl tree) { + if (frameStack.head.tree.hasTag(LAMBDA)) { + ((LambdaTranslationContext)context()).addSymbol(tree.sym, LOCAL_VAR); + } + List prevStack = frameStack; + try { + if (tree.sym.owner.kind == MTH) { + frameStack.head.addLocal(tree.sym); + } + frameStack = frameStack.prepend(new Frame(tree)); + super.visitVarDef(tree); + } + finally { + frameStack = prevStack; + } + } + + private Name lambdaName() { + return names.lambda.append(names.fromString("$" + lambdaCount++)); + } + + /** + * Return a valid owner given the current declaration stack + * (required to skip synthetic lambda symbols) + */ + private Symbol owner() { + List frameStack2 = frameStack; + while (frameStack2.nonEmpty()) { + switch (frameStack2.head.tree.getTag()) { + case VARDEF: + if (((JCVariableDecl)frameStack2.head.tree).sym.isLocal()) { + frameStack2 = frameStack2.tail; + break; + } + JCClassDecl cdecl = (JCClassDecl)frameStack2.tail.head.tree; + return makeSyntheticMethod(((JCVariableDecl)frameStack2.head.tree).sym.flags() & STATIC, names.empty, null, cdecl.sym); + case BLOCK: + JCClassDecl cdecl2 = (JCClassDecl)frameStack2.tail.head.tree; + return makeSyntheticMethod(((JCBlock)frameStack2.head.tree).flags & STATIC | Flags.BLOCK, names.empty, null, cdecl2.sym); + case CLASSDEF: + return ((JCClassDecl)frameStack2.head.tree).sym; + case METHODDEF: + return ((JCMethodDecl)frameStack2.head.tree).sym; + case LAMBDA: + return ((LambdaTranslationContext)contextMap.get(frameStack2.head.tree)).translatedSym; + default: + frameStack2 = frameStack2.tail; + } + } + Assert.error(); + return null; + } + + private JCTree enclosingLambda() { + List frameStack2 = frameStack; + while (frameStack2.nonEmpty()) { + switch (frameStack2.head.tree.getTag()) { + case CLASSDEF: + case METHODDEF: + return null; + case LAMBDA: + return frameStack2.head.tree; + default: + frameStack2 = frameStack2.tail; + } + } + Assert.error(); + return null; + } + + /** + * Return the declaration corresponding to a symbol in the enclosing + * scope; the depth parameter is used to filter out symbols defined + * in nested scopes (which do not need to undergo capture). + */ + private JCTree capturedDecl(int depth, Symbol sym) { + int currentDepth = frameStack.size() - 1; + for (Frame block : frameStack) { + switch (block.tree.getTag()) { + case CLASSDEF: + ClassSymbol clazz = ((JCClassDecl)block.tree).sym; + if (sym.isMemberOf(clazz, types)) { + return currentDepth > depth ? null : block.tree; + } + break; + case VARDEF: + if (((JCVariableDecl)block.tree).sym == sym && + sym.owner.kind == MTH) { //only locals are captured + return currentDepth > depth ? null : block.tree; + } + break; + case BLOCK: + case METHODDEF: + case LAMBDA: + if (block.locals != null && block.locals.contains(sym)) { + return currentDepth > depth ? null : block.tree; + } + break; + default: + Assert.error("bad decl kind " + block.tree.getTag()); + } + currentDepth--; + } + return null; + } + + private TranslationContext context() { + for (Frame frame : frameStack) { + TranslationContext context = contextMap.get(frame.tree); + if (context != null) { + return context; + } + } + return null; + } + + /** + * This is used to filter out those identifiers that needs to be adjusted + * when translating away lambda expressions + */ + private boolean lambdaIdentSymbolFilter(Symbol sym) { + return (sym.kind == VAR || sym.kind == MTH) + && !sym.isStatic() + && sym.name != names.init; + } + + private boolean lambdaSelectSymbolFilter(Symbol sym) { + return (sym.kind == VAR || sym.kind == MTH) && + !sym.isStatic() && + (sym.name == names._this || + sym.name == names._super); + } + + /** + * This is used to filter out those new class expressions that need to + * be qualified with an enclosing tree + */ + private boolean lambdaNewClassFilter(TranslationContext context, JCNewClass tree) { + if (context != null + && tree.encl == null + && tree.def == null + && tree.type.getEnclosingType().hasTag(NONE)) { + Type encl = tree.type.getEnclosingType(); + Type current = context.owner.enclClass().type; + while (current.hasTag(NONE)) { + if (current.tsym.isSubClass(encl.tsym, types)) { + return true; + } + current = current.getEnclosingType(); + } + return false; + } else { + return false; + } + } + + private TranslationContext makeLambdaContext(JCLambda tree) { + return new LambdaTranslationContext(tree); + } + + private TranslationContext makeReferenceContext(JCMemberReference tree) { + return new ReferenceTranslationContext(tree); + } + + private class Frame { + final JCTree tree; + List locals; + + public Frame(JCTree tree) { + this.tree = tree; + } + + void addLocal(Symbol sym) { + if (locals == null) { + locals = List.nil(); + } + locals = locals.prepend(sym); + } + } + + /** + * This class is used to store important information regarding translation of + * lambda expression/method references (see subclasses). + */ + private abstract class TranslationContext { + + /** the underlying (untranslated) tree */ + T tree; + + /** points to the adjusted enclosing scope in which this lambda/mref expression occurs */ + Symbol owner; + + /** the depth of this lambda expression in the frame stack */ + int depth; + + /** the enclosing translation context (set for nested lambdas/mref) */ + TranslationContext prev; + + TranslationContext(T tree) { + this.tree = tree; + this.owner = owner(); + this.depth = frameStack.size() - 1; + this.prev = context(); + } + } + + /** + * This class retains all the useful information about a lambda expression; + * the contents of this class are filled by the LambdaAnalyzer visitor, + * and the used by the main translation routines in order to adjust references + * to captured locals/members, etc. + */ + private class LambdaTranslationContext extends TranslationContext { + + /** variable in the enclosing context to which this lambda is assigned */ + Symbol self; + + /** map from original to translated lambda parameters */ + Map lambdaParams = new LinkedHashMap(); + + /** map from original to translated lambda locals */ + Map lambdaLocals = new LinkedHashMap(); + + /** map from variables in enclosing scope to translated synthetic parameters */ + Map capturedLocals = new LinkedHashMap(); + + /** map from class symbols to translated synthetic parameters (for captured member access) */ + Map capturedThis = new LinkedHashMap(); + + /** the synthetic symbol for the method hoisting the translated lambda */ + Symbol translatedSym; + + List syntheticParams; + + LambdaTranslationContext(JCLambda tree) { + super(tree); + Frame frame = frameStack.head; + if (frame.tree.hasTag(VARDEF)) { + self = ((JCVariableDecl)frame.tree).sym; + } + this.translatedSym = makeSyntheticMethod(0, lambdaName(), 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); + } + } + + void addSymbol(Symbol sym, LambdaSymbolKind skind) { + Map transMap = null; + String preferredName; + switch (skind) { + case CAPTURED_THIS: + transMap = capturedThis; + preferredName = "encl$" + capturedThis.size(); + break; + case CAPTURED_VAR: + transMap = capturedLocals; + preferredName = "cap$" + capturedLocals.size(); + break; + case LOCAL_VAR: + transMap = lambdaLocals; + preferredName = sym.name.toString(); + break; + case PARAM: + transMap = lambdaParams; + preferredName = sym.name.toString(); + break; + default: throw new AssertionError(); + } + if (!transMap.containsKey(sym)) { + transMap.put(sym, translate(preferredName, sym, skind)); + } + } + + Map getSymbolMap(LambdaSymbolKind... skinds) { + LinkedHashMap translationMap = new LinkedHashMap(); + for (LambdaSymbolKind skind : skinds) { + switch (skind) { + case CAPTURED_THIS: + translationMap.putAll(capturedThis); + break; + case CAPTURED_VAR: + translationMap.putAll(capturedLocals); + break; + case LOCAL_VAR: + translationMap.putAll(lambdaLocals); + break; + case PARAM: + translationMap.putAll(lambdaParams); + break; + default: throw new AssertionError(); + } + } + return translationMap; + } + + /** + * The translatedSym is not complete/accurate until the analysis is + * finished. Once the analysis is finished, the translatedSym is + * "completed" -- updated with type information, access modifiers, + * and full parameter list. + */ + void complete() { + if (syntheticParams != null) { + return; + } + boolean inInterface = translatedSym.owner.isInterface(); + boolean thisReferenced = !getSymbolMap(CAPTURED_THIS).isEmpty(); + boolean needInstance = thisReferenced || inInterface; + + // 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); + + //compute synthetic params + ListBuffer params = ListBuffer.lb(); + + // The signature of the method is augmented with the following + // synthetic parameters: + // + // 1) reference to enclosing contexts captured by the lambda expression + // 2) enclosing locals captured by the lambda expression + for (Symbol thisSym : getSymbolMap(CAPTURED_VAR, PARAM).values()) { + params.append(make.VarDef((VarSymbol) thisSym, null)); + } + + syntheticParams = params.toList(); + + //prepend synthetic args to translated lambda method signature + translatedSym.type = (MethodType) types.createMethodTypeWithParameters( + (MethodType) generatedLambdaSig(), + TreeInfo.types(syntheticParams)); + } + + Type enclosingType() { + //local inner classes defined inside a lambda are always non-static + return owner.enclClass().type; + } + + Type generatedLambdaSig() { + return types.erasure(types.findDescriptorType(tree.targetType)); + } + } + + /** + * This class retains all the useful information about a method reference; + * the contents of this class are filled by the LambdaAnalyzer visitor, + * and the used by the main translation routines in order to adjust method + * references (i.e. in case a bridge is needed) + */ + private class ReferenceTranslationContext extends TranslationContext { + + final boolean isSuper; + final Symbol bridgeSym; + + ReferenceTranslationContext(JCMemberReference tree) { + super(tree); + this.isSuper = tree.hasKind(ReferenceKind.SUPER); + this.bridgeSym = needsBridge() + ? makeSyntheticMethod(isSuper ? 0 : STATIC, + lambdaName().append(names.fromString("$bridge")), null, + owner.enclClass()) + : null; + } + + /** + * Get the opcode associated with this method reference + */ + int referenceKind() { + return LambdaToMethod.this.referenceKind(needsBridge() ? bridgeSym : tree.sym); + } + + boolean needsVarArgsConversion() { + return tree.varargsElement != null; + } + + /** + * @return Is this an array operation like clone() + */ + boolean isArrayOp() { + return tree.sym.owner == syms.arrayClass; + } + + /** + * 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(); + } + + Type generatedRefSig() { + return types.erasure(tree.sym.type); + } + + Type bridgedRefSig() { + return types.erasure(types.findDescriptorSymbol(tree.targetType.tsym).type); + } + } + } + // + + enum LambdaSymbolKind { + CAPTURED_VAR, + CAPTURED_THIS, + LOCAL_VAR, + PARAM; + } +} diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java index 120c429e4ef..c52ffb76460 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java @@ -45,7 +45,7 @@ import com.sun.tools.javac.tree.EndPosTable; import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.code.Flags.BLOCK; import static com.sun.tools.javac.code.Kinds.*; -import static com.sun.tools.javac.code.TypeTags.*; +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.*; @@ -485,7 +485,7 @@ public class Lower extends TreeTranslator { * @param value The literal's value. */ JCExpression makeLit(Type type, Object value) { - return make.Literal(type.tag, value).setType(type.constType(value)); + return make.Literal(type.getTag(), value).setType(type.constType(value)); } /** Make an attributed tree representing null. @@ -549,7 +549,7 @@ public class Lower extends TreeTranslator { * reference type.. */ JCExpression makeString(JCExpression tree) { - if (tree.type.tag >= CLASS) { + if (!tree.type.isPrimitiveOrVoid()) { return tree; } else { Symbol valueOfSym = lookupMethod(tree.pos(), @@ -1405,7 +1405,7 @@ public class Lower extends TreeTranslator { Name outerThisName(Type type, Symbol owner) { Type t = type.getEnclosingType(); int nestingLevel = 0; - while (t.tag == CLASS) { + while (t.hasTag(CLASS)) { t = t.getEnclosingType(); nestingLevel++; } @@ -1529,7 +1529,7 @@ public class Lower extends TreeTranslator { new VarSymbol(SYNTHETIC | FINAL, makeSyntheticName(names.fromString("twrVar" + depth), twrVars), - (resource.type.tag == TypeTags.BOT) ? + (resource.type.hasTag(BOT)) ? syms.autoCloseableType : resource.type, currentMethodSym); twrVars.enter(syntheticTwrVar); @@ -1992,7 +1992,7 @@ public class Lower extends TreeTranslator { } private JCExpression classOfType(Type type, DiagnosticPosition pos) { - switch (type.tag) { + switch (type.getTag()) { case BYTE: case SHORT: case CHAR: case INT: case LONG: case FLOAT: case DOUBLE: case BOOLEAN: case VOID: // replace with .TYPE @@ -2761,7 +2761,7 @@ public class Lower extends TreeTranslator { } //where private JCTree convert(JCTree tree, Type pt) { - if (tree.type == pt || tree.type.tag == TypeTags.BOT) + if (tree.type == pt || tree.type.hasTag(BOT)) return tree; JCTree result = make_at(tree.pos()).TypeCast(make.Type(pt), (JCExpression)tree); result.type = (tree.type.constValue() != null) ? cfolder.coerce(tree.type, pt) @@ -2934,7 +2934,7 @@ public class Lower extends TreeTranslator { return tree; if (havePrimitive) { Type unboxedTarget = types.unboxedType(type); - if (unboxedTarget.tag != NONE) { + if (!unboxedTarget.hasTag(NONE)) { if (!types.isSubtype(tree.type, unboxedTarget)) //e.g. Character c = 89; tree.type = unboxedTarget.constType(tree.type.constValue()); return (T)boxPrimitive((JCExpression)tree, type); @@ -2974,7 +2974,7 @@ public class Lower extends TreeTranslator { /** Unbox an object to a primitive value. */ JCExpression unbox(JCExpression tree, Type primitive) { Type unboxedType = types.unboxedType(tree.type); - if (unboxedType.tag == NONE) { + if (unboxedType.hasTag(NONE)) { unboxedType = primitive; if (!unboxedType.isPrimitive()) throw new AssertionError(unboxedType); @@ -3292,7 +3292,7 @@ public class Lower extends TreeTranslator { iteratorTarget = types.erasure(iterableType.getTypeArguments().head); Type eType = tree.expr.type; tree.expr.type = types.erasure(eType); - if (eType.tag == TYPEVAR && eType.getUpperBound().isCompound()) + if (eType.hasTag(TYPEVAR) && eType.getUpperBound().isCompound()) tree.expr = make.TypeCast(types.erasure(iterableType), tree.expr); Symbol iterator = lookupMethod(tree.expr.pos(), names.iterator, diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java b/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java index 85397fc91b4..b2e9997bfce 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java @@ -42,7 +42,9 @@ import com.sun.tools.javac.tree.JCTree.*; import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.code.Flags.ANNOTATION; import static com.sun.tools.javac.code.Kinds.*; -import static com.sun.tools.javac.code.TypeTags.*; +import static com.sun.tools.javac.code.TypeTag.CLASS; +import static com.sun.tools.javac.code.TypeTag.ERROR; +import static com.sun.tools.javac.code.TypeTag.TYPEVAR; import static com.sun.tools.javac.tree.JCTree.Tag.*; import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag; import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; @@ -370,7 +372,7 @@ public class MemberEnter extends JCTree.Visitor implements Completer { ListBuffer thrownbuf = new ListBuffer(); for (List l = thrown; l.nonEmpty(); l = l.tail) { Type exc = attr.attribType(l.head, env); - if (exc.tag != TYPEVAR) + if (!exc.hasTag(TYPEVAR)) exc = chk.checkClassType(l.head.pos(), exc); thrownbuf.append(exc); } @@ -921,7 +923,7 @@ public class MemberEnter extends JCTree.Visitor implements Completer { } for (JCExpression iface : interfaceTrees) { Type i = attr.attribBase(iface, baseEnv, false, true, true); - if (i.tag == CLASS) { + if (i.hasTag(CLASS)) { interfaces.append(i); if (all_interfaces != null) all_interfaces.append(i); chk.checkNotRepeated(iface.pos(), types.erasure(i), interfaceSet); @@ -1006,7 +1008,7 @@ public class MemberEnter extends JCTree.Visitor implements Completer { new VarSymbol(FINAL | HASINIT, names._this, c.type, c); thisSym.pos = Position.FIRSTPOS; env.info.scope.enter(thisSym); - if (ct.supertype_field.tag == CLASS) { + if (ct.supertype_field.hasTag(CLASS)) { VarSymbol superSym = new VarSymbol(FINAL | HASINIT, names._super, ct.supertype_field, c); @@ -1020,11 +1022,13 @@ public class MemberEnter extends JCTree.Visitor implements Completer { // name as a top-level package. if (checkClash && c.owner.kind == PCK && c.owner != syms.unnamedPackage && - reader.packageExists(c.fullname)) - { - log.error(tree.pos, "clash.with.pkg.of.same.name", Kinds.kindName(sym), c); - } - + reader.packageExists(c.fullname)) { + log.error(tree.pos, "clash.with.pkg.of.same.name", Kinds.kindName(sym), c); + } + if (c.owner.kind == PCK && (c.flags_field & PUBLIC) == 0 && + !env.toplevel.sourcefile.isNameCompatible(c.name.toString(),JavaFileObject.Kind.SOURCE)) { + c.flags_field |= AUXILIARY; + } } catch (CompletionFailure ex) { chk.completionError(tree.pos(), ex); } finally { @@ -1094,7 +1098,7 @@ public class MemberEnter extends JCTree.Visitor implements Completer { } Type modelMissingTypes(Type t, final JCExpression tree, final boolean interfaceExpected) { - if (t.tag != ERROR) + if (!t.hasTag(ERROR)) return t; return new ErrorType(((ErrorType) t).getOriginalType(), t.tsym) { @@ -1139,7 +1143,7 @@ public class MemberEnter extends JCTree.Visitor implements Completer { @Override public void visitIdent(JCIdent tree) { - if (tree.type.tag != ERROR) { + if (!tree.type.hasTag(ERROR)) { result = tree.type; } else { result = synthesizeClass(tree.name, syms.unnamedPackage).type; @@ -1148,7 +1152,7 @@ public class MemberEnter extends JCTree.Visitor implements Completer { @Override public void visitSelect(JCFieldAccess tree) { - if (tree.type.tag != ERROR) { + if (!tree.type.hasTag(ERROR)) { result = tree.type; } else { Type selectedType; @@ -1166,7 +1170,7 @@ public class MemberEnter extends JCTree.Visitor implements Completer { @Override public void visitTypeApply(JCTypeApply tree) { - if (tree.type.tag != ERROR) { + if (!tree.type.hasTag(ERROR)) { result = tree.type; } else { ClassType clazzType = (ClassType) visit(tree.clazz); diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java index ba02bb77e80..448ecfd474a 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java @@ -59,7 +59,7 @@ import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.code.Flags.BLOCK; import static com.sun.tools.javac.code.Kinds.*; import static com.sun.tools.javac.code.Kinds.ERRONEOUS; -import static com.sun.tools.javac.code.TypeTags.*; +import static com.sun.tools.javac.code.TypeTag.*; import static com.sun.tools.javac.comp.Resolve.MethodResolutionPhase.*; import static com.sun.tools.javac.tree.JCTree.Tag.*; @@ -228,7 +228,7 @@ public class Resolve { JCDiagnostic getVerboseApplicableCandidateDiag(int pos, Symbol sym, Type inst) { JCDiagnostic subDiag = null; - if (sym.type.tag == FORALL) { + if (sym.type.hasTag(FORALL)) { subDiag = diags.fragment("partial.inst.sig", inst); } @@ -331,7 +331,7 @@ public class Resolve { } boolean isAccessible(Env env, Type t, boolean checkInner) { - return (t.tag == ARRAY) + return (t.hasTag(ARRAY)) ? isAccessible(env, types.elemtype(t)) : isAccessible(env, t.tsym, checkInner); } @@ -467,10 +467,10 @@ public class Resolve { // need to inferred. List tvars = List.nil(); if (typeargtypes == null) typeargtypes = List.nil(); - if (mt.tag != FORALL && typeargtypes.nonEmpty()) { + if (!mt.hasTag(FORALL) && typeargtypes.nonEmpty()) { // This is not a polymorphic method, but typeargs are supplied // which is fine, see JLS 15.12.2.1 - } else if (mt.tag == FORALL && typeargtypes.nonEmpty()) { + } else if (mt.hasTag(FORALL) && typeargtypes.nonEmpty()) { ForAll pmt = (ForAll) mt; if (typeargtypes.length() != pmt.tvars.length()) throw inapplicableMethodException.setMessage("arg.length.mismatch"); // not enough args @@ -487,7 +487,7 @@ public class Resolve { actuals = actuals.tail; } mt = types.subst(pmt.qtype, pmt.tvars, typeargtypes); - } else if (mt.tag == FORALL) { + } else if (mt.hasTag(FORALL)) { ForAll pmt = (ForAll) mt; List tvars1 = types.newInstances(pmt.tvars); tvars = tvars.appendList(tvars1); @@ -499,7 +499,7 @@ public class Resolve { for (List l = argtypes; l.tail != null/*inlined: l.nonEmpty()*/ && !instNeeded; l = l.tail) { - if (l.head.tag == FORALL) instNeeded = true; + if (l.head.hasTag(FORALL)) instNeeded = true; } if (instNeeded) @@ -807,7 +807,7 @@ public class Resolve { @Override protected Type check(DiagnosticPosition pos, Type found) { - if (found.tag == DEFERRED) { + if (found.hasTag(DEFERRED)) { DeferredType dt = (DeferredType)found; return dt.check(this); } else { @@ -875,7 +875,7 @@ public class Resolve { Type site, Name name, TypeSymbol c) { - while (c.type.tag == TYPEVAR) + while (c.type.hasTag(TYPEVAR)) c = c.type.getUpperBound().tsym; Symbol bestSoFar = varNotFound; Symbol sym; @@ -888,7 +888,7 @@ public class Resolve { e = e.next(); } Type st = types.supertype(c.type); - if (st != null && (st.tag == CLASS || st.tag == TYPEVAR)) { + if (st != null && (st.hasTag(CLASS) || st.hasTag(TYPEVAR))) { sym = findField(env, site, name, st.tsym); if (sym.kind < bestSoFar.kind) bestSoFar = sym; } @@ -1184,7 +1184,7 @@ public class Resolve { lastFormal2 : formals2.head; //is this a structural actual argument? - boolean isStructuralPoly = actual.tag == DEFERRED && + boolean isStructuralPoly = actual.hasTag(DEFERRED) && (((DeferredType)actual).tree.hasTag(LAMBDA) || ((DeferredType)actual).tree.hasTag(REFERENCE)); @@ -1301,7 +1301,7 @@ public class Resolve { Type rt1 = mt1.getReturnType(); Type rt2 = mt2.getReturnType(); - if (mt1.tag == FORALL && mt2.tag == FORALL) { + if (mt1.hasTag(FORALL) && mt2.hasTag(FORALL)) { //if both are generic methods, adjust return type ahead of subtyping check rt1 = types.subst(rt1, mt1.getTypeArguments(), mt2.getTypeArguments()); } @@ -1448,11 +1448,11 @@ public class Resolve { } TypeSymbol symbolFor(Type t) { - if (t.tag != CLASS && - t.tag != TYPEVAR) { + if (!t.hasTag(CLASS) && + !t.hasTag(TYPEVAR)) { return null; } - while (t.tag == TYPEVAR) + while (t.hasTag(TYPEVAR)) t = t.getUpperBound(); if (seen.contains(t.tsym)) { //degenerate case in which we have a circular @@ -1610,7 +1610,7 @@ public class Resolve { e = e.next(); } Type st = types.supertype(c.type); - if (st != null && st.tag == CLASS) { + if (st != null && st.hasTag(CLASS)) { sym = findMemberType(env, site, name, st.tsym); if (sym.kind < bestSoFar.kind) bestSoFar = sym; } @@ -1660,7 +1660,7 @@ public class Resolve { e = e.next()) { if (e.sym.kind == TYP) { if (staticOnly && - e.sym.type.tag == TYPEVAR && + e.sym.type.hasTag(TYPEVAR) && e.sym.owner.kind == TYP) return new StaticError(e.sym); return e.sym; } @@ -1669,8 +1669,8 @@ public class Resolve { sym = findMemberType(env1, env1.enclClass.sym.type, name, env1.enclClass.sym); if (staticOnly && sym.kind == TYP && - sym.type.tag == CLASS && - sym.type.getEnclosingType().tag == CLASS && + sym.type.hasTag(CLASS) && + sym.type.getEnclosingType().hasTag(CLASS) && env1.enclClass.sym.type.isParameterized() && sym.type.getEnclosingType().isParameterized()) return new StaticError(sym); @@ -1906,7 +1906,7 @@ public class Resolve { //method symbol that can be used for lookups in the speculative cache, //causing problems in Attr.checkId() for (Type t : argtypes) { - if (t.tag == DEFERRED) { + if (t.hasTag(DEFERRED)) { DeferredType dt = (DeferredType)t; dt.speculativeCache.dupAllTo(msym, accessedSym); } @@ -1955,7 +1955,7 @@ public class Resolve { } public void printscopes(Type t) { - while (t.tag == CLASS) { + while (t.hasTag(CLASS)) { printscopes(t.tsym.members()); t = types.supertype(t); } @@ -2259,7 +2259,7 @@ public class Resolve { //- System.out.println(" e " + e.sym); if (sym.kind == MTH && (sym.flags_field & SYNTHETIC) == 0) { - List oldParams = e.sym.type.tag == FORALL ? + List oldParams = e.sym.type.hasTag(FORALL) ? ((ForAll)sym.type).tvars : List.nil(); Type constrType = new ForAll(site.tsym.type.getTypeArguments().appendList(oldParams), @@ -2565,7 +2565,7 @@ public class Resolve { findMethod(env, site, name, argtypes, typeargtypes, phase.isBoxingRequired(), phase.isVarargsRequired(), syms.operatorNames.contains(name)); return sym.kind != MTH || - site.getEnclosingType().tag == NONE || + site.getEnclosingType().hasTag(NONE) || hasEnclosingInstance(env, site) ? sym : new InvalidSymbolError(Kinds.MISSING_ENCL, sym, null) { @Override @@ -2578,7 +2578,7 @@ public class Resolve { @Override ReferenceKind referenceKind(Symbol sym) { - return site.getEnclosingType().tag == NONE ? + return site.getEnclosingType().hasTag(NONE) ? ReferenceKind.TOPLEVEL : ReferenceKind.IMPLICIT_INNER; } } @@ -2847,7 +2847,7 @@ public class Resolve { } else { ListBuffer diagArgs = ListBuffer.lb(); for (Type t : argtypes) { - if (t.tag == DEFERRED) { + if (t.hasTag(DEFERRED)) { diagArgs.append(((DeferredAttr.DeferredType)t).tree); } else { diagArgs.append(t); @@ -3222,7 +3222,7 @@ public class Resolve { Name name, List argtypes, List typeargtypes) { - if (sym.owner.type.tag == ERROR) + if (sym.owner.type.hasTag(ERROR)) return null; if (sym.name == names.init && sym.owner != site.tsym) { @@ -3267,7 +3267,7 @@ public class Resolve { Name name, List argtypes, List typeargtypes) { - Symbol errSym = ((sym.kind == TYP && sym.type.tag == CLASS) + Symbol errSym = ((sym.kind == TYP && sym.type.hasTag(CLASS)) ? types.erasure(sym.type).tsym : sym); return diags.create(dkind, log.currentSource(), pos, diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java b/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java index 36f3a25f243..e06da066d14 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java @@ -37,7 +37,9 @@ import com.sun.tools.javac.util.List; import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.code.Kinds.*; -import static com.sun.tools.javac.code.TypeTags.*; +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; /** This pass translates Generic Java to conventional Java. * @@ -118,6 +120,16 @@ public class TransTypes extends TreeTranslator { * @param tree The expression tree. * @param target The target type. */ + public JCExpression coerce(Env env, JCExpression tree, Type target) { + Env prevEnv = this.env; + try { + this.env = env; + return coerce(tree, target); + } + finally { + this.env = prevEnv; + } + } JCExpression coerce(JCExpression tree, Type target) { Type btarget = target.baseType(); if (tree.type.isPrimitive() == target.isPrimitive()) { @@ -155,7 +167,7 @@ public class TransTypes extends TreeTranslator { */ JCExpression retype(JCExpression tree, Type erasedType, Type target) { // System.err.println("retype " + tree + " to " + erasedType);//DEBUG - if (erasedType.tag > lastBaseTag) { + if (!erasedType.isPrimitive()) { if (target != null && target.isPrimitive()) target = erasure(tree.type); tree.type = erasedType; @@ -194,6 +206,20 @@ public class TransTypes extends TreeTranslator { return _args; } + public List translateArgs(List _args, + List parameters, + Type varargsElement, + Env localEnv) { + Env prevEnv = env; + try { + env = localEnv; + return translateArgs(_args, parameters, varargsElement); + } + finally { + env = prevEnv; + } + } + /** Add a bridge definition and enter corresponding method symbol in * local scope of origin. * @@ -245,7 +271,7 @@ public class TransTypes extends TreeTranslator { make.Select(receiver, impl).setType(calltype), translateArgs(make.Idents(md.params), origErasure.getParameterTypes(), null)) .setType(calltype); - JCStatement stat = (origErasure.getReturnType().tag == VOID) + JCStatement stat = (origErasure.getReturnType().hasTag(VOID)) ? make.Exec(call) : make.Return(coerce(call, bridgeType.getReturnType())); md.body = make.Block(0, List.of(stat)); @@ -400,7 +426,7 @@ public class TransTypes extends TreeTranslator { */ void addBridges(DiagnosticPosition pos, ClassSymbol origin, ListBuffer bridges) { Type st = types.supertype(origin.type); - while (st.tag == CLASS) { + while (st.hasTag(CLASS)) { // if (isSpecialization(st)) addBridges(pos, st.tsym, origin, bridges); st = types.supertype(st); @@ -449,9 +475,9 @@ public class TransTypes extends TreeTranslator { result = tree; } - JCMethodDecl currentMethod = null; + JCTree currentMethod = null; public void visitMethodDef(JCMethodDecl tree) { - JCMethodDecl previousMethod = currentMethod; + JCTree previousMethod = currentMethod; try { currentMethod = tree; tree.restype = translate(tree.restype, null); @@ -517,6 +543,22 @@ public class TransTypes extends TreeTranslator { result = tree; } + public void visitLambda(JCLambda tree) { + JCTree prevMethod = currentMethod; + try { + currentMethod = null; + tree.params = translate(tree.params); + tree.body = translate(tree.body, null); + //save non-erased target + tree.targetType = tree.type; + tree.type = erasure(tree.type); + result = tree; + } + finally { + currentMethod = prevMethod; + } + } + public void visitSwitch(JCSwitch tree) { Type selsuper = types.supertype(tree.selector.type); boolean enumSwitch = selsuper != null && @@ -568,7 +610,7 @@ public class TransTypes extends TreeTranslator { } public void visitReturn(JCReturn tree) { - tree.expr = translate(tree.expr, currentMethod.sym.erasure(types).getReturnType()); + tree.expr = translate(tree.expr, currentMethod != null ? types.erasure(currentMethod.type).getReturnType() : null); result = tree; } @@ -599,6 +641,7 @@ public class TransTypes extends TreeTranslator { Assert.check(tree.args.length() == argtypes.length()); tree.args = translateArgs(tree.args, argtypes, tree.varargsElement); + tree.type = types.erasure(tree.type); // Insert casts of method invocation results as needed. result = retype(tree, mt.getReturnType(), pt); } @@ -612,6 +655,8 @@ public class TransTypes extends TreeTranslator { tree.args = translateArgs( tree.args, tree.constructor.erasure(types).getParameterTypes(), tree.varargsElement); tree.def = translate(tree.def, null); + if (tree.constructorType != null) + tree.constructorType = erasure(tree.constructorType); tree.type = erasure(tree.type); result = tree; } @@ -629,16 +674,6 @@ public class TransTypes extends TreeTranslator { result = tree; } - @Override - public void visitLambda(JCLambda tree) { - Assert.error("Translation of lambda expression not supported yet"); - } - - @Override - public void visitReference(JCMemberReference tree) { - Assert.error("Translation of method reference not supported yet"); - } - public void visitParens(JCParens tree) { tree.expr = translate(tree.expr, pt); tree.type = erasure(tree.type); @@ -701,7 +736,7 @@ public class TransTypes extends TreeTranslator { Type et = tree.sym.erasure(types); // Map type variables to their bounds. - if (tree.sym.kind == TYP && tree.sym.type.tag == TYPEVAR) { + if (tree.sym.kind == TYP && tree.sym.type.hasTag(TYPEVAR)) { result = make.at(tree.pos).Type(et); } else // Map constants expressions to themselves. @@ -720,7 +755,7 @@ public class TransTypes extends TreeTranslator { public void visitSelect(JCFieldAccess tree) { Type t = tree.selected.type; - while (t.tag == TYPEVAR) + while (t.hasTag(TYPEVAR)) t = t.getUpperBound(); if (t.isCompound()) { if ((tree.sym.flags() & IPROXY) != 0) { @@ -747,6 +782,14 @@ public class TransTypes extends TreeTranslator { } } + public void visitReference(JCMemberReference tree) { + tree.expr = translate(tree.expr, null); + //save non-erased target + tree.targetType = tree.type; + tree.type = erasure(tree.type); + result = tree; + } + public void visitTypeArray(JCArrayTypeTree tree) { tree.elemtype = translate(tree.elemtype, null); tree.type = erasure(tree.type); @@ -844,7 +887,7 @@ public class TransTypes extends TreeTranslator { translateArgs(make.Idents(md.params), implErasure.getParameterTypes(), null)) .setType(calltype); - JCStatement stat = (member.getReturnType().tag == VOID) + JCStatement stat = (member.getReturnType().hasTag(VOID)) ? make.Exec(call) : make.Return(coerce(call, member.erasure(types).getReturnType())); md.body = make.Block(0, List.of(stat)); @@ -862,7 +905,7 @@ public class TransTypes extends TreeTranslator { Type st = types.supertype(c.type); // process superclass before derived - if (st.tag == CLASS) + if (st.hasTag(CLASS)) translateClass((ClassSymbol)st.tsym); Env myEnv = enter.typeEnvs.remove(c); diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java b/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java index 87bbfbcf2c8..e49e9e0234b 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java +++ b/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java @@ -90,7 +90,7 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil EnumSet.of(JavaFileObject.Kind.SOURCE, JavaFileObject.Kind.CLASS); protected boolean mmappedIO; - protected boolean ignoreSymbolFile; + protected boolean symbolFileEnabled; protected enum SortFiles implements Comparator { FORWARD { @@ -142,7 +142,7 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil zipFileIndexCache = ZipFileIndexCache.getSharedInstance(); mmappedIO = options.isSet("mmappedIO"); - ignoreSymbolFile = options.isSet("ignore.symbol.file"); + symbolFileEnabled = !options.isSet("ignore.symbol.file"); String sf = options.get("sortFiles"); if (sf != null) { @@ -150,6 +150,13 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil } } + /** + * Set whether or not to use ct.sym as an alternate to rt.jar. + */ + public void setSymbolFileEnabled(boolean b) { + symbolFileEnabled = b; + } + @Override public boolean isDefaultBootClassPath() { return locations.isDefaultBootClassPath(); @@ -466,7 +473,7 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil */ private Archive openArchive(File zipFileName, boolean useOptimizedZip) throws IOException { File origZipFileName = zipFileName; - if (!ignoreSymbolFile && locations.isDefaultBootClassPathRtJar(zipFileName)) { + if (symbolFileEnabled && locations.isDefaultBootClassPathRtJar(zipFileName)) { File file = zipFileName.getParentFile().getParentFile(); // ${java.home} if (new File(file.getName()).equals(new File("jre"))) file = file.getParentFile(); diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/Locations.java b/langtools/src/share/classes/com/sun/tools/javac/file/Locations.java index 6e0472c97dc..7ee850bb4d5 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/file/Locations.java +++ b/langtools/src/share/classes/com/sun/tools/javac/file/Locations.java @@ -420,14 +420,10 @@ public class Locations { if (!options.contains(option)) return false; searchPath = value == null ? null : - Collections.unmodifiableCollection(computePath(value)); + Collections.unmodifiableCollection(createPath().addFiles(value)); return true; } - protected Path computePath(String value) { - return new Path().addFiles(value); - } - @Override Collection getLocation() { return searchPath; @@ -439,10 +435,18 @@ public class Locations { if (files == null) { p = computePath(null); } else { - p = new Path().addFiles(files); + p = createPath().addFiles(files); } searchPath = Collections.unmodifiableCollection(p); } + + protected Path computePath(String value) { + return createPath().addFiles(value); + } + + protected Path createPath() { + return new Path(); + } } /** @@ -477,11 +481,15 @@ public class Locations { // Default to current working directory. if (cp == null) cp = "."; + return createPath().addFiles(cp); + } + + @Override + protected Path createPath() { return new Path() - .expandJarClassPaths(true) // Only search user jars for Class-Paths - .emptyPathDefault(new File(".")) // Empty path elt ==> current directory - .addFiles(cp); - } + .expandJarClassPaths(true) // Only search user jars for Class-Paths + .emptyPathDefault(new File(".")); // Empty path elt ==> current directory + } private void lazy() { if (searchPath == null) @@ -591,7 +599,6 @@ public class Locations { String extdirsOpt = optionValues.get(EXTDIRS); String xbootclasspathPrependOpt = optionValues.get(XBOOTCLASSPATH_PREPEND); String xbootclasspathAppendOpt = optionValues.get(XBOOTCLASSPATH_APPEND); - path.addFiles(xbootclasspathPrependOpt); if (endorseddirsOpt != null) diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java index b221ba5b705..f2b8ab56d16 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java +++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java @@ -55,7 +55,7 @@ import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.code.Kinds.*; -import static com.sun.tools.javac.code.TypeTags.*; +import static com.sun.tools.javac.code.TypeTag.CLASS; import static com.sun.tools.javac.jvm.ClassFile.*; import static com.sun.tools.javac.jvm.ClassFile.Version.*; @@ -1018,6 +1018,15 @@ public class ClassReader implements Completer { ClassSymbol c = (ClassSymbol) sym; Name n = readName(nextChar()); c.sourcefile = new SourceFileObject(n, c.flatname); + // If the class is a toplevel class, originating from a Java source file, + // but the class name does not match the file name, then it is + // an auxiliary class. + String sn = n.toString(); + if (c.owner.kind == Kinds.PCK && + sn.endsWith(".java") && + !sn.equals(c.name.toString()+".java")) { + c.flags_field |= AUXILIARY; + } } }, @@ -1870,7 +1879,7 @@ public class ClassReader implements Completer { * `typevars'. */ protected void enterTypevars(Type t) { - if (t.getEnclosingType() != null && t.getEnclosingType().tag == CLASS) + if (t.getEnclosingType() != null && t.getEnclosingType().hasTag(CLASS)) enterTypevars(t.getEnclosingType()); for (List xs = t.getTypeArguments(); xs.nonEmpty(); xs = xs.tail) typevars.enter(xs.head.tsym); @@ -1895,7 +1904,7 @@ public class ClassReader implements Completer { // prepare type variable table typevars = typevars.dup(currentOwner); - if (ct.getEnclosingType().tag == CLASS) + if (ct.getEnclosingType().hasTag(CLASS)) enterTypevars(ct.getEnclosingType()); // read flags, or skip if this is an inner class diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java index 463ce4c07bf..bf9b0d67509 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java +++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java @@ -45,7 +45,7 @@ import com.sun.tools.javac.util.*; import static com.sun.tools.javac.code.BoundKind.*; import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.code.Kinds.*; -import static com.sun.tools.javac.code.TypeTags.*; +import static com.sun.tools.javac.code.TypeTag.*; import static com.sun.tools.javac.jvm.UninitializedType.*; import static com.sun.tools.javac.main.Option.*; import static javax.tools.StandardLocation.CLASS_OUTPUT; @@ -274,7 +274,7 @@ public class ClassWriter extends ClassFile { /** Assemble signature of given type in string buffer. */ void assembleSig(Type type) { - switch (type.tag) { + switch (type.getTag()) { case BYTE: sigbuf.appendByte('B'); break; @@ -361,13 +361,13 @@ public class ClassWriter extends ClassFile { assembleSig(types.erasure(((UninitializedType)type).qtype)); break; default: - throw new AssertionError("typeSig " + type.tag); + throw new AssertionError("typeSig " + type.getTag()); } } boolean hasTypeVar(List l) { while (l.nonEmpty()) { - if (l.head.tag == TypeTags.TYPEVAR) return true; + if (l.head.hasTag(TYPEVAR)) return true; l = l.tail; } return false; @@ -439,9 +439,9 @@ public class ClassWriter extends ClassFile { * external representation. */ public Name xClassName(Type t) { - if (t.tag == CLASS) { + if (t.hasTag(CLASS)) { return names.fromUtf(externalize(t.tsym.flatName())); - } else if (t.tag == ARRAY) { + } else if (t.hasTag(ARRAY)) { return typeSig(types.erasure(t)); } else { throw new AssertionError("xClassName"); @@ -521,7 +521,7 @@ public class ClassWriter extends ClassFile { ClassSymbol c = (ClassSymbol)value; if (c.owner.kind == TYP) pool.put(c.owner); poolbuf.appendByte(CONSTANT_Class); - if (c.type.tag == ARRAY) { + if (c.type.hasTag(ARRAY)) { poolbuf.appendChar(pool.put(typeSig(c.type))); } else { poolbuf.appendChar(pool.put(names.fromUtf(externalize(c.flatname)))); @@ -555,7 +555,7 @@ public class ClassWriter extends ClassFile { poolbuf.appendChar(pool.put(typeSig(mtype))); } else if (value instanceof Type) { Type type = (Type)value; - if (type.tag == CLASS) enterInner((ClassSymbol)type.tsym); + if (type.hasTag(CLASS)) enterInner((ClassSymbol)type.tsym); poolbuf.appendByte(CONSTANT_Class); poolbuf.appendChar(pool.put(xClassName(type))); } else if (value instanceof Pool.MethodHandle) { @@ -815,7 +815,7 @@ public class ClassWriter extends ClassFile { class AttributeWriter implements Attribute.Visitor { public void visitConstant(Attribute.Constant _value) { Object value = _value.value; - switch (_value.type.tag) { + switch (_value.type.getTag()) { case BYTE: databuf.appendByte('B'); break; @@ -901,7 +901,7 @@ public class ClassWriter extends ClassFile { System.err.println("error: " + c + ": " + ex.getMessage()); throw ex; } - if (c.type.tag != CLASS) return; // arrays + if (!c.type.hasTag(CLASS)) return; // arrays if (pool != null && // pool might be null if called from xClassName c.owner.enclClass() != null && (innerClasses == null || !innerClasses.contains(c))) { @@ -1207,7 +1207,7 @@ public class ClassWriter extends ClassFile { if (debugstackmap) System.out.print("empty"); databuf.appendByte(0); } - else switch(t.tag) { + else switch(t.getTag()) { case BYTE: case CHAR: case SHORT: @@ -1430,7 +1430,7 @@ public class ClassWriter extends ClassFile { } static boolean isInt(Type t) { - return (t.tag < TypeTags.INT || t.tag == TypeTags.BOOLEAN); + return (t.getTag().isStrictSubRangeOf(INT) || t.hasTag(BOOLEAN)); } static boolean isSameType(Type t1, Type t2, Types types) { @@ -1439,15 +1439,15 @@ public class ClassWriter extends ClassFile { if (isInt(t1) && isInt(t2)) { return true; } - if (t1.tag == UNINITIALIZED_THIS) { - return t2.tag == UNINITIALIZED_THIS; - } else if (t1.tag == UNINITIALIZED_OBJECT) { - if (t2.tag == UNINITIALIZED_OBJECT) { + if (t1.hasTag(UNINITIALIZED_THIS)) { + return t2.hasTag(UNINITIALIZED_THIS); + } else if (t1.hasTag(UNINITIALIZED_OBJECT)) { + if (t2.hasTag(UNINITIALIZED_OBJECT)) { return ((UninitializedType)t1).offset == ((UninitializedType)t2).offset; } else { return false; } - } else if (t2.tag == UNINITIALIZED_THIS || t2.tag == UNINITIALIZED_OBJECT) { + } else if (t2.hasTag(UNINITIALIZED_THIS) || t2.hasTag(UNINITIALIZED_OBJECT)) { return false; } @@ -1554,7 +1554,7 @@ public class ClassWriter extends ClassFile { databuf.appendChar(flags); databuf.appendChar(pool.put(c)); - databuf.appendChar(supertype.tag == CLASS ? pool.put(supertype.tsym) : 0); + databuf.appendChar(supertype.hasTag(CLASS) ? pool.put(supertype.tsym) : 0); databuf.appendChar(interfaces.length()); for (List l = interfaces; l.nonEmpty(); l = l.tail) databuf.appendChar(pool.put(l.head.tsym)); diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java b/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java index a3cffbc58e1..59788f2a1d5 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java +++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java @@ -30,7 +30,8 @@ import com.sun.tools.javac.code.Symbol.*; import com.sun.tools.javac.util.*; import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; -import static com.sun.tools.javac.code.TypeTags.*; +import static com.sun.tools.javac.code.TypeTag.BOT; +import static com.sun.tools.javac.code.TypeTag.INT; import static com.sun.tools.javac.jvm.ByteCodes.*; import static com.sun.tools.javac.jvm.UninitializedType.*; import static com.sun.tools.javac.jvm.ClassWriter.StackMapTableFrame; @@ -224,7 +225,7 @@ public class Code { * JVM architecture). */ public static int typecode(Type type) { - switch (type.tag) { + switch (type.getTag()) { case BYTE: return BYTEcode; case SHORT: return SHORTcode; case CHAR: return CHARcode; @@ -242,7 +243,7 @@ public class Code { case UNINITIALIZED_THIS: case UNINITIALIZED_OBJECT: return OBJECTcode; - default: throw new AssertionError("typecode " + type.tag); + default: throw new AssertionError("typecode " + type.getTag()); } } @@ -281,7 +282,7 @@ public class Code { /** Given a type, return its code for allocating arrays of that type. */ public static int arraycode(Type type) { - switch (type.tag) { + switch (type.getTag()) { case BYTE: return 8; case BOOLEAN: return 4; case SHORT: return 9; @@ -477,7 +478,7 @@ public class Code { state.pop(1); //sometimes 'null type' is treated as a one-dimensional array type //see Gen.visitLiteral - we should handle this case accordingly - Type stackType = a.tag == BOT ? + Type stackType = a.hasTag(BOT) ? syms.objectType : types.erasure(types.elemtype(a)); state.push(stackType); } @@ -1656,13 +1657,13 @@ public class Code { void push(Type t) { if (debugCode) System.err.println(" pushing " + t); - switch (t.tag) { - case TypeTags.VOID: + switch (t.getTag()) { + case VOID: return; - case TypeTags.BYTE: - case TypeTags.CHAR: - case TypeTags.SHORT: - case TypeTags.BOOLEAN: + case BYTE: + case CHAR: + case SHORT: + case BOOLEAN: t = syms.intType; break; default: @@ -1722,7 +1723,7 @@ public class Code { * of its current type. */ void forceStackTop(Type t) { if (!alive) return; - switch (t.tag) { + switch (t.getTag()) { case CLASS: case ARRAY: int width = width(t); @@ -1824,7 +1825,7 @@ public class Code { } } - static Type jsrReturnValue = new Type(TypeTags.INT, null); + static Type jsrReturnValue = new Type(INT, null); /* ************************************************************************** diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java b/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java index 9f99fb6d66f..4bbab1eb709 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java +++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java @@ -42,7 +42,7 @@ import com.sun.tools.javac.tree.JCTree.*; import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.code.Kinds.*; -import static com.sun.tools.javac.code.TypeTags.*; +import static com.sun.tools.javac.code.TypeTag.*; import static com.sun.tools.javac.jvm.ByteCodes.*; import static com.sun.tools.javac.jvm.CRTFlags.*; import static com.sun.tools.javac.main.Option.*; @@ -258,7 +258,7 @@ public class Gen extends JCTree.Visitor { */ Symbol binaryQualifier(Symbol sym, Type site) { - if (site.tag == ARRAY) { + if (site.hasTag(ARRAY)) { if (sym == syms.lengthVar || sym.owner != syms.arrayClass) return sym; @@ -305,13 +305,13 @@ public class Gen extends JCTree.Visitor { */ int makeRef(DiagnosticPosition pos, Type type) { checkDimension(pos, type); - return pool.put(type.tag == CLASS ? (Object)type.tsym : (Object)type); + return pool.put(type.hasTag(CLASS) ? (Object)type.tsym : (Object)type); } /** Check if the given type is an array with too many dimensions. */ private void checkDimension(DiagnosticPosition pos, Type t) { - switch (t.tag) { + switch (t.getTag()) { case METHOD: checkDimension(pos, t.getReturnType()); for (List args = t.getParameterTypes(); args.nonEmpty(); args = args.tail) @@ -922,7 +922,7 @@ public class Gen extends JCTree.Visitor { if (code.isAlive()) { code.statBegin(TreeInfo.endPos(tree.body)); if (env.enclMethod == null || - env.enclMethod.sym.type.getReturnType().tag == VOID) { + env.enclMethod.sym.type.getReturnType().hasTag(VOID)) { code.emitop0(return_); } else { // sometime dead code seems alive (4415991); @@ -1110,7 +1110,7 @@ public class Gen extends JCTree.Visitor { public void visitSwitch(JCSwitch tree) { int limit = code.nextreg; - Assert.check(tree.selector.type.tag != CLASS); + Assert.check(!tree.selector.type.hasTag(CLASS)); int startpcCrt = genCrt ? code.curPc() : 0; Item sel = genExpr(tree.selector, syms.intType); List cases = tree.cases; @@ -1817,8 +1817,8 @@ public class Gen extends JCTree.Visitor { // proceeding further. if ((tree.hasTag(PLUS_ASG) || tree.hasTag(MINUS_ASG)) && l instanceof LocalItem && - tree.lhs.type.tag <= INT && - tree.rhs.type.tag <= INT && + tree.lhs.type.getTag().isSubRangeOf(INT) && + tree.rhs.type.getTag().isSubRangeOf(INT) && tree.rhs.type.constValue() != null) { int ival = ((Number) tree.rhs.type.constValue()).intValue(); if (tree.hasTag(MINUS_ASG)) ival = -ival; @@ -1969,7 +1969,7 @@ public class Gen extends JCTree.Visitor { */ void appendString(JCTree tree) { Type t = tree.type.baseType(); - if (t.tag > lastBaseTag && t.tsym != syms.stringType.tsym) { + if (!t.isPrimitive() && t.tsym != syms.stringType.tsym) { t = syms.objectType; } items.makeMemberItem(getStringBufferAppend(tree, t), false).invoke(); @@ -2067,7 +2067,7 @@ public class Gen extends JCTree.Visitor { // which is not statically a supertype of the expression's type. // For basic types, the coerce(...) in genExpr(...) will do // the conversion. - if (tree.clazz.type.tag > lastBaseTag && + if (!tree.clazz.type.isPrimitive() && types.asSuper(tree.expr.type, tree.clazz.type.tsym) == null) { code.emitop2(checkcast, makeRef(tree.pos(), tree.clazz.type)); } @@ -2185,7 +2185,7 @@ public class Gen extends JCTree.Visitor { } public void visitLiteral(JCLiteral tree) { - if (tree.type.tag == TypeTags.BOT) { + if (tree.type.hasTag(BOT)) { code.emitop0(aconst_null); if (types.dimensions(pt) > 1) { code.emitop2(checkcast, makeRef(tree.pos(), pt)); diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java b/langtools/src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java index 82ba522cd4b..73614a0c022 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java +++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -27,6 +27,8 @@ package com.sun.tools.javac.jvm; import com.sun.tools.javac.code.*; +import static com.sun.tools.javac.code.TypeTag.UNINITIALIZED_OBJECT; +import static com.sun.tools.javac.code.TypeTag.UNINITIALIZED_THIS; /** These pseudo-types appear in the generated verifier tables to * indicate objects that have been allocated but not yet constructed. @@ -37,8 +39,6 @@ import com.sun.tools.javac.code.*; * deletion without notice. */ class UninitializedType extends Type.DelegatedType { - public static final int UNINITIALIZED_THIS = TypeTags.TypeTagCount; - public static final int UNINITIALIZED_OBJECT = UNINITIALIZED_THIS + 1; public static UninitializedType uninitializedThis(Type qtype) { return new UninitializedType(UNINITIALIZED_THIS, qtype, -1); @@ -49,7 +49,7 @@ class UninitializedType extends Type.DelegatedType { } public final int offset; // PC where allocation took place - private UninitializedType(int tag, Type qtype, int offset) { + private UninitializedType(TypeTag tag, Type qtype, int offset) { super(tag, qtype); this.offset = offset; } diff --git a/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java index 150746a571d..b62da0f4b46 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java +++ b/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java @@ -63,6 +63,7 @@ import com.sun.tools.javac.tree.JCTree.*; import com.sun.tools.javac.util.*; 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.*; import static com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag.*; import static com.sun.tools.javac.util.ListBuffer.lb; @@ -270,6 +271,10 @@ public class JavaCompiler implements ClassReader.SourceCompleter { */ protected TransTypes transTypes; + /** The lambda translator. + */ + protected LambdaToMethod lambdaToMethod; + /** The syntactic sugar desweetener. */ protected Lower lower; @@ -368,6 +373,8 @@ public class JavaCompiler implements ClassReader.SourceCompleter { options = Options.instance(context); + lambdaToMethod = LambdaToMethod.instance(context); + verbose = options.isSet(VERBOSE); sourceOutput = options.isSet(PRINTSOURCE); // used to be -s stubOutput = options.isSet("-stubs"); @@ -523,8 +530,10 @@ public class JavaCompiler implements ClassReader.SourceCompleter { ATTR(4), FLOW(5), TRANSTYPES(6), - LOWER(7), - GENERATE(8); + UNLAMBDA(7), + LOWER(8), + GENERATE(9); + CompileState(int value) { this.value = value; } @@ -1349,7 +1358,7 @@ public class JavaCompiler implements ClassReader.SourceCompleter { @Override public void visitClassDef(JCClassDecl node) { Type st = types.supertype(node.sym.type); - if (st.tag == TypeTags.CLASS) { + if (st.hasTag(CLASS)) { ClassSymbol c = st.tsym.outermostClass(); Env stEnv = enter.getEnv(c); if (stEnv != null && env != stEnv) { @@ -1417,6 +1426,12 @@ public class JavaCompiler implements ClassReader.SourceCompleter { env.tree = transTypes.translateTopLevelClass(env.tree, localMake); compileStates.put(env, CompileState.TRANSTYPES); + if (shouldStop(CompileState.UNLAMBDA)) + return; + + env.tree = lambdaToMethod.translateTopLevelClass(env, env.tree, localMake); + compileStates.put(env, CompileState.UNLAMBDA); + if (shouldStop(CompileState.LOWER)) return; diff --git a/langtools/src/share/classes/com/sun/tools/javac/model/JavacElements.java b/langtools/src/share/classes/com/sun/tools/javac/model/JavacElements.java index 4f036bd9d17..168cef93e72 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/model/JavacElements.java +++ b/langtools/src/share/classes/com/sun/tools/javac/model/JavacElements.java @@ -38,7 +38,7 @@ import static javax.lang.model.util.ElementFilter.methodsIn; import com.sun.tools.javac.code.*; import com.sun.tools.javac.code.Symbol.*; -import com.sun.tools.javac.code.TypeTags; +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; @@ -50,6 +50,7 @@ import com.sun.tools.javac.tree.TreeInfo; import com.sun.tools.javac.tree.TreeScanner; import com.sun.tools.javac.util.*; import com.sun.tools.javac.util.Name; +import static com.sun.tools.javac.code.TypeTag.CLASS; import static com.sun.tools.javac.tree.JCTree.Tag.*; /** @@ -124,7 +125,7 @@ public class JavacElements implements Elements { if (result != null || !inherited) break; Type sup = annotated.getSuperclass(); - if (sup.tag != TypeTags.CLASS || sup.isErroneous()) + if (!sup.hasTag(CLASS) || sup.isErroneous()) break; annotated = (ClassSymbol) sup.tsym; } @@ -444,7 +445,7 @@ public class JavacElements implements Elements { List annos = sym.getAnnotationMirrors(); while (sym.getKind() == ElementKind.CLASS) { Type sup = ((ClassSymbol) sym).getSuperclass(); - if (sup.tag != TypeTags.CLASS || sup.isErroneous() || + if (!sup.hasTag(CLASS) || sup.isErroneous() || sup.tsym == syms.objectType.tsym) { break; } diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java b/langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java index f6ddfcbeb99..2048c1cd48a 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java +++ b/langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java @@ -662,7 +662,10 @@ public class JavaTokenizer { tk = TokenKind.EOF; pos = reader.buflen; } else { - lexError(pos, "illegal.char", String.valueOf((int)reader.ch)); + String arg = (32 < reader.ch && reader.ch < 127) ? + String.format("%s", reader.ch) : + String.format("\\u%04x", (int)reader.ch); + lexError(pos, "illegal.char", arg); reader.scanChar(); } } diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java b/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java index 616f023dc1f..7e71133db60 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java +++ b/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java @@ -560,7 +560,7 @@ public class JavacParser implements Parser { case INTLITERAL: try { t = F.at(pos).Literal( - TypeTags.INT, + TypeTag.INT, Convert.string2int(strval(prefix), token.radix())); } catch (NumberFormatException ex) { error(token.pos, "int.number.too.large", strval(prefix)); @@ -569,7 +569,7 @@ public class JavacParser implements Parser { case LONGLITERAL: try { t = F.at(pos).Literal( - TypeTags.LONG, + TypeTag.LONG, new Long(Convert.string2long(strval(prefix), token.radix()))); } catch (NumberFormatException ex) { error(token.pos, "int.number.too.large", strval(prefix)); @@ -591,7 +591,7 @@ public class JavacParser implements Parser { else if (n.floatValue() == Float.POSITIVE_INFINITY) error(token.pos, "fp.number.too.large"); else - t = F.at(pos).Literal(TypeTags.FLOAT, n); + t = F.at(pos).Literal(TypeTag.FLOAT, n); break; } case DOUBLELITERAL: { @@ -610,27 +610,27 @@ public class JavacParser implements Parser { else if (n.doubleValue() == Double.POSITIVE_INFINITY) error(token.pos, "fp.number.too.large"); else - t = F.at(pos).Literal(TypeTags.DOUBLE, n); + t = F.at(pos).Literal(TypeTag.DOUBLE, n); break; } case CHARLITERAL: t = F.at(pos).Literal( - TypeTags.CHAR, + TypeTag.CHAR, token.stringVal().charAt(0) + 0); break; case STRINGLITERAL: t = F.at(pos).Literal( - TypeTags.CLASS, + TypeTag.CLASS, token.stringVal()); break; case TRUE: case FALSE: t = F.at(pos).Literal( - TypeTags.BOOLEAN, + TypeTag.BOOLEAN, (token.kind == TRUE ? 1 : 0)); break; case NULL: t = F.at(pos).Literal( - TypeTags.BOT, + TypeTag.BOT, null); break; default: @@ -814,7 +814,7 @@ public class JavacParser implements Parser { if (t.hasTag(JCTree.Tag.PLUS)) { StringBuilder buf = foldStrings(t); if (buf != null) { - t = toP(F.at(startPos).Literal(TypeTags.CLASS, buf.toString())); + t = toP(F.at(startPos).Literal(TypeTag.CLASS, buf.toString())); } } @@ -846,7 +846,7 @@ public class JavacParser implements Parser { while (true) { if (tree.hasTag(LITERAL)) { JCLiteral lit = (JCLiteral) tree; - if (lit.typetag == TypeTags.CLASS) { + if (lit.typetag == TypeTag.CLASS) { StringBuilder sbuf = new StringBuilder((String)lit.value); while (buf.nonEmpty()) { @@ -859,7 +859,7 @@ public class JavacParser implements Parser { JCBinary op = (JCBinary)tree; if (op.rhs.hasTag(LITERAL)) { JCLiteral lit = (JCLiteral) op.rhs; - if (lit.typetag == TypeTags.CLASS) { + if (lit.typetag == TypeTag.CLASS) { buf = buf.prepend((String) lit.value); tree = op.lhs; continue; @@ -1211,7 +1211,7 @@ public class JavacParser implements Parser { if ((mode & EXPR) != 0) { nextToken(); if (token.kind == DOT) { - JCPrimitiveTypeTree ti = toP(F.at(pos).TypeIdent(TypeTags.VOID)); + JCPrimitiveTypeTree ti = toP(F.at(pos).TypeIdent(TypeTag.VOID)); t = bracketsSuffix(ti); } else { return illegal(pos); @@ -1220,7 +1220,7 @@ public class JavacParser implements Parser { // Support the corner case of myMethodHandle.invoke() by passing // a void type (like other primitive types) to the next phase. // The error will be reported in Attr.attribTypes or Attr.visitApply. - JCPrimitiveTypeTree ti = to(F.at(pos).TypeIdent(TypeTags.VOID)); + JCPrimitiveTypeTree ti = to(F.at(pos).TypeIdent(TypeTag.VOID)); nextToken(); return ti; //return illegal(); @@ -2920,7 +2920,7 @@ public class JavacParser implements Parser { JCExpression type; boolean isVoid = token.kind == VOID; if (isVoid) { - type = to(F.at(pos).TypeIdent(TypeTags.VOID)); + type = to(F.at(pos).TypeIdent(TypeTag.VOID)); nextToken(); } else { type = parseType(); @@ -3283,28 +3283,28 @@ public class JavacParser implements Parser { } /** Return type tag of basic type represented by token, - * -1 if token is not a basic type identifier. + * NONE if token is not a basic type identifier. */ - static int typetag(TokenKind token) { + static TypeTag typetag(TokenKind token) { switch (token) { case BYTE: - return TypeTags.BYTE; + return TypeTag.BYTE; case CHAR: - return TypeTags.CHAR; + return TypeTag.CHAR; case SHORT: - return TypeTags.SHORT; + return TypeTag.SHORT; case INT: - return TypeTags.INT; + return TypeTag.INT; case LONG: - return TypeTags.LONG; + return TypeTag.LONG; case FLOAT: - return TypeTags.FLOAT; + return TypeTag.FLOAT; case DOUBLE: - return TypeTags.DOUBLE; + return TypeTag.DOUBLE; case BOOLEAN: - return TypeTags.BOOLEAN; + return TypeTag.BOOLEAN; default: - return -1; + return TypeTag.NONE; } } diff --git a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties index f3495045680..e8dd77889cc 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties +++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties @@ -475,7 +475,7 @@ compiler.err.icls.cant.have.static.decl=\ # 0: string compiler.err.illegal.char=\ - illegal character: \\{0} + illegal character: ''{0}'' compiler.err.illegal.char.for.encoding=\ unmappable character for encoding {0} @@ -1847,6 +1847,11 @@ compiler.misc.varargs.argument.mismatch=\ ##### +# 0: type, 1: file name +compiler.warn.auxiliary.class.accessed.from.outside.of.its.source.file=\ + auxiliary class {0} in {1} should not be accessed from outside its own source file + + ## The first argument ({0}) is a "kindname". # 0: symbol kind, 1: symbol, 2: symbol compiler.err.abstract.cant.be.accessed.directly=\ diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java b/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java index d8008d716b6..22926654a00 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java +++ b/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java @@ -81,7 +81,7 @@ import static com.sun.tools.javac.tree.JCTree.Tag.*; public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { /* Tree tag values, identifying kinds of trees */ - public enum Tag{ + public enum Tag { /** For methods that return an invalid tag if a given condition is not met */ NO_TAG, @@ -1912,10 +1912,10 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { * A constant value given literally. */ public static class JCLiteral extends JCExpression implements LiteralTree { - public int typetag; + public TypeTag typetag; /** value representation */ public Object value; - protected JCLiteral(int typetag, Object value) { + protected JCLiteral(TypeTag typetag, Object value) { this.typetag = typetag; this.value = value; } @@ -1923,33 +1923,15 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { public void accept(Visitor v) { v.visitLiteral(this); } public Kind getKind() { - switch (typetag) { - case TypeTags.INT: - return Kind.INT_LITERAL; - case TypeTags.LONG: - return Kind.LONG_LITERAL; - case TypeTags.FLOAT: - return Kind.FLOAT_LITERAL; - case TypeTags.DOUBLE: - return Kind.DOUBLE_LITERAL; - case TypeTags.BOOLEAN: - return Kind.BOOLEAN_LITERAL; - case TypeTags.CHAR: - return Kind.CHAR_LITERAL; - case TypeTags.CLASS: - return Kind.STRING_LITERAL; - case TypeTags.BOT: - return Kind.NULL_LITERAL; - default: - throw new AssertionError("unknown literal kind " + this); - } + return typetag.getKindLiteral(); } + public Object getValue() { switch (typetag) { - case TypeTags.BOOLEAN: + case BOOLEAN: int bi = (Integer) value; return (bi != 0); - case TypeTags.CHAR: + case CHAR: int ci = (Integer) value; char c = (char) ci; if (c != ci) @@ -1976,12 +1958,12 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { /** * Identifies a basic type. - * @see TypeTags + * @see TypeTag */ public static class JCPrimitiveTypeTree extends JCExpression implements PrimitiveTypeTree { /** the basic type id */ - public int typetag; - protected JCPrimitiveTypeTree(int typetag) { + public TypeTag typetag; + protected JCPrimitiveTypeTree(TypeTag typetag) { this.typetag = typetag; } @Override @@ -1989,29 +1971,9 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { public Kind getKind() { return Kind.PRIMITIVE_TYPE; } public TypeKind getPrimitiveTypeKind() { - switch (typetag) { - case TypeTags.BOOLEAN: - return TypeKind.BOOLEAN; - case TypeTags.BYTE: - return TypeKind.BYTE; - case TypeTags.SHORT: - return TypeKind.SHORT; - case TypeTags.INT: - return TypeKind.INT; - case TypeTags.LONG: - return TypeKind.LONG; - case TypeTags.CHAR: - return TypeKind.CHAR; - case TypeTags.FLOAT: - return TypeKind.FLOAT; - case TypeTags.DOUBLE: - return TypeKind.DOUBLE; - case TypeTags.VOID: - return TypeKind.VOID; - default: - throw new AssertionError("unknown primitive type " + this); - } + return typetag.getPrimitiveTypeKind(); } + @Override public R accept(TreeVisitor v, D d) { return v.visitPrimitiveType(this, d); @@ -2161,7 +2123,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { } @Override public Tag getTag() { - return WILDCARD; + return Tag.WILDCARD; } } @@ -2362,8 +2324,8 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { JCArrayAccess Indexed(JCExpression indexed, JCExpression index); JCFieldAccess Select(JCExpression selected, Name selector); JCIdent Ident(Name idname); - JCLiteral Literal(int tag, Object value); - JCPrimitiveTypeTree TypeIdent(int typetag); + JCLiteral Literal(TypeTag tag, Object value); + JCPrimitiveTypeTree TypeIdent(TypeTag typetag); JCArrayTypeTree TypeArray(JCExpression elemtype); JCTypeApply TypeApply(JCExpression clazz, List arguments); JCTypeParameter TypeParameter(Name name, List bounds); diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java b/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java index c501f7a2e3a..5fc31dc733f 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java +++ b/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java @@ -1133,28 +1133,28 @@ public class Pretty extends JCTree.Visitor { public void visitLiteral(JCLiteral tree) { try { switch (tree.typetag) { - case TypeTags.INT: + case INT: print(tree.value.toString()); break; - case TypeTags.LONG: + case LONG: print(tree.value + "L"); break; - case TypeTags.FLOAT: + case FLOAT: print(tree.value + "F"); break; - case TypeTags.DOUBLE: + case DOUBLE: print(tree.value.toString()); break; - case TypeTags.CHAR: + case CHAR: print("\'" + Convert.quote( String.valueOf((char)((Number)tree.value).intValue())) + "\'"); break; - case TypeTags.BOOLEAN: + case BOOLEAN: print(((Number)tree.value).intValue() == 1 ? "true" : "false"); break; - case TypeTags.BOT: + case BOT: print("null"); break; default: @@ -1169,31 +1169,31 @@ public class Pretty extends JCTree.Visitor { public void visitTypeIdent(JCPrimitiveTypeTree tree) { try { switch(tree.typetag) { - case TypeTags.BYTE: + case BYTE: print("byte"); break; - case TypeTags.CHAR: + case CHAR: print("char"); break; - case TypeTags.SHORT: + case SHORT: print("short"); break; - case TypeTags.INT: + case INT: print("int"); break; - case TypeTags.LONG: + case LONG: print("long"); break; - case TypeTags.FLOAT: + case FLOAT: print("float"); break; - case TypeTags.DOUBLE: + case DOUBLE: print("double"); break; - case TypeTags.BOOLEAN: + case BOOLEAN: print("boolean"); break; - case TypeTags.VOID: + case VOID: print("void"); break; default: diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java index 3111b6af042..a68c719a7dc 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java +++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java @@ -34,6 +34,7 @@ import com.sun.tools.javac.tree.JCTree.*; import com.sun.tools.javac.util.*; import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; import static com.sun.tools.javac.code.Flags.*; +import static com.sun.tools.javac.code.TypeTag.BOT; import static com.sun.tools.javac.tree.JCTree.Tag.*; import static com.sun.tools.javac.tree.JCTree.Tag.BLOCK; import static com.sun.tools.javac.tree.JCTree.Tag.SYNCHRONIZED; @@ -300,7 +301,7 @@ public class TreeInfo { if (!tree.hasTag(LITERAL)) return false; JCLiteral lit = (JCLiteral) tree; - return (lit.typetag == TypeTags.BOT); + return (lit.typetag == BOT); } public static String getCommentText(Env env, JCTree tree) { diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java index 25f064ec85b..3182d6ed954 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java +++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java @@ -35,7 +35,7 @@ import com.sun.tools.javac.tree.JCTree.*; import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.code.Kinds.*; -import static com.sun.tools.javac.code.TypeTags.*; +import static com.sun.tools.javac.code.TypeTag.*; /** Factory class for trees. * @@ -426,13 +426,13 @@ public class TreeMaker implements JCTree.Factory { return tree; } - public JCLiteral Literal(int tag, Object value) { + public JCLiteral Literal(TypeTag tag, Object value) { JCLiteral tree = new JCLiteral(tag, value); tree.pos = pos; return tree; } - public JCPrimitiveTypeTree TypeIdent(int typetag) { + public JCPrimitiveTypeTree TypeIdent(TypeTag typetag) { JCPrimitiveTypeTree tree = new JCPrimitiveTypeTree(typetag); tree.pos = pos; return tree; @@ -629,10 +629,10 @@ public class TreeMaker implements JCTree.Factory { public JCExpression Type(Type t) { if (t == null) return null; JCExpression tp; - switch (t.tag) { + switch (t.getTag()) { case BYTE: case CHAR: case SHORT: case INT: case LONG: case FLOAT: case DOUBLE: case BOOLEAN: case VOID: - tp = TypeIdent(t.tag); + tp = TypeIdent(t.getTag()); break; case TYPEVAR: tp = Ident(t.tsym); @@ -644,7 +644,7 @@ public class TreeMaker implements JCTree.Factory { } case CLASS: Type outer = t.getEnclosingType(); - JCExpression clazz = outer.tag == CLASS && t.tsym.owner.kind == TYP + JCExpression clazz = outer.hasTag(CLASS) && t.tsym.owner.kind == TYP ? Select(Type(outer), t.tsym) : QualIdent(t.tsym); tp = t.getTypeArguments().isEmpty() @@ -849,7 +849,7 @@ public class TreeMaker implements JCTree.Factory { * depending on whether the method invocation expression's type is void. */ public JCStatement Call(JCExpression apply) { - return apply.type.tag == VOID ? Exec(apply) : Return(apply); + return apply.type.hasTag(VOID) ? Exec(apply) : Return(apply); } /** Construct an assignment from a variable symbol and a right hand side. diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Constants.java b/langtools/src/share/classes/com/sun/tools/javac/util/Constants.java index 36a473df5c7..30753d7dfec 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/util/Constants.java +++ b/langtools/src/share/classes/com/sun/tools/javac/util/Constants.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -27,8 +27,6 @@ package com.sun.tools.javac.util; import com.sun.tools.javac.code.Type; -import static com.sun.tools.javac.code.TypeTags.*; - /** * Utilities for operating on constant values. * @@ -48,7 +46,7 @@ public class Constants { public static Object decode(Object value, Type type) { if (value instanceof Integer) { int i = (Integer) value; - switch (type.tag) { + switch (type.getTag()) { case BOOLEAN: return i != 0; case CHAR: return (char) i; case BYTE: return (byte) i; @@ -64,7 +62,7 @@ public class Constants { */ public static String format(Object value, Type type) { value = decode(value, type); - switch (type.tag) { + switch (type.getTag()) { case BYTE: return formatByte((Byte) value); case LONG: return formatLong((Long) value); case FLOAT: return formatFloat((Float) value); diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Names.java b/langtools/src/share/classes/com/sun/tools/javac/util/Names.java index 53827d2ce65..77d7d4097b1 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/util/Names.java +++ b/langtools/src/share/classes/com/sun/tools/javac/util/Names.java @@ -170,6 +170,10 @@ public class Names { public final Name ex; public final Name package_info; + //lambda-related + public final Name lambda; + public final Name metaFactory; + public final Name.Table table; public Names(Context context) { @@ -298,6 +302,10 @@ public class Names { deprecated = fromString("deprecated"); ex = fromString("ex"); package_info = fromString("package-info"); + + //lambda-related + lambda = fromString("lambda"); + metaFactory = fromString("metaFactory"); } protected Name.Table createTable(Options options) { diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java b/langtools/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java index 106fbcb52fd..6cdbb2447db 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java +++ b/langtools/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java @@ -39,7 +39,7 @@ import com.sun.tools.javac.code.Type; import com.sun.tools.javac.code.Type.*; import com.sun.tools.javac.code.Types; -import static com.sun.tools.javac.code.TypeTags.*; +import static com.sun.tools.javac.code.TypeTag.*; import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.util.LayoutCharacters.*; import static com.sun.tools.javac.util.RichDiagnosticFormatter.RichConfiguration.*; @@ -295,7 +295,7 @@ public class RichDiagnosticFormatter extends conflicts.contains(s))) { List l = List.nil(); Symbol s2 = s; - while (s2.type.getEnclosingType().tag == CLASS + while (s2.type.getEnclosingType().hasTag(CLASS) && s2.owner.kind == Kinds.TYP) { l = l.prepend(s2.getSimpleName()); s2 = s2.owner; @@ -414,7 +414,7 @@ public class RichDiagnosticFormatter extends ? ownerName : s.name.toString(); if (s.type != null) { - if (s.type.tag == FORALL) { + if (s.type.hasTag(FORALL)) { ms = "<" + visitTypes(s.type.getTypeArguments(), locale) + ">" + ms; } ms += "(" + printMethodArgs( @@ -532,8 +532,8 @@ public class RichDiagnosticFormatter extends nameSimplifier.addUsage(t.tsym); boolean boundErroneous = bounds.head == null || - bounds.head.tag == NONE || - bounds.head.tag == ERROR; + bounds.head.hasTag(NONE) || + bounds.head.hasTag(ERROR); if ((t.tsym.flags() & SYNTHETIC) == 0) { //this is a true typevar diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java index 6a8818c47a1..20ed8fdbd5d 100644 --- a/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java +++ b/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java @@ -29,8 +29,8 @@ import com.sun.javadoc.*; import com.sun.tools.javac.code.Attribute; import com.sun.tools.javac.code.Symbol.*; -import com.sun.tools.javac.code.TypeTags; +import static com.sun.tools.javac.code.TypeTag.BOOLEAN; /** * Represents a value of an annotation type element. @@ -76,7 +76,7 @@ public class AnnotationValueImpl implements AnnotationValue { public Object value; public void visitConstant(Attribute.Constant c) { - if (c.type.tag == TypeTags.BOOLEAN) { + if (c.type.hasTag(BOOLEAN)) { // javac represents false and true as integers 0 and 1 value = Boolean.valueOf( ((Integer)c.value).intValue() != 0); @@ -133,7 +133,7 @@ public class AnnotationValueImpl implements AnnotationValue { } public void visitConstant(Attribute.Constant c) { - if (c.type.tag == TypeTags.BOOLEAN) { + if (c.type.hasTag(BOOLEAN)) { // javac represents false and true as integers 0 and 1 sb.append(((Integer)c.value).intValue() != 0); } else { diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java index efaf4a49793..37b3547e590 100644 --- a/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java +++ b/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java @@ -45,7 +45,6 @@ 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.ClassType; -import com.sun.tools.javac.code.TypeTags; import com.sun.tools.javac.comp.AttrContext; import com.sun.tools.javac.comp.Env; @@ -63,6 +62,7 @@ import com.sun.tools.javac.util.Names; import com.sun.tools.javac.util.Position; import static com.sun.tools.javac.code.Kinds.*; +import static com.sun.tools.javac.code.TypeTag.CLASS; import static com.sun.tools.javac.tree.JCTree.Tag.*; /** @@ -164,7 +164,7 @@ public class ClassDocImpl extends ProgramElementDocImpl implements ClassDoc { if (isEnum() || isInterface() || isAnnotationType()) { return false; } - for (Type t = type; t.tag == TypeTags.CLASS; t = env.types.supertype(t)) { + for (Type t = type; t.hasTag(CLASS); t = env.types.supertype(t)) { if (t.tsym == env.syms.errorType.tsym || t.tsym == env.syms.exceptionType.tsym) { return false; @@ -201,7 +201,7 @@ public class ClassDocImpl extends ProgramElementDocImpl implements ClassDoc { if (isEnum() || isInterface() || isAnnotationType()) { return false; } - for (Type t = type; t.tag == TypeTags.CLASS; t = env.types.supertype(t)) { + for (Type t = type; t.hasTag(CLASS); t = env.types.supertype(t)) { if (t.tsym == env.syms.exceptionType.tsym) { return true; } @@ -217,7 +217,7 @@ public class ClassDocImpl extends ProgramElementDocImpl implements ClassDoc { if (isEnum() || isInterface() || isAnnotationType()) { return false; } - for (Type t = type; t.tag == TypeTags.CLASS; t = env.types.supertype(t)) { + for (Type t = type; t.hasTag(CLASS); t = env.types.supertype(t)) { if (t.tsym == env.syms.errorType.tsym) { return true; } @@ -232,7 +232,7 @@ public class ClassDocImpl extends ProgramElementDocImpl implements ClassDoc { if (isEnum() || isInterface() || isAnnotationType()) { return false; } - for (Type t = type; t.tag == TypeTags.CLASS; t = env.types.supertype(t)) { + for (Type t = type; t.hasTag(CLASS); t = env.types.supertype(t)) { if (t.tsym == env.syms.throwableType.tsym) { return true; } diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java index c76dd7a87d6..b10992a99b9 100644 --- a/langtools/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java +++ b/langtools/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java @@ -32,12 +32,13 @@ import com.sun.javadoc.*; import com.sun.tools.javac.code.Flags; import com.sun.tools.javac.code.Symbol.ClassSymbol; import com.sun.tools.javac.code.Symbol.VarSymbol; -import com.sun.tools.javac.code.TypeTags; import com.sun.tools.javac.tree.JCTree.JCVariableDecl; import com.sun.tools.javac.util.Position; +import static com.sun.tools.javac.code.TypeTag.BOOLEAN; + /** * Represents a field in a java class. * @@ -103,7 +104,7 @@ public class FieldDocImpl extends MemberDocImpl implements FieldDoc { */ public Object constantValue() { Object result = sym.getConstValue(); - if (result != null && sym.type.tag == TypeTags.BOOLEAN) + if (result != null && sym.type.hasTag(BOOLEAN)) // javac represents false and true as Integers 0 and 1 result = Boolean.valueOf(((Integer)result).intValue() != 0); return result; diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java index f90b1641cc3..025463cf136 100644 --- a/langtools/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java +++ b/langtools/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java @@ -31,10 +31,11 @@ import com.sun.javadoc.*; 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.TypeTags; import com.sun.tools.javac.tree.JCTree.JCMethodDecl; import com.sun.tools.javac.util.Position; +import static com.sun.tools.javac.code.TypeTag.CLASS; + /** * Represents a method of a java class. * @@ -129,7 +130,7 @@ public class MethodDocImpl ClassSymbol origin = (ClassSymbol)sym.owner; for (Type t = env.types.supertype(origin.type); - t.tag == TypeTags.CLASS; + t.hasTag(CLASS); t = env.types.supertype(t)) { ClassSymbol c = (ClassSymbol)t.tsym; for (Scope.Entry e = c.members().lookup(sym.name); e.scope != null; e = e.next()) { @@ -161,7 +162,7 @@ public class MethodDocImpl ClassSymbol origin = (ClassSymbol)sym.owner; for (Type t = env.types.supertype(origin.type); - t.tag == TypeTags.CLASS; + t.hasTag(CLASS); t = env.types.supertype(t)) { ClassSymbol c = (ClassSymbol)t.tsym; for (Scope.Entry e = c.members().lookup(sym.name); e.scope != null; e = e.next()) { diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ParameterizedTypeImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/ParameterizedTypeImpl.java index 1974ec10ad7..2fac11119d3 100644 --- a/langtools/src/share/classes/com/sun/tools/javadoc/ParameterizedTypeImpl.java +++ b/langtools/src/share/classes/com/sun/tools/javadoc/ParameterizedTypeImpl.java @@ -31,7 +31,7 @@ import com.sun.tools.javac.code.Symbol.ClassSymbol; import com.sun.tools.javac.code.Type; import com.sun.tools.javac.code.Type.ClassType; -import static com.sun.tools.javac.code.TypeTags.*; +import static com.sun.tools.javac.code.TypeTag.CLASS; /** @@ -95,7 +95,7 @@ public class ParameterizedTypeImpl * Return null is this is a top-level type. */ public com.sun.javadoc.Type containingType() { - if (type.getEnclosingType().tag == CLASS) { + if (type.getEnclosingType().hasTag(CLASS)) { // This is the type of an inner class. return TypeMaker.getType(env, type.getEnclosingType()); } @@ -134,7 +134,7 @@ public class ParameterizedTypeImpl return TypeMaker.getTypeName(cl, full); } StringBuilder s = new StringBuilder(); - if (cl.getEnclosingType().tag != CLASS) { // if not an inner class... + if (!(cl.getEnclosingType().hasTag(CLASS))) { // if not an inner class... s.append(TypeMaker.getTypeName(cl, full)); } else { ClassType encl = (ClassType)cl.getEnclosingType(); diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/SerializedForm.java b/langtools/src/share/classes/com/sun/tools/javadoc/SerializedForm.java index 559be36a7de..76dc6a08fd7 100644 --- a/langtools/src/share/classes/com/sun/tools/javadoc/SerializedForm.java +++ b/langtools/src/share/classes/com/sun/tools/javadoc/SerializedForm.java @@ -237,6 +237,9 @@ class SerializedForm { SerialFieldTag[] sfTag = spfDoc.serialFieldTags(); for (int i = 0; i < sfTag.length; i++) { + if (sfTag[i].fieldName() == null || sfTag[i].fieldType() == null) // ignore malformed @serialField tags + continue; + Name fieldName = names.fromString(sfTag[i].fieldName()); // Look for a FieldDocImpl that is documented by serialFieldTagImpl. diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/TypeMaker.java b/langtools/src/share/classes/com/sun/tools/javadoc/TypeMaker.java index 63ada2b9b50..dd0f355fa24 100644 --- a/langtools/src/share/classes/com/sun/tools/javadoc/TypeMaker.java +++ b/langtools/src/share/classes/com/sun/tools/javadoc/TypeMaker.java @@ -33,7 +33,7 @@ import com.sun.tools.javac.code.Type.ArrayType; import com.sun.tools.javac.code.Type.ClassType; import com.sun.tools.javac.code.Type.TypeVar; import com.sun.tools.javac.util.List; -import static com.sun.tools.javac.code.TypeTags.*; +import static com.sun.tools.javac.code.TypeTag.ARRAY; /** *

This is NOT part of any supported API. @@ -57,7 +57,7 @@ public class TypeMaker { if (env.legacyDoclet) { t = env.types.erasure(t); } - switch (t.tag) { + switch (t.getTag()) { case CLASS: if (ClassDocImpl.isGeneric((ClassSymbol)t.tsym)) { return env.getParameterizedType((ClassType)t); @@ -107,10 +107,10 @@ public class TypeMaker { } public static String getTypeName(Type t, boolean full) { - switch (t.tag) { + switch (t.getTag()) { case ARRAY: StringBuilder s = new StringBuilder(); - while (t.tag == ARRAY) { + while (t.hasTag(ARRAY)) { s.append("[]"); t = ((ArrayType)t).elemtype; } @@ -129,10 +129,10 @@ public class TypeMaker { * Class names are qualified if "full" is true. */ static String getTypeString(DocEnv env, Type t, boolean full) { - switch (t.tag) { + switch (t.getTag()) { case ARRAY: StringBuilder s = new StringBuilder(); - while (t.tag == ARRAY) { + while (t.hasTag(ARRAY)) { s.append("[]"); t = env.types.elemtype(t); } @@ -203,7 +203,7 @@ public class TypeMaker { private com.sun.javadoc.Type skipArrays() { if (skipArraysCache == null) { Type t; - for (t = arrayType; t.tag == ARRAY; t = env.types.elemtype(t)) { } + for (t = arrayType; t.hasTag(ARRAY); t = env.types.elemtype(t)) { } skipArraysCache = TypeMaker.getType(env, t); } return skipArraysCache; @@ -216,7 +216,7 @@ public class TypeMaker { */ public String dimension() { StringBuilder dimension = new StringBuilder(); - for (Type t = arrayType; t.tag == ARRAY; t = env.types.elemtype(t)) { + for (Type t = arrayType; t.hasTag(ARRAY); t = env.types.elemtype(t)) { dimension.append("[]"); } return dimension.toString(); diff --git a/langtools/src/share/classes/com/sun/tools/javah/JavahFileManager.java b/langtools/src/share/classes/com/sun/tools/javah/JavahFileManager.java index 72160c59992..e27eff2fdc9 100644 --- a/langtools/src/share/classes/com/sun/tools/javah/JavahFileManager.java +++ b/langtools/src/share/classes/com/sun/tools/javah/JavahFileManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 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 @@ -44,7 +44,7 @@ import com.sun.tools.javac.util.Context; class JavahFileManager extends JavacFileManager { private JavahFileManager(Context context, Charset charset) { super(context, true, charset); - setIgnoreSymbolFile(true); + setSymbolFileEnabled(false); } static JavahFileManager create(final DiagnosticListener dl, PrintWriter log) { @@ -56,8 +56,4 @@ class JavahFileManager extends JavacFileManager { return new JavahFileManager(javac_context, null); } - - void setIgnoreSymbolFile(boolean b) { - ignoreSymbolFile = b; - } } diff --git a/langtools/src/share/classes/com/sun/tools/javah/JavahTask.java b/langtools/src/share/classes/com/sun/tools/javah/JavahTask.java index 16c3be898aa..6b8abf9d6d1 100644 --- a/langtools/src/share/classes/com/sun/tools/javah/JavahTask.java +++ b/langtools/src/share/classes/com/sun/tools/javah/JavahTask.java @@ -500,7 +500,7 @@ public class JavahTask implements NativeHeaderTool.NativeHeaderTask { g.setForce(force); if (fileManager instanceof JavahFileManager) - ((JavahFileManager) fileManager).setIgnoreSymbolFile(true); + ((JavahFileManager) fileManager).setSymbolFileEnabled(false); JavaCompiler c = ToolProvider.getSystemJavaCompiler(); List opts = new ArrayList(); diff --git a/langtools/src/share/classes/com/sun/tools/javap/JavapFileManager.java b/langtools/src/share/classes/com/sun/tools/javap/JavapFileManager.java index 8fa75792dae..cf491bf83fa 100644 --- a/langtools/src/share/classes/com/sun/tools/javap/JavapFileManager.java +++ b/langtools/src/share/classes/com/sun/tools/javap/JavapFileManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 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 @@ -44,7 +44,7 @@ import com.sun.tools.javac.util.Context; public class JavapFileManager extends JavacFileManager { private JavapFileManager(Context context, Charset charset) { super(context, true, charset); - setIgnoreSymbolFile(true); + setSymbolFileEnabled(false); } public static JavapFileManager create(final DiagnosticListener dl, PrintWriter log) { @@ -56,8 +56,4 @@ public class JavapFileManager extends JavacFileManager { return new JavapFileManager(javac_context, null); } - - void setIgnoreSymbolFile(boolean b) { - ignoreSymbolFile = b; - } } diff --git a/langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java b/langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java index dcedab663bf..c5dd3468443 100644 --- a/langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java +++ b/langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -77,17 +77,19 @@ public class TestDocFileDir extends JavadocTester { //Output dir = Input Dir private static final String[] ARGS1 = new String[] { - "-d", BUG_ID + "-1", "-sourcepath", - "blah" + String.valueOf(File.pathSeparatorChar) + - BUG_ID + "-1" + String.valueOf(File.pathSeparatorChar) + - "blah", "pkg"}; + "-d", BUG_ID + "-1", + "-sourcepath", + "blah" + File.pathSeparator + BUG_ID + "-1" + File.pathSeparator + "blah", + "pkg"}; //Exercising -docfilessubdirs and -excludedocfilessubdir private static final String[] ARGS2 = new String[] { - "-d", BUG_ID + "-2", "-sourcepath", SRC_DIR, - "-docfilessubdirs", "-excludedocfilessubdir", - "subdir-excluded1:subdir-excluded2", "pkg"}; + "-d", BUG_ID + "-2", + "-sourcepath", SRC_DIR, + "-docfilessubdirs", + "-excludedocfilessubdir", "subdir-excluded1:subdir-excluded2", + "pkg"}; //Output dir = "", Input dir = "" private static final String[] ARGS0 = diff --git a/langtools/test/com/sun/javadoc/testIndex/TestIndex.java b/langtools/test/com/sun/javadoc/testIndex/TestIndex.java index f38982807fa..ae916ba4040 100644 --- a/langtools/test/com/sun/javadoc/testIndex/TestIndex.java +++ b/langtools/test/com/sun/javadoc/testIndex/TestIndex.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -53,28 +53,28 @@ public class TestIndex extends JavadocTester { //Test index-all.html {BUG_ID + FS + "index-all.html", - "C" + - " - Class in pkg"}, + "C" + + " - Class in pkg"}, {BUG_ID + FS + "index-all.html", - "" + + "" + "Interface - Interface in " + - "pkg"}, + "pkg"}, {BUG_ID + FS + "index-all.html", - "" + + "" + "AnnotationType - Annotation Type in " + - "pkg"}, + "pkg"}, {BUG_ID + FS + "index-all.html", - "" + + "" + "Coin - Enum in " + - "pkg"}, + "pkg"}, {BUG_ID + FS + "index-all.html", - "Class in <Unnamed>"}, + "Class in <Unnamed>"}, {BUG_ID + FS + "index-all.html", - "

" + NL + "
" + - "Java - Static variable in class pkg." + NL + "
" + + "Java - Static variable in class pkg.C
" + NL + "
 
" + NL + - "
JDK " + - "- Static variable in class pkg." + + "
JDK " + + "- Static variable in class pkg." + "C
" + NL + "
 
" + NL + "
"}, }; private static final String[][] NEGATED_TEST = NO_TEST; diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java index 059393768a2..0ad0d86e84e 100644 --- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java +++ b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -663,14 +663,14 @@ public class TestNewLanguageFeatures extends JavadocTester { // TYPE PARAMETER IN INDEX //================================= {BUG_ID + FS + "index-all.html", - "" + + "" + "method(Vector<Object>)" }, //================================= // TYPE PARAMETER IN INDEX //================================= {BUG_ID + FS + "index-all.html", - "" + + "" + "method(Vector<Object>)" }, }; diff --git a/langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java b/langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java index da0a87f72c5..06cb6eefba9 100644 --- a/langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java +++ b/langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -52,7 +52,7 @@ public class TestPackagePage extends JavadocTester { "
  • Package
    • " }, {BUG_ID + "-1" + FS + "index-all.html", - "
  • Package
    • " + "
  • Package
    • " }, {BUG_ID + "-1" + FS + "help-doc.html", "
  • Package
    • " diff --git a/langtools/test/tools/javac/6889255/T6889255.java b/langtools/test/tools/javac/6889255/T6889255.java index 5d77d8c40ed..8c820bcd3bc 100644 --- a/langtools/test/tools/javac/6889255/T6889255.java +++ b/langtools/test/tools/javac/6889255/T6889255.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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 @@ -36,7 +36,7 @@ import com.sun.tools.javac.code.Scope; import com.sun.tools.javac.code.Symbol.*; import com.sun.tools.javac.code.Type; import com.sun.tools.javac.code.Type.ClassType; -import com.sun.tools.javac.code.TypeTags; +import com.sun.tools.javac.code.TypeTag; import com.sun.tools.javac.file.JavacFileManager; import com.sun.tools.javac.jvm.ClassReader; import com.sun.tools.javac.util.Context; @@ -436,7 +436,7 @@ public class T6889255 { // The rest of this method assumes the local conventions in the test program Type t = v.type; String s; - if (t.tag == TypeTags.CLASS) + if (t.hasTag(TypeTag.CLASS)) s = ((ClassType) t).tsym.name.toString(); else s = t.toString(); diff --git a/langtools/test/tools/javac/Paths/TestCompileJARInClassPath.java b/langtools/test/tools/javac/Paths/TestCompileJARInClassPath.java new file mode 100644 index 00000000000..96347c2ac31 --- /dev/null +++ b/langtools/test/tools/javac/Paths/TestCompileJARInClassPath.java @@ -0,0 +1,132 @@ +/* + * 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 6725230 + * @summary Test to make sure that java Compilation with JSR199 does not ignore + * Class-Path in manifest + * @author vicente.romero + * @build TestCompileJARInClassPath + * @run main TestCompileJARInClassPath + */ + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.List; +import javax.tools.DiagnosticCollector; +import javax.tools.JavaFileObject; +import javax.tools.StandardJavaFileManager; +import javax.tools.StandardLocation; +import javax.tools.ToolProvider; + +public class TestCompileJARInClassPath { + + public static void main(String args[]) throws Exception { + TestCompileJARInClassPath theTest = new TestCompileJARInClassPath(); + theTest.run(); + } + + void run() throws Exception { + try { + clean(); + generateFilesNeeded(); + compileWithJSR199(); + } finally { + clean(); + } + } + + void writeFile(String f, String contents) throws IOException { + PrintStream s = new PrintStream(new FileOutputStream(f)); + s.println(contents); + s.close(); + } + + void rm(String filename) throws Exception { + File f = new File(filename); + f.delete(); + if (f.exists()) + throw new Exception(filename + ": couldn't remove"); + } + + void clean() throws Exception { + rm("C1.java"); + rm("C1.class"); + rm("C1.jar"); + + rm("C2.java"); + rm("C2.class"); + rm("C2.jar"); + rm("MANIFEST.MF"); + + rm("C3.java"); + rm("C3.class"); + } + + void generateFilesNeeded() throws Exception { + sun.tools.jar.Main jarGenerator = new sun.tools.jar.Main(System.out, System.err, "jar"); + + writeFile("C1.java", + "public class C1 {public static void f() {}}"); + com.sun.tools.javac.Main.compile(new String[]{"C1.java"}); + jarGenerator.run(new String[] {"cf", "C1.jar", "C1.class"}); + + writeFile("C2.java", + "public class C2 {public static void g() {}}"); + writeFile("MANIFEST.MF", + "Manifest-Version: 1.0\n" + + "Class-Path: C1.jar\n" + + "Main-Class: C2"); + com.sun.tools.javac.Main.compile(new String[]{"C2.java"}); + jarGenerator.run(new String[] {"cfm", "C2.jar", "MANIFEST.MF", "C2.class"}); + + writeFile("C3.java", + "public class C3 {public static void h() {C2.g(); C1.f();}}"); + } + + void compileWithJSR199() throws IOException { + String cpath = "C2.jar"; + File clientJarFile = new File(cpath); + File sourceFileToCompile = new File("C3.java"); + + + javax.tools.JavaCompiler javac = ToolProvider.getSystemJavaCompiler(); + DiagnosticCollector diagnostics = new DiagnosticCollector<>(); + StandardJavaFileManager stdFileManager = javac.getStandardFileManager(diagnostics, null, null); + + List files = new ArrayList<>(); + files.add(clientJarFile); + + stdFileManager.setLocation(StandardLocation.CLASS_PATH, files); + + Iterable sourceFiles = stdFileManager.getJavaFileObjects(sourceFileToCompile); + + if (!javac.getTask(null, stdFileManager, diagnostics, null, null, sourceFiles).call()) { + throw new AssertionError("compilation failed"); + } + } +} diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/BaseAnnoAsContainerAnno.java b/langtools/test/tools/javac/annotations/repeatingAnnotations/BaseAnnoAsContainerAnno.java new file mode 100644 index 00000000000..d508fea04c7 --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/BaseAnnoAsContainerAnno.java @@ -0,0 +1,20 @@ +/** + * @test /nodynamiccopyright/ + * @bug 7169362 + * @author sogoel + * @summary Base annotation specify itself as ContainerAnnotation + * @compile/fail/ref=BaseAnnoAsContainerAnno.out -XDrawDiagnostics BaseAnnoAsContainerAnno.java + */ + +import java.lang.annotation.ContainedBy; +import java.lang.annotation.ContainerFor; + +@ContainedBy(Foo.class) +@ContainerFor(Foo.class) +@interface Foo { + Foo[] value() default {}; +} + +@Foo() @Foo() +public class BaseAnnoAsContainerAnno {} + diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/BaseAnnoAsContainerAnno.out b/langtools/test/tools/javac/annotations/repeatingAnnotations/BaseAnnoAsContainerAnno.out new file mode 100644 index 00000000000..8f2419f297b --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/BaseAnnoAsContainerAnno.out @@ -0,0 +1,2 @@ +BaseAnnoAsContainerAnno.java:15:11: compiler.err.cyclic.annotation.element +1 error diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/ClassReaderDefault.java b/langtools/test/tools/javac/annotations/repeatingAnnotations/ClassReaderDefault.java new file mode 100644 index 00000000000..18d9d7c6a41 --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/ClassReaderDefault.java @@ -0,0 +1,46 @@ +/* + * 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 7199925 + * + * @clean ClassReaderDefault SeparateCompile + * @compile ClassReaderDefault.java + * @compile SeparateCompile.java + */ +import java.lang.annotation.ContainedBy; +import java.lang.annotation.ContainerFor; + +public class ClassReaderDefault { +} + +@ContainerFor(Foo.class) +@interface FooContainer { + Foo[] value(); + int f() default 0; +} + +@ContainedBy(FooContainer.class) +@interface Foo {} diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/CyclicAnnotation.java b/langtools/test/tools/javac/annotations/repeatingAnnotations/CyclicAnnotation.java new file mode 100644 index 00000000000..7549d464d5f --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/CyclicAnnotation.java @@ -0,0 +1,26 @@ +/** + * @test /nodynamiccopyright/ + * @bug 7169362 + * @author sogoel + * @summary Cyclic annotation not allowed + * @compile/fail/ref=CyclicAnnotation.out -XDrawDiagnostics CyclicAnnotation.java + */ + +import java.lang.annotation.ContainedBy; +import java.lang.annotation.ContainerFor; + +@ContainedBy(Foo.class) +@ContainerFor(Baz.class) +@interface Baz { + Foo[] value() default {}; +} + +@ContainedBy(Baz.class) +@ContainerFor(Foo.class) +@interface Foo{ + Baz[] value() default {}; +} + +@Foo(value = {@Baz,@Baz}) +@Baz(value = {@Foo,@Foo}) +public class CyclicAnnotation {} diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/CyclicAnnotation.out b/langtools/test/tools/javac/annotations/repeatingAnnotations/CyclicAnnotation.out new file mode 100644 index 00000000000..070b8ca0883 --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/CyclicAnnotation.out @@ -0,0 +1,6 @@ +CyclicAnnotation.java:12:1: compiler.err.invalid.container.wrong.containerfor: Foo, Baz +CyclicAnnotation.java:13:1: compiler.err.invalid.container.wrong.containedby: Foo, Baz +CyclicAnnotation.java:15:11: compiler.err.cyclic.annotation.element +CyclicAnnotation.java:18:1: compiler.err.invalid.container.wrong.containerfor: Baz, Foo +CyclicAnnotation.java:19:1: compiler.err.invalid.container.wrong.containedby: Baz, Foo +5 errors diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/DefaultCasePresent.java b/langtools/test/tools/javac/annotations/repeatingAnnotations/DefaultCasePresent.java new file mode 100644 index 00000000000..7352a622119 --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/DefaultCasePresent.java @@ -0,0 +1,46 @@ +/* + * 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 7169362 + * @author sogoel + * @summary Default case for methods other than value() in ContainerAnno + * @compile DefaultCasePresent.java + */ + +import java.lang.annotation.ContainedBy; +import java.lang.annotation.ContainerFor; + +@ContainedBy(FooContainer.class) +@interface Foo {} + +@ContainerFor(Foo.class) +@interface FooContainer { + Foo[] value(); + String other() default "other-method"; +} + +@Foo @Foo +public class DefaultCasePresent {} + diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/DocumentedContainerAnno.java b/langtools/test/tools/javac/annotations/repeatingAnnotations/DocumentedContainerAnno.java new file mode 100644 index 00000000000..96d86f7a368 --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/DocumentedContainerAnno.java @@ -0,0 +1,23 @@ +/** + * @test /nodynamiccopyright/ + * @bug 7169362 + * @author sogoel + * @summary Base anno is Documented but Container anno is not + * @compile/fail/ref=DocumentedContainerAnno.out -XDrawDiagnostics DocumentedContainerAnno.java + */ + +import java.lang.annotation.ContainedBy; +import java.lang.annotation.ContainerFor; +import java.lang.annotation.Documented; + +@Documented +@ContainedBy(FooContainer.class) +@interface Foo {} + +@ContainerFor(Foo.class) +@interface FooContainer{ + Foo[] value(); +} + +@Foo @Foo +public class DocumentedContainerAnno {} diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/DocumentedContainerAnno.out b/langtools/test/tools/javac/annotations/repeatingAnnotations/DocumentedContainerAnno.out new file mode 100644 index 00000000000..409d0414e77 --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/DocumentedContainerAnno.out @@ -0,0 +1,2 @@ +DocumentedContainerAnno.java:14:1: compiler.err.invalid.containedby.annotation.not.documented: FooContainer, Foo +1 error diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/InheritedContainerAnno.java b/langtools/test/tools/javac/annotations/repeatingAnnotations/InheritedContainerAnno.java new file mode 100644 index 00000000000..2d2a9c63894 --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/InheritedContainerAnno.java @@ -0,0 +1,24 @@ +/** + * @test /nodynamiccopyright/ + * @bug 7169362 + * @author sogoel + * @summary Base anno is Inherited but Container anno is not + * @compile/fail/ref=InheritedContainerAnno.out -XDrawDiagnostics InheritedContainerAnno.java + */ + +import java.lang.annotation.ContainedBy; +import java.lang.annotation.ContainerFor; +import java.lang.annotation.Inherited; + +@Inherited +@ContainedBy(FooContainer.class) +@interface Foo {} + +@ContainerFor(Foo.class) +@interface FooContainer{ + Foo[] value(); +} + +@Foo @Foo +public class InheritedContainerAnno {} + diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/InheritedContainerAnno.out b/langtools/test/tools/javac/annotations/repeatingAnnotations/InheritedContainerAnno.out new file mode 100644 index 00000000000..10fcc772581 --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/InheritedContainerAnno.out @@ -0,0 +1,2 @@ +InheritedContainerAnno.java:14:1: compiler.err.invalid.containedby.annotation.not.inherited: FooContainer, Foo +1 error diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingContainer.java b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingContainer.java new file mode 100644 index 00000000000..8e5650442dc --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingContainer.java @@ -0,0 +1,21 @@ +/** + * @test /nodynamiccopyright/ + * @bug 7169362 + * @author sogoel + * @summary ContainerAnnotation does not have FooContainer.class specified + * @compile/fail/ref=MissingContainer.out -XDrawDiagnostics MissingContainer.java + */ + +import java.lang.annotation.ContainedBy; +import java.lang.annotation.ContainerFor; + +@ContainedBy() +@interface Foo {} + +@ContainerFor(Foo.class) +@interface FooContainer { + Foo[] value(); +} + +@Foo @Foo +public class MissingContainer {} diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingContainer.out b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingContainer.out new file mode 100644 index 00000000000..76986a76769 --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingContainer.out @@ -0,0 +1,5 @@ +MissingContainer.java:20:1: compiler.err.invalid.containedby.annotation: Foo +MissingContainer.java:20:6: compiler.err.invalid.containedby.annotation: Foo +MissingContainer.java:12:1: compiler.err.annotation.missing.default.value: java.lang.annotation.ContainedBy, value +MissingContainer.java:15:1: compiler.err.invalid.container.wrong.containedby: Foo, FooContainer +4 errors diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.java b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.java new file mode 100644 index 00000000000..a994aa8cf77 --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.java @@ -0,0 +1,23 @@ +/** + * @test /nodynamiccopyright/ + * @bug 7169362 + * @author sogoel + * @summary Default case not specified for other methods in container annotation + * @compile/fail/ref=MissingDefaultCase1.out -XDrawDiagnostics MissingDefaultCase1.java + */ + +import java.lang.annotation.ContainedBy; +import java.lang.annotation.ContainerFor; + +@ContainedBy(FooContainer.class) +@interface Foo {} + +@ContainerFor(Foo.class) +@interface FooContainer { + Foo[] value(); + String other(); // missing default clause +} + +@Foo @Foo +public class MissingDefaultCase1 {} + diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.out b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.out new file mode 100644 index 00000000000..9724b370b4d --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.out @@ -0,0 +1,2 @@ +MissingDefaultCase1.java:12:1: compiler.err.invalid.containedby.annotation.elem.nondefault: FooContainer, other() +1 error diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.java b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.java new file mode 100644 index 00000000000..bd50b909cb4 --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.java @@ -0,0 +1,23 @@ +/** + * @test /nodynamiccopyright/ + * @bug 7169362 + * @author sogoel + * @summary Missing default case for other method and return type is base annotation + * @compile/fail/ref=MissingDefaultCase2.out -XDrawDiagnostics MissingDefaultCase2.java + */ + +import java.lang.annotation.ContainedBy; +import java.lang.annotation.ContainerFor; + +@ContainedBy(FooContainer.class) +@interface Foo {} + +@ContainerFor(Foo.class) +@interface FooContainer { + Foo[] value(); + Foo other(); // missing default clause and return type is an annotation +} + +@Foo @Foo +public class MissingDefaultCase2 {} + diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.out b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.out new file mode 100644 index 00000000000..13d93f2f7c6 --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.out @@ -0,0 +1,2 @@ +MissingDefaultCase2.java:12:1: compiler.err.invalid.containedby.annotation.elem.nondefault: FooContainer, other() +1 error diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingValueMethod.java b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingValueMethod.java new file mode 100644 index 00000000000..36333b75cb2 --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingValueMethod.java @@ -0,0 +1,22 @@ +/** + * @test /nodynamiccopyright/ + * @bug 7169362 + * @author sogoel + * @summary Missing value() method in ContainerAnnotation + * @compile/fail/ref=MissingValueMethod.out -XDrawDiagnostics MissingValueMethod.java + */ + +import java.lang.annotation.ContainedBy; +import java.lang.annotation.ContainerFor; + +@ContainedBy(FooContainer.class) +@interface Foo {} + +@ContainerFor(Foo.class) +@interface FooContainer{ + Foo[] values(); // wrong method name +} + +@Foo @Foo +public class MissingValueMethod {} + diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingValueMethod.out b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingValueMethod.out new file mode 100644 index 00000000000..a712b5fa798 --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingValueMethod.out @@ -0,0 +1,4 @@ +MissingValueMethod.java:20:1: compiler.err.invalid.containedby.annotation.no.value: FooContainer +MissingValueMethod.java:20:6: compiler.err.invalid.containedby.annotation.no.value: FooContainer +MissingValueMethod.java:12:1: compiler.err.invalid.containedby.annotation.elem.nondefault: FooContainer, values() +3 errors diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/MultiLevelRepeatableAnno.java b/langtools/test/tools/javac/annotations/repeatingAnnotations/MultiLevelRepeatableAnno.java new file mode 100644 index 00000000000..62b0089e0a4 --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/MultiLevelRepeatableAnno.java @@ -0,0 +1,51 @@ +/* + * 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 7169362 + * @author sogoel + * @summary ContainerType can have its own container + * @compile MultiLevelRepeatableAnno.java + */ + +import java.lang.annotation.ContainedBy; +import java.lang.annotation.ContainerFor; + +@ContainedBy(FooContainer.class) +@interface Foo {} + +@ContainedBy(FooContainerContainer.class) +@ContainerFor(Foo.class) +@interface FooContainer { + Foo[] value(); +} + +@ContainerFor(FooContainer.class) +@interface FooContainerContainer { + FooContainer[] value(); +} + +@Foo @Foo +public class MultiLevelRepeatableAnno {} + diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/MultipleAnnoMixedOrder.java b/langtools/test/tools/javac/annotations/repeatingAnnotations/MultipleAnnoMixedOrder.java new file mode 100644 index 00000000000..0de0c3221a0 --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/MultipleAnnoMixedOrder.java @@ -0,0 +1,60 @@ +/* + * 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 7169362 + * @author sogoel + * @summary Repeatable annotations in random order + * @compile MultipleAnnoMixedOrder.java + */ + +import java.lang.annotation.ContainedBy; +import java.lang.annotation.ContainerFor; + +@ContainedBy(FooContainer.class) +@interface Foo { + int getNumbers(); +} + +@ContainerFor(Foo.class) +@interface FooContainer { + Foo[] value(); +} + +@ContainedBy(BazContainer.class) +@interface Baz { + String getStr(); +} + +@ContainerFor(Baz.class) +@interface BazContainer { + Baz[] value(); +} + +@Foo(getNumbers=1) +@Baz(getStr="hello") +@Foo(getNumbers=2) +@Baz(getStr="world") +public class MultipleAnnoMixedOrder {} + diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/NoRepeatableAnno.java b/langtools/test/tools/javac/annotations/repeatingAnnotations/NoRepeatableAnno.java new file mode 100644 index 00000000000..a4c8e218563 --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/NoRepeatableAnno.java @@ -0,0 +1,12 @@ +/** + * @test /nodynamiccopyright/ + * @bug 7169362 + * @author sogoel + * @summary Foo is not a repeatable annotation but used as one. + * @compile/fail/ref=NoRepeatableAnno.out -XDrawDiagnostics NoRepeatableAnno.java + */ + +@interface Foo {} + +@Foo @Foo +public class NoRepeatableAnno {} diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/NoRepeatableAnno.out b/langtools/test/tools/javac/annotations/repeatingAnnotations/NoRepeatableAnno.out new file mode 100644 index 00000000000..df37cdd1852 --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/NoRepeatableAnno.out @@ -0,0 +1,3 @@ +NoRepeatableAnno.java:11:1: compiler.err.duplicate.annotation.missing.container: Foo +NoRepeatableAnno.java:11:6: compiler.err.duplicate.annotation.missing.container: Foo +2 errors diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/SeparateCompile.java b/langtools/test/tools/javac/annotations/repeatingAnnotations/SeparateCompile.java new file mode 100644 index 00000000000..66c5d0e3acd --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/SeparateCompile.java @@ -0,0 +1,30 @@ +/* + * 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. + */ + +/** + * part of test for bug: 7199925 + * see: ClassReaderDefault.java + */ +@Foo @Foo +public class SeparateCompile { +} diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/WrongReturnTypeForValue.java b/langtools/test/tools/javac/annotations/repeatingAnnotations/WrongReturnTypeForValue.java new file mode 100644 index 00000000000..6573f2f86e7 --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/WrongReturnTypeForValue.java @@ -0,0 +1,23 @@ +/** + * @test /nodynamiccopyright/ + * @bug 7169362 + * @author sogoel + * @summary Wrong return type for value() in ContainerAnnotation + * @compile/fail/ref=WrongReturnTypeForValue.out -XDrawDiagnostics WrongReturnTypeForValue.java + */ + +import java.lang.annotation.ContainedBy; +import java.lang.annotation.ContainerFor; + +@ContainedBy(FooContainer.class) +@interface Foo { + int getNumbers(); +} + +@ContainerFor(Foo.class) +@interface FooContainer{ + Foo value(); // wrong return type +} + +@Foo @Foo +public class WrongReturnTypeForValue {} diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/WrongReturnTypeForValue.out b/langtools/test/tools/javac/annotations/repeatingAnnotations/WrongReturnTypeForValue.out new file mode 100644 index 00000000000..aa2c6384851 --- /dev/null +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/WrongReturnTypeForValue.out @@ -0,0 +1,3 @@ +WrongReturnTypeForValue.java:22:1: compiler.err.invalid.containedby.annotation.value.return: FooContainer, Foo, Foo[] +WrongReturnTypeForValue.java:22:6: compiler.err.invalid.containedby.annotation.value.return: FooContainer, Foo, Foo[] +2 errors diff --git a/langtools/test/tools/javac/diags/examples/AuxiliaryClassWarning/ClassUsingAuxiliary.java b/langtools/test/tools/javac/diags/examples/AuxiliaryClassWarning/ClassUsingAuxiliary.java new file mode 100644 index 00000000000..d558fea8de0 --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/AuxiliaryClassWarning/ClassUsingAuxiliary.java @@ -0,0 +1,29 @@ +/* + * 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.warn.auxiliary.class.accessed.from.outside.of.its.source.file +// options: -Xlint:auxiliaryclass + +class ClassUsingAuxiliary { + AuxiliaryClass ahem; +} diff --git a/langtools/test/tools/javac/diags/examples/AuxiliaryClassWarning/ClassWithAuxiliary.java b/langtools/test/tools/javac/diags/examples/AuxiliaryClassWarning/ClassWithAuxiliary.java new file mode 100644 index 00000000000..2cc6aea8542 --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/AuxiliaryClassWarning/ClassWithAuxiliary.java @@ -0,0 +1,29 @@ +/* + * 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. + */ + +class ClassWithAuxiliaryClass { +} + +// Auxiliary class that cannot be found through implicit compilation. +class AuxiliaryClass { +} diff --git a/langtools/test/tools/javac/quid/T6999438.out b/langtools/test/tools/javac/quid/T6999438.out index cd6266895d1..3527ae6aa22 100644 --- a/langtools/test/tools/javac/quid/T6999438.out +++ b/langtools/test/tools/javac/quid/T6999438.out @@ -1,4 +1,4 @@ -T6999438.java:8:9: compiler.err.illegal.char: 35 +T6999438.java:8:9: compiler.err.illegal.char: # T6999438.java:8:10: compiler.err.illegal.start.of.type T6999438.java:8:25: compiler.err.expected: token.identifier T6999438.java:8:26: compiler.err.expected: ';' diff --git a/langtools/test/tools/javac/tree/MakeLiteralTest.java b/langtools/test/tools/javac/tree/MakeLiteralTest.java index c205bf7da4c..782a2cd0958 100644 --- a/langtools/test/tools/javac/tree/MakeLiteralTest.java +++ b/langtools/test/tools/javac/tree/MakeLiteralTest.java @@ -1,7 +1,5 @@ - - /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 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,13 +28,14 @@ */ import com.sun.tools.javac.code.Type; +import com.sun.tools.javac.code.TypeTag; import com.sun.tools.javac.code.Symtab; import com.sun.tools.javac.code.Types; import com.sun.tools.javac.file.JavacFileManager; import com.sun.tools.javac.tree.JCTree.JCLiteral; import com.sun.tools.javac.util.Context; import com.sun.tools.javac.tree.TreeMaker; -import static com.sun.tools.javac.code.TypeTags.*; +import static com.sun.tools.javac.code.TypeTag.*; public class MakeLiteralTest { public static void main(String... args) throws Exception { @@ -65,9 +64,9 @@ public class MakeLiteralTest { throw new Exception(errors + " errors found"); } - void test(Object value, int tag, Type type, Object constValue) { + void test(Object value, TypeTag tag, Type type, Object constValue) { JCLiteral l = maker.Literal(value); - if (l.type.tag != tag) + if (!l.type.hasTag(tag)) error("unexpected tag: " + l.getTag() + ": expected: " + tag); if (!types.isSameType(l.type, type)) error("unexpected type: " + l.type + ": expected: " + type); diff --git a/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.java b/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.java new file mode 100644 index 00000000000..07ed640a415 --- /dev/null +++ b/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.java @@ -0,0 +1,34 @@ +/* + * 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 + * @compile ClassUsingAnotherAuxiliary.java NotAClassName.java + * @compile -Xlint:auxiliaryclass ClassUsingAnotherAuxiliary.java NotAClassName.java + * @compile/fail/ref=ClassUsingAnotherAuxiliary.out -XDrawDiagnostics -Werror -Xlint:auxiliaryclass ClassUsingAnotherAuxiliary.java NotAClassName.java + */ + +class ClassUsingAnotherAuxiliary { + AnAuxiliaryClass ahem; +} + diff --git a/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.out b/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.out new file mode 100644 index 00000000000..57123508721 --- /dev/null +++ b/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.out @@ -0,0 +1,4 @@ +ClassUsingAnotherAuxiliary.java:32:5: compiler.warn.auxiliary.class.accessed.from.outside.of.its.source.file: AnAuxiliaryClass, NotAClassName.java +- compiler.err.warnings.and.werror +1 error +1 warning diff --git a/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary.java b/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary.java new file mode 100644 index 00000000000..9d22ba780e7 --- /dev/null +++ b/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary.java @@ -0,0 +1,34 @@ +/* + * 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 + * @clean ClassUsingAuxiliary ClassWithAuxiliary AuxiliaryClass ClassWithAuxiliary$NotAnAuxiliaryClass ClassWithAuxiliary$NotAnAuxiliaryClassEither + * @run compile ClassUsingAuxiliary.java ClassWithAuxiliary.java + * @run compile/fail/ref=ClassUsingAuxiliary1.out -XDrawDiagnostics -Werror -Xlint:auxiliaryclass ClassUsingAuxiliary.java ClassWithAuxiliary.java + * @run compile/fail/ref=ClassUsingAuxiliary2.out -XDrawDiagnostics -Werror -Xlint:auxiliaryclass ClassUsingAuxiliary.java + */ + +class ClassUsingAuxiliary { + AuxiliaryClass ahem; +} diff --git a/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary1.out b/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary1.out new file mode 100644 index 00000000000..e0f30900377 --- /dev/null +++ b/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary1.out @@ -0,0 +1,4 @@ +ClassUsingAuxiliary.java:33:5: compiler.warn.auxiliary.class.accessed.from.outside.of.its.source.file: AuxiliaryClass, ClassWithAuxiliary.java +- compiler.err.warnings.and.werror +1 error +1 warning diff --git a/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary2.out b/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary2.out new file mode 100644 index 00000000000..e0f30900377 --- /dev/null +++ b/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary2.out @@ -0,0 +1,4 @@ +ClassUsingAuxiliary.java:33:5: compiler.warn.auxiliary.class.accessed.from.outside.of.its.source.file: AuxiliaryClass, ClassWithAuxiliary.java +- compiler.err.warnings.and.werror +1 error +1 warning diff --git a/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassWithAuxiliary.java b/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassWithAuxiliary.java new file mode 100644 index 00000000000..ac3b86ceab7 --- /dev/null +++ b/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassWithAuxiliary.java @@ -0,0 +1,31 @@ +/* + * 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. + */ + +public class ClassWithAuxiliary { + public static class NotAnAuxiliaryClass { } + public class NotAnAuxiliaryClassEither { } +} + +// Auxiliary class that cannot be found through implicit compilation. +class AuxiliaryClass { +} diff --git a/langtools/test/tools/javac/warnings/AuxiliaryClass/NotAClassName.java b/langtools/test/tools/javac/warnings/AuxiliaryClass/NotAClassName.java new file mode 100644 index 00000000000..67feedd86e1 --- /dev/null +++ b/langtools/test/tools/javac/warnings/AuxiliaryClass/NotAClassName.java @@ -0,0 +1,25 @@ +/* + * 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. + */ + +class AnAuxiliaryClass { +} diff --git a/langtools/test/tools/javac/warnings/AuxiliaryClass/SelfClassWithAux.java b/langtools/test/tools/javac/warnings/AuxiliaryClass/SelfClassWithAux.java new file mode 100644 index 00000000000..fdc5a8fad71 --- /dev/null +++ b/langtools/test/tools/javac/warnings/AuxiliaryClass/SelfClassWithAux.java @@ -0,0 +1,44 @@ +/* + * 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 that an auxiliary class referenced from its own source file, + * does not trigger the warning. Such code does not prevent implicit + * compilation. Also test that references to inner classes do not trigger the warning. + */ + +/* + * @test + * @run compile -Werror -Xlint:auxiliaryclass SelfClassWithAux.java ClassWithAuxiliary.java + * @run compile -Werror -Xlint:auxiliaryclass SelfClassWithAux.java + */ + +class SelfClassWithAux { + Aux aux; + ClassWithAuxiliary.NotAnAuxiliaryClass alfa; + ClassWithAuxiliary.NotAnAuxiliaryClassEither beta; +} + +class Aux { + Aux aux; +}