src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java
author jjg
Thu, 16 Nov 2017 15:01:45 -0800
changeset 47846 4e78aba768f0
parent 47272 e0d686cdf608
child 47850 4a28dc8a86c2
permissions -rw-r--r--
8190295: Introduce a new Table builder class Reviewed-by: bpatel, ksrini
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     1
/*
43370
5969237f927c 8166175: javadoc search doesn't work on local doc bundles
bpatel
parents: 42816
diff changeset
     2
 * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
06bc494ca11e Initial load
duke
parents:
diff changeset
     4
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
06bc494ca11e Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 2216
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 2216
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    10
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
06bc494ca11e Initial load
duke
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
06bc494ca11e Initial load
duke
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
06bc494ca11e Initial load
duke
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
06bc494ca11e Initial load
duke
parents:
diff changeset
    15
 * accompanied this code).
06bc494ca11e Initial load
duke
parents:
diff changeset
    16
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
06bc494ca11e Initial load
duke
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
06bc494ca11e Initial load
duke
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
06bc494ca11e Initial load
duke
parents:
diff changeset
    20
 *
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 2216
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 2216
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 2216
diff changeset
    23
 * questions.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    24
 */
06bc494ca11e Initial load
duke
parents:
diff changeset
    25
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
    26
package jdk.javadoc.internal.doclets.formats.html;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    27
2216
b124d5c924eb 6786690: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - DL tag and nesting issue
bpatel
parents: 1789
diff changeset
    28
import java.io.*;
b124d5c924eb 6786690: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - DL tag and nesting issue
bpatel
parents: 1789
diff changeset
    29
import java.util.*;
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
    30
import java.util.zip.*;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    31
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
    32
import javax.lang.model.element.Element;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
    33
import javax.lang.model.element.ExecutableElement;
40511
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
    34
import javax.lang.model.element.ModuleElement;
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
    35
import javax.lang.model.element.PackageElement;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
    36
import javax.lang.model.element.TypeElement;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
    37
import javax.lang.model.util.SimpleElementVisitor9;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
    38
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
    39
import com.sun.source.doctree.DocTree;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
    40
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
    41
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
    42
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
    43
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
    44
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
    45
import jdk.javadoc.internal.doclets.toolkit.Content;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
    46
import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
40587
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
    47
import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
    48
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
    49
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
    50
import jdk.javadoc.internal.doclets.toolkit.util.IndexBuilder;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    51
06bc494ca11e Initial load
duke
parents:
diff changeset
    52
/**
06bc494ca11e Initial load
duke
parents:
diff changeset
    53
 * Generate Index for all the Member Names with Indexing in
06bc494ca11e Initial load
duke
parents:
diff changeset
    54
 * Unicode Order. This class is a base class for {@link SingleIndexWriter} and
06bc494ca11e Initial load
duke
parents:
diff changeset
    55
 * {@link SplitIndexWriter}. It uses the functionality from
06bc494ca11e Initial load
duke
parents:
diff changeset
    56
 * {@link HtmlDocletWriter} to generate the Index Contents.
06bc494ca11e Initial load
duke
parents:
diff changeset
    57
 *
14260
727a84636f12 8000665: fix "internal API" comments on javadoc files
jjg
parents: 14258
diff changeset
    58
 *  <p><b>This is NOT part of any supported API.
727a84636f12 8000665: fix "internal API" comments on javadoc files
jjg
parents: 14258
diff changeset
    59
 *  If you write code that depends on this, you do so at your own risk.
727a84636f12 8000665: fix "internal API" comments on javadoc files
jjg
parents: 14258
diff changeset
    60
 *  This code and its internal interfaces are subject to change or
727a84636f12 8000665: fix "internal API" comments on javadoc files
jjg
parents: 14258
diff changeset
    61
 *  deletion without notice.</b>
727a84636f12 8000665: fix "internal API" comments on javadoc files
jjg
parents: 14258
diff changeset
    62
 *
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    63
 * @see    IndexBuilder
06bc494ca11e Initial load
duke
parents:
diff changeset
    64
 * @author Atul M Dambalkar
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
    65
 * @author Bhavesh Patel (Modified)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    66
 */
