diff options
| author | Julian Odell <juliano@google.com> | 2016-10-04 17:12:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-04 17:12:08 +0000 |
| commit | e00f938e69a626ccde396908a36a4b09492c82da (patch) | |
| tree | 61abadb25c785eb14fbe9ba2fdb4841e7a44661b | |
| parent | a2ef283dddc748aa4694efb6f3de8fd5cf25d7b8 (diff) | |
| parent | 3af96716b993d5df4782abdabd46723eda2ca475 (diff) | |
| download | platform_external_doclava-e00f938e69a626ccde396908a36a4b09492c82da.tar.gz platform_external_doclava-e00f938e69a626ccde396908a36a4b09492c82da.tar.bz2 platform_external_doclava-e00f938e69a626ccde396908a36a4b09492c82da.zip | |
Fix collisions due to ignoring outer class names. am: 35e0d1defa am: df2f58d5ec
am: 3af96716b9
Change-Id: Ie1d3388ad705320dcf0764f43532713f2e159978
| -rw-r--r-- | src/com/google/doclava/apicheck/ApiFile.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/google/doclava/apicheck/ApiFile.java b/src/com/google/doclava/apicheck/ApiFile.java index d865e20..14a8ab3 100644 --- a/src/com/google/doclava/apicheck/ApiFile.java +++ b/src/com/google/doclava/apicheck/ApiFile.java @@ -166,11 +166,13 @@ class ApiFile { name = token; qname = qualifiedName(pkg.name(), name, null); final TypeInfo typeInfo = Converter.obtainTypeFromString(qname); + // Simple type info excludes the package name (but includes enclosing class names) + final TypeInfo simpleTypeInfo = Converter.obtainTypeFromString(name); token = tokenizer.requireToken(); - cl = new ClassInfo(null/*classDoc*/, ""/*rawCommentText*/, tokenizer.pos(), pub, prot, - pkgpriv, false/*isPrivate*/, stat, iface, abs, true/*isOrdinaryClass*/, + cl = new ClassInfo(null/*classDoc*/, ""/*rawCommentText*/, tokenizer.pos(), pub, prot, + pkgpriv, false/*isPrivate*/, stat, iface, abs, true/*isOrdinaryClass*/, false/*isException*/, false/*isError*/, false/*isEnum*/, false/*isAnnotation*/, - fin, false/*isIncluded*/, typeInfo.simpleTypeName(), typeInfo.qualifiedTypeName(), + fin, false/*isIncluded*/, simpleTypeInfo.qualifiedTypeName(), typeInfo.qualifiedTypeName(), null/*qualifiedTypeName*/, false/*isPrimitive*/); cl.setTypeInfo(typeInfo); cl.setDeprecated(dep); @@ -755,4 +757,3 @@ class ApiFile { return true; } } - |