langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java
equal
deleted
inserted
replaced
138 int searchListSize = searchList.size(); |
138 int searchListSize = searchList.size(); |
139 int i = 0; |
139 int i = 0; |
140 int j = 0; |
140 int j = 0; |
141 Content dl = new HtmlTree(HtmlTag.DL); |
141 Content dl = new HtmlTree(HtmlTag.DL); |
142 while (i < memberListSize && j < searchListSize) { |
142 while (i < memberListSize && j < searchListSize) { |
143 String name = utils.getSimpleName(memberlist.get(i)); |
143 Element elem = memberlist.get(i); |
|
144 String name = (utils.isModule(elem)) |
|
145 ? utils.getFullyQualifiedName(elem) : utils.getSimpleName(elem); |
144 if (name.compareTo(searchList.get(j).getLabel()) < 0) { |
146 if (name.compareTo(searchList.get(j).getLabel()) < 0) { |
145 addDescription(dl, memberlist.get(i)); |
147 addDescription(dl, memberlist.get(i)); |
146 i++; |
148 i++; |
147 } else if (name.compareTo(searchList.get(j).getLabel()) > 0) { |
149 } else if (name.compareTo(searchList.get(j).getLabel()) > 0) { |
148 addDescription(searchList.get(j), dl); |
150 addDescription(searchList.get(j), dl); |
220 * |
222 * |
221 * @param mdle the module to be documented |
223 * @param mdle the module to be documented |
222 * @param dlTree the content tree to which the description will be added |
224 * @param dlTree the content tree to which the description will be added |
223 */ |
225 */ |
224 protected void addDescription(ModuleElement mdle, Content dlTree, SearchIndexItem si) { |
226 protected void addDescription(ModuleElement mdle, Content dlTree, SearchIndexItem si) { |
225 String moduleName = utils.getSimpleName(mdle); |
227 String moduleName = utils.getFullyQualifiedName(mdle); |
226 Content link = getModuleLink(mdle, new StringContent(moduleName)); |
228 Content link = getModuleLink(mdle, new StringContent(moduleName)); |
227 si.setLabel(moduleName); |
229 si.setLabel(moduleName); |
228 si.setCategory(resources.getText("doclet.Modules")); |
230 si.setCategory(resources.getText("doclet.Modules")); |
229 Content dt = HtmlTree.DT(link); |
231 Content dt = HtmlTree.DT(link); |
230 dt.addContent(" - "); |
232 dt.addContent(" - "); |
244 * @param si the search index item to be updated |
246 * @param si the search index item to be updated |
245 */ |
247 */ |
246 protected void addDescription(PackageElement pkg, Content dlTree, SearchIndexItem si) { |
248 protected void addDescription(PackageElement pkg, Content dlTree, SearchIndexItem si) { |
247 Content link = getPackageLink(pkg, new StringContent(utils.getPackageName(pkg))); |
249 Content link = getPackageLink(pkg, new StringContent(utils.getPackageName(pkg))); |
248 if (configuration.showModules) { |
250 if (configuration.showModules) { |
249 si.setContainingModule(utils.getSimpleName(utils.containingModule(pkg))); |
251 si.setContainingModule(utils.getFullyQualifiedName(utils.containingModule(pkg))); |
250 } |
252 } |
251 si.setLabel(utils.getPackageName(pkg)); |
253 si.setLabel(utils.getPackageName(pkg)); |
252 si.setCategory(resources.getText("doclet.Packages")); |
254 si.setCategory(resources.getText("doclet.Packages")); |
253 Content dt = HtmlTree.DT(link); |
255 Content dt = HtmlTree.DT(link); |
254 dt.addContent(" - "); |
256 dt.addContent(" - "); |