src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java

*** 208,217 ****
--- 208,223 ----
       * The default value is determined later.
       */
      public HtmlVersion htmlVersion = null;
  
      /**
+      * Flag to enable/disable use of module directories when generating docs for modules
+      * Default: on (module directories are enabled).
+      */
+     public boolean useModuleDirectories = true;
+ 
+     /**
       * Collected set of doclint options
       */
      public Map<Doclet.Option, String> doclintOpts = new LinkedHashMap<>();
  
      public final Resources resources;
*** 243,252 ****
--- 249,260 ----
  
      protected final Contents contents;
  
      protected final Messages messages;
  
+     protected DocPaths docPaths;
+ 
      /**
       * Creates an object to hold the configuration for a doclet.
       *
       * @param doclet the doclet
       */
*** 355,364 ****
--- 363,373 ----
                  if (!map.containsKey(utils.getPackageName(pkg))) {
                      map.put(utils.getPackageName(pkg), pkg);
                  }
              }
          }
+         docPaths = new DocPaths(utils, useModuleDirectories);
          setCreateOverview();
          setTopFile(docEnv);
          workArounds.initDocLint(doclintOpts.values(), tagletManager.getCustomTagNames(),
                  Utils.toLowerCase(htmlVersion.name()));
          return true;
*** 404,422 ****
          }
          if (createoverview) {
              topFile = DocPaths.overviewSummary(frames);
          } else {
              if (showModules) {
!                 topFile = DocPath.empty.resolve(DocPaths.moduleSummary(modules.first()));
              } else if (packages.size() == 1 && packages.first().isUnnamed()) {
                  List<TypeElement> classes = new ArrayList<>(getIncludedTypeElements());
                  if (!classes.isEmpty()) {
                      TypeElement te = getValidClass(classes);
!                     topFile = DocPath.forClass(utils, te);
                  }
              } else if (!packages.isEmpty()) {
!                 topFile = DocPath.forPackage(packages.first()).resolve(DocPaths.PACKAGE_SUMMARY);
              }
          }
      }
  
      protected TypeElement getValidClass(List<TypeElement> classes) {
--- 413,431 ----
          }
          if (createoverview) {
              topFile = DocPaths.overviewSummary(frames);
          } else {
              if (showModules) {
!                 topFile = DocPath.empty.resolve(docPaths.moduleSummary(modules.first()));
              } else if (packages.size() == 1 && packages.first().isUnnamed()) {
                  List<TypeElement> classes = new ArrayList<>(getIncludedTypeElements());
                  if (!classes.isEmpty()) {
                      TypeElement te = getValidClass(classes);
!                     topFile = docPaths.forClass(te);
                  }
              } else if (!packages.isEmpty()) {
!                 topFile = docPaths.forPackage(packages.first()).resolve(DocPaths.PACKAGE_SUMMARY);
              }
          }
      }
  
      protected TypeElement getValidClass(List<TypeElement> classes) {
*** 835,844 ****
--- 844,860 ----
                          reporter.print(ERROR, getText("doclet.Option_doclint_package_invalid_arg"));
                          return false;
                      }
                      return true;
                  }
+             },
+             new XOption(resources, "--no-module-directories") {
+                 @Override
+                 public boolean process(String option, List<String> args) {
+                     useModuleDirectories = false;
+                     return true;
+                 }
              }
          };
          Set<Doclet.Option> oset = new TreeSet<>();
          oset.addAll(Arrays.asList(options));
          oset.addAll(super.getSupportedOptions());