Compact naming.

Author: highsource

compiler/src/main/java/org/hisrc/jsonix/compiler/CreateTypeInfoDeclarationVisitor.java

@@ -61,7 +61,7 @@ final class CreateTypeInfoDeclarationVisitor<T, C extends T> implements
 	private static final String IDREFS_TYPE_INFO_NAME = "IDREFS";
 	private static final String IDREF_TYPE_INFO_NAME = "IDREF";
 	private static final String ID_TYPE_INFO_NAME = "ID";
-	
+
 	private static Map<QName, String> XSD_TYPE_MAPPING = new HashMap<QName, String>();
 	{
 		XSD_TYPE_MAPPING.put(XmlSchemaConstants.ANYTYPE, "AnyType");
@@ -162,7 +162,7 @@ public JSAssignmentExpression visitEnumLeafInfo(MEnumLeafInfo<T, C> info) {
 	public JSAssignmentExpression visitClassInfo(MClassInfo<T, C> info) {
 		return createTypeInfoDeclaration(info);
 	}
-	
+
 	@Override
 	public JSAssignmentExpression visitClassRef(MClassRef<T, C> info) {
 		return createTypeInfoDeclaration(info);
@@ -171,8 +171,13 @@ public JSAssignmentExpression visitClassRef(MClassRef<T, C> info) {
 	public JSAssignmentExpression visitList(MList<T, C> info) {
 		final JSObjectLiteral list = this.codeModel.object();
 		list.append(naming.type(), this.codeModel.string(naming.list()));
-		list.append(naming.typeInfo(),
-				info.getItemTypeInfo().acceptTypeInfoVisitor(this));
+		final JSAssignmentExpression typeInfoDeclaration = info
+				.getItemTypeInfo().acceptTypeInfoVisitor(this);
+		if (!typeInfoDeclaration
+				.acceptExpressionVisitor(new CheckValueStringLiteralExpressionVisitor(
+						"String"))) {
+			list.append(naming.typeInfo(), typeInfoDeclaration);
+		}
 		return list;
 	}
 

compiler/src/main/java/org/hisrc/jsonix/compiler/PropertyInfoVisitor.java

@@ -37,6 +37,7 @@
 
 import org.hisrc.jscm.codemodel.JSCodeModel;
 import org.hisrc.jscm.codemodel.expression.JSArrayLiteral;
+import org.hisrc.jscm.codemodel.expression.JSAssignmentExpression;
 import org.hisrc.jscm.codemodel.expression.JSMemberExpression;
 import org.hisrc.jscm.codemodel.expression.JSObjectLiteral;
 import org.jvnet.jaxb2_commons.xml.bind.model.MAnyAttributePropertyInfo;
@@ -93,9 +94,13 @@ private void createTypedOptions(MTyped<T, C> info,
 		typeInfo.acceptTypeInfoVisitor(new DefaultTypeInfoVisitor<T, C, Void>() {
 			@Override
 			public Void visitTypeInfo(MTypeInfo<T, C> typeInfo) {
-				options.append(naming.typeInfo(),
-						PropertyInfoVisitor.this.jsonixCompiler
-								.getTypeInfoDeclaration(typeInfo));
+				final JSAssignmentExpression typeInfoDeclaration = PropertyInfoVisitor.this.jsonixCompiler
+						.getTypeInfoDeclaration(typeInfo);
+				if (!typeInfoDeclaration
+						.acceptExpressionVisitor(new CheckValueStringLiteralExpressionVisitor(
+								"String"))) {
+					options.append(naming.typeInfo(), typeInfoDeclaration);
+				}
 				return null;
 			}