06bc494ca11e Initial load
duke
parents:
diff changeset
    67
public class AbstractIndexWriter extends HtmlDocletWriter {
06bc494ca11e Initial load
duke
parents:
diff changeset
    68
06bc494ca11e Initial load
duke
parents:
diff changeset
    69
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
    70
     * The index of all the members with unicode character.
06bc494ca11e Initial load
duke
parents:
diff changeset
    71
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
    72
    protected IndexBuilder indexbuilder;
06bc494ca11e Initial load
duke
parents:
diff changeset
    73
06bc494ca11e Initial load
duke
parents:
diff changeset
    74
    /**
14357
faf9cde2817b 8000741: refactor javadoc to use abstraction to handle relative paths
jjg
parents: 14260
diff changeset
    75
     * This constructor will be used by {@link SplitIndexWriter}. Initializes
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    76
     * path to this file and relative path from this file.
06bc494ca11e Initial load
duke
parents:
diff changeset
    77
     *
14357
faf9cde2817b 8000741: refactor javadoc to use abstraction to handle relative paths
jjg
parents: 14260
diff changeset
    78
     * @param configuration  The current configuration
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    79
     * @param path       Path to the file which is getting generated.
06bc494ca11e Initial load
duke
parents:
diff changeset
    80
     * @param indexbuilder Unicode based Index from {@link IndexBuilder}
06bc494ca11e Initial load
duke
parents:
diff changeset
    81
     */
45417
f7479ee8de69 8177848: Rename Configuration(Impl) classes
ksrini
parents: 43370
diff changeset
    82
    protected AbstractIndexWriter(HtmlConfiguration configuration,
14357
faf9cde2817b 8000741: refactor javadoc to use abstraction to handle relative paths
jjg
parents: 14260
diff changeset
    83
                                  DocPath path,
40303
96a1226aca18 8160697: HTMLWriter needs perf cleanup
jjg
parents: 35426
diff changeset
    84
                                  IndexBuilder indexbuilder) {
14357
faf9cde2817b 8000741: refactor javadoc to use abstraction to handle relative paths
jjg
parents: 14260
diff changeset
    85
        super(configuration, path);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    86
        this.indexbuilder = indexbuilder;
06bc494ca11e Initial load
duke
parents:
diff changeset
    87
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
    88
06bc494ca11e Initial load
duke
parents:
diff changeset
    89
    /**
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
    90
     * Get the index label for navigation bar.
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
    91
     *
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
    92
     * @return a content tree for the tree label
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    93
     */
40587
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
    94
    @Override
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
    95
    protected Content getNavLinkIndex() {
40303
96a1226aca18 8160697: HTMLWriter needs perf cleanup
jjg
parents: 35426
diff changeset
    96
        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.indexLabel);
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
    97
        return li;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    98
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
    99
06bc494ca11e Initial load
duke
parents:
diff changeset
   100
    /**
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   101
     * Add the member information for the unicode character along with the
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   102
     * list of the members.
06bc494ca11e Initial load
duke
parents:
diff changeset
   103
     *
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   104
     * @param uc Unicode for which member list information to be generated
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   105
     * @param memberlist List of members for the unicode character
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   106
     * @param contentTree the content tree to which the information will be added
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   107
     */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   108
    protected void addContents(Character uc, Collection<? extends Element> memberlist,
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   109
            Content contentTree) {
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   110
        addHeading(uc, contentTree);
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   111
        // Display the list only if there are elements to be displayed.
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   112
        if (!memberlist.isEmpty()) {
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   113
            Content dl = new HtmlTree(HtmlTag.DL);
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   114
            for (Element element : memberlist) {
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   115
                addDescription(dl, element);
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   116
            }
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   117
            contentTree.addContent(dl);
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   118
        }
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   119
    }
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   120
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   121
    protected void addSearchContents(Character uc, List<SearchIndexItem> searchList,
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   122
            Content contentTree) {
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   123
        addHeading(uc, contentTree);
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   124
        // Display the list only if there are elements to be displayed.
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   125
        if (!searchList.isEmpty()) {
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   126
            Content dl = new HtmlTree(HtmlTag.DL);
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   127
            for (SearchIndexItem sii : searchList) {
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   128
                addDescription(sii, dl);
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   129
            }
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   130
            contentTree.addContent(dl);
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   131
        }
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   132
    }
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   133
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   134
    protected void addContents(Character uc, List<? extends Element> memberlist,
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   135
            List<SearchIndexItem> searchList, Content contentTree) {
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   136
        addHeading(uc, contentTree);
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   137
        int memberListSize = memberlist.size();
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   138
        int searchListSize = searchList.size();
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   139
        int i = 0;
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   140
        int j = 0;
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   141
        Content dl = new HtmlTree(HtmlTag.DL);
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   142
        while (i < memberListSize && j < searchListSize) {
45771
e447c20c3ff9 8182736: javadoc generates bad names and broken module graph links
jjg
parents: 43370
diff changeset
   143
            Element elem = memberlist.get(i);
e447c20c3ff9 8182736: javadoc generates bad names and broken module graph links
jjg
parents: 43370
diff changeset
   144
            String name = (utils.isModule(elem))
e447c20c3ff9 8182736: javadoc generates bad names and broken module graph links
jjg
parents: 43370
diff changeset
   145
                    ? utils.getFullyQualifiedName(elem) : utils.getSimpleName(elem);
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   146
            if (name.compareTo(searchList.get(j).getLabel()) < 0) {
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   147
                addDescription(dl, memberlist.get(i));
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   148
                i++;
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   149
            } else if (name.compareTo(searchList.get(j).getLabel()) > 0) {
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   150
                addDescription(searchList.get(j), dl);
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   151
                j++;
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   152
            } else {
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   153
                addDescription(dl, memberlist.get(i));
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   154
                addDescription(searchList.get(j), dl);
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   155
                j++;
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   156
                i++;
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   157
            }
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   158
        }
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   159
        if (i >= memberListSize) {
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   160
            while (j < searchListSize) {
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   161
                addDescription(searchList.get(j), dl);
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   162
                j++;
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   163
            }
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   164
        }
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   165
        if (j >= searchListSize) {
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   166
            while (i < memberListSize) {
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   167
                addDescription(dl, memberlist.get(i));
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   168
                i++;
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   169
            }
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   170
        }
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   171
        contentTree.addContent(dl);
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   172
    }
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   173
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   174
    protected void addHeading(Character uc, Content contentTree) {
21008
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   175
        String unicode = uc.toString();
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   176
        contentTree.addContent(getMarkerAnchorForIndex(unicode));
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   177
        Content headContent = new StringContent(unicode);
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   178
        Content heading = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING, false,
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   179
                HtmlStyle.title, headContent);
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   180
        contentTree.addContent(heading);
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   181
    }
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   182
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   183
    protected void addDescription(Content dl, Element element) {
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   184
        SearchIndexItem si = new SearchIndexItem();
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   185
        new SimpleElementVisitor9<Void, Void>() {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   186
40606
eb2c81860c86 8164836: TEST_BUG: adjust scope of the DefinedByAnalyzer in tools/all/RunCodingRules.java
jlahoda
parents: 40587
diff changeset
   187
            @Override
40511
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   188
            public Void visitModule(ModuleElement e, Void p) {
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   189
                if (configuration.showModules) {
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   190
                    addDescription(e, dl, si);
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   191
                    configuration.moduleSearchIndex.add(si);
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   192
                }
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   193
                return null;
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   194
            }
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   195
40606
eb2c81860c86 8164836: TEST_BUG: adjust scope of the DefinedByAnalyzer in tools/all/RunCodingRules.java
jlahoda
parents: 40587
diff changeset
   196
            @Override
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   197
            public Void visitPackage(PackageElement e, Void p) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   198
                addDescription(e, dl, si);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   199
                configuration.packageSearchIndex.add(si);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   200
                return null;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   201
            }
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   202
40606
eb2c81860c86 8164836: TEST_BUG: adjust scope of the DefinedByAnalyzer in tools/all/RunCodingRules.java
jlahoda
parents: 40587
diff changeset
   203
            @Override
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   204
            public Void visitType(TypeElement e, Void p) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   205
                addDescription(e, dl, si);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   206
                configuration.typeSearchIndex.add(si);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   207
                return null;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   208
            }
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   209
40606
eb2c81860c86 8164836: TEST_BUG: adjust scope of the DefinedByAnalyzer in tools/all/RunCodingRules.java
jlahoda
parents: 40587
diff changeset
   210
            @Override
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   211
            protected Void defaultAction(Element e, Void p) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   212
                addDescription(e, dl, si);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   213
                configuration.memberSearchIndex.add(si);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   214
                return null;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   215
            }
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   216
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   217
        }.visit(element);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   218
    }
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   219
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   220
    /**
40511
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   221
     * Add one line summary comment for the module.
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   222
     *
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   223
     * @param mdle the module to be documented
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   224
     * @param dlTree the content tree to which the description will be added
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   225
     */
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   226
    protected void addDescription(ModuleElement mdle, Content dlTree, SearchIndexItem si) {
45771
e447c20c3ff9 8182736: javadoc generates bad names and broken module graph links
jjg
parents: 43370
diff changeset
   227
        String moduleName = utils.getFullyQualifiedName(mdle);
40511
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   228
        Content link = getModuleLink(mdle, new StringContent(moduleName));
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   229
        si.setLabel(moduleName);
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   230
        si.setCategory(resources.getText("doclet.Modules"));
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   231
        Content dt = HtmlTree.DT(link);
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   232
        dt.addContent(" - ");
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   233
        dt.addContent(contents.module_);
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   234
        dt.addContent(" " + moduleName);
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   235
        dlTree.addContent(dt);
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   236
        Content dd = new HtmlTree(HtmlTag.DD);
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   237
        addSummaryComment(mdle, dd);
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   238
        dlTree.addContent(dd);
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   239
    }
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   240
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   241
    /**
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   242
     * Add one line summary comment for the package.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   243
     *
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   244
     * @param pkg the package to be documented
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   245
     * @param dlTree the content tree to which the description will be added
40587
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   246
     * @param si the search index item to be updated
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   247
     */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   248
    protected void addDescription(PackageElement pkg, Content dlTree, SearchIndexItem si) {
25454
376a52c9540c 8039028: [javadoc] refactor the usage of Util.java
ksrini
parents: 22159
diff changeset
   249
        Content link = getPackageLink(pkg, new StringContent(utils.getPackageName(pkg)));
40511
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   250
        if (configuration.showModules) {
45771
e447c20c3ff9 8182736: javadoc generates bad names and broken module graph links
jjg
parents: 43370
diff changeset
   251
            si.setContainingModule(utils.getFullyQualifiedName(utils.containingModule(pkg)));
40511
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   252
        }
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   253
        si.setLabel(utils.getPackageName(pkg));
40303
96a1226aca18 8160697: HTMLWriter needs perf cleanup
jjg
parents: 35426
diff changeset
   254
        si.setCategory(resources.getText("doclet.Packages"));
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   255
        Content dt = HtmlTree.DT(link);
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   256
        dt.addContent(" - ");
40303
96a1226aca18 8160697: HTMLWriter needs perf cleanup
jjg
parents: 35426
diff changeset
   257
        dt.addContent(contents.package_);
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   258
        dt.addContent(" " + utils.getPackageName(pkg));
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   259
        dlTree.addContent(dt);
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   260
        Content dd = new HtmlTree(HtmlTag.DD);
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   261
        addSummaryComment(pkg, dd);
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   262
        dlTree.addContent(dd);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   263
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   264
06bc494ca11e Initial load
duke
parents:
diff changeset
   265
    /**
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   266
     * Add one line summary comment for the class.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   267
     *
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   268
     * @param typeElement the class being documented
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   269
     * @param dlTree the content tree to which the description will be added
40587
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   270
     * @param si the search index item to be updated
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   271
     */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   272
    protected void addDescription(TypeElement typeElement, Content dlTree, SearchIndexItem si) {
17559
87c28ee29329 8011642: Remove LinkOutput in favor of direct use of Content
jjg
parents: 17558
diff changeset
   273
        Content link = getLink(new LinkInfoImpl(configuration,
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   274
                        LinkInfoImpl.Kind.INDEX, typeElement).strong(true));
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   275
        si.setContainingPackage(utils.getPackageName(utils.containingPackage(typeElement)));
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   276
        si.setLabel(utils.getSimpleName(typeElement));
40303
96a1226aca18 8160697: HTMLWriter needs perf cleanup
jjg
parents: 35426
diff changeset
   277
        si.setCategory(resources.getText("doclet.Types"));
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   278
        Content dt = HtmlTree.DT(link);
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   279
        dt.addContent(" - ");
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   280
        addClassInfo(typeElement, dt);
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   281
        dlTree.addContent(dt);
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   282
        Content dd = new HtmlTree(HtmlTag.DD);
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   283
        addComment(typeElement, dd);
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   284
        dlTree.addContent(dd);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   285
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   286
06bc494ca11e Initial load
duke
parents:
diff changeset
   287
    /**
17558
eee4ccf66cfd 8010440: Replace int constants in LinkInfoImpl with enum
jjg
parents: 14542
diff changeset
   288
     * Add the classkind (class, interface, exception), error of the class
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   289
     * passed.
06bc494ca11e Initial load
duke
parents:
diff changeset
   290
     *
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   291
     * @param te the class being documented
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   292
     * @param contentTree the content tree to which the class info will be added
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   293
     */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   294
    protected void addClassInfo(TypeElement te, Content contentTree) {
40303
96a1226aca18 8160697: HTMLWriter needs perf cleanup
jjg
parents: 35426
diff changeset
   295
        contentTree.addContent(contents.getContent("doclet.in",
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   296
                utils.getTypeElementName(te, false),
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   297
                getPackageLink(utils.containingPackage(te),
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   298
                    utils.getPackageName(utils.containingPackage(te)))
17563
e8ddeb9bd17c 8011668: Allow HTMLWriter.getResource to take Content args
jjg
parents: 17561
diff changeset
   299
                ));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   300
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   301
06bc494ca11e Initial load
duke
parents:
diff changeset
   302
    /**
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   303
     * Add description for Class, Field, Method or Constructor.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   304
     *
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   305
     * @param member the member of the Class Kind
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   306
     * @param dlTree the content tree to which the description will be added
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   307
     * @param si search index item
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   308
     */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   309
    protected void addDescription(Element member, Content dlTree, SearchIndexItem si) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   310
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   311
        si.setContainingPackage(utils.getPackageName(utils.containingPackage(member)));
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   312
        si.setContainingClass(utils.getSimpleName(utils.getEnclosingTypeElement(member)));
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   313
        String name = utils.getSimpleName(member);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   314
        if (utils.isExecutableElement(member)) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   315
            ExecutableElement ee = (ExecutableElement)member;
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   316
            name = name + utils.flatSignature(ee);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   317
            si.setLabel(name);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   318
            if (!((utils.signature(ee)).equals(utils.flatSignature(ee)))) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   319
                si.setUrl(getName(getAnchor(ee)));
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   320
            }
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   321
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   322
        }  else {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   323
            si.setLabel(name);
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   324
        }
40303
96a1226aca18 8160697: HTMLWriter needs perf cleanup
jjg
parents: 35426
diff changeset
   325
        si.setCategory(resources.getText("doclet.Members"));
21478
fa4c7cda1b41 8026567: Use meaningful style names for strong and italic styles.
bpatel
parents: 21008
diff changeset
   326
        Content span = HtmlTree.SPAN(HtmlStyle.memberNameLink,
17558
eee4ccf66cfd 8010440: Replace int constants in LinkInfoImpl with enum
jjg
parents: 14542
diff changeset
   327
                getDocLink(LinkInfoImpl.Kind.INDEX, member, name));
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   328
        Content dt = HtmlTree.DT(span);
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   329
        dt.addContent(" - ");
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   330
        addMemberDesc(member, dt);
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   331
        dlTree.addContent(dt);
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   332
        Content dd = new HtmlTree(HtmlTag.DD);
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   333
        addComment(member, dd);
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   334
        dlTree.addContent(dd);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   335
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   336
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   337
    protected void addDescription(SearchIndexItem sii, Content dlTree) {
40587
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   338
        String siiPath = pathToRoot.isEmpty() ? "" : pathToRoot.getPath() + "/";
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   339
        siiPath += sii.getUrl();
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   340
        HtmlTree labelLink = HtmlTree.A(siiPath, new StringContent(sii.getLabel()));
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   341
        Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.searchTagLink, labelLink));
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   342
        dt.addContent(" - ");
