aboutsummaryrefslogtreecommitdiffstats
path: root/tools/droiddoc/templates-sac
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2016-01-14 22:44:11 +0000
committerNeil Fuller <nfuller@google.com>2016-01-22 10:37:17 -0800
commitca59875e12e47162fc765bc43d6651b555c04d81 (patch)
treeba890ccdef7d78b7d64515b8636075e475bb5732 /tools/droiddoc/templates-sac
parent1398f9d30da32142122928eed68deb7595367e0e (diff)
downloadplatform_build-ca59875e12e47162fc765bc43d6651b555c04d81.tar.gz
platform_build-ca59875e12e47162fc765bc43d6651b555c04d81.tar.bz2
platform_build-ca59875e12e47162fc765bc43d6651b555c04d81.zip
Doclava template changes associated with default methods
The ordering of method declaration modifiers changed slightly to reflect the ordering given in: http://docs.oracle.com/javase/specs/jls/se8/html/jls-8.html#jls-8.4.3 http://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.4 Bug: 26241119 Change-Id: I1dfc014b3c6218cc1f7716a760d73c9b915f2d97
Diffstat (limited to 'tools/droiddoc/templates-sac')
-rw-r--r--tools/droiddoc/templates-sac/class.cs12
1 files changed, 7 insertions, 5 deletions
diff --git a/tools/droiddoc/templates-sac/class.cs b/tools/droiddoc/templates-sac/class.cs
index 440e705be4..98633fb57e 100644
--- a/tools/droiddoc/templates-sac/class.cs
+++ b/tools/droiddoc/templates-sac/class.cs
@@ -185,8 +185,9 @@ Summary:
<tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:method.since ?>" >
<td class="jd-typecol"><nobr>
<?cs var:method.abstract ?>
- <?cs var:method.final ?>
+ <?cs var:method.default ?>
<?cs var:method.static ?>
+ <?cs var:method.final ?>
<?cs call:type_link(method.generic) ?>
<?cs call:type_link(method.returnType) ?></nobr>
</td>
@@ -534,10 +535,11 @@ From <?cs var:cl.kind ?>
<div class="jd-details api apilevel-<?cs var:method.since ?>">
<h4 class="jd-details-title">
<span class="normal">
- <?cs var:method.scope ?>
- <?cs var:method.static ?>
- <?cs var:method.final ?>
- <?cs var:method.abstract ?>
+ <?cs var:method.scope ?>
+ <?cs var:method.abstract ?>
+ <?cs var:method.default ?>
+ <?cs var:method.static ?>
+ <?cs var:method.final ?>
<?cs call:type_link(method.returnType) ?>
</span>
<span class="sympad"><?cs var:method.name ?></span>