langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Sat Apr 30 16:57:18 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Mon May 02 02:13:02 2011 -0700
@@ -149,11 +149,20 @@
ClassUseMapper mapper = new ClassUseMapper(configuration.root, classtree);
ClassDoc[] classes = configuration.root.classes();
for (int i = 0; i < classes.length; i++) {
- ClassUseWriter.generate(configuration, mapper, classes[i]);
+ // If -nodeprecated option is set and the containing package is marked
+ // as deprecated, do not generate the class-use page. We will still generate
+ // the class-use page if the class is marked as deprecated but the containing
+ // package is not since it could still be linked from that package-use page.
+ if (!(configuration.nodeprecated &&
+ Util.isDeprecated(classes[i].containingPackage())))
+ ClassUseWriter.generate(configuration, mapper, classes[i]);
}
PackageDoc[] pkgs = configuration.packages;
for (int i = 0; i < pkgs.length; i++) {
- PackageUseWriter.generate(configuration, mapper, pkgs[i]);
+ // If -nodeprecated option is set and the package is marked
+ // as deprecated, do not generate the package-use page.
+ if (!(configuration.nodeprecated && Util.isDeprecated(pkgs[i])))
+ PackageUseWriter.generate(configuration, mapper, pkgs[i]);
}
}