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

*** 56,65 ****
--- 56,66 ----
  
  import jdk.javadoc.doclet.Doclet;
  import jdk.javadoc.doclet.DocletEnvironment;
  import jdk.javadoc.doclet.Taglet.Location;
  import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
+ import jdk.javadoc.internal.doclets.toolkit.BaseOptions;
  import jdk.javadoc.internal.doclets.toolkit.DocletElement;
  import jdk.javadoc.internal.doclets.toolkit.Messages;
  import jdk.javadoc.internal.doclets.toolkit.Resources;
  import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
  import jdk.javadoc.internal.doclets.toolkit.util.Utils;
*** 175,211 ****
      /**
       * Show the taglets table when it has been initialized.
       */
      private final boolean showTaglets;
  
      /**
       * Construct a new {@code TagletManager}.
-      * @param nosince true if we do not want to use @since tags.
-      * @param showversion true if we want to use @version tags.
-      * @param showauthor true if we want to use @author tags.
-      * @param javafx indicates whether javafx is active.
       * @param configuration the configuration for this taglet manager
       */
!     public TagletManager(boolean nosince, boolean showversion,
!                          boolean showauthor, boolean javafx,
!                          BaseConfiguration configuration) {
          overriddenStandardTags = new HashSet<>();
          potentiallyConflictingTags = new HashSet<>();
          standardTags = new HashSet<>();
          standardTagsLowercase = new HashSet<>();
          unseenCustomTags = new HashSet<>();
          allTaglets = new LinkedHashMap<>();
!         this.nosince = nosince;
!         this.showversion = showversion;
!         this.showauthor = showauthor;
!         this.javafx = javafx;
          this.docEnv = configuration.docEnv;
          this.doclet = configuration.doclet;
          this.messages = configuration.getMessages();
          this.resources = configuration.getResources();
!         this.showTaglets = configuration.showTaglets;
          this.utils = configuration.utils;
          initStandardTaglets();
      }
  
      /**
       * Add a new {@code Taglet}.  This is used to add a Taglet from within
--- 176,210 ----
      /**
       * Show the taglets table when it has been initialized.
       */
      private final boolean showTaglets;
  
+     private final String tagletPath;
+ 
      /**
       * Construct a new {@code TagletManager}.
       * @param configuration the configuration for this taglet manager
       */
!     public TagletManager(BaseConfiguration configuration) {
          overriddenStandardTags = new HashSet<>();
          potentiallyConflictingTags = new HashSet<>();
          standardTags = new HashSet<>();
          standardTagsLowercase = new HashSet<>();
          unseenCustomTags = new HashSet<>();
          allTaglets = new LinkedHashMap<>();
!         BaseOptions options = configuration.getOptions();
!         this.nosince = options.noSince;
!         this.showversion = options.showVersion;
!         this.showauthor = options.showAuthor;
!         this.javafx = options.javafx;
          this.docEnv = configuration.docEnv;
          this.doclet = configuration.doclet;
          this.messages = configuration.getMessages();
          this.resources = configuration.getResources();
!         this.showTaglets = options.showTaglets;
          this.utils = configuration.utils;
+         this.tagletPath = options.tagletPath;
          initStandardTaglets();
      }
  
      /**
       * Add a new {@code Taglet}.  This is used to add a Taglet from within
*** 228,241 ****
      }
  
      /**
       * Initializes the location TAGLET_PATH which is used to locate the custom taglets.
       * @param fileManager the file manager to load classes and resources.
-      * @param tagletPath the path to the custom taglet.
       * @throws IOException if an error occurs while setting the location.
       */
!     public void initTagletPath(JavaFileManager fileManager, String tagletPath) throws IOException {
          if (fileManager instanceof StandardJavaFileManager) {
              StandardJavaFileManager sfm = (StandardJavaFileManager)fileManager;
              if (tagletPath != null) {
                  List<File> paths = new ArrayList<>();
                  for (String pathname : tagletPath.split(File.pathSeparator)) {
--- 227,239 ----
      }
  
      /**
       * Initializes the location TAGLET_PATH which is used to locate the custom taglets.
       * @param fileManager the file manager to load classes and resources.
       * @throws IOException if an error occurs while setting the location.
       */
!     public void initTagletPath(JavaFileManager fileManager) throws IOException {
          if (fileManager instanceof StandardJavaFileManager) {
              StandardJavaFileManager sfm = (StandardJavaFileManager)fileManager;
              if (tagletPath != null) {
                  List<File> paths = new ArrayList<>();
                  for (String pathname : tagletPath.split(File.pathSeparator)) {