From 03a625226b8ffd7c50a738af77e28602c9942628 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 10 Oct 2017 13:37:27 +0200 Subject: [PATCH] Added throw CoreException to each method using Enum's fromInt function --- wrappers/java/genwrapper.py | 1 + wrappers/java/java_class.mustache | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/wrappers/java/genwrapper.py b/wrappers/java/genwrapper.py index 3191e102e..13a22f7a8 100644 --- a/wrappers/java/genwrapper.py +++ b/wrappers/java/genwrapper.py @@ -186,6 +186,7 @@ class JavaTranslator(object): methodDict['enumCast'] = type(_method.returnType) is AbsApi.EnumType methodDict['classCast'] = type(_method.returnType) is AbsApi.ClassType + methodDict['params'] = '' methodDict['native_params'] = 'long nativePtr' methodDict['static_native_params'] = '' diff --git a/wrappers/java/java_class.mustache b/wrappers/java/java_class.mustache index 28f074c8f..51ab7f613 100644 --- a/wrappers/java/java_class.mustache +++ b/wrappers/java/java_class.mustache @@ -127,7 +127,7 @@ class {{classImplName}} implements {{className}} { {{#methods}} private native {{return_native}} {{name}}({{native_params}}); - public {{return}} {{name}}({{params}}) {{#exception}}throws CoreException{{/exception}} { + public {{return}} {{name}}({{params}}) {{#exception}}throws CoreException{{/exception}}{{#enumCast}}throws CoreException{{/enumCast}} { {{#exception}}int exceptionResult = {{/exception}}{{return_keyword}}{{#enumCast}}{{return}}.fromInt({{/enumCast}}{{#classCast}}({{return}}){{/classCast}}{{name}}(nativePtr{{native_params_impl}}){{#enumCast}}){{/enumCast}}; {{#exception}}if (exceptionResult != 0) throw new CoreException("{{name}} returned value " + exceptionResult){{/exception}} }