From 8a95dba194e48a40b33941a6d5303f938ba831de Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 12 Jan 2018 14:41:29 +0100 Subject: [PATCH] Fixed abstractApi and Java wrapper use of RefCountable attribute --- tools/abstractapi.py | 3 ++- wrappers/java/genwrapper.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/abstractapi.py b/tools/abstractapi.py index 20645dae6..0956b2cbf 100644 --- a/tools/abstractapi.py +++ b/tools/abstractapi.py @@ -357,7 +357,7 @@ class Class(DocumentableObject): self.classMethods = [] self._listenerInterface = None self.multilistener = False - self.refcountable = True + self.refcountable = False def add_property(self, property): self.properties.append(property) @@ -644,6 +644,7 @@ class CParser(object): _class = Class(name) _class.briefDescription = cclass.briefDoc _class.detailedDescription = cclass.detailedDoc + _class.refcountable = self._class_is_refcountable(cclass) for cproperty in cclass.properties.values(): try: diff --git a/wrappers/java/genwrapper.py b/wrappers/java/genwrapper.py index 2d477a049..837b7cc65 100755 --- a/wrappers/java/genwrapper.py +++ b/wrappers/java/genwrapper.py @@ -439,7 +439,7 @@ class JavaTranslator(object): classCName = 'Linphone' + arg.type.desc.name.to_camel_case() if classCName[-8:] == 'Listener': classCName = 'Linphone' + arg.type.desc.name.to_camel_case()[:-8] + 'Cbs' - methodDict['objects'].append({'object': argname, 'objectClassCName': classCName, 'refCountable': arg.type.desc.refcountable}) + methodDict['objects'].append({'object': argname, 'objectClassCName': classCName}) methodDict['params_impl'] += 'c_' + argname elif type(arg.type) is AbsApi.ListType: @@ -477,6 +477,7 @@ class JavaTranslator(object): hasCoreAccessor = _class.name.to_camel_case() in CORE_ACCESSOR_LIST classDict['hasCoreAccessor'] = hasCoreAccessor classDict['doc'] = _class.briefDescription.translate(self.docTranslator) if _class.briefDescription is not None else None + classDict['refCountable'] = _class.refcountable for _property in _class.properties: try: @@ -717,6 +718,7 @@ class JavaClass(object): self.packageName = package self.className = _class.name.to_camel_case() self.classImplName = self.className + "Impl" + self.refCountable = self._class['refCountable'] self.factoryName = _class.name.to_snake_case() self.filename = self.className + ".java" self.imports = [] @@ -768,6 +770,7 @@ class Jni(object): 'className': javaClass.className, 'classCName': javaClass.cName, 'classImplName': javaClass.classImplName, + 'refCountable': javaClass.refCountable } self.objects.append(obj) @@ -785,7 +788,6 @@ class Jni(object): } for callback in jniInterface.callbacks: interface['callbacksList'].append(callback) - print(obj['className']) if obj['className'] == 'Core': self.coreListener.append(callback) self.interfaces.append(interface)