From dd6dec7b9a3bd3145e4e14a24547cd19a4799401 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Fri, 10 Dec 2010 04:50:26 +0000 Subject: [PATCH] Handle arrays (potentially of nested types). Ray's got some crazy shit over in PX land. --- .../com/samskivert/depot/tools/GenRecordTask.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/samskivert/depot/tools/GenRecordTask.java b/src/main/java/com/samskivert/depot/tools/GenRecordTask.java index de76b33..658fb51 100644 --- a/src/main/java/com/samskivert/depot/tools/GenRecordTask.java +++ b/src/main/java/com/samskivert/depot/tools/GenRecordTask.java @@ -462,12 +462,17 @@ public class GenRecordTask extends Task protected static String getTypeName (Class clazz) { - Class nclass = clazz.isPrimitive() ? BOXES.get(clazz) : clazz; - Class eclass = nclass.getEnclosingClass(); - if (eclass != null) { - return getTypeName(eclass) + "." + nclass.getSimpleName(); + if (clazz.isArray()) { + Class cclass = clazz.getComponentType(); + return (cclass.isPrimitive() ? cclass.getSimpleName() : getTypeName(cclass)) + "[]"; } else { - return nclass.getSimpleName(); + Class nclass = clazz.isPrimitive() ? BOXES.get(clazz) : clazz; + Class eclass = nclass.getEnclosingClass(); + if (eclass != null) { + return getTypeName(eclass) + "." + nclass.getSimpleName(); + } else { + return nclass.getSimpleName(); + } } }