From 5950e361a250cc4e11943b44fc065479bfb80629 Mon Sep 17 00:00:00 2001 From: Kumar Srinivasan Date: Mon, 2 May 2016 15:01:54 -0700 Subject: [PATCH] 8154578: Drop residual use of addReads from javadoc Reviewed-by: alanb, jjg --- .../toolkit/taglets/TagletManager.java | 22 ----------------- .../com/sun/tools/javadoc/DocletInvoker.java | 24 ------------------- .../toolkit/taglets/TagletManager.java | 22 ----------------- .../jdk/javadoc/internal/tool/Start.java | 23 ------------------ 4 files changed, 91 deletions(-) diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java index bd4ff763147..1b43a69ae06 100644 --- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java +++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java @@ -242,7 +242,6 @@ public class TagletManager { } customTagClass = tagClassLoader.loadClass(classname); - ensureReadable(customTagClass); Method meth = customTagClass.getMethod("register", Map.class); @@ -269,27 +268,6 @@ public class TagletManager { } - /** - * Ensures that the module of the given class is readable to this - * module. - * @param targetClass class in module to be made readable - */ - private void ensureReadable(Class targetClass) { - try { - Method getModuleMethod = Class.class.getMethod("getModule"); - Object thisModule = getModuleMethod.invoke(this.getClass()); - Object targetModule = getModuleMethod.invoke(targetClass); - - Class moduleClass = getModuleMethod.getReturnType(); - Method addReadsMethod = moduleClass.getMethod("addReads", moduleClass); - addReadsMethod.invoke(thisModule, targetModule); - } catch (NoSuchMethodException e) { - // ignore - } catch (Exception e) { - throw new InternalError(e); - } - } - /** * Export javadoc internal API to the unnamed module for a classloader. * This is to support continued use of existing non-standard doclets that diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/DocletInvoker.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/DocletInvoker.java index f41edba705a..91e333e8ccb 100644 --- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/DocletInvoker.java +++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/DocletInvoker.java @@ -102,7 +102,6 @@ public class DocletInvoker { this.apiMode = apiMode; this.exportInternalAPI = exportInternalAPI; // for backdoor use by standard doclet for taglets - ensureReadable(docletClass); // this may not be soon enough if the class has already been loaded if (exportInternalAPI) { exportInternalAPI(docletClass.getClassLoader()); @@ -149,8 +148,6 @@ public class DocletInvoker { messager.exit(); } docletClass = dc; - - ensureReadable(docletClass); } /* @@ -361,27 +358,6 @@ public class DocletInvoker { } } - /** - * Ensures that the module of the given class is readable to this - * module. - * @param targetClass class in module to be made readable - */ - private void ensureReadable(Class targetClass) { - try { - Method getModuleMethod = Class.class.getMethod("getModule"); - Object thisModule = getModuleMethod.invoke(this.getClass()); - Object targetModule = getModuleMethod.invoke(targetClass); - - Class moduleClass = getModuleMethod.getReturnType(); - Method addReadsMethod = moduleClass.getMethod("addReads", moduleClass); - addReadsMethod.invoke(thisModule, targetModule); - } catch (NoSuchMethodException e) { - // ignore - } catch (Exception e) { - throw new InternalError(e); - } - } - /** * Export javadoc internal API to the unnamed module for a classloader. * This is to support continued use of existing non-standard doclets that diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java index 5b354316a11..ec809050f3c 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java @@ -246,7 +246,6 @@ public class TagletManager { } tagClassLoader = fileManager.getClassLoader(TAGLET_PATH); Class customTagClass = tagClassLoader.loadClass(classname); - ensureReadable(customTagClass); Object instance = customTagClass.newInstance(); Taglet newLegacy = new UserTaglet((jdk.javadoc.doclet.taglet.Taglet)instance); String tname = newLegacy.getName(); @@ -261,27 +260,6 @@ public class TagletManager { } } - /** - * Ensures that the module of the given class is readable to this - * module. - * @param targetClass class in module to be made readable - */ - private void ensureReadable(Class targetClass) { - try { - Method getModuleMethod = Class.class.getMethod("getModule"); - Object thisModule = getModuleMethod.invoke(this.getClass()); - Object targetModule = getModuleMethod.invoke(targetClass); - - Class moduleClass = getModuleMethod.getReturnType(); - Method addReadsMethod = moduleClass.getMethod("addReads", moduleClass); - addReadsMethod.invoke(thisModule, targetModule); - } catch (NoSuchMethodException e) { - // ignore - } catch (Exception e) { - throw new InternalError(e.toString()); - } - } - /** * Add a new SimpleTaglet. If this tag already exists * and the header passed as an argument is null, move tag to the back of the diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java index f281ee43a17..d998e077663 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java @@ -330,27 +330,6 @@ public class Start extends ToolOption.Helper { return !failed; } - /** - * Ensures that the module of the given class is readable to this - * module. - * @param targetClass class in module to be made readable - */ - private void ensureReadable(Class targetClass) { - try { - Method getModuleMethod = Class.class.getMethod("getModule"); - Object thisModule = getModuleMethod.invoke(this.getClass()); - Object targetModule = getModuleMethod.invoke(targetClass); - - Class moduleClass = getModuleMethod.getReturnType(); - Method addReadsMethod = moduleClass.getMethod("addReads", moduleClass); - addReadsMethod.invoke(thisModule, targetModule); - } catch (NoSuchMethodException e) { - // ignore - } catch (Exception e) { - throw new InternalError(e); - } - } - /** * Main program - internal */ @@ -550,7 +529,6 @@ public class Start extends ToolOption.Helper { } try { Class klass = cl.loadClass(userDocletName); - ensureReadable(klass); return klass; } catch (ClassNotFoundException cnfe) { error("main.doclet_class_not_found", userDocletName); @@ -601,7 +579,6 @@ public class Start extends ToolOption.Helper { for (String tagletName : tagletNames) { try { Class klass = cl.loadClass(tagletName); - ensureReadable(klass); if (com.sun.tools.doclets.Taglet.class.isAssignableFrom(klass)) { return true; }