From ed9bc0f6db3cad33ad238ff3dd02dfda54ec738d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Tue, 6 Mar 2018 15:41:28 +0100 Subject: [PATCH] Java enums support --- coreapi/help/doc/sphinx/enums_page.mustache | 7 +++++-- coreapi/help/doc/sphinx/gendoc.py | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/coreapi/help/doc/sphinx/enums_page.mustache b/coreapi/help/doc/sphinx/enums_page.mustache index 16b45bddb..cd74bd73c 100644 --- a/coreapi/help/doc/sphinx/enums_page.mustache +++ b/coreapi/help/doc/sphinx/enums_page.mustache @@ -18,10 +18,14 @@ {{{selector}}} - {{#isNotJava}} {{#enumerators}} + {{#isNotJava}} .. {{#write_declarator}}enumerator{{/write_declarator}}:: {{{name}}} + {{/isNotJava}} + {{#isJava}} + **{{{name}}}** + {{/isJava}} {{#briefDesc}} {{#lines}} {{{line}}} @@ -31,5 +35,4 @@ {{{selector}}} {{/enumerators}} - {{/isNotJava}} {{/enums}} diff --git a/coreapi/help/doc/sphinx/gendoc.py b/coreapi/help/doc/sphinx/gendoc.py index 11d3b68d0..6a5556fa6 100755 --- a/coreapi/help/doc/sphinx/gendoc.py +++ b/coreapi/help/doc/sphinx/gendoc.py @@ -195,11 +195,14 @@ class SphinxPage(object): def _make_selector(self, obj): links = [] - ref = metadoc.Reference.make_ref_from_object(None, obj) for lang in self.langs: if lang is self.lang: link = lang.displayName else: + if lang.langCode == 'Java' and type(obj) is abstractapi.Enumerator: + ref = metadoc.Reference.make_ref_from_object(None, obj.parent) + else: + ref = metadoc.Reference.make_ref_from_object(None, obj) link = ref.translate(lang.docTranslator, label=lang.displayName) links.append(link) return ' '.join(links)