src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPath.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -21,14 +21,14 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
-package com.sun.tools.doclets.internal.toolkit.util;
+package jdk.javadoc.internal.doclets.toolkit.util;
 
-import com.sun.javadoc.ClassDoc;
-import com.sun.javadoc.PackageDoc;
+import javax.lang.model.element.PackageElement;
+import javax.lang.model.element.TypeElement;
 
 /**
  * Abstraction for immutable relative paths.
  * Paths always use '/' as a separator, and never begin or end with '/'.
  *

@@ -56,58 +56,61 @@
     /**
      * Return the path for a class.
      * For example, if the class is java.lang.Object,
      * the path is java/lang/Object.html.
      */
-    public static DocPath forClass(ClassDoc cd) {
-        return (cd == null) ? empty :
-                forPackage(cd.containingPackage()).resolve(forName(cd));
+    public static DocPath forClass(Utils utils, TypeElement typeElement) {
+        return (typeElement == null)
+                ? empty
+                : forPackage(utils.containingPackage(typeElement)).resolve(forName(utils, typeElement));
     }
 
     /**
      * Return the path for the simple name of the class.
      * For example, if the class is java.lang.Object,
      * the path is Object.html.
      */
-    public static DocPath forName(ClassDoc cd) {
-        return (cd == null) ? empty : new DocPath(cd.name() + ".html");
+    public static DocPath forName(Utils utils, TypeElement typeElement) {
+        return (typeElement == null) ? empty : new DocPath(utils.getSimpleName(typeElement) + ".html");
     }
 
     /**
      * Return the path for the package of a class.
      * For example, if the class is java.lang.Object,
      * the path is java/lang.
      */
-    public static DocPath forPackage(ClassDoc cd) {
-        return (cd == null) ? empty : forPackage(cd.containingPackage());
+    public static DocPath forPackage(Utils utils, TypeElement typeElement) {
+        return (typeElement == null) ? empty : forPackage(utils.containingPackage(typeElement));
     }
 
     /**
      * Return the path for a package.
      * For example, if the package is java.lang,
      * the path is java/lang.
      */
-    public static DocPath forPackage(PackageDoc pd) {
-        return (pd == null) ? empty : DocPath.create(pd.name().replace('.', '/'));
+    public static DocPath forPackage(PackageElement pkgElement) {
+        return pkgElement == null || pkgElement.isUnnamed()
+                ? empty
+                : DocPath.create(pkgElement.getQualifiedName().toString().replace('.', '/'));
     }
 
     /**
      * Return the inverse path for a package.
      * For example, if the package is java.lang,
      * the inverse path is ../...
      */
-    public static DocPath forRoot(PackageDoc pd) {
-        String name = (pd == null) ? "" : pd.name();
-        if (name.isEmpty())
-            return empty;
+    public static DocPath forRoot(PackageElement pkgElement) {
+        String name = (pkgElement == null || pkgElement.isUnnamed())
+                ? ""
+                : pkgElement.getQualifiedName().toString();
         return new DocPath(name.replace('.', '/').replaceAll("[^/]+", ".."));
     }
 
     /**
      * Return the relative path from one package to another.
      */
-    public static DocPath relativePath(PackageDoc from, PackageDoc to) {
+    public static DocPath relativePath(PackageElement from, PackageElement to) {
         return forRoot(from).resolve(forPackage(to));
     }
 
     protected DocPath(String p) {
         path = (p.endsWith("/") ? p.substring(0, p.length() - 1) : p);