changeset 19887:f140e400a7f0 tip

Merge
author alanb
date Sat, 01 Jul 2017 07:57:15 +0100
parents 911ab13492eb 473db5c4c2c9
children
files .hgtags src/java.base/share/classes/java/lang/RuntimePermission.java
diffstat 3 files changed, 3 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jun 26 07:49:38 2017 +0100
+++ b/.hgtags	Sat Jul 01 07:57:15 2017 +0100
@@ -421,3 +421,4 @@
 a5506b425f1bf91530d8417b57360e5d89328c0c jdk-9+173
 42f18c931bd4fae5c206ccf6d8e591e4c4e69d31 jdk-9+174
 e6c4f6ef717d104dba880e2dae538690c993b46f jdk-9+175
+9f27d513658d5375b0e26846857d92563f279073 jdk-9+176
--- a/make/src/classes/build/tools/taglet/ModuleGraph.java	Mon Jun 26 07:49:38 2017 +0100
+++ b/make/src/classes/build/tools/taglet/ModuleGraph.java	Sat Jul 01 07:57:15 2017 +0100
@@ -29,6 +29,7 @@
 import java.util.List;
 import java.util.Set;
 import javax.lang.model.element.Element;
+import javax.lang.model.element.ModuleElement;
 import com.sun.source.doctree.DocTree;
 import jdk.javadoc.doclet.Taglet;
 import static jdk.javadoc.doclet.Taglet.Location.*;
@@ -62,7 +63,7 @@
             return "";
         }
 
-        String moduleName = element.getSimpleName().toString();
+        String moduleName = ((ModuleElement) element).getQualifiedName().toString();
         String imageFile = moduleName + "-graph.png";
         int thumbnailHeight = -1;
         String hoverImage = "";
--- a/src/java.base/share/classes/java/lang/RuntimePermission.java	Mon Jun 26 07:49:38 2017 +0100
+++ b/src/java.base/share/classes/java/lang/RuntimePermission.java	Sat Jul 01 07:57:15 2017 +0100
@@ -340,14 +340,6 @@
  * </tr>
  *
  * <tr>
- *   <td>usePolicy</td>
- *   <td>Granting this permission disables the Java Plug-In's default
- *   security prompting behavior.</td>
- *   <td>For more information, refer to the <a href=
- *   "../../../technotes/guides/deploy/index.html">deployment guide</a>.
- *   </td>
- * </tr>
- * <tr>
  *   <td>manageProcess</td>
  *   <td>Native process termination and information about processes
  *       {@link ProcessHandle}.</td>