jdk-sandbox: comparison langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java

equal deleted inserted replaced

-:e17429a7e843
+:1c355ea550ed
 * questions.
 */
 package jdk.javadoc.internal.doclets.formats.html;
-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.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.Content;
-import jdk.javadoc.internal.doclets.toolkit.Messages;
 import jdk.javadoc.internal.doclets.toolkit.util.ClassUseMapper;
+import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
-import jdk.javadoc.internal.doclets.toolkit.util.DocletAbortException;
 /**
 * Generate package usage information.
 *
 *  <p><b>This is NOT part of any supported API.
 /**
 * Constructor.
 *
 * @param filename the file to be generated.
-* @throws IOException
-* @throws DocletAbortException
 */
 public PackageUseWriter(ConfigurationImpl configuration,
 ClassUseMapper mapper, DocPath filename,
-PackageElement pkgElement) throws IOException {
+PackageElement pkgElement) {
 super(configuration, DocPath.forPackage(pkgElement).resolve(filename));
 this.packageElement = pkgElement;
 // by examining all classes in this package, find what packages
 // use these classes - produce a map between using package and
 * Generate a class page.
 *
 * @param configuration the current configuration of the doclet.
 * @param mapper        the mapping of the class usage.
 * @param pkgElement    the package being documented.
+* @throws DocFileIOException if there is a problem generating the package use page
 */
 public static void generate(ConfigurationImpl configuration,
-ClassUseMapper mapper, PackageElement pkgElement) {
+ClassUseMapper mapper, PackageElement pkgElement)
-PackageUseWriter pkgusegen;
+throws DocFileIOException {
 DocPath filename = DocPaths.PACKAGE_USE;
-try {
+PackageUseWriter pkgusegen = new PackageUseWriter(configuration, mapper, filename, pkgElement);
-pkgusegen = new PackageUseWriter(configuration, mapper, filename, pkgElement);
+pkgusegen.generatePackageUseFile();
-pkgusegen.generatePackageUseFile();
-} catch (IOException exc) {
-Messages messages = configuration.getMessages();
-messages.error(exc.toString(), filename);
-throw new DocletAbortException(exc);
-}
 }
 /**
 * Generate the package use list.
-*/
+* @throws DocFileIOException if there is a problem generating the package use page
-protected void generatePackageUseFile() throws IOException {
+*/
+protected void generatePackageUseFile() throws DocFileIOException {
 HtmlTree body = getPackageUseHeader();
 HtmlTree div = new HtmlTree(HtmlTag.DIV);
 div.addStyle(HtmlStyle.contentContainer);
 if (usingPackageToUsedClasses.isEmpty()) {
 div.addContent(contents.getContent("doclet.ClassUse_No.usage.of.0", utils.getPackageName(packageElement)));
 /**
 * Add the package use information.
 *
 * @param contentTree the content tree to which the package use information will be added
 */
-protected void addPackageUse(Content contentTree) throws IOException {
+protected void addPackageUse(Content contentTree) {
 HtmlTree ul = new HtmlTree(HtmlTag.UL);
 ul.addStyle(HtmlStyle.blockList);
 if (configuration.packages.size() > 1) {
 addPackageList(ul);
 }
 /**
 * Add the list of packages that use the given package.
 *
 * @param contentTree the content tree to which the package list will be added
 */
-protected void addPackageList(Content contentTree) throws IOException {
+protected void addPackageList(Content contentTree) {
 Content caption = getTableCaption(configuration.getContent(
 "doclet.ClassUse_Packages.that.use.0",
 getPackageLink(packageElement, utils.getPackageName(packageElement))));
 Content table = (configuration.isOutputHtml5())
 ? HtmlTree.TABLE(HtmlStyle.useSummary, caption)
 /**
 * Add the list of classes that use the given package.
 *
 * @param contentTree the content tree to which the class list will be added
 */
-protected void addClassList(Content contentTree) throws IOException {
+protected void addClassList(Content contentTree) {
 List<String> classTableHeader = Arrays.asList(
 configuration.getText("doclet.0_and_1",
 configuration.getText("doclet.Class"),
 configuration.getText("doclet.Description")));
 for (String packageName : usingPackageToUsedClasses.keySet()) {
 * Add the package use information.
 *
 * @param pkg the package that used the given package
 * @param contentTree the content tree to which the information will be added
 */
-protected void addPackageUse(PackageElement pkg, Content contentTree) throws IOException {
+protected void addPackageUse(PackageElement pkg, Content contentTree) {
 Content tdFirst = HtmlTree.TD(HtmlStyle.colFirst,
 getHyperLink(utils.getPackageName(pkg),
 new StringContent(utils.getPackageName(pkg))));
 contentTree.addContent(tdFirst);
 HtmlTree tdLast = new HtmlTree(HtmlTag.TD);
 /**
 * Get this package link.
 *
 * @return a content tree for the package link
 */
+@Override
 protected Content getNavLinkPackage() {
 Content linkContent = getHyperLink(DocPaths.PACKAGE_SUMMARY,
 contents.packageLabel);
 Content li = HtmlTree.LI(linkContent);
 return li;
 /**
 * Get the use link.
 *
 * @return a content tree for the use link
 */
+@Override
 protected Content getNavLinkClassUse() {
 Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.useLabel);
 return li;
 }
 /**
 * Get the tree link.
 *
 * @return a content tree for the tree link
 */
+@Override
 protected Content getNavLinkTree() {
 Content linkContent = getHyperLink(DocPaths.PACKAGE_TREE,
 contents.treeLabel);
 Content li = HtmlTree.LI(linkContent);
 return li;

changeset 40587	1c355ea550ed
parent 40303	96a1226aca18
child 41157	b235a429089a