src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ClassUseMapper.java

*** 44,54 ****
  import javax.lang.model.util.SimpleElementVisitor9;
  import javax.lang.model.util.SimpleTypeVisitor9;
  import javax.lang.model.util.Types;
  
  import jdk.javadoc.doclet.DocletEnvironment;
! import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
  import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberMap.Kind;
  
  /**
   * Map all class uses for a given class.
   *
--- 44,54 ----
  import javax.lang.model.util.SimpleElementVisitor9;
  import javax.lang.model.util.SimpleTypeVisitor9;
  import javax.lang.model.util.Types;
  
  import jdk.javadoc.doclet.DocletEnvironment;
! import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
  import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberMap.Kind;
  
  /**
   * Map all class uses for a given class.
   *
*** 190,200 ****
      private final DocletEnvironment docEnv;
      private final Elements elementUtils;
      private final Types typeUtils;
      private final Utils utils;
  
!     public ClassUseMapper(HtmlConfiguration configuration, ClassTree classtree) {
          docEnv = configuration.docEnv;
          elementUtils = docEnv.getElementUtils();
          typeUtils = docEnv.getTypeUtils();
          utils = configuration.utils;
          this.classtree = classtree;
--- 190,200 ----
      private final DocletEnvironment docEnv;
      private final Elements elementUtils;
      private final Types typeUtils;
      private final Utils utils;
  
!     public ClassUseMapper(BaseConfiguration configuration, ClassTree classtree) {
          docEnv = configuration.docEnv;
          elementUtils = docEnv.getElementUtils();
          typeUtils = docEnv.getTypeUtils();
          utils = configuration.utils;
          this.classtree = classtree;
*** 412,426 ****
  
              stv.visit(typeUtils.erasure(anException), ee);
          }
      }
  
!     private <T> List<T> refList(Map<TypeElement, List<T>> map, Element element) {
          List<T> list = map.get(element);
          if (list == null) {
              list = new ArrayList<>();
!             map.put((TypeElement) element, list);
          }
          return list;
      }
  
      private Set<PackageElement> packageSet(TypeElement te) {
--- 412,426 ----
  
              stv.visit(typeUtils.erasure(anException), ee);
          }
      }
  
!     private <T> List<T> refList(Map<TypeElement, List<T>> map, TypeElement element) {
          List<T> list = map.get(element);
          if (list == null) {
              list = new ArrayList<>();
!             map.put(element, list);
          }
          return list;
      }
  
      private Set<PackageElement> packageSet(TypeElement te) {
*** 568,578 ****
              }
  
              @Override
              public Void visitPackage(PackageElement e, Void p) {
                  for (AnnotationMirror a : e.getAnnotationMirrors()) {
!                     refList(map, a.getAnnotationType().asElement()).add(holder);
                  }
                  return null;
              }
  
              @Override
--- 568,578 ----
              }
  
              @Override
              public Void visitPackage(PackageElement e, Void p) {
                  for (AnnotationMirror a : e.getAnnotationMirrors()) {
!                     refList(map, (TypeElement) a.getAnnotationType().asElement()).add(holder);
                  }
                  return null;
              }
  
              @Override