summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-06-05 22:15:26 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-06-05 22:15:26 +0000
commitce9e9aadc5fd3033d67b247b3d6c66318749d52f (patch)
tree9dd6daa094f6ab0edc32cdbb0407ea8921f00994
parenta75af37150ebca7cdca4869b72948ae0ac5abfc3 (diff)
parent2da2d64196a401f664644619160f8a33eda77d9a (diff)
downloadandroid_external_doclava-ce9e9aadc5fd3033d67b247b3d6c66318749d52f.tar.gz
android_external_doclava-ce9e9aadc5fd3033d67b247b3d6c66318749d52f.tar.bz2
android_external_doclava-ce9e9aadc5fd3033d67b247b3d6c66318749d52f.zip
Merge "Change hidden super class to use first non-hidden super class"
-rw-r--r--src/com/google/doclava/Stubs.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/google/doclava/Stubs.java b/src/com/google/doclava/Stubs.java
index 7cc1740..d9bfa14 100644
--- a/src/com/google/doclava/Stubs.java
+++ b/src/com/google/doclava/Stubs.java
@@ -220,12 +220,12 @@ public class Stubs {
if (supr.isHidden()) {
// cl is a public class declared as extending a hidden superclass.
// this is not a desired practice but it's happened, so we deal
- // with it by stripping off the superclass relation for purposes of
+ // with it by finding the first super class which passes checklevel for purposes of
// generating the doc & stub information, and proceeding normally.
cl.init(cl.asTypeInfo(), cl.realInterfaces(), cl.realInterfaceTypes(), cl.innerClasses(),
cl.allConstructors(), cl.allSelfMethods(), cl.annotationElements(), cl.allSelfFields(),
- cl.enumConstants(), cl.containingPackage(), cl.containingClass(), null, null, cl
- .annotations());
+ cl.enumConstants(), cl.containingPackage(), cl.containingClass(),
+ supr.superclass(), null, cl.annotations());
Errors.error(Errors.HIDDEN_SUPERCLASS, cl.position(), "Public class " + cl.qualifiedName()
+ " stripped of unavailable superclass " + supr.qualifiedName());
} else {