openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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
(cherry-picked from commit ca59875e12)

Change-Id: I8489ad5010fc811b22167af50ba29221aac8b6cb
This commit is contained in:
Neil Fuller 2016-01-14 22:44:11 +00:00
parent 3e2f5d83a4
commit 8f7d4b7474
5 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/droiddoc/templates-ds/class.cs
View File

@ -184,8 +184,9 @@ Summary:
<tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:method.since ?>" > <tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:method.since ?>" >
<td class="jd-typecol"><nobr> <td class="jd-typecol"><nobr>
<?cs var:method.abstract ?> <?cs var:method.abstract ?>
<?cs var:method.final ?> <?cs var:method.default ?>
<?cs var:method.static ?> <?cs var:method.static ?>
<?cs var:method.final ?>
<?cs call:type_link(method.generic) ?> <?cs call:type_link(method.generic) ?>
<?cs call:type_link(method.returnType) ?></nobr> <?cs call:type_link(method.returnType) ?></nobr>
</td> </td>
@ -530,10 +531,11 @@ From <?cs var:cl.kind ?>
<div class="jd-details api apilevel-<?cs var:method.since ?>"> <div class="jd-details api apilevel-<?cs var:method.since ?>">
<h4 class="jd-details-title"> <h4 class="jd-details-title">
<span class="normal"> <span class="normal">
<?cs var:method.scope ?> <?cs var:method.scope ?>
<?cs var:method.static ?> <?cs var:method.abstract ?>
<?cs var:method.final ?> <?cs var:method.default ?>
<?cs var:method.abstract ?> <?cs var:method.static ?>
<?cs var:method.final ?>
<?cs call:type_link(method.returnType) ?> <?cs call:type_link(method.returnType) ?>
</span> </span>
<span class="sympad"><?cs var:method.name ?></span> <span class="sympad"><?cs var:method.name ?></span>

12
tools/droiddoc/templates-ndk/class.cs
View File

@ -188,8 +188,9 @@ Summary:
<tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:method.since ?>" > <tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:method.since ?>" >
<td class="jd-typecol"><nobr> <td class="jd-typecol"><nobr>
<?cs var:method.abstract ?> <?cs var:method.abstract ?>
<?cs var:method.final ?> <?cs var:method.default ?>
<?cs var:method.static ?> <?cs var:method.static ?>
<?cs var:method.final ?>
<?cs call:type_link(method.generic) ?> <?cs call:type_link(method.generic) ?>
<?cs call:type_link(method.returnType) ?></nobr> <?cs call:type_link(method.returnType) ?></nobr>
</td> </td>
@ -553,10 +554,11 @@ From <?cs var:cl.kind ?>
<div class="jd-details api apilevel-<?cs var:method.since ?>"> <div class="jd-details api apilevel-<?cs var:method.since ?>">
<h4 class="jd-details-title"> <h4 class="jd-details-title">
<span class="normal"> <span class="normal">
<?cs var:method.scope ?> <?cs var:method.scope ?>
<?cs var:method.static ?> <?cs var:method.abstract ?>
<?cs var:method.final ?> <?cs var:method.default ?>
<?cs var:method.abstract ?> <?cs var:method.static ?>
<?cs var:method.final ?>
<?cs call:type_link(method.returnType) ?> <?cs call:type_link(method.returnType) ?>
</span> </span>
<span class="sympad"><?cs var:method.name ?></span> <span class="sympad"><?cs var:method.name ?></span>

12
tools/droiddoc/templates-sac/class.cs
View File

