summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-05-07 22:00:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-05-07 22:00:16 +0000
commitb2999d2c1da5b550a0d2b997d2f982ce88e51255 (patch)
treef53d91ded050aa1ca2ff4f85e420026d4814d98b
parentb69fd76633ffa4eaf21186dcfb4636bdd4d6e57b (diff)
parent5bb3a813145d42fd6268fd8a46c9938742e68026 (diff)
downloaddoclava-b2999d2c1da5b550a0d2b997d2f982ce88e51255.tar.gz
Merge "subcount() no longer works for strings." into pi-dev
-rw-r--r--res/assets/templates-sdk/class.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/res/assets/templates-sdk/class.cs b/res/assets/templates-sdk/class.cs
index 61ca4fa..d014edd 100644
--- a/res/assets/templates-sdk/class.cs
+++ b/res/assets/templates-sdk/class.cs
@@ -174,9 +174,9 @@
<?cs call:federated_refs(field) ?>
</div>
<pre class="api-signature no-pretty-print">
-<?cs if:subcount(field.scope) ?><?cs var:field.scope
-?> <?cs /if ?><?cs if:subcount(field.static) ?><?cs var:field.static
-?> <?cs /if ?><?cs if:subcount(field.final) ?><?cs var:field.final
+<?cs if:string.length(field.scope) ?><?cs var:field.scope
+?> <?cs /if ?><?cs if:string.length(field.static) ?><?cs var:field.static
+?> <?cs /if ?><?cs if:string.length(field.final) ?><?cs var:field.final
?> <?cs /if ?><?cs if:subcount(field.type) ?><?cs call:type_link(field.type)
?> <?cs /if ?><?cs var:field.name ?></pre>
<?cs call:show_annotations_list(field) ?>
@@ -212,10 +212,10 @@
<?cs call:federated_refs(method) ?>
</div>
<pre class="api-signature no-pretty-print">
-<?cs if:subcount(method.scope) ?><?cs var:method.scope
-?> <?cs /if ?><?cs if:subcount(method.static) ?><?cs var:method.static
-?> <?cs /if ?><?cs if:subcount(method.final) ?><?cs var:method.final
-?> <?cs /if ?><?cs if:subcount(method.abstract) ?><?cs var:method.abstract
+<?cs if:string.length(method.scope) ?><?cs var:method.scope
+?> <?cs /if ?><?cs if:string.length(method.static) ?><?cs var:method.static
+?> <?cs /if ?><?cs if:string.length(method.final) ?><?cs var:method.final
+?> <?cs /if ?><?cs if:string.length(method.abstract) ?><?cs var:method.abstract
?> <?cs /if ?><?cs if:subcount(method.returnType) ?><?cs call:type_link(method.returnType)
?> <?cs /if ?><?cs var:method.name ?> (<?cs call:parameter_list(method.params, 1) ?>)</pre>
<?cs call:show_annotations_list(method) ?>