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

@@ -21,19 +21,26 @@
  * 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;
+package jdk.javadoc.internal.doclets.formats.html;
 
 import java.io.*;
 import java.util.*;
 
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
+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.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 only one index file for all the Member Names with Indexing in
  * Unicode Order. The name of the generated file is "index-all.html" and it is
  * generated in current or the destination directory.
  *

@@ -46,11 +53,11 @@
  * @author Atul M Dambalkar
  * @author Bhavesh Patel (Modified)
  */
 public class SingleIndexWriter extends AbstractIndexWriter {
 
-    private List<Object> elements;
+    private Set<Character> elements;
 
     /**
      * Construct the SingleIndexWriter with filename "index-all.html" and the
      * {@link IndexBuilder}
      *

@@ -101,16 +108,14 @@
         if (configuration.allowTag(HtmlTag.HEADER)) {
             body.addContent(htmlTree);
         }
         HtmlTree divTree = new HtmlTree(HtmlTag.DIV);
         divTree.addStyle(HtmlStyle.contentContainer);
-        Set<Object> keys = new TreeSet<>(Arrays.asList(indexbuilder.elements()));
-        keys.addAll(configuration.tagSearchIndexKeys);
-        elements = new ArrayList<>(keys);
+        elements = new TreeSet<>(indexbuilder.getIndexMap().keySet());
+        elements.addAll(configuration.tagSearchIndexKeys);
         addLinksForIndexes(divTree);
-        for (Object ch : elements) {
-            Character unicode = (Character) ch;
+        for (Character unicode : elements) {
             if (configuration.tagSearchIndexMap.get(unicode) == null) {
                 addContents(unicode, indexbuilder.getMemberList(unicode), divTree);
             } else if (indexbuilder.getMemberList(unicode) == null) {
                 addSearchContents(unicode, configuration.tagSearchIndexMap.get(unicode), divTree);
             } else {