/hg/icedtea8-forest/langtools: 13 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri May 5 03:59:09 UTC 2017
changeset 3bf46763cff7 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=3bf46763cff7
author: briangoetz
date: Thu Apr 20 20:22:39 2017 +0100
8030253, PR3335: Update langtools to use strings-in-switch
8030262, PR3335: Update langtools to use foreach loops
8030245, PR3335: Update langtools to use try-with-resources and multi-catch
Reviewed-by: darcy
changeset 2fa5b84a261d in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=2fa5b84a261d
author: yan
date: Fri Feb 21 15:14:09 2014 +0400
6457406, PR3335: javadoc doesn't handle <a href='http://...'> properly in producing index pages
Reviewed-by: jjg, bpatel, ksrini
changeset 67444506ee68 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=67444506ee68
author: darcy
date: Thu Mar 06 16:15:02 2014 -0800
8031670, PR3335: Remove unneeded -source options in javadoc tests
Reviewed-by: jjg, darcy, vromero
Contributed-by: neil.toda at oracle.com
changeset 67c12f404f7f in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=67c12f404f7f
author: bpatel
date: Tue Mar 25 22:07:55 2014 -0700
8031625, PR3335: javadoc problems referencing inner class constructors
Reviewed-by: jjg
changeset dec2c533a034 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=dec2c533a034
author: jjg
date: Thu Apr 27 15:39:26 2017 +0100
8031649, PR3335: Clean up javadoc tests
Reviewed-by: jjg
Contributed-by: neil.toda at oracle.com
changeset 79f3f42fd8b5 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=79f3f42fd8b5
author: bpatel
date: Tue Apr 01 23:58:04 2014 -0700
8032066, PR3335: Serialized form has broken links to non private inner classes of package private
Reviewed-by: jjg
changeset 2056ecdd75b4 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=2056ecdd75b4
author: jjg
date: Fri Apr 18 17:25:43 2014 -0700
8041150, PR3335: Avoid silly use of static methods in JavadocTester
Reviewed-by: ksrini
changeset b883ee8e757a in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=b883ee8e757a
author: jjg
date: Tue Apr 22 17:41:11 2014 -0700
8041253, PR3335: Avoid redundant synonyms of NO_TEST
Reviewed-by: ksrini
changeset cfe563078384 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=cfe563078384
author: jjg
date: Wed May 03 05:40:05 2017 +0100
8040903, PR3335: Clean up use of BUG_ID in javadoc tests
Reviewed-by: ksrini
changeset d8aee310c613 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=d8aee310c613
author: jjg
date: Fri Apr 25 13:08:41 2014 -0700
8040904, PR3335: Ensure javadoc tests do not overwrite results within tests
Reviewed-by: ksrini
changeset aff4e4416d56 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=aff4e4416d56
author: jjg
date: Thu May 04 21:38:52 2017 +0100
8040908, PR3335: javadoc test TestDocEncoding should use -notimestamp
Reviewed-by: ksrini
changeset 059911105c60 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=059911105c60
author: jjg
date: Thu May 04 21:40:50 2017 +0100
8038730, PR3335: Clean up the way JavadocTester is invoked, and checks for errors.
Reviewed-by: ksrini, sogoel, bpatel
changeset a3d47fe59cc4 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=a3d47fe59cc4
author: ksrini
date: Fri Oct 31 07:02:56 2014 -0700
8061305, PR3335: Javadoc crashes when method name ends with "Property"
Reviewed-by: jjg
diffstat:
src/share/classes/com/sun/tools/classfile/Attributes.java | 3 +-
src/share/classes/com/sun/tools/classfile/ClassWriter.java | 5 +-
src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java | 12 +-
src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java | 9 +-
src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java | 15 +-
src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java | 8 +-
src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java | 27 +-
src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java | 13 +-
src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java | 17 +-
src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java | 5 +-
src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java | 50 +-
src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java | 3 +-
src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java | 17 +-
src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java | 8 +-
src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java | 9 +-
src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java | 23 +-
src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java | 17 +-
src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageIndexFrameWriter.java | 6 +-
src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java | 18 +-
src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java | 31 +-
src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java | 4 +-
src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java | 4 +-
src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java | 4 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java | 9 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java | 82 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java | 49 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java | 5 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java | 14 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ProfileSummaryBuilder.java | 4 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java | 30 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java | 35 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java | 14 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java | 27 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java | 28 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java | 54 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java | 7 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java | 4 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java | 47 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java | 115 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java | 16 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java | 35 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java | 4 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java | 7 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java | 6 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java | 6 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java | 31 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java | 7 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodFinder.java | 6 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java | 11 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java | 109 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java | 69 +-
src/share/classes/com/sun/tools/doclint/DocLint.java | 3 +-
src/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java | 116 +-
src/share/classes/com/sun/tools/javac/file/FSInfo.java | 8 +-
src/share/classes/com/sun/tools/javac/file/RegularFileObject.java | 5 +-
src/share/classes/com/sun/tools/javac/file/ZipArchive.java | 5 +-
src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java | 5 +-
src/share/classes/com/sun/tools/javac/file/ZipFileIndexCache.java | 6 +-
src/share/classes/com/sun/tools/javac/jvm/JNIWriter.java | 51 +-
src/share/classes/com/sun/tools/javac/main/CommandLine.java | 25 +-
src/share/classes/com/sun/tools/javac/main/JavaCompiler.java | 5 +-
src/share/classes/com/sun/tools/javac/main/Main.java | 11 +-
src/share/classes/com/sun/tools/javac/nio/PathFileObject.java | 5 +-
src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java | 4 +-
src/share/classes/com/sun/tools/javac/sym/Profiles.java | 12 +-
src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java | 2 +-
src/share/classes/com/sun/tools/javac/util/Convert.java | 8 +-
src/share/classes/com/sun/tools/javac/util/ListBuffer.java | 4 +-
src/share/classes/com/sun/tools/javac/util/ServiceLoader.java | 9 +-
src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java | 10 +-
src/share/classes/com/sun/tools/javadoc/Comment.java | 56 +-
src/share/classes/com/sun/tools/javadoc/DocLocale.java | 16 +-
src/share/classes/com/sun/tools/javadoc/DocletInvoker.java | 11 +-
src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java | 10 +-
src/share/classes/com/sun/tools/javadoc/SerializedForm.java | 15 +-
src/share/classes/com/sun/tools/javah/JavahTool.java | 7 +-
src/share/classes/com/sun/tools/javah/TypeSignature.java | 51 +-
src/share/classes/com/sun/tools/javap/AnnotationWriter.java | 3 +-
src/share/classes/com/sun/tools/javap/JavapTask.java | 3 +-
src/share/classes/com/sun/tools/javap/StackMapWriter.java | 4 +-
src/share/classes/com/sun/tools/sjavac/Log.java | 13 +-
src/share/classes/com/sun/tools/sjavac/Main.java | 5 +-
src/share/classes/javax/lang/model/SourceVersion.java | 14 +-
test/com/sun/javadoc/5093723/T5093723.java | 29 +-
test/com/sun/javadoc/AccessAsciiArt/AccessAsciiArt.java | 153 +-
test/com/sun/javadoc/AccessFrameTitle/AccessFrameTitle.java | 153 +-
test/com/sun/javadoc/AccessH1/AccessH1.java | 148 +-
test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java | 163 +-
test/com/sun/javadoc/AccessSummary/AccessSummary.java | 65 +-
test/com/sun/javadoc/AuthorDD/AuthorDD.java | 150 +-
test/com/sun/javadoc/DocRootSlash/DocRootSlash.java | 215 +-
test/com/sun/javadoc/InheritDocForUserTags/DocTest.java | 54 +-
test/com/sun/javadoc/JavascriptWinTitle/JavascriptWinTitle.java | 196 +-
test/com/sun/javadoc/MetaTag/MetaTag.java | 179 +-
test/com/sun/javadoc/PackagesHeader/PackagesHeader.java | 123 +-
test/com/sun/javadoc/T6735320/T6735320.java | 37 +-
test/com/sun/javadoc/ValidHtml/ValidHtml.java | 195 +-
test/com/sun/javadoc/VersionNumber/VersionNumber.java | 135 +-
test/com/sun/javadoc/WindowTitles/WindowTitles.java | 220 +-
test/com/sun/javadoc/_template/Template.java | 22 +-
test/com/sun/javadoc/_template/TemplateComplete.java | 26 +-
test/com/sun/javadoc/constantValues/TestConstantValuesDriver.java | 63 +-
test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java | 47 +-
test/com/sun/javadoc/lib/JavadocTester.java | 1108 +++++---
test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java | 52 +-
test/com/sun/javadoc/testAbstractMethod/TestAbstractMethod.java | 141 +-
test/com/sun/javadoc/testAnchorNames/TestAnchorNames.java | 367 +--
test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java | 50 +-
test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java | 100 +-
test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java | 43 +-
test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java | 48 +-
test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java | 44 +-
test/com/sun/javadoc/testBaseClass/TestBaseClass.java | 43 +-
test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java | 44 +-
test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java | 65 +-
test/com/sun/javadoc/testCharset/TestCharset.java | 64 +-
test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java | 72 +-
test/com/sun/javadoc/testClassTree/TestClassTree.java | 95 +-
test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java | 80 +-
test/com/sun/javadoc/testCompletionFailure/TestCompletionFailure.java | 50 +-
test/com/sun/javadoc/testConstantValuesPage/TestConstantValuesPage.java | 42 +-
test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java | 56 +-
test/com/sun/javadoc/testConstructors/TestConstructors.java | 137 +-
test/com/sun/javadoc/testConstructors/pkg1/Outer.java | 13 +-
test/com/sun/javadoc/testCustomTag/TestCustomTag.java | 123 +-
test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java | 134 +-
test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java | 53 +-
test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java | 48 +-
test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java | 119 +-
test/com/sun/javadoc/testDocFiles/TestDocFiles.java | 41 +-
test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java | 68 +-
test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java | 172 +-
test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java | 41 +-
test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java | 60 +-
test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java | 47 +-
test/com/sun/javadoc/testEncoding/TestEncoding.java | 48 +-
test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java | 70 +-
test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java | 114 +-
test/com/sun/javadoc/testGroupOption/TestGroupOption.java | 84 +-
test/com/sun/javadoc/testHeadings/TestHeadings.java | 144 +-
test/com/sun/javadoc/testHelpFile/TestHelpFile.java | 51 +-
test/com/sun/javadoc/testHelpOption/TestHelpOption.java | 149 +-
test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java | 47 +-
test/com/sun/javadoc/testHref/TestHref.java | 120 +-
test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java | 40 +-
test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java | 48 +-
test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java | 593 ++-
test/com/sun/javadoc/testHtmlDocument/TestHtmlDocument.java | 54 +-
test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java | 75 +-
test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java | 116 +-
test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java | 739 ++---
test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java | 106 +-
test/com/sun/javadoc/testIndentation/TestIndentation.java | 55 +-
test/com/sun/javadoc/testIndex/TestIndex.java | 101 +-
test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java | 49 +-
test/com/sun/javadoc/testInterface/TestInterface.java | 158 +-
test/com/sun/javadoc/testJavaFX/C.java | 104 -
test/com/sun/javadoc/testJavaFX/D.java | 28 -
test/com/sun/javadoc/testJavaFX/TestJavaFX.java | 213 +-
test/com/sun/javadoc/testJavaFX/pkg1/C.java | 100 +
test/com/sun/javadoc/testJavaFX/pkg1/D.java | 25 +
test/com/sun/javadoc/testJavaFX/pkg2/Test.java | 34 +
test/com/sun/javadoc/testJavascript/TestJavascript.java | 183 +-
test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java | 148 +-
test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java | 54 +-
test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java | 67 +-
test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java | 54 +-
test/com/sun/javadoc/testLinkOption/TestLinkOption.java | 159 +-
test/com/sun/javadoc/testLinkOption/TestNewLineInLink.java | 46 +-
test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java | 86 +-
test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java | 45 +-
test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java | 128 +-
test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java | 131 +-
test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java | 80 +-
test/com/sun/javadoc/testMethodTypes/TestMethodTypes.java | 162 +-
test/com/sun/javadoc/testModifier/TestModifier.java | 43 +-
test/com/sun/javadoc/testNavigation/TestNavigation.java | 83 +-
test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java | 55 +-
test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java | 75 +-
test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java | 1236 ++++-----
test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java | 46 +-
test/com/sun/javadoc/testNonFrameWarning/TestNonFrameWarning.java | 48 +-
test/com/sun/javadoc/testNotifications/TestNotifications.java | 74 +-
test/com/sun/javadoc/testOptions/TestOptions.java | 55 +-
test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java | 102 +-
test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java | 49 +-
test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java | 99 +-
test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java | 120 +-
test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java | 110 +-
test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java | 94 +-
test/com/sun/javadoc/testPackagePage/TestPackagePage.java | 114 +-
test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java | 76 +-
test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java | 398 +-
test/com/sun/javadoc/testProfiles/TestProfiles.java | 442 +-
test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java | 174 +-
test/com/sun/javadoc/testRecurseSubPackages/TestRecurseSubPackages.java | 55 +-
test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java | 137 +-
test/com/sun/javadoc/testRepeatedAnnotations/TestRepeatedAnnotations.java | 261 +-
test/com/sun/javadoc/testReturnTag/TestReturnTag.java | 49 +-
test/com/sun/javadoc/testSeeTag/TestSeeTag.java | 58 +-
test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java | 48 +-
test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java | 123 +-
test/com/sun/javadoc/testSerializedForm/pkg1/NestedInnerClass.java | 62 +
test/com/sun/javadoc/testSerializedForm/pkg1/PrivateIncludeInnerClass.java | 62 +
test/com/sun/javadoc/testSerializedForm/pkg1/ProtectedInnerClass.java | 59 +
test/com/sun/javadoc/testSerializedForm/pkg1/PublicExcludeInnerClass.java | 62 +
test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java | 202 +-
test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java | 65 +-
test/com/sun/javadoc/testSimpleTagExclude/TestSimpleTagExclude.java | 46 +-
test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java | 54 +-
test/com/sun/javadoc/testSinceTag/TestSinceTag.java | 78 +-
test/com/sun/javadoc/testSingleQuotedLink/TestSingleQuotedLink.java | 57 +
test/com/sun/javadoc/testSingleQuotedLink/pkg1/C1.java | 29 +
test/com/sun/javadoc/testSingleQuotedLink/pkg1/C2.java | 31 +
test/com/sun/javadoc/testSingleQuotedLink/pkg1/package.html | 14 +
test/com/sun/javadoc/testSourceTab/TestSourceTab.java | 105 +-
test/com/sun/javadoc/testStylesheet/TestStylesheet.java | 255 +-
test/com/sun/javadoc/testSubTitle/TestSubTitle.java | 67 +-
test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java | 47 +-
test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java | 46 +-
test/com/sun/javadoc/testSupplementary/TestSupplementary.java | 58 +-
test/com/sun/javadoc/testTagHolderMethod/TestTagHolderMethod.java | 47 +-
test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java | 68 +-
test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java | 44 +-
test/com/sun/javadoc/testTagOutput/TestTagOutput.java | 57 +-
test/com/sun/javadoc/testTaglets/TestTaglets.java | 82 +-
test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java | 43 +-
test/com/sun/javadoc/testThrowsInheritence/TestThrowsTagInheritence.java | 58 +-
test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java | 64 +-
test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java | 63 +-
test/com/sun/javadoc/testTopOption/TestTopOption.java | 86 +-
test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java | 636 ++--
test/com/sun/javadoc/testTypeParams/TestTypeParameters.java | 117 +-
test/com/sun/javadoc/testUnnamedPackage/TestUnnamedPackage.java | 78 +-
test/com/sun/javadoc/testUseOption/TestUseOption.java | 160 +-
test/com/sun/javadoc/testValueTag/TestValueTag.java | 240 +-
test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java | 48 +-
test/com/sun/javadoc/testWarnings/TestWarnings.java | 93 +-
test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java | 353 +-
test/com/sun/javadoc/testXOption/TestXOption.java | 81 +-
test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java | 140 +-
test/tools/javadoc/6964914/JavacWarning.java | 2 +-
test/tools/javadoc/6964914/Test.java | 1 -
test/tools/javadoc/LangVers.java | 2 +-
test/tools/javadoc/sourceOption/SourceOption.java | 39 +-
test/tools/javadoc/sourceOption/p/A.java | 29 -
test/tools/javadoc/sourceOption/p/LambdaConstructTest.java | 37 +
247 files changed, 8593 insertions(+), 12140 deletions(-)
diffs (truncated from 26975 to 500 lines):
diff -r c340c18278db -r a3d47fe59cc4 src/share/classes/com/sun/tools/classfile/Attributes.java
--- a/src/share/classes/com/sun/tools/classfile/Attributes.java Wed Jan 25 07:14:14 2017 +0000
+++ b/src/share/classes/com/sun/tools/classfile/Attributes.java Fri Oct 31 07:02:56 2014 -0700
@@ -56,8 +56,7 @@
public Attributes(ConstantPool constant_pool, Attribute[] attrs) {
this.attrs = attrs;
map = new HashMap<String,Attribute>();
- for (int i = 0; i < attrs.length; i++) {
- Attribute attr = attrs[i];
+ for (Attribute attr : attrs) {
try {
map.put(attr.getName(constant_pool), attr);
} catch (ConstantPoolException e) {
diff -r c340c18278db -r a3d47fe59cc4 src/share/classes/com/sun/tools/classfile/ClassWriter.java
--- a/src/share/classes/com/sun/tools/classfile/ClassWriter.java Wed Jan 25 07:14:14 2017 +0000
+++ b/src/share/classes/com/sun/tools/classfile/ClassWriter.java Fri Oct 31 07:02:56 2014 -0700
@@ -57,11 +57,8 @@
* Write a ClassFile data structure to a file.
*/
public void write(ClassFile classFile, File f) throws IOException {
- FileOutputStream f_out = new FileOutputStream(f);
- try {
+ try (FileOutputStream f_out = new FileOutputStream(f)) {
write(classFile, f_out);
- } finally {
- f_out.close();
}
}
diff -r c340c18278db -r a3d47fe59cc4 src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java Wed Jan 25 07:14:14 2017 +0000
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java Fri Oct 31 07:02:56 2014 -0700
@@ -268,13 +268,13 @@
protected ClassDoc implementsMethodInIntfac(MethodDoc method,
ClassDoc[] intfacs) {
- for (int i = 0; i < intfacs.length; i++) {
- MethodDoc[] methods = intfacs[i].methods();
+ for (ClassDoc intf : intfacs) {
+ MethodDoc[] methods = intf.methods();
if (methods.length > 0) {
- for (int j = 0; j < methods.length; j++) {
- if (methods[j].name().equals(method.name()) &&
- methods[j].signature().equals(method.signature())) {
- return intfacs[i];
+ for (MethodDoc md : methods) {
+ if (md.name().equals(method.name()) &&
+ md.signature().equals(method.signature())) {
+ return intf;
}
}
}
diff -r c340c18278db -r a3d47fe59cc4 src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java Wed Jan 25 07:14:14 2017 +0000
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java Fri Oct 31 07:02:56 2014 -0700
@@ -101,14 +101,13 @@
// Display the list only if there are elements to be displayed.
if (memberListSize > 0) {
Content dl = new HtmlTree(HtmlTag.DL);
- for (int i = 0; i < memberListSize; i++) {
- Doc element = memberlist.get(i);
+ for (Doc element : memberlist) {
if (element instanceof MemberDoc) {
- addDescription((MemberDoc)element, dl);
+ addDescription((MemberDoc) element, dl);
} else if (element instanceof ClassDoc) {
- addDescription((ClassDoc)element, dl);
+ addDescription((ClassDoc) element, dl);
} else if (element instanceof PackageDoc) {
- addDescription((PackageDoc)element, dl);
+ addDescription((PackageDoc) element, dl);
}
}
contentTree.addContent(dl);
diff -r c340c18278db -r a3d47fe59cc4 src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java Wed Jan 25 07:14:14 2017 +0000
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java Fri Oct 31 07:02:56 2014 -0700
@@ -87,14 +87,13 @@
int size = list.size();
if (size > 0) {
Content ul = new HtmlTree(HtmlTag.UL);
- for (int i = 0; i < size; i++) {
- ClassDoc local = list.get(i);
+ for (ClassDoc local : list) {
HtmlTree li = new HtmlTree(HtmlTag.LI);
li.addAttr(HtmlAttr.TYPE, LI_CIRCLE);
addPartialInfo(local, li);
addExtendsImplements(parent, local, li);
addLevelInfo(local, classtree.subs(local, isEnum),
- isEnum, li); // Recurse
+ isEnum, li); // Recurse
ul.addContent(li);
}
contentTree.addContent(ul);
@@ -135,10 +134,10 @@
if (interfaces.length > (cd.isInterface()? 1 : 0)) {
Arrays.sort(interfaces);
int counter = 0;
- for (int i = 0; i < interfaces.length; i++) {
- if (parent != interfaces[i]) {
- if (! (interfaces[i].isPublic() ||
- Util.isLinkable(interfaces[i], configuration))) {
+ for (ClassDoc intf : interfaces) {
+ if (parent != intf) {
+ if (!(intf.isPublic() ||
+ Util.isLinkable(intf, configuration))) {
continue;
}
if (counter == 0) {
@@ -153,7 +152,7 @@
contentTree.addContent(", ");
}
addPreQualifiedClassLink(LinkInfoImpl.Kind.TREE,
- interfaces[i], contentTree);
+ intf, contentTree);
counter++;
}
}
diff -r c340c18278db -r a3d47fe59cc4 src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java Wed Jan 25 07:14:14 2017 +0000
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java Fri Oct 31 07:02:56 2014 -0700
@@ -150,9 +150,9 @@
* @param content HtmlTree content to which the links will be added
*/
protected void addContents(List<Doc> classlist, boolean wantFrames,
- Content content) {
- for (int i = 0; i < classlist.size(); i++) {
- ClassDoc cd = (ClassDoc)classlist.get(i);
+ Content content) {
+ for (Doc doc : classlist) {
+ ClassDoc cd = (ClassDoc) doc;
if (!Util.isCoreClass(cd)) {
continue;
}
@@ -160,7 +160,7 @@
Content linkContent;
if (wantFrames) {
linkContent = getLink(new LinkInfoImpl(configuration,
- LinkInfoImpl.Kind.ALL_CLASSES_FRAME, cd).label(label).target("classFrame"));
+ LinkInfoImpl.Kind.ALL_CLASSES_FRAME, cd).label(label).target("classFrame"));
} else {
linkContent = getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.DEFAULT, cd).label(label));
}
diff -r c340c18278db -r a3d47fe59cc4 src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Wed Jan 25 07:14:14 2017 +0000
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Fri Oct 31 07:02:56 2014 -0700
@@ -159,22 +159,20 @@
public static void generate(ConfigurationImpl configuration,
ClassTree classtree) {
ClassUseMapper mapper = new ClassUseMapper(configuration.root, classtree);
- ClassDoc[] classes = configuration.root.classes();
- for (int i = 0; i < classes.length; i++) {
+ for (ClassDoc aClass : configuration.root.classes()) {
// If -nodeprecated option is set and the containing package is marked
// as deprecated, do not generate the class-use page. We will still generate
// the class-use page if the class is marked as deprecated but the containing
// package is not since it could still be linked from that package-use page.
if (!(configuration.nodeprecated &&
- Util.isDeprecated(classes[i].containingPackage())))
- ClassUseWriter.generate(configuration, mapper, classes[i]);
+ Util.isDeprecated(aClass.containingPackage())))
+ ClassUseWriter.generate(configuration, mapper, aClass);
}
- PackageDoc[] pkgs = configuration.packages;
- for (int i = 0; i < pkgs.length; i++) {
+ for (PackageDoc pkg : configuration.packages) {
// If -nodeprecated option is set and the package is marked
// as deprecated, do not generate the package-use page.
- if (!(configuration.nodeprecated && Util.isDeprecated(pkgs[i])))
- PackageUseWriter.generate(configuration, mapper, pkgs[i]);
+ if (!(configuration.nodeprecated && Util.isDeprecated(pkg)))
+ PackageUseWriter.generate(configuration, mapper, pkg);
}
}
@@ -183,9 +181,7 @@
List<? extends ProgramElementDoc> list= classMap.get(classdoc.qualifiedName());
if (list != null) {
Collections.sort(list);
- Iterator<? extends ProgramElementDoc> it = list.iterator();
- while (it.hasNext()) {
- ProgramElementDoc doc = it.next();
+ for (ProgramElementDoc doc : list) {
PackageDoc pkg = doc.containingPackage();
pkgSet.add(pkg);
List<ProgramElementDoc> inPkg = map.get(pkg.name());
@@ -336,13 +332,12 @@
protected void addClassList(Content contentTree) throws IOException {
HtmlTree ul = new HtmlTree(HtmlTag.UL);
ul.addStyle(HtmlStyle.blockList);
- for (Iterator<PackageDoc> it = pkgSet.iterator(); it.hasNext();) {
- PackageDoc pkg = it.next();
+ for (PackageDoc pkg : pkgSet) {
Content li = HtmlTree.LI(HtmlStyle.blockList, getMarkerAnchor(pkg.name()));
Content link = getResource("doclet.ClassUse_Uses.of.0.in.1",
- getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.CLASS_USE_HEADER,
- classdoc)),
- getPackageLink(pkg, Util.getPackageName(pkg)));
+ getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.CLASS_USE_HEADER,
+ classdoc)),
+ getPackageLink(pkg, Util.getPackageName(pkg)));
Content heading = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING, link);
li.addContent(heading);
addClassUse(pkg, li);
diff -r c340c18278db -r a3d47fe59cc4 src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Wed Jan 25 07:14:14 2017 +0000
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Fri Oct 31 07:02:56 2014 -0700
@@ -274,21 +274,20 @@
Type[] implIntfacs = classDoc.interfaceTypes();
if (implIntfacs != null && implIntfacs.length > 0) {
int counter = 0;
- for (int i = 0; i < implIntfacs.length; i++) {
- ClassDoc classDoc = implIntfacs[i].asClassDoc();
- if (! (classDoc.isPublic() ||
- Util.isLinkable(classDoc, configuration))) {
+ for (Type implType : implIntfacs) {
+ ClassDoc classDoc = implType.asClassDoc();
+ if (!(classDoc.isPublic() || Util.isLinkable(classDoc, configuration))) {
continue;
}
if (counter == 0) {
pre.addContent(DocletConstants.NL);
- pre.addContent(isInterface? "extends " : "implements ");
+ pre.addContent(isInterface ? "extends " : "implements ");
} else {
pre.addContent(", ");
}
Content link = getLink(new LinkInfoImpl(configuration,
- LinkInfoImpl.Kind.CLASS_SIGNATURE_PARENT_NAME,
- implIntfacs[i]));
+ LinkInfoImpl.Kind.CLASS_SIGNATURE_PARENT_NAME,
+ implType));
pre.addContent(link);
counter++;
}
diff -r c340c18278db -r a3d47fe59cc4 src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Wed Jan 25 07:14:14 2017 +0000
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Fri Oct 31 07:02:56 2014 -0700
@@ -298,9 +298,9 @@
Map<String,PackageDoc> map = new HashMap<String,PackageDoc>();
PackageDoc pd;
ClassDoc[] classes = root.classes();
- for (int i = 0; i < classes.length; i++) {
- pd = classes[i].containingPackage();
- if(! map.containsKey(pd.name())) {
+ for (ClassDoc aClass : classes) {
+ pd = aClass.containingPackage();
+ if (!map.containsKey(pd.name())) {
map.put(pd.name(), pd);
}
}
@@ -543,18 +543,17 @@
if (!nodeprecated) {
return classarr[0];
}
- for (int i = 0; i < classarr.length; i++) {
- if (classarr[i].tags("deprecated").length == 0) {
- return classarr[i];
+ for (ClassDoc cd : classarr) {
+ if (cd.tags("deprecated").length == 0) {
+ return cd;
}
}
return null;
}
protected boolean checkForDeprecation(RootDoc root) {
- ClassDoc[] classarr = root.classes();
- for (int i = 0; i < classarr.length; i++) {
- if (isGeneratedDoc(classarr[i])) {
+ for (ClassDoc cd : root.classes()) {
+ if (isGeneratedDoc(cd)) {
return true;
}
}
diff -r c340c18278db -r a3d47fe59cc4 src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java Wed Jan 25 07:14:14 2017 +0000
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java Fri Oct 31 07:02:56 2014 -0700
@@ -62,9 +62,8 @@
VisibleMemberMap visibleMemberMap = new VisibleMemberMap(classDoc,
VisibleMemberMap.CONSTRUCTORS, configuration);
List<ProgramElementDoc> constructors = new ArrayList<ProgramElementDoc>(visibleMemberMap.getMembersFor(classDoc));
- for (int i = 0; i < constructors.size(); i++) {
- if ((constructors.get(i)).isProtected() ||
- (constructors.get(i)).isPrivate()) {
+ for (ProgramElementDoc constructor : constructors) {
+ if (constructor.isProtected() || constructor.isPrivate()) {
setFoundNonPubConstructor(true);
}
}
diff -r c340c18278db -r a3d47fe59cc4 src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Wed Jan 25 07:14:14 2017 +0000
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Fri Oct 31 07:02:56 2014 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -406,8 +406,8 @@
head.addContent(meta);
}
if (metakeywords != null) {
- for (int i=0; i < metakeywords.length; i++) {
- Content meta = HtmlTree.META("keywords", metakeywords[i]);
+ for (String metakeyword : metakeywords) {
+ Content meta = HtmlTree.META("keywords", metakeyword);
head.addContent(meta);
}
}
@@ -1010,9 +1010,8 @@
public Content getPackageLink(PackageDoc pkg, Content label) {
boolean included = pkg != null && pkg.isIncluded();
if (! included) {
- PackageDoc[] packages = configuration.packages;
- for (int i = 0; i < packages.length; i++) {
- if (packages[i].equals(pkg)) {
+ for (PackageDoc p : configuration.packages) {
+ if (p.equals(pkg)) {
included = true;
break;
}
@@ -1441,7 +1440,8 @@
}
}
if (configuration.currentcd != containing) {
- refMemName = containing.name() + "." + refMemName;
+ refMemName = (refMem instanceof ConstructorDoc) ?
+ refMemName : containing.name() + "." + refMemName;
}
if (refMem instanceof ExecutableMemberDoc) {
if (refMemName.indexOf('(') < 0) {
@@ -1711,9 +1711,13 @@
//might be missing '>' character because the href has an inline tag.
break;
}
- if (textBuff.substring(begin, end).indexOf("\"") != -1){
- begin = textBuff.indexOf("\"", begin) + 1;
- end = textBuff.indexOf("\"", begin +1);
+
+ String quote = textBuff.substring(begin, end);
+ quote = quote.contains("\"") ? "\"" :
+ quote.contains("\'") ? "\'" : null;
+ if (quote != null) {
+ begin = textBuff.indexOf(quote, begin) + 1;
+ end = textBuff.indexOf(quote, begin +1);
if (begin == 0 || end == -1){
//Link is missing a quote.
break;
@@ -1944,15 +1948,15 @@
boolean isJava5DeclarationLocation) {
List<Content> results = new ArrayList<Content>();
ContentBuilder annotation;
- for (int i = 0; i < descList.length; i++) {
- AnnotationTypeDoc annotationDoc = descList[i].annotationType();
+ for (AnnotationDesc aDesc : descList) {
+ AnnotationTypeDoc annotationDoc = aDesc.annotationType();
// If an annotation is not documented, do not add it to the list. If
// the annotation is of a repeatable type, and if it is not documented
// and also if its container annotation is not documented, do not add it
// to the list. If an annotation of a repeatable type is not documented
// but its container is documented, it will be added to the list.
- if (! Util.isDocumentedAnnotation(annotationDoc) &&
- (!isAnnotationDocumented && !isContainerDocumented)) {
+ if (!Util.isDocumentedAnnotation(annotationDoc) &&
+ (!isAnnotationDocumented && !isContainerDocumented)) {
continue;
}
/* TODO: check logic here to correctly handle declaration
@@ -1963,12 +1967,12 @@
annotation = new ContentBuilder();
isAnnotationDocumented = false;
LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
- LinkInfoImpl.Kind.ANNOTATION, annotationDoc);
- AnnotationDesc.ElementValuePair[] pairs = descList[i].elementValues();
+ LinkInfoImpl.Kind.ANNOTATION, annotationDoc);
+ AnnotationDesc.ElementValuePair[] pairs = aDesc.elementValues();
// If the annotation is synthesized, do not print the container.
- if (descList[i].isSynthesized()) {
- for (int j = 0; j < pairs.length; j++) {
- AnnotationValue annotationValue = pairs[j].value();
+ if (aDesc.isSynthesized()) {
+ for (AnnotationDesc.ElementValuePair pair : pairs) {
+ AnnotationValue annotationValue = pair.value();
List<AnnotationValue> annotationTypeValues = new ArrayList<AnnotationValue>();
if (annotationValue.value() instanceof AnnotationValue[]) {
AnnotationValue[] annotationArray =
@@ -2005,12 +2009,12 @@
// repeatable type annotation is not documented, print the container.
else {
addAnnotations(annotationDoc, linkInfo, annotation, pairs,
- indent, false);
+ indent, false);
}
}
else {
addAnnotations(annotationDoc, linkInfo, annotation, pairs,
- indent, linkBreak);
+ indent, linkBreak);
}
annotation.addContent(linkBreak ? DocletConstants.NL : "");
results.add(annotation);
@@ -2082,8 +2086,8 @@
*/
private boolean isAnnotationArray(AnnotationDesc.ElementValuePair[] pairs) {
AnnotationValue annotationValue;
- for (int j = 0; j < pairs.length; j++) {
- annotationValue = pairs[j].value();
+ for (AnnotationDesc.ElementValuePair pair : pairs) {
+ annotationValue = pair.value();
if (annotationValue.value() instanceof AnnotationValue[]) {
AnnotationValue[] annotationArray =
(AnnotationValue[]) annotationValue.value();
diff -r c340c18278db -r a3d47fe59cc4 src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Wed Jan 25 07:14:14 2017 +0000
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Fri Oct 31 07:02:56 2014 -0700
@@ -342,8 +342,7 @@
ImplementedMethods implementedMethodsFinder =
new ImplementedMethods(method, writer.configuration);
MethodDoc[] implementedMethods = implementedMethodsFinder.build();
- for (int i = 0; i < implementedMethods.length; i++) {
- MethodDoc implementedMeth = implementedMethods[i];
+ for (MethodDoc implementedMeth : implementedMethods) {
Type intfac = implementedMethodsFinder.getMethodHolder(implementedMeth);
Content intfaclink = writer.getLink(new LinkInfoImpl(
writer.configuration, LinkInfoImpl.Kind.METHOD_SPECIFIED_BY, intfac));
diff -r c340c18278db -r a3d47fe59cc4 src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Wed Jan 25 07:14:14 2017 +0000
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Fri Oct 31 07:02:56 2014 -0700
@@ -167,25 +167,24 @@
boolean printedHeader = false;
HtmlTree ul = new HtmlTree(HtmlTag.UL);
ul.setTitle(labelContent);
- for (int i = 0; i < arr.length; i++) {
- if (documentedClasses != null &&
- !documentedClasses.contains(arr[i])) {
+ for (ClassDoc classDoc : arr) {
+ if (documentedClasses != null && !documentedClasses.contains(classDoc)) {
continue;
}
- if (!Util.isCoreClass(arr[i]) || !
- configuration.isGeneratedDoc(arr[i])) {
+ if (!Util.isCoreClass(classDoc) || !configuration.isGeneratedDoc(classDoc)) {
continue;
}
if (!printedHeader) {
Content heading = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
- true, labelContent);
+ true, labelContent);
contentTree.addContent(heading);
printedHeader = true;
}
- Content arr_i_name = new StringContent(arr[i].name());
- if (arr[i].isInterface()) arr_i_name = HtmlTree.SPAN(HtmlStyle.interfaceName, arr_i_name);
+ Content arr_i_name = new StringContent(classDoc.name());
+ if (classDoc.isInterface())
+ arr_i_name = HtmlTree.SPAN(HtmlStyle.interfaceName, arr_i_name);
Content link = getLink(new LinkInfoImpl(configuration,
- LinkInfoImpl.Kind.PACKAGE_FRAME, arr[i]).label(arr_i_name).target("classFrame"));
+ LinkInfoImpl.Kind.PACKAGE_FRAME, classDoc).label(arr_i_name).target("classFrame"));
Content li = HtmlTree.LI(link);
ul.addContent(li);
}
diff -r c340c18278db -r a3d47fe59cc4 src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Wed Jan 25 07:14:14 2017 +0000
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Fri Oct 31 07:02:56 2014 -0700
@@ -85,12 +85,12 @@
Content div = HtmlTree.DIV(HtmlStyle.indexContainer, heading);
HtmlTree ul = new HtmlTree(HtmlTag.UL);
ul.setTitle(packagesLabel);
- for(int i = 0; i < packages.length; i++) {
+ for (PackageDoc aPackage : packages) {
// Do not list the package if -nodeprecated option is set and the
// package is marked as deprecated.
- if (packages[i] != null &&
- (!(configuration.nodeprecated && Util.isDeprecated(packages[i])))) {
- ul.addContent(getPackage(packages[i]));
+ if (aPackage != null &&
+ (!(configuration.nodeprecated && Util.isDeprecated(aPackage)))) {
+ ul.addContent(getPackage(aPackage));
}
}
div.addContent(ul);
diff -r c340c18278db -r a3d47fe59cc4 src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Wed Jan 25 07:14:14 2017 +0000
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Fri Oct 31 07:02:56 2014 -0700
@@ -109,13 +109,12 @@
* @param body the documentation tree to which the index will be added
*/
protected void addIndex(Content body) {
- for (int i = 0; i < groupList.size(); i++) {
- String groupname = groupList.get(i);
- List<PackageDoc> list = groupPackageMap.get(groupname);
+ for (String groupname : groupList) {
+ List<PackageDoc> list = groupPackageMap.get(groupname);
if (list != null && list.size() > 0) {
addIndexContents(list.toArray(new PackageDoc[list.size()]),
- groupname, configuration.getText("doclet.Member_Table_Summary",
- groupname, configuration.getText("doclet.packages")), body);
More information about the distro-pkg-dev
mailing list