40303
96a1226aca18 8160697: HTMLWriter needs perf cleanup
jjg
parents: 35426
diff changeset
   343
        dt.addContent(contents.getContent("doclet.Search_tag_in", sii.getHolder()));
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   344
        dlTree.addContent(dt);
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   345
        Content dd = new HtmlTree(HtmlTag.DD);
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   346
        if (sii.getDescription().isEmpty()) {
40303
96a1226aca18 8160697: HTMLWriter needs perf cleanup
jjg
parents: 35426
diff changeset
   347
            dd.addContent(Contents.SPACE);
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   348
        } else {
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   349
            dd.addContent(sii.getDescription());
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   350
        }
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   351
        dlTree.addContent(dd);
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   352
    }
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   353
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   354
    /**
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   355
     * Add comment for each element in the index. If the element is deprecated
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   356
     * and it has a @deprecated tag, use that comment. Else if the containing
06bc494ca11e Initial load
duke
parents:
diff changeset
   357
     * class for this element is deprecated, then add the word "Deprecated." at
06bc494ca11e Initial load
duke
parents:
diff changeset
   358
     * the start and then print the normal comment.
06bc494ca11e Initial load
duke
parents:
diff changeset
   359
     *
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   360
     * @param element Index element
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   361
     * @param contentTree the content tree to which the comment will be added
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   362
     */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   363
    protected void addComment(Element element, Content contentTree) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   364
        List<? extends DocTree> tags;
