Fixes #37.

Author: highsource

plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingArrayValueVisitor.java

@@ -52,6 +52,8 @@
 import com.sun.codemodel.JAnnotationUse;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
+import com.sun.codemodel.JExpressionImpl;
+import com.sun.codemodel.JFormatter;
 import com.sun.codemodel.JType;
 
 public class AnnotatingArrayValueVisitor implements
@@ -141,13 +143,13 @@ public JAnnotationArrayMember visit(XEnumByNameAnnotationValue<?> value) {
 	}
 
 	public JAnnotationArrayMember visit(XClassAnnotationValue<?> value) {
-		final Class<?> _class = value.getValue();
-		return annotationArrayMember.param(_class);
+		final JType type = this.codeModel._ref(value.getValue());
+		return param(type);
 	}
 
 	public JAnnotationArrayMember visit(XClassByNameAnnotationValue<?> value) {
 		final JType ref = CodeModelUtils.ref(codeModel, value.getClassName());
-		return annotationArrayMember.param(ref);
+		return param(ref);
 	}
 
 	public JAnnotationArrayMember visit(XArrayClassAnnotationValue<?, ?> value) {
@@ -156,7 +158,19 @@ public JAnnotationArrayMember visit(XArrayClassAnnotationValue<?, ?> value) {
 		for (int index = 0; index < value.getDimension(); index++) {
 			type = type.array();
 		}
-		return annotationArrayMember.param(type);
+		return param(type);
+	}
+
+	private JAnnotationArrayMember param(final JType type) {
+		if (type instanceof JClass) {
+			return annotationArrayMember.param((JClass) type);
+		} else {
+			return annotationArrayMember.param(new JExpressionImpl() {
+				public void generate(JFormatter f) {
+					f.g(type).p(".class");
+				}
+			});
+		}
 	}
 
 }

plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingSingleValueVisitor.java

@@ -51,6 +51,8 @@
 import com.sun.codemodel.JAnnotationUse;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
+import com.sun.codemodel.JExpressionImpl;
+import com.sun.codemodel.JFormatter;
 import com.sun.codemodel.JType;
 
 public class AnnotatingSingleValueVisitor implements
@@ -140,13 +142,13 @@ public JAnnotationUse visit(XEnumByNameAnnotationValue<?> value) {
 	}
 
 	public JAnnotationUse visit(XClassAnnotationValue<?> value) {
-		final JType type = this.codeModel.ref(value.getValue());
-		return annotationUse.param(this.name, type);
+		final JType type = this.codeModel._ref(value.getValue());
+		return param(type);
 	}
 
 	public JAnnotationUse visit(XClassByNameAnnotationValue<?> value) {
 		JType type = CodeModelUtils.ref(this.codeModel, value.getClassName());
-		return annotationUse.param(this.name, type);
+		return param(type);
 	}
 
 	public JAnnotationUse visit(XArrayClassAnnotationValue<?, ?> value) {
@@ -155,7 +157,19 @@ public JAnnotationUse visit(XArrayClassAnnotationValue<?, ?> value) {
 		for (int index = 0; index < value.getDimension(); index++) {
 			type = type.array();
 		}
-		return annotationUse.param(this.name, type);
+		return param(type);
+	}
+
+	private JAnnotationUse param(final JType type) {
+		if (type instanceof JClass) {
+			return annotationUse.param(this.name, (JClass) type);
+		} else {
+			return annotationUse.param(this.name, new JExpressionImpl() {
+				public void generate(JFormatter f) {
+					f.g(type).p(".class");
+				}
+			});
+		}
 	}
 
 }

plugin/src/test/resources/schema.xsd

@@ -90,7 +90,7 @@
 							<A
 								xmlns="http://annox.dev.java.net/org.jvnet.jaxb2_commons.plugin.annotate.tests"
 								booleanField="false" byteField="0" charField="a"
-								classField="java.lang.String" doubleField="1"
+								classField="double" doubleField="1"
 								enumField="ONE" floatField="2.3" intField="4"
 								longField="5" shortField="6" stringField="7">
 								<annotationField>
@@ -121,7 +121,7 @@
 						    <A
 								xmlns="http://annox.dev.java.net/org.jvnet.jaxb2_commons.plugin.annotate.tests"
 								booleanField="false" byteField="0" charField="a"
-								classField="java.lang.String" doubleField="1"
+								classField="double[]" doubleField="1"
 								enumField="ONE" floatField="2.3" intField="4"
 								longField="5" shortField="6" stringField="7">
 								<annotationField>

tests/annox/schema/src/main/resources/schema.xsd

@@ -266,7 +266,7 @@
 					booleanField = false,
 					byteField = 0,
 					charField = 'a',
-					classField = java.lang.String[][][].class,
+					classField = double.class,
 					anotherClassField=org.jvnet.jaxb2_commons.plugin.annotate.test.annox.schema.One.class,
 					doubleField = 1,
 					enumField = org.jvnet.jaxb2_commons.plugin.annotate.test.annox.annotations.E.ONE,
@@ -279,7 +279,7 @@
 						booleanArrayField = { false, true },
 						byteArrayField = { 0, 1 },
 						charArrayField = { 'a', 'b' },
-						classArrayField = { java.lang.String.class, java.lang.Boolean.class },
+						classArrayField = { java.lang.String.class, java.lang.Boolean.class, java.lang.String[][][].class, double.class },
 						anotherClassArrayField= {org.jvnet.jaxb2_commons.plugin.annotate.test.annox.schema.One.class, org.jvnet.jaxb2_commons.plugin.annotate.test.annox.schema.Two.class },
 						doubleArrayField = { 2, 3 },
 						enumArrayField = { org.jvnet.jaxb2_commons.plugin.annotate.test.annox.annotations.E.ONE, org.jvnet.jaxb2_commons.plugin.annotate.test.annox.annotations.E.TWO },