langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java
equal
deleted
inserted
replaced
618 // add all packages belonging to expanded modules |
618 // add all packages belonging to expanded modules |
619 ipackages.addAll(expandedModulePackages); |
619 ipackages.addAll(expandedModulePackages); |
620 // add all specified packages |
620 // add all specified packages |
621 specifiedPackageElements.forEach(pkg -> { |
621 specifiedPackageElements.forEach(pkg -> { |
622 ModuleElement mdle = toolEnv.elements.getModuleOf(pkg); |
622 ModuleElement mdle = toolEnv.elements.getModuleOf(pkg); |
623 imodules.add(mdle); |
623 if (mdle != null) |
|
624 imodules.add(mdle); |
624 ipackages.add(pkg); |
625 ipackages.add(pkg); |
625 }); |
626 }); |
626 |
627 |
627 // process types |
628 // process types |
628 Set<TypeElement> iclasses = new LinkedHashSet<>(); |
629 Set<TypeElement> iclasses = new LinkedHashSet<>(); |
631 addAllClasses(iclasses, pkg); |
632 addAllClasses(iclasses, pkg); |
632 }); |
633 }); |
633 // add all types and its nested types |
634 // add all types and its nested types |
634 specifiedTypeElements.forEach((klass) -> { |
635 specifiedTypeElements.forEach((klass) -> { |
635 ModuleElement mdle = toolEnv.elements.getModuleOf(klass); |
636 ModuleElement mdle = toolEnv.elements.getModuleOf(klass); |
636 if (!mdle.isUnnamed()) |
637 if (mdle != null && !mdle.isUnnamed()) |
637 imodules.add(mdle); |
638 imodules.add(mdle); |
638 PackageElement pkg = toolEnv.elements.getPackageOf(klass); |
639 PackageElement pkg = toolEnv.elements.getPackageOf(klass); |
639 ipackages.add(pkg); |
640 ipackages.add(pkg); |
640 addAllClasses(iclasses, klass, true); |
641 addAllClasses(iclasses, klass, true); |
641 }); |
642 }); |