1.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java Fri Feb 22 18:19:51 2013 +0000
1.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java Sun Feb 24 11:36:58 2013 -0800
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -176,6 +176,7 @@
1.11 ? packageDoc.interfaces()
1.12 : configuration.classDocCatalog.interfaces(
1.13 Util.getPackageName(packageDoc));
1.14 + interfaces = Util.filterOutPrivateClasses(interfaces, configuration.javafx);
1.15 if (interfaces.length > 0) {
1.16 packageWriter.addClassesSummary(
1.17 interfaces,
1.18 @@ -205,6 +206,7 @@
1.19 ? packageDoc.ordinaryClasses()
1.20 : configuration.classDocCatalog.ordinaryClasses(
1.21 Util.getPackageName(packageDoc));
1.22 + classes = Util.filterOutPrivateClasses(classes, configuration.javafx);
1.23 if (classes.length > 0) {
1.24 packageWriter.addClassesSummary(
1.25 classes,
1.26 @@ -234,6 +236,7 @@
1.27 ? packageDoc.enums()
1.28 : configuration.classDocCatalog.enums(
1.29 Util.getPackageName(packageDoc));
1.30 + enums = Util.filterOutPrivateClasses(enums, configuration.javafx);
1.31 if (enums.length > 0) {
1.32 packageWriter.addClassesSummary(
1.33 enums,
1.34 @@ -263,6 +266,7 @@
1.35 ? packageDoc.exceptions()
1.36 : configuration.classDocCatalog.exceptions(
1.37 Util.getPackageName(packageDoc));
1.38 + exceptions = Util.filterOutPrivateClasses(exceptions, configuration.javafx);
1.39 if (exceptions.length > 0) {
1.40 packageWriter.addClassesSummary(
1.41 exceptions,
1.42 @@ -292,6 +296,7 @@
1.43 ? packageDoc.errors()
1.44 : configuration.classDocCatalog.errors(
1.45 Util.getPackageName(packageDoc));
1.46 + errors = Util.filterOutPrivateClasses(errors, configuration.javafx);
1.47 if (errors.length > 0) {
1.48 packageWriter.addClassesSummary(
1.49 errors,
1.50 @@ -321,6 +326,7 @@
1.51 ? packageDoc.annotationTypes()
1.52 : configuration.classDocCatalog.annotationTypes(
1.53 Util.getPackageName(packageDoc));
1.54 + annotationTypes = Util.filterOutPrivateClasses(annotationTypes, configuration.javafx);
1.55 if (annotationTypes.length > 0) {
1.56 packageWriter.addClassesSummary(
1.57 annotationTypes,
