src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
changeset 48521 30243cf1503e
parent 47850 4a28dc8a86c2
child 48654 36f58bd6269f
equal deleted inserted replaced
48520:f6f6d86b90e7 48521:30243cf1503e
     1 /*
     1 /*
     2  * Copyright (c) 1998, 2017, 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
   202      * Defaults to true; can be set by --frames; can be set to false by --no-frames; last one wins.
   202      * Defaults to true; can be set by --frames; can be set to false by --no-frames; last one wins.
   203      */
   203      */
   204     public boolean frames = true;
   204     public boolean frames = true;
   205 
   205 
   206     /**
   206     /**
   207      * This is the HTML version of the generated pages. HTML 4.01 is the default output version.
   207      * This is the HTML version of the generated pages.
   208      */
   208      * The default value is determined later.
   209     public HtmlVersion htmlVersion = HtmlVersion.HTML4;
   209      */
       
   210     public HtmlVersion htmlVersion = null;
   210 
   211 
   211     /**
   212     /**
   212      * Collected set of doclint options
   213      * Collected set of doclint options
   213      */
   214      */
   214     public Map<Doclet.Option, String> doclintOpts = new LinkedHashMap<>();
   215     public Map<Doclet.Option, String> doclintOpts = new LinkedHashMap<>();
   296     protected boolean validateOptions() {
   297     protected boolean validateOptions() {
   297         // check shared options
   298         // check shared options
   298         if (!generalValidOptions()) {
   299         if (!generalValidOptions()) {
   299             return false;
   300             return false;
   300         }
   301         }
       
   302 
       
   303         if (htmlVersion == null) {
       
   304             reporter.print(WARNING, getText("doclet.HTML_version_not_specified", helpfile));
       
   305             htmlVersion = HtmlVersion.HTML4;
       
   306         }
       
   307 
   301         // check if helpfile exists
   308         // check if helpfile exists
   302         if (!helpfile.isEmpty()) {
   309         if (!helpfile.isEmpty()) {
   303             DocFile help = DocFile.createFileForInput(this, helpfile);
   310             DocFile help = DocFile.createFileForInput(this, helpfile);
   304             if (!help.exists()) {
   311             if (!help.exists()) {
   305                 reporter.print(ERROR, getText("doclet.File_not_found", helpfile));
   312                 reporter.print(ERROR, getText("doclet.File_not_found", helpfile));