Don't duplicate ...intern.tool.

It's the doclet independent part of javadoc. While it's also internal,
substituting it makes the invocation more difficult, because our doclet
is needed on the general classpath as well as
on the doclet-classpat.

mdoclet/MDoclet-Test (Java 21).launch

@@ -2,17 +2,17 @@
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
     <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-        <listEntry value="/mdoclet/src/org/jdrupes/mdoclet/internal/tool/Main.java"/>
+        <listEntry value="/mdoclet"/>
     </listAttribute>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="1"/>
+        <listEntry value="4"/>
     </listAttribute>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21/"/>
-    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jdrupes.mdoclet.internal.tool.Main"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="jdk.javadoc.internal.tool.Main"/>
     <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="mdoclet"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--add-exports=jdk.javadoc/org.jdrupes.mdoclet.internal.tool=ALL-UNNAMED&#10;--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED&#10;-doclet org.jdrupes.mdoclet.MDoclet --disable-auto-highlight -Xdoclint:-html&#10;-overview testfiles/overview.md -d build/testfiles testfiles/test/Test.java testfiles/test/MDocletExample.java"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="mdoclet"/>

mdoclet/build.gradle

@@ -99,11 +99,11 @@ task apidocs(type: JavaExec) {
         '--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED',
         '--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED',
         '--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED',
-        '--add-exports=jdk.compiler/com.sun.tools.doclint=ALL-UNNAMED']
-    classpath jar
+        '--add-exports=jdk.compiler/com.sun.tools.doclint=ALL-UNNAMED',
+        '--add-exports=jdk.javadoc/jdk.javadoc.internal.tool=ALL-UNNAMED']
     classpath sourceSets.main.compileClasspath
 
-    main = 'org.jdrupes.mdoclet.internal.tool.Main'
+    main = 'jdk.javadoc.internal.tool.Main'
     args = ['-doctitle', 'JDrupes MDoclet',
         '-use',
         '-linksource',

mdoclet/overview.md

@@ -82,6 +82,7 @@ Specify the Doclet on JavaDoc's command line:
     -J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
     -J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
     -J--add-exports=jdk.compiler/com.sun.tools.doclint=ALL-UNNAMED \
+    -J--add-exports=jdk.javadoc/jdk.javadoc.internal.tool=ALL-UNNAMED \
     -doclet org.jdrupes.mdoclet.MDoclet -docletpath /path/to/org.jdrupes.mdoclet.jar:another.jar</code></pre>
 </div>
 
@@ -181,7 +182,8 @@ task apidocs(type: JavaExec) {
         '--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED',
         '--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED',
         '--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED',
-        '--add-exports=jdk.compiler/com.sun.tools.doclint=ALL-UNNAMED']
+        '--add-exports=jdk.compiler/com.sun.tools.doclint=ALL-UNNAMED',
+        '--add-exports=jdk.javadoc/jdk.javadoc.internal.tool=ALL-UNNAMED']
     classpath sourceSets.main.compileClasspath
     main = 'jdk.javadoc.internal.tool.Main'
     args = ['-doctitle', "My Code",

mdoclet/src/org/jdrupes/mdoclet/MDocletEnvironment.java

@@ -28,7 +28,7 @@
 import javax.tools.JavaFileManager;
 import javax.tools.JavaFileObject.Kind;
 
-import org.jdrupes.mdoclet.internal.tool.DocEnvImpl;
+import jdk.javadoc.internal.tool.DocEnvImpl;
 
 import com.sun.source.util.DocTrees;
 

mdoclet/src/org/jdrupes/mdoclet/internal/api/JavadocTaskImpl.java

@@ -33,7 +33,7 @@
 
 import javax.tools.DocumentationTool.DocumentationTask;
 
-import org.jdrupes.mdoclet.internal.tool.Start;
+import jdk.javadoc.internal.tool.Start;
 
 import javax.tools.JavaFileObject;
 
@@ -57,17 +57,16 @@ public class JavadocTaskImpl implements DocumentationTask {
     private final List<String> addModules = new ArrayList<>();
 
     public JavadocTaskImpl(Context context,
-                           Class<?> docletClass,
-                           Iterable<String> options,
-                           Iterable<? extends JavaFileObject> fileObjects)
-    {
+            Class<?> docletClass,
+            Iterable<String> options,
+            Iterable<? extends JavaFileObject> fileObjects) {
         this.context = context;
         this.docletClass = docletClass;
 
         this.options = (options == null) ? Set.of()
-                : nullCheck(options);
+            : nullCheck(options);
         this.fileObjects = (fileObjects == null) ? Set.of()
-                : nullCheck(fileObjects);
+            : nullCheck(fileObjects);
         setLocale(Locale.getDefault());
     }
 
@@ -105,13 +104,14 @@ public Boolean call() {
     }
 
     private void initContext() {
-        //initialize compiler's default locale
+        // initialize compiler's default locale
         context.put(Locale.class, locale);
         if (!addModules.isEmpty()) {
             String names = String.join(",", addModules);
             Options opts = Options.instance(context);
             String prev = opts.get(Option.ADD_MODULES);
-            opts.put(Option.ADD_MODULES, (prev == null) ? names : prev + "," + names);
+            opts.put(Option.ADD_MODULES,
+                (prev == null) ? names : prev + "," + names);
         }
     }
 

mdoclet/src/org/jdrupes/mdoclet/internal/api/JavadocTool.java

@@ -44,7 +44,7 @@
 import javax.tools.JavaFileObject;
 import javax.tools.StandardJavaFileManager;
 
-import org.jdrupes.mdoclet.internal.tool.ToolOptions;
+import jdk.javadoc.internal.tool.ToolOptions;
 
 import com.sun.tools.javac.api.ClientCodeWrapper;
 import com.sun.tools.javac.file.JavacFileManager;
@@ -161,7 +161,7 @@ public int run(InputStream in, OutputStream out, OutputStream err,
             = new PrintWriter(err == null ? System.err : err, true);
         PrintWriter out_pw = new PrintWriter(out == null ? System.out : out);
         try {
-            return org.jdrupes.mdoclet.internal.tool.Main.execute(arguments,
+            return jdk.javadoc.internal.tool.Main.execute(arguments,
                 err_pw);
         } finally {
             err_pw.flush();

mdoclet/src/org/jdrupes/mdoclet/internal/doclets/toolkit/WorkArounds.java

@@ -48,8 +48,8 @@
 import javax.tools.JavaFileManager.Location;
 
 import org.jdrupes.mdoclet.internal.doclets.toolkit.util.Utils;
-import org.jdrupes.mdoclet.internal.tool.DocEnvImpl;
-import org.jdrupes.mdoclet.internal.tool.ToolEnvironment;
+import jdk.javadoc.internal.tool.DocEnvImpl;
+import jdk.javadoc.internal.tool.ToolEnvironment;
 
 import com.sun.source.util.TreePath;
 import com.sun.tools.javac.code.Flags;