Revision: 7728079d80d5 Author: Janne Härkönen <j...@reaktor.fi> Date: Wed Feb 15 02:29:33 2012 Log: libdoc: cleanup javabuilder http://code.google.com/p/robotframework/source/detail?r=7728079d80d5
Modified: /src/robot/libdocpkg/javabuilder.py ======================================= --- /src/robot/libdocpkg/javabuilder.py Tue Feb 14 05:38:50 2012 +++ /src/robot/libdocpkg/javabuilder.py Wed Feb 15 02:29:33 2012 @@ -21,33 +21,36 @@ class JavaDocBuilder(object): def build(self, path, arguments=None): - cls = ClassDoc(path) - libdoc = LibraryDoc(name=cls.qualifiedName(), - doc=self._get_doc(cls), - version=self._get_version(cls), - scope=self._get_scope(cls)) - libdoc.keywords = [self._keyword_doc(m) for m in cls.methods()] - libdoc.inits = self._intializers(cls) + doc = ClassDoc(path) + libdoc = LibraryDoc(name=doc.qualifiedName(), + doc=self._get_doc(doc), + version=self._get_version(doc), + scope=self._get_scope(doc)) + libdoc.keywords = self._keywords(doc) + libdoc.inits = self._intializers(doc) return libdoc def _get_doc(self, code_object): return code_object.getRawCommentText().strip() - def _get_version(self, cls): - version = self._get_attr(cls, 'VERSION', '<unknown>') + def _get_version(self, doc): + version = self._get_attr(doc, 'VERSION', '<unknown>') return utils.html_escape(version) - def _get_scope(self, cls): - scope = self._get_attr(cls, 'SCOPE', 'TEST CASE') + def _get_scope(self, doc): + scope = self._get_attr(doc, 'SCOPE', 'TEST CASE') return scope.replace('_', ' ').lower() - def _get_attr(self, cls, name, default): - for field in cls.fields(): + def _get_attr(self, doc, name, default): + for field in doc.fields(): if field.name() == 'ROBOT_LIBRARY_' + name \ and field.isPublic() and field.constantValue(): return field.constantValue() return default + def _keywords(self, doc): + return [self._keyword_doc(m) for m in doc.methods()] + def _keyword_doc(self, method): return KeywordDoc( name=utils.printable_name(method.name(), code_style=True), @@ -55,8 +58,8 @@ doc=self._get_doc(method) ) - def _intializers(self, cls): - inits = [self._keyword_doc(init) for init in cls.constructors()] + def _intializers(self, doc): + inits = [self._keyword_doc(init) for init in doc.constructors()] if len(inits) == 1 and not inits[0].args: return [] return inits