stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8177848: Rename Configuration(Impl) classes

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Kumar Srinivasan 2017-06-05 13:45:34 -07:00
parent 3b6aac2ac0
commit afbde4b351
81 changed files with 275 additions and 290 deletions
langtools
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets
formats/html
AbstractIndexWriter.javaAbstractMemberWriter.javaAbstractModuleIndexWriter.javaAbstractPackageIndexWriter.javaAbstractTreeWriter.javaAllClassesFrameWriter.javaAnnotationTypeWriterImpl.javaClassUseWriter.javaClassWriterImpl.javaConstantsSummaryWriterImpl.javaContents.javaDeprecatedListWriter.javaFrameOutputWriter.javaHelpWriter.javaHtmlConfiguration.javaHtmlDoclet.javaHtmlDocletWriter.javaIndexRedirectWriter.javaLinkFactoryImpl.javaLinkInfoImpl.javaModuleFrameWriter.javaModuleIndexFrameWriter.javaModuleIndexWriter.javaModulePackageIndexFrameWriter.javaModuleWriterImpl.javaPackageFrameWriter.javaPackageIndexFrameWriter.javaPackageIndexWriter.javaPackageTreeWriter.javaPackageUseWriter.javaPackageWriterImpl.javaSerializedFormWriterImpl.javaSingleIndexWriter.javaSourceToHTMLConverter.javaSplitIndexWriter.javaSubWriterHolderWriter.javaTagletWriterImpl.javaTreeWriter.javaWriterFactoryImpl.java
markup
HtmlDocWriter.javaHtmlWriter.java
toolkit
AbstractDoclet.javaBaseConfiguration.javaCommentUtils.javaMessages.javaResources.javaWorkArounds.java
builders
AbstractBuilder.javaAbstractMemberBuilder.javaAnnotationTypeFieldBuilder.javaAnnotationTypeRequiredMemberBuilder.javaBuilderFactory.javaConstructorBuilder.javaEnumConstantBuilder.javaFieldBuilder.javaLayoutParser.javaMethodBuilder.javaPropertyBuilder.java
taglets
InheritDocTaglet.javaTagletManager.javaTagletWriter.javaValueTaglet.java
util
ClassTree.javaClassUseMapper.javaCommentHelper.javaDeprecatedAPIListBuilder.javaDocFile.javaDocFileFactory.javaDocFinder.javaExtern.javaGroup.javaImplementedMethods.javaIndexBuilder.javaMetaKeywords.javaPackageListWriter.javaStandardDocFileFactory.javaTypeElementCatalog.javaUtils.javaVisibleMemberMap.java
links
LinkInfo.java
test/jdk/javadoc/tool
T4696488.java

2
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java

