diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-01 08:53:29 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-01 08:53:29 +0000 |
| commit | dd986369aa9ba07de23b56ebf5acabb79578f386 (patch) | |
| tree | d5cfd02b1470faab485af5f1188f58e7f3a3a244 | |
| parent | a53381258a40efe59307ce80928bcf85683b6e9d (diff) | |
| parent | d88468c008c4a90d346a80022edbe987fc3a2aed (diff) | |
| download | platform_external_doclava-dd986369aa9ba07de23b56ebf5acabb79578f386.tar.gz platform_external_doclava-dd986369aa9ba07de23b56ebf5acabb79578f386.tar.bz2 platform_external_doclava-dd986369aa9ba07de23b56ebf5acabb79578f386.zip | |
Snap for 4579913 from d88468c008c4a90d346a80022edbe987fc3a2aed to pi-release
Change-Id: I01e59f58f045052fd3af9ad24baa582c90797b83
| -rw-r--r-- | src/com/google/doclava/Converter.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/com/google/doclava/Converter.java b/src/com/google/doclava/Converter.java index 269c860..a6f803b 100644 --- a/src/com/google/doclava/Converter.java +++ b/src/com/google/doclava/Converter.java @@ -474,15 +474,20 @@ public class Converter { return result; } else if (o instanceof MethodDoc) { MethodDoc m = (MethodDoc) o; + final ClassInfo containingClass = Converter.obtainClass(m.containingClass()); + + // The containing class is final, so it is implied that every method is final as well. + // No need to apply 'final' to each method. + final boolean isMethodFinal = m.isFinal() && !containingClass.isFinal(); MethodInfo result = new MethodInfo(m.getRawCommentText(), new ArrayList<TypeInfo>(Arrays.asList( Converter.convertTypes(m.typeParameters()))), m.name(), m.signature(), - Converter.obtainClass(m.containingClass()), - Converter.obtainClass(m.containingClass()), m.isPublic(), m.isProtected(), - m.isPackagePrivate(), m.isPrivate(), m.isFinal(), m.isStatic(), m.isSynthetic(), - m.isAbstract(), m.isSynchronized(), m.isNative(), m.isDefault(), false, - "method", m.flatSignature(), Converter.obtainMethod(m.overriddenMethod()), + containingClass, containingClass, m.isPublic(), m.isProtected(), + m.isPackagePrivate(), m.isPrivate(), isMethodFinal, m.isStatic(), + m.isSynthetic(), m.isAbstract(), m.isSynchronized(), m.isNative(), + m.isDefault(), false, "method", m.flatSignature(), + Converter.obtainMethod(m.overriddenMethod()), Converter.obtainType(m.returnType()), new ArrayList<ParameterInfo>(Arrays.asList( Converter.convertParameters(m.parameters(), m))), |