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

equal deleted inserted replaced

-:e17429a7e843
+:1c355ea550ed
 */
 package jdk.javadoc.internal.doclets.formats.html;
 import java.io.*;
-import java.nio.file.*;
 import java.util.*;
 import java.util.zip.*;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 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.util.DocFile;
+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;
 import jdk.javadoc.internal.doclets.toolkit.util.IndexBuilder;
 /**
 * Generate Index for all the Member Names with Indexing in
 * Unicode Order. This class is a base class for {@link SingleIndexWriter} and
 /**
 * Get the index label for navigation bar.
 *
 * @return a content tree for the tree label
 */
+@Override
 protected Content getNavLinkIndex() {
 Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.indexLabel);
 return li;
 }
 /**
 * Add one line summary comment for the package.
 *
 * @param pkg the package to be documented
 * @param dlTree the content tree to which the description will be added
+* @param si the search index item to be updated
 */
 protected void addDescription(PackageElement pkg, Content dlTree, SearchIndexItem si) {
 Content link = getPackageLink(pkg, new StringContent(utils.getPackageName(pkg)));
 if (configuration.showModules) {
 si.setContainingModule(utils.getSimpleName(utils.containingModule(pkg)));
 /**
 * Add one line summary comment for the class.
 *
 * @param typeElement the class being documented
 * @param dlTree the content tree to which the description will be added
+* @param si the search index item to be updated
 */
 protected void addDescription(TypeElement typeElement, Content dlTree, SearchIndexItem si) {
 Content link = getLink(new LinkInfoImpl(configuration,
 LinkInfoImpl.Kind.INDEX, typeElement).strong(true));
 si.setContainingPackage(utils.getPackageName(utils.containingPackage(typeElement)));
 addComment(member, dd);
 dlTree.addContent(dd);
 }
 protected void addDescription(SearchIndexItem sii, Content dlTree) {
-String path = pathToRoot.isEmpty() ? "" : pathToRoot.getPath() + "/";
+String siiPath = pathToRoot.isEmpty() ? "" : pathToRoot.getPath() + "/";
-path += sii.getUrl();
+siiPath += sii.getUrl();
-HtmlTree labelLink = HtmlTree.A(path, new StringContent(sii.getLabel()));
+HtmlTree labelLink = HtmlTree.A(siiPath, new StringContent(sii.getLabel()));
 Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.searchTagLink, labelLink));
 dt.addContent(" - ");
 dt.addContent(contents.getContent("doclet.Search_tag_in", sii.getHolder()));
 dlTree.addContent(dt);
 Content dd = new HtmlTree(HtmlTag.DD);
 */
 public String getNameForIndex(String unicode) {
 return "I:" + getName(unicode);
 }
-protected void createSearchIndexFiles() {
+/**
+* @throws DocFileIOException if there is a problem creating any of the search index files
+*/
+protected void createSearchIndexFiles() throws DocFileIOException {
 if (configuration.showModules) {
 createSearchIndexFile(DocPaths.MODULE_SEARCH_INDEX_JSON, DocPaths.MODULE_SEARCH_INDEX_ZIP,
 configuration.moduleSearchIndex);
 }
 createSearchIndexFile(DocPaths.PACKAGE_SEARCH_INDEX_JSON, DocPaths.PACKAGE_SEARCH_INDEX_ZIP,
 configuration.memberSearchIndex);
 createSearchIndexFile(DocPaths.TAG_SEARCH_INDEX_JSON, DocPaths.TAG_SEARCH_INDEX_ZIP,
 configuration.tagSearchIndex);
 }
+/**
+* @throws DocFileIOException if there is a problem creating the search index file
+*/
 protected void createSearchIndexFile(DocPath searchIndexFile, DocPath searchIndexZip,
-List<SearchIndexItem> searchIndex) {
+List<SearchIndexItem> searchIndex) throws DocFileIOException {
 if (!searchIndex.isEmpty()) {
-try {
+StringBuilder searchVar = new StringBuilder("[");
-StringBuilder searchVar = new StringBuilder("[");
+boolean first = true;
-boolean first = true;
+for (SearchIndexItem item : searchIndex) {
-DocFile searchFile = DocFile.createFileForOutput(configuration, searchIndexFile);
+if (first) {
-Path p = Paths.get(searchFile.getPath());
+searchVar.append(item.toString());
-for (SearchIndexItem item : searchIndex) {
+first = false;
-if (first) {
+} else {
-searchVar.append(item.toString());
+searchVar.append(",").append(item.toString());
-first = false;
-} else {
-searchVar.append(",").append(item.toString());
-}
 }
-searchVar.append("]");
+}
-Files.write(p, searchVar.toString().getBytes());
+searchVar.append("]");
-DocFile zipFile = DocFile.createFileForOutput(configuration, searchIndexZip);
-try (FileOutputStream fos = new FileOutputStream(zipFile.getPath());
+DocFile zipFile = DocFile.createFileForOutput(configuration, searchIndexZip);
-ZipOutputStream zos = new ZipOutputStream(fos)) {
+try (OutputStream fos = zipFile.openOutputStream();
-zipFile(searchFile.getPath(), searchIndexFile, zos);
+ZipOutputStream zos = new ZipOutputStream(fos)) {
+try {
+ZipEntry ze = new ZipEntry(searchIndexFile.getPath());
+zos.putNextEntry(ze);
+zos.write(searchVar.toString().getBytes());
+} finally {
+zos.closeEntry();
 }
-Files.delete(p);
 } catch (IOException ie) {
-throw new DocletAbortException(ie);
+throw new DocFileIOException(zipFile, DocFileIOException.Mode.WRITE, ie);
 }
-}
-}
-protected void zipFile(String inputFile, DocPath file, ZipOutputStream zos) {
-try {
-try {
-ZipEntry ze = new ZipEntry(file.getPath());
-zos.putNextEntry(ze);
-try (FileInputStream fis = new FileInputStream(new File(inputFile))) {
-byte[] buf = new byte[2048];
-int len = fis.read(buf);
-while (len > 0) {
-zos.write(buf, 0, len);
-len = fis.read(buf);
-}
-}
-} finally {
-zos.closeEntry();
-}
-} catch (IOException e) {
-throw new DocletAbortException(e);
 }
 }
 }

changeset 40587	1c355ea550ed
parent 40511	1b3c502e0bdc
child 40606	eb2c81860c86