42816
3638773ff1b0 8162674: change javadoc output text and style emitted by for-removal deprecations
bpatel
parents: 40606
diff changeset
   365
        Content span = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(element));
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   366
        HtmlTree div = new HtmlTree(HtmlTag.DIV);
47846
4e78aba768f0 8190295: Introduce a new Table builder class
jjg
parents: 47272
diff changeset
   367
        div.setStyle(HtmlStyle.deprecationBlock);
25454
376a52c9540c 8039028: [javadoc] refactor the usage of Util.java
ksrini
parents: 22159
diff changeset
   368
        if (utils.isDeprecated(element)) {
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   369
            div.addContent(span);
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   370
            tags = utils.getBlockTags(element, DocTree.Kind.DEPRECATED);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   371
            if (!tags.isEmpty())
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   372
                addInlineDeprecatedComment(element, tags.get(0), div);
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   373
            contentTree.addContent(div);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   374
        } else {
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   375
            TypeElement encl = utils.getEnclosingTypeElement(element);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   376
            while (encl != null) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   377
                if (utils.isDeprecated(encl)) {
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   378
                    div.addContent(span);
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   379
                    contentTree.addContent(div);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   380
                    break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   381
                }
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   382
                encl = utils.getEnclosingTypeElement(encl);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   383
            }
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   384
            addSummaryComment(element, contentTree);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   385
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   386
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   387
06bc494ca11e Initial load
duke
parents:
diff changeset
   388
    /**
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   389
     * Add description about the Static Variable/Method/Constructor for a
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   390
     * member.
06bc494ca11e Initial load
duke
parents:
diff changeset
   391
     *
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   392
     * @param member MemberDoc for the member within the Class Kind
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   393
     * @param contentTree the content tree to which the member description will be added
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   394
     */
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   395
    protected void addMemberDesc(Element member, Content contentTree) {
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   396
        TypeElement containing = utils.getEnclosingTypeElement(member);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   397
        String classdesc = utils.getTypeElementName(containing, true) + " ";
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   398
        if (utils.isField(member)) {
40303
96a1226aca18 8160697: HTMLWriter needs perf cleanup
jjg
parents: 35426
diff changeset
   399
            Content resource = contents.getContent(utils.isStatic(member)
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   400
                    ? "doclet.Static_variable_in"
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   401
                    : "doclet.Variable_in", classdesc);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   402
            contentTree.addContent(resource);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   403
        } else if (utils.isConstructor(member)) {
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   404
            contentTree.addContent(
40303
96a1226aca18 8160697: HTMLWriter needs perf cleanup
jjg
parents: 35426
diff changeset
   405
                    contents.getContent("doclet.Constructor_for", classdesc));
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   406
        } else if (utils.isMethod(member)) {
40303
96a1226aca18 8160697: HTMLWriter needs perf cleanup
jjg
parents: 35426
diff changeset
   407
            Content resource = contents.getContent(utils.isStatic(member)
35426
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   408
                    ? "doclet.Static_method_in"
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   409
                    : "doclet.Method_in", classdesc);
374342e56a56 8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents: 33920
diff changeset
   410
            contentTree.addContent(resource);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   411
        }
17558
eee4ccf66cfd 8010440: Replace int constants in LinkInfoImpl with enum
jjg
parents: 14542
diff changeset
   412
        addPreQualifiedClassLink(LinkInfoImpl.Kind.INDEX, containing,
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   413
                false, contentTree);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   414
    }
