src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
changeset 53883 f41793b5b83f
parent 53879 e7cb0348fa1c
child 53991 786825220790
equal deleted inserted replaced
53882:ca682d9d8db5 53883:f41793b5b83f
     1 /*
     1 /*
     2  * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
     2  * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
     3  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4  *
     4  *
     5  * This code is free software; you can redistribute it and/or modify it
     5  * This code is free software; you can redistribute it and/or modify it
     6  * under the terms of the GNU General Public License version 2 only, as
     6  * under the terms of the GNU General Public License version 2 only, as
     7  * published by the Free Software Foundation.  Oracle designates this
     7  * published by the Free Software Foundation.  Oracle designates this
    39 import com.sun.source.util.DocTreePath;
    39 import com.sun.source.util.DocTreePath;
    40 import com.sun.tools.doclint.DocLint;
    40 import com.sun.tools.doclint.DocLint;
    41 
    41 
    42 import jdk.javadoc.doclet.Doclet;
    42 import jdk.javadoc.doclet.Doclet;
    43 import jdk.javadoc.doclet.DocletEnvironment;
    43 import jdk.javadoc.doclet.DocletEnvironment;
       
    44 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
    44 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
    45 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
    45 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlVersion;
    46 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlVersion;
    46 import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
    47 import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
       
    48 import jdk.javadoc.internal.doclets.toolkit.Content;
    47 import jdk.javadoc.internal.doclets.toolkit.DocletException;
    49 import jdk.javadoc.internal.doclets.toolkit.DocletException;
    48 import jdk.javadoc.internal.doclets.toolkit.Messages;
    50 import jdk.javadoc.internal.doclets.toolkit.Messages;
    49 import jdk.javadoc.internal.doclets.toolkit.Resources;
    51 import jdk.javadoc.internal.doclets.toolkit.Resources;
    50 import jdk.javadoc.internal.doclets.toolkit.WriterFactory;
    52 import jdk.javadoc.internal.doclets.toolkit.WriterFactory;
    51 import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
    53 import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
    79  * @author Bhavesh Patel (Modified)
    81  * @author Bhavesh Patel (Modified)
    80  */
    82  */
    81 public class HtmlConfiguration extends BaseConfiguration {
    83 public class HtmlConfiguration extends BaseConfiguration {
    82 
    84 
    83     /**
    85     /**
    84      * Default charset for HTML.
       
    85      */
       
    86     public static final String HTML_DEFAULT_CHARSET = "utf-8";
       
    87 
       
    88     /**
       
    89      * Argument for command line option "-header".
    86      * Argument for command line option "-header".
    90      */
    87      */
    91     public String header = "";
    88     public String header = "";
    92 
    89 
    93     /**
    90     /**
   763 
   760 
   764     @Override
   761     @Override
   765     protected boolean finishOptionSettings0() throws DocletException {
   762     protected boolean finishOptionSettings0() throws DocletException {
   766         if (docencoding == null) {
   763         if (docencoding == null) {
   767             if (charset == null) {
   764             if (charset == null) {
   768                 docencoding = charset = (encoding == null) ? HTML_DEFAULT_CHARSET : encoding;
   765                 docencoding = charset = (encoding == null) ? HtmlConstants.HTML_DEFAULT_CHARSET : encoding;
   769             } else {
   766             } else {
   770                 docencoding = charset;
   767                 docencoding = charset;
   771             }
   768             }
   772         } else {
   769         } else {
   773             if (charset == null) {
   770             if (charset == null) {