8075703: jdk.javadoc module exports com.sun.tools.javadoc package which contains a lot of internal API

Reviewed-by: ksrini

langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java

@@ -28,7 +28,7 @@ package com.sun.tools.doclets.formats.html;
 import java.util.*;
 
 import com.sun.javadoc.*;
-import com.sun.tools.javadoc.RootDocImpl;
+import com.sun.tools.javadoc.main.RootDocImpl;
 import com.sun.tools.doclets.formats.html.markup.*;
 import com.sun.tools.doclets.internal.toolkit.*;
 import com.sun.tools.doclets.internal.toolkit.builders.*;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java

@@ -40,7 +40,7 @@ import com.sun.tools.doclint.DocLint;
 import com.sun.tools.javac.file.JavacFileManager;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.StringUtils;
-import com.sun.tools.javadoc.RootDocImpl;
+import com.sun.tools.javadoc.main.RootDocImpl;
 
 /**
  * Configure the output based on the command line options.

langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java

@@ -149,8 +149,8 @@ public class SourceToHTMLConverter {
                 return;
             Reader r;
             // temp hack until we can update SourcePosition API.
-            if (sp instanceof com.sun.tools.javadoc.SourcePositionImpl) {
+            if (sp instanceof com.sun.tools.javadoc.main.SourcePositionImpl) {
-                FileObject fo = ((com.sun.tools.javadoc.SourcePositionImpl) sp).fileObject();
+                FileObject fo = ((com.sun.tools.javadoc.main.SourcePositionImpl) sp).fileObject();
                 if (fo == null)
                     return;
                 r = fo.openReader(true);

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/Main.java

@@ -27,6 +27,8 @@ package com.sun.tools.javadoc;
 
 import java.io.PrintWriter;
 
+import com.sun.tools.javadoc.main.Start;
+
 /**
  * Provides external entry points (tool and programmatic)
  * for the javadoc program.

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AbstractTypeImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import com.sun.javadoc.*;
 

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotatedTypeImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import com.sun.javadoc.*;
 import com.sun.tools.javac.code.Attribute;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationDescImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import com.sun.javadoc.*;
 

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationTypeDocImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import com.sun.javadoc.*;
 

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationTypeElementDocImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import com.sun.javadoc.*;
 

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationValueImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import com.sun.javadoc.*;
 

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ClassDocImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import java.io.File;
 import java.io.IOException;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Comment.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ConstructorDocImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import com.sun.javadoc.*;
 

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocEnv.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import java.lang.reflect.Modifier;
 import java.util.*;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import java.io.DataInputStream;
 import java.io.IOException;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocLocale.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import java.text.BreakIterator;
 import java.text.Collator;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocletInvoker.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import java.io.File;
 import java.io.IOException;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ExecutableMemberDocImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import java.lang.reflect.Modifier;
 import java.text.CollationKey;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/FieldDocImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import com.sun.source.util.TreePath;
 import java.lang.reflect.Modifier;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocClassFinder.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import java.util.EnumSet;
 import javax.tools.JavaFileObject;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocEnter.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import javax.tools.JavaFileObject;
 

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocMemberEnter.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import com.sun.source.util.TreePath;
 import com.sun.tools.javac.code.Flags;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTodo.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import com.sun.tools.javac.comp.*;
 import com.sun.tools.javac.util.*;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTool.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import java.io.File;
 import java.io.IOException;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/MemberDocImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import com.sun.javadoc.*;
 

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Messager.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import java.io.PrintWriter;
 import java.util.Locale;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/MethodDocImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import java.lang.reflect.Modifier;
 

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ModifierFilter.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import static com.sun.tools.javac.code.Flags.*;
 

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/PackageDocImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import java.io.IOException;
 import java.io.InputStream;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParamTagImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import java.util.regex.*;
 

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParameterImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import com.sun.javadoc.*;
 

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParameterizedTypeImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import com.sun.javadoc.*;
 

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/PrimitiveType.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import com.sun.javadoc.*;
 

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ProgramElementDocImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import java.lang.reflect.Modifier;
 import java.text.CollationKey;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/RootDocImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import java.io.IOException;
 import java.util.Collection;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SeeTagImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import java.io.File;
 import java.util.Locale;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SerialFieldTagImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import com.sun.javadoc.*;
 

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SerializedForm.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import com.sun.javadoc.*;
 import com.sun.tools.javac.code.*;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SourcePositionImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import java.io.File;
 import javax.tools.FileObject;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Start.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -95,7 +95,7 @@ public class Start extends ToolOption.Helper {
 
     private JavaFileManager fileManager;
 
-    Start(String programName,
+    public Start(String programName,
           PrintWriter errWriter,
           PrintWriter warnWriter,
           PrintWriter noticeWriter,
@@ -119,11 +119,11 @@ public class Start extends ToolOption.Helper {
         this.docletParentClassLoader = docletParentClassLoader;
     }
 
-    Start(String programName, String defaultDocletClassName) {
+    public Start(String programName, String defaultDocletClassName) {
         this(programName, defaultDocletClassName, null);
     }
 
-    Start(String programName, String defaultDocletClassName,
+    public Start(String programName, String defaultDocletClassName,
           ClassLoader docletParentClassLoader) {
         context = new Context();
         messager = new Messager(context, programName);
@@ -131,15 +131,15 @@ public class Start extends ToolOption.Helper {
         this.docletParentClassLoader = docletParentClassLoader;
     }
 
-    Start(String programName, ClassLoader docletParentClassLoader) {
+    public Start(String programName, ClassLoader docletParentClassLoader) {
         this(programName, standardDocletClassName, docletParentClassLoader);
     }
 
-    Start(String programName) {
+    public Start(String programName) {
         this(programName, standardDocletClassName);
     }
 
-    Start(ClassLoader docletParentClassLoader) {
+    public Start(ClassLoader docletParentClassLoader) {
         this(javadocName, docletParentClassLoader);
     }
 

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TagImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import com.sun.javadoc.*;
 

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ThrowsTagImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import com.sun.javadoc.*;
 

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ToolOption.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TypeMaker.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import com.sun.javadoc.*;
 import com.sun.tools.javac.code.Symbol;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TypeVariableImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import com.sun.javadoc.*;
 

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/WildcardTypeImpl.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.sun.tools.javadoc;
+package com.sun.tools.javadoc.main;
 
 import com.sun.javadoc.*;
 

langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java

@@ -283,8 +283,8 @@ public class Start extends ToolOption.Helper {
             }
         } else {
             if (this.apiMode) {
-                com.sun.tools.javadoc.Start ostart
+                com.sun.tools.javadoc.main.Start ostart
-                        = new com.sun.tools.javadoc.Start(context);
+                        = new com.sun.tools.javadoc.main.Start(context);
                 return ostart.begin(docletClass, options, fileObjects);
             }
             warn("main.legacy_api");