Fixed byte array interpreter

ashitikov · Feb 7, 2016 · 412b52f · 412b52f
1 parent e1e3bba
commit 412b52f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ allprojects {
     apply plugin: 'java'
 
     group = 'ru.objective.jni'
-    version = '1.0-SNAPSHOT'
+    version = '1.2-SNAPSHOT'
     sourceCompatibility = 7
 
     repositories {

diff --git a/src/main/java/ru/objective/jni/tasks/builders/AbstractBuilder.java b/src/main/java/ru/objective/jni/tasks/builders/AbstractBuilder.java
@@ -80,7 +80,7 @@ protected String getHeaderDeclarationField(String name, Field field, boolean set
 
         String returnType = Utility.signatureToString(field.getSignature());
 
-        returnType = PrimitiveTypeConverter.convertToOBJCType(Utils.getBasicType(returnType));
+        returnType = Utils.getBasicType(returnType);
 
         if (!Utils.isPrimitive(field.getType())) {
             JavaClass typeJavaClass = OJNIClassLoader.getInstance().loadClass(field.getType().toString());
@@ -93,6 +93,8 @@ protected String getHeaderDeclarationField(String name, Field field, boolean set
 
         if (Utils.isArrayType(field.getType()))
             returnType = getStringArrayType(returnType, (ArrayType)field.getType());
+        else
+            returnType = PrimitiveTypeConverter.convertToOBJCType(returnType);
 
         String declSign = (field.isStatic() ? "+" : "-")+" ";
 
@@ -136,7 +138,7 @@ protected String getHeaderDeclarationMethod(MethodExportInfo info, Method method
 
             methodReturnType = Utility.methodSignatureReturnType(method.getSignature()).toString();
 
-            methodReturnType = PrimitiveTypeConverter.convertToOBJCType(Utils.getBasicType(methodReturnType));
+            methodReturnType = Utils.getBasicType(methodReturnType);
 
             if (!Utils.isPrimitive(method.getReturnType())) {
                 JavaClass typeJavaClass = OJNIClassLoader.getInstance().loadClass(method.getReturnType().toString());
@@ -149,6 +151,8 @@ protected String getHeaderDeclarationMethod(MethodExportInfo info, Method method
 
             if (Utils.isArrayType(method.getReturnType()))
                 methodReturnType = getStringArrayType(methodReturnType, (ArrayType)method.getReturnType());
+            else
+                methodReturnType = PrimitiveTypeConverter.convertToOBJCType(methodReturnType);
         }
         stringBuilder.append((method.isStatic() ? "+" : "-")+" " + "("+PrimitiveTypeConverter.convertToOBJCType(methodReturnType)+")");
 
@@ -190,8 +194,6 @@ protected String getHeaderDeclarationMethod(MethodExportInfo info, Method method
                         + Utils.getShortClassName(type);/*+ StringUtils.capitalize(utils.getShortClassName(type));*/
             }
 
-            type = PrimitiveTypeConverter.convertToOBJCType(type);
-
             if (!Utils.isPrimitive(javaType)) {
                 JavaClass argTypeJavaClass = OJNIClassLoader.getInstance().loadClass(javaType.toString());
 
@@ -211,6 +213,8 @@ protected String getHeaderDeclarationMethod(MethodExportInfo info, Method method
                         overloadedParameter += "Array";
                 }
                 type = getStringArrayType(type, (ArrayType) javaType);
+            } else {
+                type = PrimitiveTypeConverter.convertToOBJCType(type);
             }
 
             stringBuilder.append(nameParameter + overloadedParameter + ":(" + type + ")" + variable_name + " ");

diff --git a/src/main/java/ru/objective/jni/tasks/builders/ClassBuilder.java b/src/main/java/ru/objective/jni/tasks/builders/ClassBuilder.java
@@ -258,8 +258,7 @@ private String getFieldImplementation(Field field, String declaration, boolean s
             if (Utils.isArrayType(returnType)) {
                 ArrayType arrayType = (ArrayType)returnType;
                 int dimensions = arrayType.getDimensions();
-                String typeString = PrimitiveTypeConverter.convertToOBJCType(
-                        arrayType.getBasicType().toString());
+                String typeString = arrayType.getBasicType().toString();
                 String capitalizedType = StringUtils.capitalize(typeString);
 
                 // fix Boolean = Bool conflicts
@@ -406,8 +405,7 @@ public String generateArgumentString(Method method) {
             if (Utils.isArrayType(type)) {
                 ArrayType arrayType = (ArrayType)type;
                 int dimensions = arrayType.getDimensions();
-                String typeString = PrimitiveTypeConverter.convertToOBJCType(
-                        arrayType.getBasicType().toString());
+                String typeString = arrayType.getBasicType().toString();
                 String capitalizedType = StringUtils.capitalize(typeString);
 
                 // fix Boolean = Bool conflicts
@@ -459,8 +457,7 @@ public String generateReturnObject(Type returnType) {
         if (Utils.isArrayType(returnType)) {
             ArrayType arrReturnType = (ArrayType) returnType;
             int dimensions = arrReturnType.getDimensions();
-            String capitalizedType = StringUtils.capitalize(PrimitiveTypeConverter.convertToOBJCType(
-                    arrReturnType.getBasicType().toString()));
+            String capitalizedType = StringUtils.capitalize(arrReturnType.getBasicType().toString());
 
             // fix Boolean = Bool conflicts
             if (capitalizedType.equals("Bool"))