21008
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   415
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   416
    /**
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   417
     * Get the marker anchor which will be added to the index documentation tree.
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   418
     *
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   419
     * @param anchorNameForIndex the anchor name attribute for index page
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   420
     * @return a content tree for the marker anchor
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   421
     */
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   422
    public Content getMarkerAnchorForIndex(String anchorNameForIndex) {
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   423
        return getMarkerAnchor(getNameForIndex(anchorNameForIndex), null);
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   424
    }
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   425
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   426
    /**
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   427
     * Generate a valid HTML name for member index page.
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   428
     *
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   429
     * @param unicode the string that needs to be converted to valid HTML name.
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   430
     * @return a valid HTML name string.
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   431
     */
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   432
    public String getNameForIndex(String unicode) {
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   433
        return "I:" + getName(unicode);
af0b915df7cc 8025633: Fix javadoc to generate valid anchor names
bpatel
parents: 17563
diff changeset
   434
    }
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   435
40587
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   436
    /**
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   437
     * @throws DocFileIOException if there is a problem creating any of the search index files
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   438
     */
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   439
    protected void createSearchIndexFiles() throws DocFileIOException {
40511
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   440
        if (configuration.showModules) {
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   441
            createSearchIndexFile(DocPaths.MODULE_SEARCH_INDEX_JSON, DocPaths.MODULE_SEARCH_INDEX_ZIP,
43370
5969237f927c 8166175: javadoc search doesn't work on local doc bundles
bpatel
parents: 42816
diff changeset
   442
                    DocPaths.MODULE_SEARCH_INDEX_JS, configuration.moduleSearchIndex, "moduleSearchIndex");
40511
1b3c502e0bdc 8155995: Update javadoc to include module search
bpatel
parents: 40303
diff changeset
   443
        }
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   444
        createSearchIndexFile(DocPaths.PACKAGE_SEARCH_INDEX_JSON, DocPaths.PACKAGE_SEARCH_INDEX_ZIP,
43370
5969237f927c 8166175: javadoc search doesn't work on local doc bundles
bpatel
parents: 42816
diff changeset
   445
                DocPaths.PACKAGE_SEARCH_INDEX_JS, configuration.packageSearchIndex, "packageSearchIndex");
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   446
        createSearchIndexFile(DocPaths.TYPE_SEARCH_INDEX_JSON, DocPaths.TYPE_SEARCH_INDEX_ZIP,
43370
5969237f927c 8166175: javadoc search doesn't work on local doc bundles
bpatel
parents: 42816
diff changeset
   447
                DocPaths.TYPE_SEARCH_INDEX_JS, configuration.typeSearchIndex, "typeSearchIndex");
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   448
        createSearchIndexFile(DocPaths.MEMBER_SEARCH_INDEX_JSON, DocPaths.MEMBER_SEARCH_INDEX_ZIP,
43370
5969237f927c 8166175: javadoc search doesn't work on local doc bundles
bpatel
parents: 42816
diff changeset
   449
                DocPaths.MEMBER_SEARCH_INDEX_JS, configuration.memberSearchIndex, "memberSearchIndex");
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   450
        createSearchIndexFile(DocPaths.TAG_SEARCH_INDEX_JSON, DocPaths.TAG_SEARCH_INDEX_ZIP,
43370
5969237f927c 8166175: javadoc search doesn't work on local doc bundles
bpatel
parents: 42816
diff changeset
   451
                DocPaths.TAG_SEARCH_INDEX_JS, configuration.tagSearchIndex, "tagSearchIndex");
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   452
    }
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   453
40587
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   454
    /**
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   455
     * @throws DocFileIOException if there is a problem creating the search index file
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   456
     */
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   457
    protected void createSearchIndexFile(DocPath searchIndexFile, DocPath searchIndexZip,
45913
90f6a96c1603 8181622: new {@index} tag generates multiple index entries
bpatel
parents: 45864
diff changeset
   458
            DocPath searchIndexJS, Collection<SearchIndexItem> searchIndex, String varName) throws DocFileIOException {
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   459
        if (!searchIndex.isEmpty()) {
40587
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   460
            StringBuilder searchVar = new StringBuilder("[");
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   461
            boolean first = true;
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   462
            for (SearchIndexItem item : searchIndex) {
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   463
                if (first) {
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   464
                    searchVar.append(item.toString());
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   465
                    first = false;
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   466
                } else {
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   467
                    searchVar.append(",").append(item.toString());
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   468
                }
40587
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   469
            }
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   470
            searchVar.append("]");
43370
5969237f927c 8166175: javadoc search doesn't work on local doc bundles
bpatel
parents: 42816
diff changeset
   471
            DocFile jsFile = DocFile.createFileForOutput(configuration, searchIndexJS);
5969237f927c 8166175: javadoc search doesn't work on local doc bundles
bpatel
parents: 42816
diff changeset
   472
            try (Writer wr = jsFile.openWriter()) {
5969237f927c 8166175: javadoc search doesn't work on local doc bundles
bpatel
parents: 42816
diff changeset
   473
                wr.write(varName);
5969237f927c 8166175: javadoc search doesn't work on local doc bundles
bpatel
parents: 42816
diff changeset
   474
                wr.write(" = ");
5969237f927c 8166175: javadoc search doesn't work on local doc bundles
bpatel
parents: 42816
diff changeset
   475
                wr.write(searchVar.toString());
5969237f927c 8166175: javadoc search doesn't work on local doc bundles
bpatel
parents: 42816
diff changeset
   476
            } catch (IOException ie) {
5969237f927c 8166175: javadoc search doesn't work on local doc bundles
bpatel
parents: 42816
diff changeset
   477
                throw new DocFileIOException(jsFile, DocFileIOException.Mode.WRITE, ie);
5969237f927c 8166175: javadoc search doesn't work on local doc bundles
bpatel
parents: 42816
diff changeset
   478
            }
40587
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   479
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   480
            DocFile zipFile = DocFile.createFileForOutput(configuration, searchIndexZip);
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   481
            try (OutputStream fos = zipFile.openOutputStream();
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   482
                    ZipOutputStream zos = new ZipOutputStream(fos)) {
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   483
                try {
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   484
                    ZipEntry ze = new ZipEntry(searchIndexFile.getPath());
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   485
                    zos.putNextEntry(ze);
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   486
                    zos.write(searchVar.toString().getBytes());
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   487
                } finally {
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   488
                    zos.closeEntry();
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   489
                }
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   490
            } catch (IOException ie) {
40587
1c355ea550ed 8164130: Simplify doclet IOException handling
jjg
parents: 40511
diff changeset
   491
                throw new DocFileIOException(zipFile, DocFileIOException.Mode.WRITE, ie);
33920
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   492
            }
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   493
        }
bd731341c405 8141492: Implement search feature in javadoc
bpatel
parents: 25874
diff changeset
   494
    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   495
}