From d3e2cd6432b3383d4589350d60170e02db469343 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 16 Jun 2014 01:16:46 +0200 Subject: JavaEmitter.typeToJavaType: Simplify if-else block ; JavaType.getDumpString(): Add more info .. --- src/java/com/jogamp/gluegen/JavaEmitter.java | 6 ++---- src/java/com/jogamp/gluegen/JavaType.java | 4 +++- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/java/com') diff --git a/src/java/com/jogamp/gluegen/JavaEmitter.java b/src/java/com/jogamp/gluegen/JavaEmitter.java index 3f4fa9e..f37f5a3 100644 --- a/src/java/com/jogamp/gluegen/JavaEmitter.java +++ b/src/java/com/jogamp/gluegen/JavaEmitter.java @@ -1273,8 +1273,7 @@ public class JavaEmitter implements GlueEmitter { return javaType(Double.TYPE); } else if (t.isVoid()) { return javaType(Void.TYPE); - } else { - if (t.pointerDepth() > 0 || t.arrayDimension() > 0) { + } else if (t.pointerDepth() > 0 || t.arrayDimension() > 0) { Type targetType; // target type if (t.isPointer()) { // t is *, we need to get @@ -1394,11 +1393,10 @@ public class JavaEmitter implements GlueEmitter { t.arrayDimension() + " targetType=\"" + targetType + "\"]"); } - } else { + } else { throw new RuntimeException( "Could not convert C type \"" + t + "\" (class " + t.getClass().getName() + ") to appropriate Java type"); - } } } diff --git a/src/java/com/jogamp/gluegen/JavaType.java b/src/java/com/jogamp/gluegen/JavaType.java index 8a79559..a9e1941 100644 --- a/src/java/com/jogamp/gluegen/JavaType.java +++ b/src/java/com/jogamp/gluegen/JavaType.java @@ -489,7 +489,9 @@ public class JavaType { // For debugging public String getDumpString() { - return "[clazz = " + clazz + " , name = " + name + " , elementType = " + elementType + " , primitivePointerType = " + primitivePointerType + "]"; + return "[clazz = " + clazz + " , name = " + name + " , elementType = " + elementType + " , primitivePointerType = " + primitivePointerType + + ", isArray "+isArray()+", isArrayOfCompoundTypeWrappers "+isArrayOfCompoundTypeWrappers()+ + ", isNIOBuffer "+isNIOBuffer()+", isNIOBufferArray "+isNIOBufferArray()+"]"; } public void dump() { System.err.println(getDumpString()); -- cgit v1.2.3