@ -185,8 +185,9 @@ Summary:
<tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:method.since ?>" > <tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:method.since ?>" >
<td class="jd-typecol"><nobr> <td class="jd-typecol"><nobr>
<?cs var:method.abstract ?> <?cs var:method.abstract ?>
<?cs var:method.final ?> <?cs var:method.default ?>
<?cs var:method.static ?> <?cs var:method.static ?>
<?cs var:method.final ?>
<?cs call:type_link(method.generic) ?> <?cs call:type_link(method.generic) ?>
<?cs call:type_link(method.returnType) ?></nobr> <?cs call:type_link(method.returnType) ?></nobr>
</td> </td>
@ -534,10 +535,11 @@ From <?cs var:cl.kind ?>
<div class="jd-details api apilevel-<?cs var:method.since ?>"> <div class="jd-details api apilevel-<?cs var:method.since ?>">
<h4 class="jd-details-title"> <h4 class="jd-details-title">
<span class="normal"> <span class="normal">
<?cs var:method.scope ?> <?cs var:method.scope ?>
<?cs var:method.static ?> <?cs var:method.abstract ?>
<?cs var:method.final ?> <?cs var:method.default ?>
<?cs var:method.abstract ?> <?cs var:method.static ?>
<?cs var:method.final ?>
<?cs call:type_link(method.returnType) ?> <?cs call:type_link(method.returnType) ?>
</span> </span>
<span class="sympad"><?cs var:method.name ?></span> <span class="sympad"><?cs var:method.name ?></span>

12
tools/droiddoc/templates-sdk-dev/class.cs
View File

@ -190,8 +190,9 @@ Summary:
<tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:method.since ?>" > <tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:method.since ?>" >
<td class="jd-typecol"><nobr> <td class="jd-typecol"><nobr>
<?cs var:method.abstract ?> <?cs var:method.abstract ?>
<?cs var:method.final ?> <?cs var:method.default ?>
<?cs var:method.static ?> <?cs var:method.static ?>
<?cs var:method.final ?>
<?cs call:type_link(method.generic) ?> <?cs call:type_link(method.generic) ?>
<?cs call:type_link(method.returnType) ?></nobr> <?cs call:type_link(method.returnType) ?></nobr>
</td> </td>
@ -555,10 +556,11 @@ From <?cs var:cl.kind ?>
<div class="jd-details api apilevel-<?cs var:method.since ?>"> <div class="jd-details api apilevel-<?cs var:method.since ?>">
<h4 class="jd-details-title"> <h4 class="jd-details-title">
<span class="normal"> <span class="normal">
<?cs var:method.scope ?> <?cs var:method.scope ?>
<?cs var:method.static ?> <?cs var:method.abstract ?>
<?cs var:method.final ?> <?cs var:method.default ?>
<?cs var:method.abstract ?> <?cs var:method.static ?>
<?cs var:method.final ?>
<?cs call:type_link(method.returnType) ?> <?cs call:type_link(method.returnType) ?>
</span> </span>
<span class="sympad"><?cs var:method.name ?></span> <span class="sympad"><?cs var:method.name ?></span>

12
tools/droiddoc/templates-sdk/class.cs
View File

@ -188,8 +188,9 @@ Summary:
<tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:method.since ?>" > <tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:method.since ?>" >
<td class="jd-typecol"><nobr> <td class="jd-typecol"><nobr>
<?cs var:method.abstract ?> <?cs var:method.abstract ?>
<?cs var:method.final ?> <?cs var:method.default ?>
<?cs var:method.static ?> <?cs var:method.static ?>
<?cs var:method.final ?>
<?cs call:type_link(method.generic) ?> <?cs call:type_link(method.generic) ?>
<?cs call:type_link(method.returnType) ?></nobr> <?cs call:type_link(method.returnType) ?></nobr>
</td> </td>
@ -553,10 +554,11 @@ From <?cs var:cl.kind ?>
<div class="jd-details api apilevel-<?cs var:method.since ?>"> <div class="jd-details api apilevel-<?cs var:method.since ?>">
<h4 class="jd-details-title"> <h4 class="jd-details-title">
<span class="normal"> <span class="normal">
<?cs var:method.scope ?> <?cs var:method.scope ?>
<?cs var:method.static ?> <?cs var:method.abstract ?>
<?cs var:method.final ?> <?cs var:method.default ?>
<?cs var:method.abstract ?> <?cs var:method.static ?>
<?cs var:method.final ?>
<?cs call:type_link(method.returnType) ?> <?cs call:type_link(method.returnType) ?>
</span> </span>
<span class="sympad"><?cs var:method.name ?></span> <span class="sympad"><?cs var:method.name ?></span>