src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocWriter.java

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2015, 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
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 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,50 ****
   * 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.formats.html.markup;
  
  import java.io.*;
  import java.util.*;
  
! import com.sun.javadoc.*;
! import com.sun.tools.doclets.formats.html.ConfigurationImpl;
! import com.sun.tools.doclets.formats.html.SectionName;
! import com.sun.tools.doclets.internal.toolkit.*;
! import com.sun.tools.doclets.internal.toolkit.util.DocFile;
! import com.sun.tools.doclets.internal.toolkit.util.DocLink;
! import com.sun.tools.doclets.internal.toolkit.util.DocPath;
! import com.sun.tools.doclets.internal.toolkit.util.DocPaths;
  
  
  /**
   * Class for the Html Format Code Generation specific to JavaDoc.
   * This Class contains methods related to the Html Code Generation which
!  * are used by the Sub-Classes in the package com.sun.tools.doclets.standard
!  * and com.sun.tools.doclets.oneone.
   *
   *  <p><b>This is NOT part of any supported API.
   *  If you write code that depends on this, you do so at your own risk.
   *  This code and its internal interfaces are subject to change or
   *  deletion without notice.</b>
--- 21,52 ----
   * 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 jdk.javadoc.internal.doclets.formats.html.markup;
  
  import java.io.*;
  import java.util.*;
  
! import javax.lang.model.element.PackageElement;
! import javax.lang.model.element.TypeElement;
  
+ import jdk.javadoc.internal.doclets.formats.html.ConfigurationImpl;
+ import jdk.javadoc.internal.doclets.formats.html.SectionName;
+ import jdk.javadoc.internal.doclets.toolkit.Configuration;
+ import jdk.javadoc.internal.doclets.toolkit.Content;
+ import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
+ import jdk.javadoc.internal.doclets.toolkit.util.DocLink;
+ import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
+ import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
  
+ 
  /**
   * Class for the Html Format Code Generation specific to JavaDoc.
   * This Class contains methods related to the Html Code Generation which
!  * are used by the Sub-Classes in the package jdk.javadoc.internal.tool.standard.
   *
   *  <p><b>This is NOT part of any supported API.
   *  If you write code that depends on this, you do so at your own risk.
   *  This code and its internal interfaces are subject to change or
   *  deletion without notice.</b>
*** 264,280 ****
       * @param label      Tag for the link.
       * @param title      String that describes the link's content for accessibility.
       * @param target     Target frame.
       * @return a content tree for the hyper link.
       */
!     public Content getHyperLink(DocPath link,
!             Content label, String title, String target) {
          return getHyperLink(new DocLink(link), label, title, target);
      }
  
!     public Content getHyperLink(DocLink link,
!             Content label, String title, String target) {
          HtmlTree anchor = HtmlTree.A(link.toString(), label);
          if (title != null && title.length() != 0) {
              anchor.addAttr(HtmlAttr.TITLE, title);
          }
          if (target != null && target.length() != 0) {
--- 266,280 ----
       * @param label      Tag for the link.
       * @param title      String that describes the link's content for accessibility.
       * @param target     Target frame.
       * @return a content tree for the hyper link.
       */
!     public Content getHyperLink(DocPath link, Content label, String title, String target) {
          return getHyperLink(new DocLink(link), label, title, target);
      }
  
!     public Content getHyperLink(DocLink link, Content label, String title, String target) {
          HtmlTree anchor = HtmlTree.A(link.toString(), label);
          if (title != null && title.length() != 0) {
              anchor.addAttr(HtmlAttr.TITLE, title);
          }
          if (target != null && target.length() != 0) {
*** 282,303 ****
          }
          return anchor;
      }
  
      /**
!      * Get the name of the package, this class is in.
       *
!      * @param cd    ClassDoc.
       */
!     public String getPkgName(ClassDoc cd) {
!         String pkgName = cd.containingPackage().name();
!         if (pkgName.length() > 0) {
!             pkgName += ".";
!             return pkgName;
          }
-         return "";
-     }
  
      public boolean getMemberDetailsListPrinted() {
          return memberDetailsListPrinted;
      }
  
--- 282,301 ----
          }
          return anchor;
      }
  
      /**
!      * Get the enclosed name of the package
       *
!      * @param te  TypeElement
!      * @return the name
       */
!     public String getEnclosingPackageName(TypeElement te) {
! 
!         PackageElement encl = configuration.utils.containingPackage(te);
!         return (encl.isUnnamed()) ? "" : (encl.getQualifiedName() + ".");
      }
  
      public boolean getMemberDetailsListPrinted() {
          return memberDetailsListPrinted;
      }