@ -79,7 +79,7 @@ public class AbstractIndexWriter extends HtmlDocletWriter {
* @param path Path to the file which is getting generated.
* @param indexbuilder Unicode based Index from {@link IndexBuilder}
*/
protected AbstractIndexWriter(ConfigurationImpl configuration,
protected AbstractIndexWriter(HtmlConfiguration configuration,
DocPath path,
IndexBuilder indexbuilder) {
super(configuration, path);

4
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -66,7 +66,7 @@ import static javax.lang.model.element.Modifier.*;
*/
public abstract class AbstractMemberWriter {
protected final ConfigurationImpl configuration;
protected final HtmlConfiguration configuration;
protected final Utils utils;
protected final SubWriterHolderWriter writer;
protected final Contents contents;

4
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -67,7 +67,7 @@ public abstract class AbstractModuleIndexWriter extends HtmlDocletWriter {
* @param configuration The current configuration
* @param filename Name of the module index file to be generated.
*/
public AbstractModuleIndexWriter(ConfigurationImpl configuration,
public AbstractModuleIndexWriter(HtmlConfiguration configuration,
DocPath filename) {
super(configuration, filename);
modules = configuration.modulePackages;

2
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java

@ -64,7 +64,7 @@ public abstract class AbstractPackageIndexWriter extends HtmlDocletWriter {
* @param configuration The current configuration
* @param filename Name of the package index file to be generated.
*/
public AbstractPackageIndexWriter(ConfigurationImpl configuration,
public AbstractPackageIndexWriter(HtmlConfiguration configuration,
DocPath filename) {
super(configuration, filename);
packages = configuration.packages;

4
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -66,7 +66,7 @@ public abstract class AbstractTreeWriter extends HtmlDocletWriter {
* @param filename File to be generated.
* @param classtree Tree built by {@link ClassTree}.
*/
protected AbstractTreeWriter(ConfigurationImpl configuration,
protected AbstractTreeWriter(HtmlConfiguration configuration,
DocPath filename, ClassTree classtree) {
super(configuration, filename);
this.classtree = classtree;

10
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesFrameWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -74,7 +74,7 @@ public class AllClassesFrameWriter extends HtmlDocletWriter {
* @param filename Path to the file which is getting generated.
* @param indexbuilder Unicode based Index from {@link IndexBuilder}
*/
public AllClassesFrameWriter(ConfigurationImpl configuration,
public AllClassesFrameWriter(HtmlConfiguration configuration,
DocPath filename, IndexBuilder indexbuilder) {
super(configuration, filename);
this.indexbuilder = indexbuilder;
@ -88,7 +88,7 @@ public class AllClassesFrameWriter extends HtmlDocletWriter {
* @param indexBuilder IndexBuilder object for all classes index.
* @throws DocFileIOException
*/
public static void generate(ConfigurationImpl configuration,
public static void generate(HtmlConfiguration configuration,
IndexBuilder indexBuilder) throws DocFileIOException {
if (configuration.frames) {
generate(configuration, indexBuilder, DocPaths.ALLCLASSES_FRAME, true);
@ -98,8 +98,8 @@ public class AllClassesFrameWriter extends HtmlDocletWriter {
}
}
private static void generate(ConfigurationImpl configuration, IndexBuilder indexBuilder,
DocPath fileName, boolean wantFrames) throws DocFileIOException {
private static void generate(HtmlConfiguration configuration, IndexBuilder indexBuilder,
DocPath fileName, boolean wantFrames) throws DocFileIOException {
AllClassesFrameWriter allclassgen = new AllClassesFrameWriter(configuration,
fileName, indexBuilder);
allclassgen.buildAllClassesFile(wantFrames);

2
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java

@ -79,7 +79,7 @@ public class AnnotationTypeWriterImpl extends SubWriterHolderWriter
* @param prevType the previous class that was documented.
* @param nextType the next class being documented.
*/
public AnnotationTypeWriterImpl(ConfigurationImpl configuration,
public AnnotationTypeWriterImpl(HtmlConfiguration configuration,
TypeElement annotationType, TypeMirror prevType, TypeMirror nextType) {
super(configuration, DocPath.forClass(configuration.utils, annotationType));
this.annotationType = annotationType;

8
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -112,7 +112,7 @@ public class ClassUseWriter extends SubWriterHolderWriter {
*
* @param filename the file to be generated.
*/
public ClassUseWriter(ConfigurationImpl configuration,
public ClassUseWriter(HtmlConfiguration configuration,
ClassUseMapper mapper, DocPath filename,
TypeElement typeElement) {
super(configuration, filename);
@ -177,7 +177,7 @@ public class ClassUseWriter extends SubWriterHolderWriter {
* @param classtree the class tree hierarchy
* @throws DocFileIOException if there is an error while generating the documentation
*/
public static void generate(ConfigurationImpl configuration, ClassTree classtree) throws DocFileIOException {
public static void generate(HtmlConfiguration configuration, ClassTree classtree) throws DocFileIOException {
ClassUseMapper mapper = new ClassUseMapper(configuration, classtree);
for (TypeElement aClass : configuration.getIncludedTypeElements()) {
// If -nodeprecated option is set and the containing package is marked
@ -220,7 +220,7 @@ public class ClassUseWriter extends SubWriterHolderWriter {
*
* @throws DocFileIOException if there is a problem while generating the documentation
*/
public static void generate(ConfigurationImpl configuration, ClassUseMapper mapper,
public static void generate(HtmlConfiguration configuration, ClassUseMapper mapper,
TypeElement typeElement) throws DocFileIOException {
ClassUseWriter clsgen;
DocPath path = DocPath.forPackage(configuration.utils, typeElement)

4
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java

@ -89,8 +89,8 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
* @param nextClass the next class being documented.
* @param classTree the class tree for the given class.
*/
public ClassWriterImpl(ConfigurationImpl configuration, TypeElement typeElement,
TypeElement prevClass, TypeElement nextClass, ClassTree classTree) {
public ClassWriterImpl(HtmlConfiguration configuration, TypeElement typeElement,
TypeElement prevClass, TypeElement nextClass, ClassTree classTree) {
super(configuration, DocPath.forClass(configuration.utils, typeElement));
this.typeElement = typeElement;
configuration.currentTypeElement = typeElement;

6
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -61,7 +61,7 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
/**
* The configuration used in this run of the standard doclet.
*/
ConfigurationImpl configuration;
HtmlConfiguration configuration;
/**
* The current class being documented.
@ -87,7 +87,7 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
* @param configuration the configuration used in this run
* of the standard doclet.
*/
public ConstantsSummaryWriterImpl(ConfigurationImpl configuration) {
public ConstantsSummaryWriterImpl(HtmlConfiguration configuration) {
super(configuration, DocPaths.CONSTANT_VALUES);
this.configuration = configuration;
constantsTableSummary = configuration.getText("doclet.Constants_Table_Summary",

2
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java

@ -162,7 +162,7 @@ public class Contents {
* @param configuration the configuration in which to find the
* resources used to look up resource keys, and other details.
*/
Contents(ConfigurationImpl configuration) {
Contents(HtmlConfiguration configuration) {
this.resources = configuration.getResources();
allClassesLabel = getNonBreakContent("doclet.All_Classes");

8
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -204,7 +204,7 @@ public class DeprecatedListWriter extends SubWriterHolderWriter {
private EnumMap<DeprElementKind, AbstractMemberWriter> writerMap;
private ConfigurationImpl configuration;
private HtmlConfiguration configuration;
/**
* Constructor.
@ -213,7 +213,7 @@ public class DeprecatedListWriter extends SubWriterHolderWriter {
* @param filename the file to be generated
*/
public DeprecatedListWriter(ConfigurationImpl configuration, DocPath filename) {
public DeprecatedListWriter(HtmlConfiguration configuration, DocPath filename) {
super(configuration, filename);
this.configuration = configuration;
NestedClassWriterImpl classW = new NestedClassWriterImpl(this);
@ -260,7 +260,7 @@ public class DeprecatedListWriter extends SubWriterHolderWriter {
* @param configuration the current configuration of the doclet.
* @throws DocFileIOException if there is a problem writing the deprecated list
*/
public static void generate(ConfigurationImpl configuration) throws DocFileIOException {
public static void generate(HtmlConfiguration configuration) throws DocFileIOException {
DocPath filename = DocPaths.DEPRECATED_LIST;
DeprecatedListWriter depr = new DeprecatedListWriter(configuration, filename);
depr.generateDeprecatedListFile(

4
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FrameOutputWriter.java

@ -67,7 +67,7 @@ public class FrameOutputWriter extends HtmlDocletWriter {
* @param configuration for this run
* @param filename File to be generated.
*/
public FrameOutputWriter(ConfigurationImpl configuration, DocPath filename) {
public FrameOutputWriter(HtmlConfiguration configuration, DocPath filename) {
super(configuration, filename);
noOfPackages = configuration.packages.size();
}
@ -80,7 +80,7 @@ public class FrameOutputWriter extends HtmlDocletWriter {
* @param configuration the configuration for this doclet
* @throws DocFileIOException if there is a problem generating the frame file
*/
public static void generate(ConfigurationImpl configuration) throws DocFileIOException {
public static void generate(HtmlConfiguration configuration) throws DocFileIOException {
FrameOutputWriter framegen = new FrameOutputWriter(configuration, DocPaths.INDEX);
framegen.generateFrameFile();
}

6
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -55,7 +55,7 @@ public class HelpWriter extends HtmlDocletWriter {
* Constructor to construct HelpWriter object.
* @param filename File to be generated.
*/
public HelpWriter(ConfigurationImpl configuration,
public HelpWriter(HtmlConfiguration configuration,
DocPath filename) {
super(configuration, filename);
}
@ -68,7 +68,7 @@ public class HelpWriter extends HtmlDocletWriter {
*
* @throws DocFileIOException if there is a problem while generating the documentation
*/
public static void generate(ConfigurationImpl configuration) throws DocFileIOException {
public static void generate(HtmlConfiguration configuration) throws DocFileIOException {
DocPath filename = DocPaths.HELP_DOC;
HelpWriter helpgen = new HelpWriter(configuration, filename);
helpgen.generateHelpFile();

8
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConfigurationImpl.java → langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java

@ -42,7 +42,7 @@ import jdk.javadoc.doclet.Doclet;
import jdk.javadoc.doclet.DocletEnvironment;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlVersion;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.Resources;
@ -77,7 +77,7 @@ import static javax.tools.Diagnostic.Kind.*;
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
*/
public class ConfigurationImpl extends Configuration {
public class HtmlConfiguration extends BaseConfiguration {
/**
* The build date. Note: For now, we will use
@ -240,10 +240,10 @@ public class ConfigurationImpl extends Configuration {
* Constructor. Initializes resource for the
* {@link com.sun.tools.doclets.internal.toolkit.util.MessageRetriever MessageRetriever}.
*/
public ConfigurationImpl(Doclet doclet) {
public HtmlConfiguration(Doclet doclet) {
super(doclet);
resources = new Resources(this,
Configuration.sharedResourceBundleName,
BaseConfiguration.sharedResourceBundleName,
"jdk.javadoc.internal.doclets.formats.html.resources.standard");
messages = new Messages(this);

7
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java

@ -31,7 +31,6 @@ import javax.lang.model.element.ModuleElement;
import javax.lang.model.element.PackageElement;
import javax.lang.model.element.TypeElement;
import jdk.javadoc.doclet.Doclet.Option;
import jdk.javadoc.doclet.DocletEnvironment;
import jdk.javadoc.doclet.Reporter;
import jdk.javadoc.internal.doclets.toolkit.AbstractDoclet;
@ -61,7 +60,7 @@ import jdk.javadoc.internal.doclets.toolkit.util.IndexBuilder;
public class HtmlDoclet extends AbstractDoclet {
public HtmlDoclet() {
configuration = new ConfigurationImpl(this);
configuration = new HtmlConfiguration(this);
}
@Override // defined by Doclet
@ -72,7 +71,7 @@ public class HtmlDoclet extends AbstractDoclet {
/**
* The global configuration information for this run.
*/
private final ConfigurationImpl configuration;
private final HtmlConfiguration configuration;
private Messages messages;
@ -95,7 +94,7 @@ public class HtmlDoclet extends AbstractDoclet {
* @return the configuration
*/
@Override // defined by AbstractDoclet
public ConfigurationImpl getConfiguration() {
public HtmlConfiguration getConfiguration() {
return configuration;
}

12
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* 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,7 +77,7 @@ import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.toolkit.AnnotationTypeWriter;
import jdk.javadoc.internal.doclets.toolkit.ClassWriter;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.PackageSummaryWriter;
@ -94,9 +94,7 @@ import jdk.javadoc.internal.doclets.toolkit.util.DocletConstants;
import jdk.javadoc.internal.doclets.toolkit.util.ImplementedMethods;
import jdk.javadoc.internal.doclets.toolkit.util.Utils;
import static com.sun.source.doctree.AttributeTree.ValueKind.*;
import static com.sun.source.doctree.DocTree.Kind.*;
import static jdk.javadoc.internal.doclets.formats.html.markup.HtmlDocWriter.CONTENT_TYPE;
import static jdk.javadoc.internal.doclets.toolkit.util.CommentHelper.SPACER;
@ -141,7 +139,7 @@ public class HtmlDocletWriter extends HtmlDocWriter {
/**
* The global configuration information for this run.
*/
public final ConfigurationImpl configuration;
public final HtmlConfiguration configuration;
protected final Utils utils;
@ -180,7 +178,7 @@ public class HtmlDocletWriter extends HtmlDocWriter {
*
* @param path File to be generated.
*/
public HtmlDocletWriter(ConfigurationImpl configuration, DocPath path) {
public HtmlDocletWriter(HtmlConfiguration configuration, DocPath path) {
super(configuration, path);
this.configuration = configuration;
this.contents = configuration.contents;
@ -2601,7 +2599,7 @@ public class HtmlDocletWriter extends HtmlDocWriter {
* @return the configuration for this doclet.
*/
@Override
public Configuration configuration() {
public BaseConfiguration configuration() {
return configuration;
}
}

8
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,8 +39,6 @@ import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
import static jdk.javadoc.internal.doclets.formats.html.markup.HtmlDocWriter.CONTENT_TYPE;
/**
* Writes an index.html file that tries to redirect to an alternate page.
* The redirect uses JavaSCript, if enabled, falling back on
@ -50,7 +48,7 @@ import static jdk.javadoc.internal.doclets.formats.html.markup.HtmlDocWriter.CON
*/
public class IndexRedirectWriter extends HtmlDocletWriter {
public static void generate(ConfigurationImpl configuration)
public static void generate(HtmlConfiguration configuration)
throws DocFileIOException {
IndexRedirectWriter indexRedirect;
DocPath filename = DocPaths.INDEX;
@ -58,7 +56,7 @@ public class IndexRedirectWriter extends HtmlDocletWriter {
indexRedirect.generateIndexFile();
}
IndexRedirectWriter(ConfigurationImpl configuration, DocPath filename) {
IndexRedirectWriter(HtmlConfiguration configuration, DocPath filename) {
super(configuration, filename);
}

10
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkFactoryImpl.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -33,15 +33,13 @@ import javax.lang.model.element.TypeElement;
import javax.lang.model.type.TypeMirror;
import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.Utils;
import jdk.javadoc.internal.doclets.toolkit.util.links.LinkFactory;
import jdk.javadoc.internal.doclets.toolkit.util.links.LinkInfo;
import static jdk.javadoc.internal.doclets.formats.html.LinkInfoImpl.Kind.MEMBER_TYPE_PARAMS;
/**
* A factory that returns a link given the information about it.
*
@ -73,7 +71,7 @@ public class LinkFactoryImpl extends LinkFactory {
*/
@Override
protected Content getClassLink(LinkInfo linkInfo) {
Configuration configuration = m_writer.configuration;
BaseConfiguration configuration = m_writer.configuration;
Utils utils = configuration.utils;
LinkInfoImpl classLinkInfo = (LinkInfoImpl) linkInfo;
boolean noLabel = linkInfo.label == null || linkInfo.label.isEmpty();
@ -198,7 +196,7 @@ public class LinkFactoryImpl extends LinkFactory {
* @return the tool tip for the appropriate class.
*/
private String getClassToolTip(TypeElement typeElement, boolean isTypeLink) {
Configuration configuration = m_writer.configuration;
BaseConfiguration configuration = m_writer.configuration;
Utils utils = configuration.utils;
if (isTypeLink) {
return configuration.getText("doclet.Href_Type_Param_Title",

10
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkInfoImpl.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -218,7 +218,7 @@ public class LinkInfoImpl extends LinkInfo {
RECEIVER_TYPE
}
public final ConfigurationImpl configuration;
public final HtmlConfiguration configuration;
/**
* The location of the link.
@ -247,7 +247,7 @@ public class LinkInfoImpl extends LinkInfo {
* @param context the context of the link.
* @param ee the member to link to.
*/
public LinkInfoImpl(ConfigurationImpl configuration, Kind context, ExecutableElement ee) {
public LinkInfoImpl(HtmlConfiguration configuration, Kind context, ExecutableElement ee) {
this.configuration = configuration;
this.utils = configuration.utils;
this.executableElement = ee;
@ -269,7 +269,7 @@ public class LinkInfoImpl extends LinkInfo {
* @param context the context of the link.
* @param typeElement the class to link to.
*/
public LinkInfoImpl(ConfigurationImpl configuration, Kind context, TypeElement typeElement) {
public LinkInfoImpl(HtmlConfiguration configuration, Kind context, TypeElement typeElement) {
this.configuration = configuration;
this.utils = configuration.utils;
this.typeElement = typeElement;
@ -283,7 +283,7 @@ public class LinkInfoImpl extends LinkInfo {
* @param context the context of the link.
* @param type the class to link to.
*/
public LinkInfoImpl(ConfigurationImpl configuration, Kind context, TypeMirror type) {
public LinkInfoImpl(HtmlConfiguration configuration, Kind context, TypeMirror type) {
this.configuration = configuration;
this.utils = configuration.utils;
this.type = type;

7
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleFrameWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -32,7 +32,6 @@ import javax.lang.model.element.PackageElement;
import javax.lang.model.element.TypeElement;
import javax.lang.model.util.ElementFilter;
import jdk.javadoc.doclet.DocletEnvironment;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
@ -75,7 +74,7 @@ public class ModuleFrameWriter extends HtmlDocletWriter {
* @param configuration the configuration of the doclet.
* @param moduleElement moduleElement under consideration.
*/
public ModuleFrameWriter(ConfigurationImpl configuration, ModuleElement moduleElement) {
public ModuleFrameWriter(HtmlConfiguration configuration, ModuleElement moduleElement) {
super(configuration, DocPaths.moduleTypeFrame(moduleElement));
this.mdle = moduleElement;
if (configuration.getSpecifiedPackageElements().isEmpty()) {
@ -91,7 +90,7 @@ public class ModuleFrameWriter extends HtmlDocletWriter {
* @param moduleElement The package for which "module_name-type-frame.html" is to be generated.
* @throws DocFileIOException if there is a problem generating the module summary file
*/
public static void generate(ConfigurationImpl configuration, ModuleElement moduleElement)
public static void generate(HtmlConfiguration configuration, ModuleElement moduleElement)
throws DocFileIOException {
ModuleFrameWriter mdlgen = new ModuleFrameWriter(configuration, moduleElement);
String mdlName = moduleElement.getQualifiedName().toString();

4
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java

@ -63,7 +63,7 @@ public class ModuleIndexFrameWriter extends AbstractModuleIndexWriter {
* @param configuration the configuration object
* @param filename Name of the module index file to be generated.
*/
public ModuleIndexFrameWriter(ConfigurationImpl configuration,
public ModuleIndexFrameWriter(HtmlConfiguration configuration,
DocPath filename) {
super(configuration, filename);
}
@ -73,7 +73,7 @@ public class ModuleIndexFrameWriter extends AbstractModuleIndexWriter {
* @throws DocFileIOException
* @param configuration the configuration object
*/
public static void generate(ConfigurationImpl configuration) throws DocFileIOException {
public static void generate(HtmlConfiguration configuration) throws DocFileIOException {
DocPath filename = DocPaths.MODULE_OVERVIEW_FRAME;
ModuleIndexFrameWriter modulegen = new ModuleIndexFrameWriter(configuration, filename);
modulegen.buildModuleIndexFile("doclet.Window_Overview", false);

4
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java

@ -77,7 +77,7 @@ public class ModuleIndexWriter extends AbstractModuleIndexWriter {
* @param configuration the configuration object
* @param filename the name of the generated file
*/
public ModuleIndexWriter(ConfigurationImpl configuration, DocPath filename) {
public ModuleIndexWriter(HtmlConfiguration configuration, DocPath filename) {
super(configuration, filename);
groupModuleMap = configuration.group.groupModules(configuration.modules);
groupList = configuration.group.getGroupList();
@ -89,7 +89,7 @@ public class ModuleIndexWriter extends AbstractModuleIndexWriter {
* @param configuration the current configuration of the doclet.
* @throws DocFileIOException if there is a problem generating the module index page
*/
public static void generate(ConfigurationImpl configuration) throws DocFileIOException {
public static void generate(HtmlConfiguration configuration) throws DocFileIOException {
DocPath filename = DocPaths.overviewSummary(configuration.frames);
ModuleIndexWriter mdlgen = new ModuleIndexWriter(configuration, filename);
mdlgen.buildModuleIndexFile("doclet.Window_Overview_Summary", true);

4
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModulePackageIndexFrameWriter.java

@ -65,7 +65,7 @@ public class ModulePackageIndexFrameWriter extends AbstractModuleIndexWriter {
* @param configuration the configuration object
* @param filename Name of the package index file to be generated.
*/
public ModulePackageIndexFrameWriter(ConfigurationImpl configuration, DocPath filename) {
public ModulePackageIndexFrameWriter(HtmlConfiguration configuration, DocPath filename) {
super(configuration, filename);
}
@ -75,7 +75,7 @@ public class ModulePackageIndexFrameWriter extends AbstractModuleIndexWriter {
* @param configuration the configuration object
* @param mdle the module being documented
*/
public static void generate(ConfigurationImpl configuration, ModuleElement mdle) throws DocFileIOException {
public static void generate(HtmlConfiguration configuration, ModuleElement mdle) throws DocFileIOException {
DocPath filename = DocPaths.moduleFrame(mdle);
ModulePackageIndexFrameWriter modpackgen = new ModulePackageIndexFrameWriter(configuration, filename);
modpackgen.buildModulePackagesIndexFile("doclet.Window_Overview", false, mdle);

2
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java

@ -181,7 +181,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
* @param prevModule Previous module in the sorted array.
* @param nextModule Next module in the sorted array.
*/
public ModuleWriterImpl(ConfigurationImpl configuration,
public ModuleWriterImpl(HtmlConfiguration configuration,
ModuleElement mdle, ModuleElement prevModule, ModuleElement nextModule) {
super(configuration, DocPaths.moduleSummary(mdle));
this.prevModule = prevModule;

11
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageFrameWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* 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 +30,12 @@ import java.util.*;
import javax.lang.model.element.PackageElement;
import javax.lang.model.element.TypeElement;
import jdk.javadoc.doclet.DocletEnvironment;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
@ -79,7 +78,7 @@ public class PackageFrameWriter extends HtmlDocletWriter {
* @param configuration the configuration of the doclet.
* @param packageElement PackageElement under consideration.
*/
public PackageFrameWriter(ConfigurationImpl configuration, PackageElement packageElement) {
public PackageFrameWriter(HtmlConfiguration configuration, PackageElement packageElement) {
super(configuration, DocPath.forPackage(packageElement).resolve(DocPaths.PACKAGE_FRAME));
this.packageElement = packageElement;
if (configuration.getSpecifiedPackageElements().isEmpty()) {
@ -96,7 +95,7 @@ public class PackageFrameWriter extends HtmlDocletWriter {
* @param packageElement The package for which "pacakge-frame.html" is to be generated.
* @throws DocFileIOException if there is a problem generating the package summary page
*/
public static void generate(ConfigurationImpl configuration, PackageElement packageElement)
public static void generate(HtmlConfiguration configuration, PackageElement packageElement)
throws DocFileIOException {
PackageFrameWriter packgen = new PackageFrameWriter(configuration, packageElement);
String pkgName = configuration.utils.getPackageName(packageElement);
@ -127,7 +126,7 @@ public class PackageFrameWriter extends HtmlDocletWriter {
* @param contentTree the content tree to which the listing will be added
*/
protected void addClassListing(HtmlTree contentTree) {
Configuration config = configuration;
BaseConfiguration config = configuration;
if (utils.isSpecified(packageElement)) {
addClassKindListing(utils.getInterfaces(packageElement),
contents.interfaces, contentTree);

6
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexFrameWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -60,7 +60,7 @@ public class PackageIndexFrameWriter extends AbstractPackageIndexWriter {
*
* @param filename Name of the package index file to be generated.
*/
public PackageIndexFrameWriter(ConfigurationImpl configuration, DocPath filename) {
public PackageIndexFrameWriter(HtmlConfiguration configuration, DocPath filename) {
super(configuration, filename);
}
@ -68,7 +68,7 @@ public class PackageIndexFrameWriter extends AbstractPackageIndexWriter {
* Generate the package index file named "overview-frame.html".
* @throws DocFileIOException
*/
public static void generate(ConfigurationImpl configuration) throws DocFileIOException {
public static void generate(HtmlConfiguration configuration) throws DocFileIOException {
DocPath filename = DocPaths.OVERVIEW_FRAME;
PackageIndexFrameWriter packgen = new PackageIndexFrameWriter(configuration, filename);
packgen.buildPackageIndexFile("doclet.Window_Overview", false);

4
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java

@ -83,7 +83,7 @@ public class PackageIndexWriter extends AbstractPackageIndexWriter {
* @param filename the path of the page to be generated
* @see Group
*/
public PackageIndexWriter(ConfigurationImpl configuration, DocPath filename) {
public PackageIndexWriter(HtmlConfiguration configuration, DocPath filename) {
super(configuration, filename);
groupPackageMap = configuration.group.groupPackages(packages);
groupList = configuration.group.getGroupList();
@ -95,7 +95,7 @@ public class PackageIndexWriter extends AbstractPackageIndexWriter {
* @param configuration the current configuration of the doclet.
* @throws DocFileIOException if there is a problem generating the package index page
*/
public static void generate(ConfigurationImpl configuration) throws DocFileIOException {
public static void generate(HtmlConfiguration configuration) throws DocFileIOException {
DocPath filename = DocPaths.overviewSummary(configuration.frames);
PackageIndexWriter packgen = new PackageIndexWriter(configuration, filename);
packgen.buildPackageIndexFile("doclet.Window_Overview_Summary", true);

6
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -75,7 +75,7 @@ public class PackageTreeWriter extends AbstractTreeWriter {
* @param prev the previous package
* @param next the next package
*/
public PackageTreeWriter(ConfigurationImpl configuration,
public PackageTreeWriter(HtmlConfiguration configuration,
DocPath path,
PackageElement packageElement,
PackageElement prev, PackageElement next) {
@ -98,7 +98,7 @@ public class PackageTreeWriter extends AbstractTreeWriter {
* deprecated classe or interfaces.
* @throws DocFileIOException if there is a problem generating the package tree page
*/
public static void generate(ConfigurationImpl configuration,
public static void generate(HtmlConfiguration configuration,
PackageElement pkg, PackageElement prev,
PackageElement next, boolean noDeprecated)
throws DocFileIOException {

6
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -64,7 +64,7 @@ public class PackageUseWriter extends SubWriterHolderWriter {
*
* @param filename the file to be generated.
*/
public PackageUseWriter(ConfigurationImpl configuration,
public PackageUseWriter(HtmlConfiguration configuration,
ClassUseMapper mapper, DocPath filename,
PackageElement pkgElement) {
super(configuration, DocPath.forPackage(pkgElement).resolve(filename));
@ -99,7 +99,7 @@ public class PackageUseWriter extends SubWriterHolderWriter {
* @param pkgElement the package being documented.
* @throws DocFileIOException if there is a problem generating the package use page
*/
public static void generate(ConfigurationImpl configuration,
public static void generate(HtmlConfiguration configuration,
ClassUseMapper mapper, PackageElement pkgElement)
throws DocFileIOException {
DocPath filename = DocPaths.PACKAGE_USE;

2
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java

@ -99,7 +99,7 @@ public class PackageWriterImpl extends HtmlDocletWriter
* @param prev Previous package in the sorted array.
* @param next Next package in the sorted array.
*/
public PackageWriterImpl(ConfigurationImpl configuration,
public PackageWriterImpl(HtmlConfiguration configuration,
PackageElement packageElement, PackageElement prev, PackageElement next) {
super(configuration, DocPath
.forPackage(packageElement)

6
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* 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,8 +36,6 @@ import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.SerializedFormWriter;
import jdk.javadoc.internal.doclets.toolkit.SerializedFormWriter.SerialFieldWriter;
import jdk.javadoc.internal.doclets.toolkit.SerializedFormWriter.SerialMethodWriter;
import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
@ -64,7 +62,7 @@ public class SerializedFormWriterImpl extends SubWriterHolderWriter
/**
* @param configuration the configuration data for the doclet
*/
public SerializedFormWriterImpl(ConfigurationImpl configuration) {
public SerializedFormWriterImpl(HtmlConfiguration configuration) {
super(configuration, DocPaths.SERIALIZED_FORM);
visibleClasses = configuration.getIncludedTypeElements();
}

6
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SingleIndexWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -64,7 +64,7 @@ public class SingleIndexWriter extends AbstractIndexWriter {
* @param filename Name of the index file to be generated.
* @param indexbuilder Unicode based Index from {@link IndexBuilder}
*/
public SingleIndexWriter(ConfigurationImpl configuration,
public SingleIndexWriter(HtmlConfiguration configuration,
DocPath filename,
IndexBuilder indexbuilder) {
super(configuration, filename, indexbuilder);
@ -77,7 +77,7 @@ public class SingleIndexWriter extends AbstractIndexWriter {
* @param indexbuilder IndexBuilder built by {@link IndexBuilder}
* @throws DocFileIOException if there is a problem generating the index
*/
public static void generate(ConfigurationImpl configuration,
public static void generate(HtmlConfiguration configuration,
IndexBuilder indexbuilder) throws DocFileIOException {
DocPath filename = DocPaths.INDEX_ALL;
SingleIndexWriter indexgen = new SingleIndexWriter(configuration,

12
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -74,7 +74,7 @@ public class SourceToHTMLConverter {
*/
private static final String NEW_LINE = DocletConstants.NL;
private final ConfigurationImpl configuration;
private final HtmlConfiguration configuration;
private final Messages messages;
private final Utils utils;
@ -88,8 +88,8 @@ public class SourceToHTMLConverter {
*/
private DocPath relativePath = DocPath.empty;
private SourceToHTMLConverter(ConfigurationImpl configuration, DocletEnvironment rd,
DocPath outputdir) {
private SourceToHTMLConverter(HtmlConfiguration configuration, DocletEnvironment rd,
DocPath outputdir) {
this.configuration = configuration;
this.messages = configuration.getMessages();
this.utils = configuration.utils;
@ -106,8 +106,8 @@ public class SourceToHTMLConverter {
* @throws DocFileIOException if there is a problem generating an output file
* @throws SimpleDocletException if there is a problem reading a source file
*/
public static void convertRoot(ConfigurationImpl configuration, DocletEnvironment docEnv,
DocPath outputdir) throws DocFileIOException, SimpleDocletException {
public static void convertRoot(HtmlConfiguration configuration, DocletEnvironment docEnv,
DocPath outputdir) throws DocFileIOException, SimpleDocletException {
new SourceToHTMLConverter(configuration, docEnv, outputdir).generate();
}

6
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SplitIndexWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -82,7 +82,7 @@ public class SplitIndexWriter extends AbstractIndexWriter {
* @param prev the previous character that was indexed
* @param next the next character to be indexed
*/
public SplitIndexWriter(ConfigurationImpl configuration,
public SplitIndexWriter(HtmlConfiguration configuration,
DocPath path,
IndexBuilder indexbuilder,
Collection<Character> elements,
@ -101,7 +101,7 @@ public class SplitIndexWriter extends AbstractIndexWriter {
* @param indexbuilder IndexBuilder built by {@link IndexBuilder}
* @throws DocFileIOException if there is a problem generating the index files
*/
public static void generate(ConfigurationImpl configuration,
public static void generate(HtmlConfiguration configuration,
IndexBuilder indexbuilder) throws DocFileIOException {
DocPath path = DocPaths.INDEX_FILES;
Set<Character> keys = new TreeSet<>(indexbuilder.getIndexMap().keySet());

4
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -66,7 +66,7 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
*/
protected HtmlTree mainTree = HtmlTree.MAIN();
public SubWriterHolderWriter(ConfigurationImpl configuration, DocPath filename) {
public SubWriterHolderWriter(HtmlConfiguration configuration, DocPath filename) {
super(configuration, filename);
}

8
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -42,7 +42,7 @@ import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.builders.SerializedFormBuilder;
import jdk.javadoc.internal.doclets.toolkit.taglets.TagletWriter;
@ -68,7 +68,7 @@ import jdk.javadoc.internal.doclets.toolkit.util.Utils;
public class TagletWriterImpl extends TagletWriter {
private final HtmlDocletWriter htmlWriter;
private final ConfigurationImpl configuration;
private final HtmlConfiguration configuration;
private final Utils utils;
public TagletWriterImpl(HtmlDocletWriter htmlWriter, boolean isFirstSentence) {
@ -438,7 +438,7 @@ public class TagletWriterImpl extends TagletWriter {
/**
* {@inheritDoc}
*/
public Configuration configuration() {
public BaseConfiguration configuration() {
return configuration;
}
}

6
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -74,7 +74,7 @@ public class TreeWriter extends AbstractTreeWriter {
* @param filename String filename
* @param classtree the tree being built.
*/
public TreeWriter(ConfigurationImpl configuration, DocPath filename, ClassTree classtree) {
public TreeWriter(HtmlConfiguration configuration, DocPath filename, ClassTree classtree) {
super(configuration, filename, classtree);
packages = configuration.packages;
classesOnly = packages.isEmpty();
@ -88,7 +88,7 @@ public class TreeWriter extends AbstractTreeWriter {
* @param classtree the class tree being documented.
* @throws DocFileIOException if there is a problem generating the overview tree page
*/
public static void generate(ConfigurationImpl configuration,
public static void generate(HtmlConfiguration configuration,
ClassTree classtree) throws DocFileIOException {
DocPath filename = DocPaths.OVERVIEW_TREE;
TreeWriter treegen = new TreeWriter(configuration, filename, classtree);

8
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/WriterFactoryImpl.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -45,8 +45,6 @@ import jdk.javadoc.internal.doclets.toolkit.WriterFactory;
import jdk.javadoc.internal.doclets.toolkit.util.ClassTree;
import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberMap;
import static jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberMap.Kind.*;
/**
* The factory that returns HTML writers.
*
@ -59,8 +57,8 @@ import static jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberMap.Kind.*;
*/
public class WriterFactoryImpl implements WriterFactory {
private final ConfigurationImpl configuration;
public WriterFactoryImpl(ConfigurationImpl configuration) {
private final HtmlConfiguration configuration;
public WriterFactoryImpl(HtmlConfiguration configuration) {
this.configuration = configuration;
}

14
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* 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,9 +31,9 @@ import javax.lang.model.element.ModuleElement;
import javax.lang.model.element.PackageElement;
import javax.lang.model.element.TypeElement;
import jdk.javadoc.internal.doclets.formats.html.ConfigurationImpl;
import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
import jdk.javadoc.internal.doclets.formats.html.SectionName;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
@ -69,7 +69,7 @@ public abstract class HtmlDocWriter extends HtmlWriter {
* @param configuration the configuration for this doclet
* @param filename String file name.
*/
public HtmlDocWriter(Configuration configuration, DocPath filename) {
public HtmlDocWriter(BaseConfiguration configuration, DocPath filename) {
super(configuration, filename);
this.pathToRoot = filename.parent().invert();
Messages messages = configuration.getMessages();
@ -81,7 +81,7 @@ public abstract class HtmlDocWriter extends HtmlWriter {
* Accessor for configuration.
* @return the configuration for this doclet
*/
public abstract Configuration configuration();
public abstract BaseConfiguration configuration();
public Content getHyperLink(DocPath link, String label) {
return getHyperLink(link, new StringContent(label), false, "", "", "");
@ -318,7 +318,7 @@ public abstract class HtmlDocWriter extends HtmlWriter {
* @param body the body content tree to be added to the HTML document
* @throws DocFileIOException if there is an error writing the frames document
*/
public void printFramesDocument(String title, ConfigurationImpl configuration,
public void printFramesDocument(String title, HtmlConfiguration configuration,
HtmlTree body) throws DocFileIOException {
Content htmlDocType = configuration.isOutputHtml5()
? DocType.HTML5
@ -347,7 +347,7 @@ public abstract class HtmlDocWriter extends HtmlWriter {
* @param configuration the configuration for this doclet
* @return an HtmlTree for the lINK tag which provides the stylesheet location
*/
public HtmlTree getStyleSheetProperties(ConfigurationImpl configuration) {
public HtmlTree getStyleSheetProperties(HtmlConfiguration configuration) {
String stylesheetfile = configuration.stylesheetfile;
DocPath stylesheet;
if (stylesheetfile.isEmpty()) {

6
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlWriter.java

@ -29,7 +29,7 @@ import java.io.*;
import java.util.*;
import jdk.javadoc.doclet.DocletEnvironment.ModuleMode;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.Resources;
import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
@ -62,7 +62,7 @@ public class HtmlWriter {
/**
* The configuration
*/
protected Configuration configuration;
protected BaseConfiguration configuration;
/**
* Header for table displaying modules and description.
@ -120,7 +120,7 @@ public class HtmlWriter {
* @param path The directory path to be created for this file
* or null if none to be created.
*/
public HtmlWriter(Configuration configuration, DocPath path) {
public HtmlWriter(BaseConfiguration configuration, DocPath path) {
docFile = DocFile.createFileForOutput(configuration, path);
this.configuration = configuration;

6
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AbstractDoclet.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -64,7 +64,7 @@ public abstract class AbstractDoclet implements Doclet {
/**
* The global configuration information for this run.
*/
private Configuration configuration;
private BaseConfiguration configuration;
protected Messages messages;
@ -181,7 +181,7 @@ public abstract class AbstractDoclet implements Doclet {
*
* @return the configuration of the doclet.
*/
public abstract Configuration getConfiguration();
public abstract BaseConfiguration getConfiguration();
/**
* Start the generation of files. Call generate methods in the individual

10
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Configuration.java → langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java

@ -63,7 +63,7 @@ import static javax.tools.Diagnostic.Kind.*;
/**
* Configure the output based on the options. Doclets should sub-class
* Configuration, to configure and add their own options. This class contains
* BaseConfiguration, to configure and add their own options. This class contains
* all user options which are supported by the 1.1 doclet and the standard
* doclet.
*
@ -76,7 +76,7 @@ import static javax.tools.Diagnostic.Kind.*;
* @author Atul Dambalkar.
* @author Jamie Ho
*/
public abstract class Configuration {
public abstract class BaseConfiguration {
/**
* The doclet that created this configuration.
*/
@ -313,7 +313,7 @@ public abstract class Configuration {
/**
* This method should be defined in all those doclets (configurations),
* which want to derive themselves from this Configuration. This method
* which want to derive themselves from this BaseConfiguration. This method
* can be used to finish up the options setup.
*
* @return true if successful and false otherwise
@ -353,7 +353,7 @@ public abstract class Configuration {
* Constructs the configurations needed by the doclet.
* @param doclet the doclet that created this configuration
*/
public Configuration(Doclet doclet) {
public BaseConfiguration(Doclet doclet) {
this.doclet = doclet;
excludedDocFileDirs = new HashSet<>();
excludedQualifiers = new HashSet<>();
@ -1045,7 +1045,7 @@ public abstract class Configuration {
*/
public InputStream getBuilderXML() throws DocFileIOException {
return builderXMLPath == null ?
Configuration.class.getResourceAsStream(DEFAULT_BUILDER_XML) :
BaseConfiguration.class.getResourceAsStream(DEFAULT_BUILDER_XML) :
DocFile.createFileForInput(this, builderXMLPath).openInputStream();
}

8
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/CommentUtils.java

@ -64,13 +64,13 @@ import jdk.javadoc.internal.doclets.toolkit.util.Utils;
public class CommentUtils {
final Configuration configuration;
final BaseConfiguration configuration;
final DocTreeFactory treeFactory;
final HashMap<Element, DocCommentDuo> dcTreesMap = new HashMap<>();
final DocTrees trees;
final Elements elementUtils;
protected CommentUtils(Configuration configuration) {
protected CommentUtils(BaseConfiguration configuration) {
this.configuration = configuration;
trees = configuration.docEnv.getDocTrees();
treeFactory = trees.getDocTreeFactory();
@ -110,7 +110,7 @@ public class CommentUtils {
return (DocTree) text;
}
public void setEnumValuesTree(Configuration config, Element e) {
public void setEnumValuesTree(BaseConfiguration config, Element e) {
Utils utils = config.utils;
String klassName = utils.getSimpleName(utils.getEnclosingTypeElement(e));
@ -126,7 +126,7 @@ public class CommentUtils {
dcTreesMap.put(e, new DocCommentDuo(null, docTree));
}
public void setEnumValueOfTree(Configuration config, Element e) {
public void setEnumValueOfTree(BaseConfiguration config, Element e) {
List<DocTree> fullBody = new ArrayList<>();
fullBody.add(treeFactory.newTextTree(config.getText("doclet.enum_valueof_doc.fullbody")));

8
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Messages.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -43,7 +43,7 @@ import static javax.tools.Diagnostic.Kind.*;
* Messages are reported to the doclet's {@link Reporter reporter}.
*/
public class Messages {
private final Configuration configuration;
private final BaseConfiguration configuration;
private final Resources resources;
private Reporter reporter;
@ -55,7 +55,7 @@ public class Messages {
* the doclet's resources, reporter, and additional methods and state
* used to filter out messages, if any, which should be suppressed.
*/
public Messages(Configuration configuration) {
public Messages(BaseConfiguration configuration) {
this.configuration = configuration;
resources = configuration.getResources();
}
@ -155,7 +155,7 @@ public class Messages {
}
// Lazy init the reporter for now, until we can fix/improve
// the init of ConfigurationImpl in HtmlDoclet (and similar.)
// the init of HtmlConfiguration in HtmlDoclet (and similar.)
private void initReporter() {
if (reporter == null) {
reporter = configuration.reporter;

6
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Resources.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,7 +39,7 @@ import java.util.ResourceBundle;
* HTML doclet.
*/
public class Resources {
private final Configuration configuration;
private final BaseConfiguration configuration;
private final String commonBundleName;
private final String docletBundleName;
@ -58,7 +58,7 @@ public class Resources {
* @param docletBundleName the name of the bundle containing the strings
* specific to a particular format
*/
public Resources(Configuration configuration, String commonBundleName, String docletBundleName) {
public Resources(BaseConfiguration configuration, String commonBundleName, String docletBundleName) {
this.configuration = configuration;
this.commonBundleName = commonBundleName;
this.docletBundleName = docletBundleName;

4
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java

@ -89,13 +89,13 @@ import static javax.lang.model.element.ElementKind.*;
*/
public class WorkArounds {
public final Configuration configuration;
public final BaseConfiguration configuration;
public final ToolEnvironment toolEnv;
public final Utils utils;
private DocLint doclint;
public WorkArounds(Configuration configuration) {
public WorkArounds(BaseConfiguration configuration) {
this.configuration = configuration;
this.utils = this.configuration.utils;
this.toolEnv = ((DocEnvImpl)this.configuration.docEnv).toolEnv;

10
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AbstractBuilder.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -30,7 +30,7 @@ import java.util.*;
import javax.lang.model.element.PackageElement;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.DocletException;
import jdk.javadoc.internal.doclets.toolkit.Messages;
@ -65,7 +65,7 @@ public abstract class AbstractBuilder {
/**
* The configuration used in this run of the doclet.
*/
final Configuration configuration;
final BaseConfiguration configuration;
/**
* Keep track of which packages we have seen for
@ -79,7 +79,7 @@ public abstract class AbstractBuilder {
*/
final LayoutParser layoutParser;
Context(Configuration configuration,
Context(BaseConfiguration configuration,
Set<PackageElement> containingPackagesSeen,
LayoutParser layoutParser) {
this.configuration = configuration;
@ -91,7 +91,7 @@ public abstract class AbstractBuilder {
/**
* The configuration used in this run of the doclet.
*/
protected final Configuration configuration;
protected final BaseConfiguration configuration;
protected final Messages messages;
protected final Resources resources;

3
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AbstractMemberBuilder.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -33,7 +33,6 @@ import java.util.TreeSet;
import javax.lang.model.element.Element;
import jdk.javadoc.internal.doclets.formats.html.ConfigurationImpl;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.DocletException;

4
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeFieldBuilder.java

@ -31,7 +31,7 @@ import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement;
import jdk.javadoc.internal.doclets.toolkit.AnnotationTypeFieldWriter;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.DocletException;
import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberMap;
@ -193,7 +193,7 @@ public class AnnotationTypeFieldBuilder extends AbstractMemberBuilder {
/**
* Build the comments for the member. Do nothing if
* {@link Configuration#nocomment} is set to true.
* {@link BaseConfiguration#nocomment} is set to true.
*
* @param node the XML element that specifies which components to document
* @param annotationDocTree the content tree to which the documentation will be added

4
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java

@ -31,7 +31,7 @@ import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement;
import jdk.javadoc.internal.doclets.toolkit.AnnotationTypeRequiredMemberWriter;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.DocletException;
import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberMap;
@ -192,7 +192,7 @@ public class AnnotationTypeRequiredMemberBuilder extends AbstractMemberBuilder {
/**
* Build the comments for the member. Do nothing if
* {@link Configuration#nocomment} is set to true.
* {@link BaseConfiguration#nocomment} is set to true.
*
* @param node the XML element that specifies which components to document
* @param annotationDocTree the content tree to which the documentation will be added

8
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/BuilderFactory.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -35,7 +35,7 @@ import javax.lang.model.type.TypeMirror;
import jdk.javadoc.internal.doclets.toolkit.AnnotationTypeWriter;
import jdk.javadoc.internal.doclets.toolkit.ClassWriter;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.PropertyWriter;
import jdk.javadoc.internal.doclets.toolkit.WriterFactory;
import jdk.javadoc.internal.doclets.toolkit.util.ClassTree;
@ -56,7 +56,7 @@ public class BuilderFactory {
/**
* The current configuration of the doclet.
*/
private final Configuration configuration;
private final BaseConfiguration configuration;
/**
* The factory to retrieve the required writers from.
@ -70,7 +70,7 @@ public class BuilderFactory {
* @param configuration the configuration for the current doclet
* being executed.
*/
public BuilderFactory (Configuration configuration) {
public BuilderFactory (BaseConfiguration configuration) {
this.configuration = configuration;
this.writerFactory = configuration.getWriterFactory();

4
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java

@ -31,7 +31,7 @@ import javax.lang.model.element.Element;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.ConstructorWriter;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.DocletException;
@ -192,7 +192,7 @@ public class ConstructorBuilder extends AbstractMemberBuilder {
/**
* Build the comments for the constructor. Do nothing if
* {@link Configuration#nocomment} is set to true.
* {@link BaseConfiguration#nocomment} is set to true.
*
* @param node the XML element that specifies which components to document
* @param constructorDocTree the content tree to which the documentation will be added

4
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java

@ -31,7 +31,7 @@ import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.VariableElement;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.DocletException;
import jdk.javadoc.internal.doclets.toolkit.EnumConstantWriter;
@ -175,7 +175,7 @@ public class EnumConstantBuilder extends AbstractMemberBuilder {
/**
* Build the comments for the enum constant. Do nothing if
* {@link Configuration#nocomment} is set to true.
* {@link BaseConfiguration#nocomment} is set to true.
*
* @param node the XML element that specifies which components to document
* @param enumConstantsTree the content tree to which the documentation will be added

4
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java

@ -31,7 +31,7 @@ import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.VariableElement;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.DocletException;
import jdk.javadoc.internal.doclets.toolkit.FieldWriter;
@ -176,7 +176,7 @@ public class FieldBuilder extends AbstractMemberBuilder {
/**
* Build the comments for the field. Do nothing if
* {@link Configuration#nocomment} is set to true.
* {@link BaseConfiguration#nocomment} is set to true.
*
* @param node the XML element that specifies which components to document
* @param fieldDocTree the content tree to which the documentation will be added

12
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/LayoutParser.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -30,7 +30,7 @@ import java.util.*;
import javax.xml.parsers.*;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
import jdk.javadoc.internal.doclets.toolkit.util.SimpleDocletException;
import org.xml.sax.*;
@ -56,11 +56,11 @@ public class LayoutParser extends DefaultHandler {
*/
private final Map<String,XMLNode> xmlElementsMap;
private XMLNode currentNode;
private final Configuration configuration;
private final BaseConfiguration configuration;
private String currentRoot;
private boolean isParsing;
private LayoutParser(Configuration configuration) {
private LayoutParser(BaseConfiguration configuration) {
xmlElementsMap = new HashMap<>();
this.configuration = configuration;
}
@ -71,7 +71,7 @@ public class LayoutParser extends DefaultHandler {
* @param configuration the current configuration of the doclet.
* @return an instance of the BuilderXML.
*/
public static LayoutParser getInstance(Configuration configuration) {
public static LayoutParser getInstance(BaseConfiguration configuration) {
return new LayoutParser(configuration);
}
@ -95,7 +95,7 @@ public class LayoutParser extends DefaultHandler {
} catch (IOException | ParserConfigurationException | SAXException e) {
String message = (configuration.builderXMLPath == null)
? configuration.getResources().getText("doclet.exception.read.resource",
Configuration.DEFAULT_BUILDER_XML, e)
BaseConfiguration.DEFAULT_BUILDER_XML, e)
: configuration.getResources().getText("doclet.exception.read.file",
configuration.builderXMLPath, e);
throw new SimpleDocletException(message, e);

5
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java

@ -32,8 +32,7 @@ import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.TypeMirror;
import jdk.javadoc.internal.doclets.formats.html.ConfigurationImpl;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.DocletException;
import jdk.javadoc.internal.doclets.toolkit.MethodWriter;
@ -178,7 +177,7 @@ public class MethodBuilder extends AbstractMemberBuilder {
/**
* Build the comments for the method. Do nothing if
* {@link Configuration#nocomment} is set to true.
* {@link BaseConfiguration#nocomment} is set to true.
*
* @param node the XML element that specifies which components to document
* @param methodDocTree the content tree to which the documentation will be added

4
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java

@ -31,7 +31,7 @@ import javax.lang.model.element.Element;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.DocletException;
import jdk.javadoc.internal.doclets.toolkit.PropertyWriter;
@ -177,7 +177,7 @@ public class PropertyBuilder extends AbstractMemberBuilder {
/**
* Build the comments for the property. Do nothing if
* {@link Configuration#nocomment} is set to true.
* {@link BaseConfiguration#nocomment} is set to true.
*
* @param node the XML element that specifies which components to document
* @param propertyDocTree the content tree to which the documentation will be added

6
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/InheritDocTaglet.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -29,7 +29,7 @@ import javax.lang.model.element.Element;
import javax.lang.model.element.ExecutableElement;
import com.sun.source.doctree.DocTree;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
@ -135,7 +135,7 @@ public class InheritDocTaglet extends BaseInlineTaglet {
private Content retrieveInheritedDocumentation(TagletWriter writer,
Element e, DocTree holderTag, boolean isFirstSentence) {
Content replacement = writer.getOutputInstance();
Configuration configuration = writer.configuration();
BaseConfiguration configuration = writer.configuration();
Messages messages = configuration.getMessages();
Utils utils = configuration.utils;
CommentHelper ch = utils.getCommentHelper(e);

4
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java

@ -42,7 +42,7 @@ import javax.tools.StandardJavaFileManager;
import com.sun.source.doctree.DocTree;
import jdk.javadoc.doclet.Doclet;
import jdk.javadoc.doclet.DocletEnvironment;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.Resources;
@ -194,7 +194,7 @@ public class TagletManager {
*/
public TagletManager(boolean nosince, boolean showversion,
boolean showauthor, boolean javafx,
Configuration configuration) {
BaseConfiguration configuration) {
overridenStandardTags = new HashSet<>();
potentiallyConflictingTags = new HashSet<>();
standardTags = new HashSet<>();

6
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -32,7 +32,7 @@ import javax.lang.model.element.VariableElement;
import javax.lang.model.type.TypeMirror;
import com.sun.source.doctree.DocTree;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.taglets.Taglet.UnsupportedTagletOperationException;
import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
@ -326,5 +326,5 @@ public abstract class TagletWriter {
/**
* @return an instance of the configuration used for this doclet.
*/
public abstract Configuration configuration();
public abstract BaseConfiguration configuration();
}

6
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ValueTaglet.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -32,7 +32,7 @@ import javax.lang.model.element.VariableElement;
import javax.lang.model.util.Elements;
import com.sun.source.doctree.DocTree;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
@ -133,7 +133,7 @@ public class ValueTaglet extends BaseInlineTaglet {
* return field that the value tag was used in. Return null if the name is null
* or empty string and if the value tag is not used on a field.
*/
private VariableElement getVariableElement(Element holder, Configuration config, DocTree tag) {
private VariableElement getVariableElement(Element holder, BaseConfiguration config, DocTree tag) {
Utils utils = config.utils;
CommentHelper ch = utils.getCommentHelper(holder);
String signature = ch.getReferencedSignature(tag);

14
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ClassTree.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -43,7 +43,7 @@ import javax.lang.model.element.TypeElement;
import javax.lang.model.type.TypeMirror;
import jdk.javadoc.doclet.DocletEnvironment;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Messages;
/**
@ -94,7 +94,7 @@ public class ClassTree {
*/
private final Map<TypeElement, SortedSet<TypeElement>> implementingClasses = new HashMap<>();
private final Configuration configuration;
private final BaseConfiguration configuration;
private final Utils utils;
private final Comparator<Element> comparator;
@ -105,7 +105,7 @@ public class ClassTree {
* @param noDeprecated Don't add deprecated classes in the class tree, if
* true.
*/
public ClassTree(Configuration configuration, boolean noDeprecated) {
public ClassTree(BaseConfiguration configuration, boolean noDeprecated) {
this.configuration = configuration;
this.utils = configuration.utils;
@ -126,7 +126,7 @@ public class ClassTree {
* @param docEnv the DocletEnvironment.
* @param configuration The current configuration of the doclet.
*/
public ClassTree(DocletEnvironment docEnv, Configuration configuration) {
public ClassTree(DocletEnvironment docEnv, BaseConfiguration configuration) {
this.configuration = configuration;
this.utils = configuration.utils;
comparator = utils.makeClassUseComparator();
@ -143,7 +143,7 @@ public class ClassTree {
* @param classesSet a set of classes
* @param configuration The current configuration of the doclet.
*/
public ClassTree(SortedSet<TypeElement>classesSet, Configuration configuration) {
public ClassTree(SortedSet<TypeElement>classesSet, BaseConfiguration configuration) {
this.configuration = configuration;
this.utils = configuration.utils;
comparator = utils.makeClassUseComparator();
@ -203,7 +203,7 @@ public class ClassTree {
* @param typeElement for which sub class mapping is to be generated.
* @param configuration the current configuration of the doclet.
*/
private void processType(TypeElement typeElement, Configuration configuration,
private void processType(TypeElement typeElement, BaseConfiguration configuration,
Collection<TypeElement> bases, Map<TypeElement, SortedSet<TypeElement>> subs) {
TypeElement superclass = utils.getFirstVisibleSuperClassAsTypeElement(typeElement);
if (superclass != null) {

6
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ClassUseMapper.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -45,7 +45,7 @@ import javax.lang.model.util.SimpleTypeVisitor9;
import javax.lang.model.util.Types;
import jdk.javadoc.doclet.DocletEnvironment;
import jdk.javadoc.internal.doclets.formats.html.ConfigurationImpl;
import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
/**
* Map all class uses for a given class.
@ -190,7 +190,7 @@ public class ClassUseMapper {
private final Types typeUtils;
private final Utils utils;
public ClassUseMapper(ConfigurationImpl configuration, ClassTree classtree) {
public ClassUseMapper(HtmlConfiguration configuration, ClassTree classtree) {
docEnv = configuration.docEnv;
elementUtils = docEnv.getElementUtils();
typeUtils = docEnv.getTypeUtils();

36
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -69,7 +69,7 @@ import com.sun.source.util.DocTreePath;
import com.sun.source.util.DocTrees;
import com.sun.source.util.SimpleDocTreeVisitor;
import com.sun.source.util.TreePath;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import static com.sun.source.doctree.DocTree.Kind.*;
@ -89,7 +89,7 @@ public class CommentHelper {
public static final String SPACER = " ";
public CommentHelper(Configuration configuration, Element element, TreePath path, DocCommentTree dctree) {
public CommentHelper(BaseConfiguration configuration, Element element, TreePath path, DocCommentTree dctree) {
//this.configuration = configuration;
this.element = element;
this.path = path;
@ -143,7 +143,7 @@ public class CommentHelper {
}
}
Element getElement(Configuration c, ReferenceTree rtree) {
Element getElement(BaseConfiguration c, ReferenceTree rtree) {
// likely a synthesized tree
if (path == null) {
TypeMirror symbol = c.utils.getSymbol(rtree.getSignature());
@ -178,7 +178,7 @@ public class CommentHelper {
return doctrees.getElement(docTreePath);
}
public Element getException(Configuration c, DocTree dtree) {
public Element getException(BaseConfiguration c, DocTree dtree) {
if (dtree.getKind() == THROWS || dtree.getKind() == EXCEPTION) {
ThrowsTree tt = (ThrowsTree)dtree;
ReferenceTree exceptionName = tt.getExceptionName();
@ -187,7 +187,7 @@ public class CommentHelper {
return null;
}
public List<? extends DocTree> getDescription(Configuration c, DocTree dtree) {
public List<? extends DocTree> getDescription(BaseConfiguration c, DocTree dtree) {
return getTags(c, dtree);
}
@ -334,7 +334,7 @@ public class CommentHelper {
return sb;
}
public String getLabel(Configuration c, DocTree dtree) {
public String getLabel(BaseConfiguration c, DocTree dtree) {
return new SimpleDocTreeVisitor<String, Void>() {
@Override
public String visitLink(LinkTree node, Void p) {
@ -361,7 +361,7 @@ public class CommentHelper {
}.visit(dtree, null);
}
public TypeElement getReferencedClass(Configuration c, DocTree dtree) {
public TypeElement getReferencedClass(BaseConfiguration c, DocTree dtree) {
Element e = getReferencedElement(c, dtree);
if (e == null) {
return null;
@ -373,7 +373,7 @@ public class CommentHelper {
return null;
}
public String getReferencedClassName(Configuration c, DocTree dtree) {
public String getReferencedClassName(BaseConfiguration c, DocTree dtree) {
Element e = getReferencedClass(c, dtree);
if (e != null) {
return c.utils.isTypeElement(e) ? c.utils.getSimpleName(e) : null;
@ -386,7 +386,7 @@ public class CommentHelper {
return (n == -1) ? s : s.substring(0, n);
}
public Element getReferencedMember(Configuration c, DocTree dtree) {
public Element getReferencedMember(BaseConfiguration c, DocTree dtree) {
Element e = getReferencedElement(c, dtree);
if (e == null) {
return null;
@ -403,7 +403,7 @@ public class CommentHelper {
return (n == -1) ? null : s.substring(n + 1);
}
public String getReferencedMemberName(Configuration c, Element e) {
public String getReferencedMemberName(BaseConfiguration c, Element e) {
if (e == null) {
return null;
}
@ -412,7 +412,7 @@ public class CommentHelper {
: c.utils.getSimpleName(e);
}
public PackageElement getReferencedPackage(Configuration c, DocTree dtree) {
public PackageElement getReferencedPackage(BaseConfiguration c, DocTree dtree) {
Element e = getReferencedElement(c, dtree);
if (e != null) {
return c.utils.containingPackage(e);
@ -420,16 +420,16 @@ public class CommentHelper {
return null;
}
public List<? extends DocTree> getFirstSentenceTrees(Configuration c, List<? extends DocTree> body) {
public List<? extends DocTree> getFirstSentenceTrees(BaseConfiguration c, List<? extends DocTree> body) {
List<DocTree> firstSentence = c.docEnv.getDocTrees().getFirstSentence(body);
return firstSentence;
}
public List<? extends DocTree> getFirstSentenceTrees(Configuration c, DocTree dtree) {
public List<? extends DocTree> getFirstSentenceTrees(BaseConfiguration c, DocTree dtree) {
return getFirstSentenceTrees(c, getBody(c, dtree));
}
private Element getReferencedElement(Configuration c, DocTree dtree) {
private Element getReferencedElement(BaseConfiguration c, DocTree dtree) {
return new SimpleDocTreeVisitor<Element, Void>() {
@Override
public Element visitSee(SeeTree node, Void p) {
@ -476,7 +476,7 @@ public class CommentHelper {
}.visit(dtree, null);
}
public TypeElement getServiceType(Configuration c, DocTree dtree) {
public TypeElement getServiceType(BaseConfiguration c, DocTree dtree) {
Element e = getReferencedElement(c, dtree);
if (e != null) {
return c.utils.isTypeElement(e) ? (TypeElement) e : null;
@ -542,7 +542,7 @@ public class CommentHelper {
}
}
public List<? extends DocTree> getTags(Configuration c, DocTree dtree) {
public List<? extends DocTree> getTags(BaseConfiguration c, DocTree dtree) {
return new SimpleDocTreeVisitor<List<? extends DocTree>, Void>() {
List<? extends DocTree> asList(String content) {
List<DocTree> out = new ArrayList<>();
@ -647,7 +647,7 @@ public class CommentHelper {
}.visit(dtree, null);
}
public List<? extends DocTree> getBody(Configuration c, DocTree dtree) {
public List<? extends DocTree> getBody(BaseConfiguration c, DocTree dtree) {
return getTags(c, dtree);
}

8
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -32,7 +32,7 @@ import javax.lang.model.element.ModuleElement;
import javax.lang.model.element.PackageElement;
import javax.lang.model.element.TypeElement;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
/**
* Build list of all the deprecated packages, classes, constructors, fields and methods.
@ -49,7 +49,7 @@ public class DeprecatedAPIListBuilder {
* List of deprecated type Lists.
*/
private final Map<DeprElementKind, SortedSet<Element>> deprecatedMap;
private final Configuration configuration;
private final BaseConfiguration configuration;
private final Utils utils;
public static enum DeprElementKind {
REMOVAL,
@ -72,7 +72,7 @@ public class DeprecatedAPIListBuilder {
*
* @param configuration the current configuration of the doclet
*/
public DeprecatedAPIListBuilder(Configuration configuration) {
public DeprecatedAPIListBuilder(BaseConfiguration configuration) {
this.configuration = configuration;
this.utils = configuration.utils;
deprecatedMap = new EnumMap<>(DeprElementKind.class);

14
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFile.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* 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 java.io.Writer;
import javax.tools.JavaFileManager.Location;
import javax.tools.StandardLocation;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
/**
* Abstraction for handling files, which may be specified directly
@ -51,17 +51,17 @@ import jdk.javadoc.internal.doclets.toolkit.Configuration;
public abstract class DocFile {
/** Create a DocFile for a directory. */
public static DocFile createFileForDirectory(Configuration configuration, String file) {
public static DocFile createFileForDirectory(BaseConfiguration configuration, String file) {
return DocFileFactory.getFactory(configuration).createFileForDirectory(file);
}
/** Create a DocFile for a file that will be opened for reading. */
public static DocFile createFileForInput(Configuration configuration, String file) {
public static DocFile createFileForInput(BaseConfiguration configuration, String file) {
return DocFileFactory.getFactory(configuration).createFileForInput(file);
}
/** Create a DocFile for a file that will be opened for writing. */
public static DocFile createFileForOutput(Configuration configuration, DocPath path) {
public static DocFile createFileForOutput(BaseConfiguration configuration, DocPath path) {
return DocFileFactory.getFactory(configuration).createFileForOutput(path);
}
@ -85,7 +85,7 @@ public abstract class DocFile {
* @param path the subdirectory of the directories of the location for which to
* list files
*/
public static Iterable<DocFile> list(Configuration configuration, Location location, DocPath path) {
public static Iterable<DocFile> list(BaseConfiguration configuration, Location location, DocPath path) {
return DocFileFactory.getFactory(configuration).list(location, path);
}
@ -173,7 +173,7 @@ public abstract class DocFile {
return;
try {
InputStream in = Configuration.class.getResourceAsStream(resource.getPath());
InputStream in = BaseConfiguration.class.getResourceAsStream(resource.getPath());
if (in == null)
return;

10
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFileFactory.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -30,7 +30,7 @@ import javax.tools.JavaFileManager.Location;
import javax.tools.StandardJavaFileManager;
import javax.tools.StandardLocation;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.DocletException;
/**
@ -50,7 +50,7 @@ public abstract class DocFileFactory {
* @param configuration the configuration for this doclet
* @return the factory associated with this configuration
*/
public static synchronized DocFileFactory getFactory(Configuration configuration) {
public static synchronized DocFileFactory getFactory(BaseConfiguration configuration) {
DocFileFactory f = configuration.docFileFactory;
if (f == null) {
JavaFileManager fm = configuration.getFileManager();
@ -64,9 +64,9 @@ public abstract class DocFileFactory {
return f;
}
protected Configuration configuration;
protected BaseConfiguration configuration;
protected DocFileFactory(Configuration configuration) {
protected DocFileFactory(BaseConfiguration configuration) {
this.configuration = configuration;
}

6
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFinder.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -33,7 +33,7 @@ import javax.lang.model.element.TypeElement;
import javax.lang.model.type.TypeMirror;
import com.sun.source.doctree.DocTree;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.taglets.InheritableTaglet;
/**
@ -241,7 +241,7 @@ public class DocFinder {
*
* @return an Output object representing the documentation that was found.
*/
public static Output search(Configuration configuration, Input input) {
public static Output search(BaseConfiguration configuration, Input input) {
Output output = new Output();
Utils utils = configuration.utils;
if (input.isInheritDocTag) {

8
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* 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 javax.tools.Diagnostic;
import javax.tools.DocumentationTool;
import jdk.javadoc.doclet.Reporter;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
/**
* Process and manage "-link" and "-linkoffline" to external packages. The
@ -64,7 +64,7 @@ public class Extern {
/**
* The global configuration information for this run.
*/
private final Configuration configuration;
private final BaseConfiguration configuration;
/**
* True if we are using -linkoffline and false if -link is used instead.
@ -123,7 +123,7 @@ public class Extern {
}
}
public Extern(Configuration configuration) {
public Extern(BaseConfiguration configuration) {
this.configuration = configuration;
}

8
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Group.java

@ -30,7 +30,7 @@ import java.util.*;
import javax.lang.model.element.ModuleElement;
import javax.lang.model.element.PackageElement;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Messages;
@ -87,7 +87,7 @@ public class Group {
/**
* The global configuration information for this run.
*/
private final Configuration configuration;
private final BaseConfiguration configuration;
private Messages messages;
/**
@ -101,7 +101,7 @@ public class Group {
}
}
public Group(Configuration configuration) {
public Group(BaseConfiguration configuration) {
this.configuration = configuration;
messages = configuration.getMessages();
}
@ -199,7 +199,7 @@ public class Group {
}
// Lazy init of the messages for now, because Group is created
// in Configuration before configuration is fully initialized.
// in BaseConfiguration before configuration is fully initialized.
private void initMessages() {
if (messages == null) {
messages = configuration.getMessages();

6
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ImplementedMethods.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -31,7 +31,7 @@ import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.TypeMirror;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
/**
* For a given class method, build an array of interface methods which it
@ -52,7 +52,7 @@ public class ImplementedMethods {
private final TypeElement typeElement;
private final ExecutableElement method;
public ImplementedMethods(ExecutableElement method, Configuration configuration) {
public ImplementedMethods(ExecutableElement method, BaseConfiguration configuration) {
this.method = method;
this.utils = configuration.utils;
typeElement = utils.getEnclosingTypeElement(method);

10
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/IndexBuilder.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -33,7 +33,7 @@ import javax.lang.model.element.PackageElement;
import javax.lang.model.element.TypeElement;
import jdk.javadoc.doclet.DocletEnvironment;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Messages;
/**
@ -73,7 +73,7 @@ public class IndexBuilder {
*/
private boolean javafx;
private final Configuration configuration;
private final BaseConfiguration configuration;
private final Utils utils;
private final Comparator<Element> comparator;
@ -84,7 +84,7 @@ public class IndexBuilder {
* @param noDeprecated true if -nodeprecated option is used,
* false otherwise.
*/
public IndexBuilder(Configuration configuration, boolean noDeprecated) {
public IndexBuilder(BaseConfiguration configuration, boolean noDeprecated) {
this(configuration, noDeprecated, false);
}
@ -96,7 +96,7 @@ public class IndexBuilder {
* false otherwise.
* @param classesOnly Include only classes in index.
*/
public IndexBuilder(Configuration configuration, boolean noDeprecated,
public IndexBuilder(BaseConfiguration configuration, boolean noDeprecated,
boolean classesOnly) {
this.configuration = configuration;
this.utils = configuration.utils;

8
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MetaKeywords.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -32,7 +32,7 @@ import javax.lang.model.element.ModuleElement;
import javax.lang.model.element.PackageElement;
import javax.lang.model.element.TypeElement;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
/**
* Provides methods for creating an array of class, method and
@ -52,12 +52,12 @@ public class MetaKeywords {
/**
* The global configuration information for this run.
*/
private final Configuration config;
private final BaseConfiguration config;
/**
* Constructor
*/
public MetaKeywords(Configuration configuration) {
public MetaKeywords(BaseConfiguration configuration) {
config = configuration;
}

10
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/PackageListWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -30,7 +30,7 @@ import java.io.*;
import javax.lang.model.element.PackageElement;
import jdk.javadoc.doclet.DocletEnvironment;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
/**
@ -45,7 +45,7 @@ import jdk.javadoc.internal.doclets.toolkit.Configuration;
*/
public class PackageListWriter {
private final Configuration configuration;
private final BaseConfiguration configuration;
private final Utils utils;
private final DocFile file;
@ -54,7 +54,7 @@ public class PackageListWriter {
*
* @param configuration the current configuration of the doclet.
*/
public PackageListWriter(Configuration configuration) {
public PackageListWriter(BaseConfiguration configuration) {
file = DocFile.createFileForOutput(configuration, DocPaths.PACKAGE_LIST);
this.configuration = configuration;
this.utils = configuration.utils;
@ -66,7 +66,7 @@ public class PackageListWriter {
* @param configuration the current configuration of the doclet.
* @throws DocFileIOException if there is a problem writing the output
*/
public static void generate(Configuration configuration) throws DocFileIOException {
public static void generate(BaseConfiguration configuration) throws DocFileIOException {
PackageListWriter packgen = new PackageListWriter(configuration);
packgen.generatePackageListFile(configuration.docEnv);
}

6
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/StandardDocFileFactory.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -53,7 +53,7 @@ import javax.tools.StandardJavaFileManager;
import javax.tools.StandardLocation;
import com.sun.tools.javac.util.Assert;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
/**
* Implementation of DocFileFactory using a {@link StandardJavaFileManager}.
@ -68,7 +68,7 @@ class StandardDocFileFactory extends DocFileFactory {
private final StandardJavaFileManager fileManager;
private Path destDir;
public StandardDocFileFactory(Configuration configuration) {
public StandardDocFileFactory(BaseConfiguration configuration) {
super(configuration);
fileManager = (StandardJavaFileManager) configuration.getFileManager();
}

10
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/TypeElementCatalog.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -30,7 +30,7 @@ import javax.lang.model.element.Element;
import javax.lang.model.element.PackageElement;
import javax.lang.model.element.TypeElement;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
/**
* This class acts as an artificial container for classes specified on the command line when
@ -88,7 +88,7 @@ public class TypeElementCatalog {
*/
private final Map<PackageElement, SortedSet<TypeElement>> interfaces;
private final Configuration configuration;
private final BaseConfiguration configuration;
private final Utils utils;
private final Comparator<Element> comparator;
@ -97,7 +97,7 @@ public class TypeElementCatalog {
*
* @param typeElements the array of TypeElements to catalog
*/
public TypeElementCatalog(Iterable<TypeElement> typeElements, Configuration config) {
public TypeElementCatalog(Iterable<TypeElement> typeElements, BaseConfiguration config) {
this(config);
for (TypeElement typeElement : typeElements) {
addTypeElement(typeElement);
@ -108,7 +108,7 @@ public class TypeElementCatalog {
* Construct a new TypeElementCatalog.
*
*/
public TypeElementCatalog(Configuration config) {
public TypeElementCatalog(BaseConfiguration config) {
this.configuration = config;
this.utils = config.utils;
comparator = utils.makeGeneralPurposeComparator();

6
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java

@ -78,8 +78,8 @@ import com.sun.source.util.DocSourcePositions;
import com.sun.source.util.DocTrees;
import com.sun.source.util.TreePath;
import com.sun.tools.javac.model.JavacTypes;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.CommentUtils.DocCommentDuo;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.WorkArounds;
import jdk.javadoc.internal.tool.DocEnvImpl;
@ -104,14 +104,14 @@ import static jdk.javadoc.internal.doclets.toolkit.builders.ConstantsSummaryBuil
* @author Jamie Ho
*/
public class Utils {
public final Configuration configuration;
public final BaseConfiguration configuration;
public final Messages messages;
public final DocTrees docTrees;
public final Elements elementUtils;
public final Types typeUtils;
public final JavaScriptScanner javaScriptScanner;
public Utils(Configuration c) {
public Utils(BaseConfiguration c) {
configuration = c;
messages = configuration.getMessages();
elementUtils = c.docEnv.getElementUtils();

8
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberMap.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -38,7 +38,7 @@ import javax.lang.model.type.TypeMirror;
import com.sun.source.doctree.DocCommentTree;
import com.sun.source.doctree.DocTree;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Messages;
/**
@ -126,7 +126,7 @@ public class VisibleMemberMap {
/**
* The configuration this VisibleMemberMap was created with.
*/
private final Configuration configuration;
private final BaseConfiguration configuration;
private final Messages messages;
private final Utils utils;
private final Comparator<Element> comparator;
@ -147,7 +147,7 @@ public class VisibleMemberMap {
*/
public VisibleMemberMap(TypeElement typeElement,
Kind kind,
Configuration configuration) {
BaseConfiguration configuration) {
this.typeElement = typeElement;
this.kind = kind;
this.configuration = configuration;

6
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkInfo.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -29,7 +29,7 @@ import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.TypeMirror;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
/**
@ -140,7 +140,7 @@ public abstract class LinkInfo {
* @param configuration the current configuration of the doclet.
* @return the label for this class link.
*/
public Content getClassLinkLabel(Configuration configuration) {
public Content getClassLinkLabel(BaseConfiguration configuration) {
if (label != null && !label.isEmpty()) {
return label;
} else if (isLinkable()) {

6
langtools/test/jdk/javadoc/tool/T4696488.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -30,7 +30,7 @@
* @run main T4696488 T4696488.java
*/
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
public class T4696488 {
@ -49,7 +49,7 @@ public class T4696488 {
}
private static void assertAddTrailingFileSep(String input, String expectedOutput) {
String output = Configuration.addTrailingFileSep(input);
String output = BaseConfiguration.addTrailingFileSep(input);
if (!expectedOutput.equals(output)) {
throw new Error("expected " + expectedOutput + " but was " + output);
}