Supporting MClassRef as baseTypeInfo.

Author: lexi

basics/trunk/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMClassOutlineGenerator.java

@@ -8,6 +8,8 @@
 import org.jvnet.jaxb2_commons.xjc.outline.MPropertyOutline;
 import org.jvnet.jaxb2_commons.xjc.outline.concrete.CMClassOutline;
 import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo;
+import org.jvnet.jaxb2_commons.xml.bind.model.MClassRef;
+import org.jvnet.jaxb2_commons.xml.bind.model.MClassTypeInfoVisitor;
 import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfo;
 
@@ -30,16 +32,31 @@ public CMClassOutlineGenerator(Outline outline, CClassInfo classInfo) {
 		this.classInfo = classInfo;
 	}
 
-	public MClassOutline generate(MPackageOutline parent,
+	public MClassOutline generate(final MPackageOutline parent,
 			MModelInfo<NType, NClass> modelInfo,
 			MClassInfo<NType, NClass> classInfo) {
 
 		ClassOutline co = outline.getClazz(this.classInfo);
 
 		final MClassOutline superClassOutline;
 		if (classInfo.getBaseTypeInfo() != null) {
-			superClassOutline = parent.getParent().getClassOutline(
-					classInfo.getBaseTypeInfo());
+			superClassOutline = classInfo
+					.getBaseTypeInfo()
+					.acceptClassTypeInfoVisitor(
+							new MClassTypeInfoVisitor<NType, NClass, MClassOutline>() {
+								@Override
+								public MClassOutline visitClassInfo(
+										MClassInfo<NType, NClass> info) {
+									return parent.getParent().getClassOutline(
+											info);
+								}
+
+								@Override
+								public MClassOutline visitClassRef(
+										MClassRef<NType, NClass> info) {
+									return null;
+								}
+							});
 		} else {
 			superClassOutline = null;
 		}

basics/trunk/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMModelOutlineGenerator.java

@@ -13,6 +13,8 @@
 import org.jvnet.jaxb2_commons.xjc.outline.MPackageOutline;
 import org.jvnet.jaxb2_commons.xjc.outline.concrete.CMModelOutline;
 import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo;
+import org.jvnet.jaxb2_commons.xml.bind.model.MClassRef;
+import org.jvnet.jaxb2_commons.xml.bind.model.MClassTypeInfoVisitor;
 import org.jvnet.jaxb2_commons.xml.bind.model.MElementInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MEnumLeafInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo;
@@ -89,12 +91,24 @@ private void generatePackageOutline(CMModelOutline modelOutline,
 		}
 	}
 
-	private void generateClassOutline(CMModelOutline modelOutline,
-			MModelInfo<NType, NClass> modelInfo,
+	private void generateClassOutline(final CMModelOutline modelOutline,
+			final MModelInfo<NType, NClass> modelInfo,
 			MClassInfo<NType, NClass> classInfo) {
 		if (classInfo.getBaseTypeInfo() != null) {
-			generateClassOutline(modelOutline, modelInfo,
-					classInfo.getBaseTypeInfo());
+			classInfo.getBaseTypeInfo().acceptClassTypeInfoVisitor(
+					new MClassTypeInfoVisitor<NType, NClass, Void>() {
+						@Override
+						public Void visitClassInfo(
+								MClassInfo<NType, NClass> info) {
+							generateClassOutline(modelOutline, modelInfo, info);
+							return null;
+						}
+
+						@Override
+						public Void visitClassRef(MClassRef<NType, NClass> info) {
+							return null;
+						}
+					});
 		}
 
 		if (classInfo.getOrigin() instanceof ClassOutlineGeneratorFactory) {

basics/trunk/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/XJCCMInfoFactory.java

@@ -1,6 +1,7 @@
 package org.jvnet.jaxb2_commons.xjc.model.concrete;
 
 import java.util.HashMap;
+import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -13,6 +14,7 @@
 import org.jvnet.jaxb2_commons.xjc.model.concrete.origin.XJCCMPropertyInfoOrigin;
 import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MClassRef;
+import org.jvnet.jaxb2_commons.xml.bind.model.MClassTypeInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MContainer;
 import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo;
@@ -55,6 +57,10 @@ public class XJCCMInfoFactory
 		extends
 		CMInfoFactory<NType, NClass, Model, CTypeInfo, CBuiltinLeafInfo, CElementInfo, CEnumLeafInfo, CEnumConstant, CClassInfo, CPropertyInfo, CAttributePropertyInfo, CValuePropertyInfo, CElementPropertyInfo, CReferencePropertyInfo, CWildcardTypeInfo> {
 
+	private final Map<CClassRef, MClassRef<NType, NClass>> classRefs =
+
+	new IdentityHashMap<CClassRef, MClassRef<NType, NClass>>();
+
 	public XJCCMInfoFactory(Model model) {
 		super(model);
 	}
@@ -118,6 +124,18 @@ protected MClassRef<NType, NClass> createClassRef(Class<?> _class) {
 				getPackage(_class), getContainer(_class), getLocalName(_class));
 	}
 
+	protected MClassRef<NType, NClass> getTypeInfo(CClassRef info) {
+
+		MClassRef<NType, NClass> classInfo = classRefs.get(info);
+
+		if (classInfo == null) {
+
+			classInfo = createClassRef(info);
+			classRefs.put(info, classInfo);
+		}
+		return classInfo;
+	}
+
 	protected MClassRef<NType, NClass> createClassRef(CClassRef info) {
 		return new CMClassRef<NType, NClass>(getClazz(info), getPackage(info),
 				getContainer(info), getLocalName(info));
@@ -126,7 +144,7 @@ protected MClassRef<NType, NClass> createClassRef(CClassRef info) {
 	@Override
 	protected MTypeInfo<NType, NClass> getTypeInfo(CTypeInfo typeInfo) {
 		if (typeInfo instanceof CClassRef) {
-			return createClassRef((CClassRef) typeInfo);
+			return getTypeInfo((CClassRef) typeInfo);
 		} else {
 			return super.getTypeInfo(typeInfo);
 		}
@@ -362,4 +380,15 @@ private MPackageInfo getPackage(JPackage pkg) {
 		}
 		return _package;
 	}
+
+	@Override
+	protected MClassTypeInfo<NType, NClass> createBaseTypeInfo(CClassInfo info) {
+		if (info.getBaseClass() != null) {
+			return getTypeInfo(info.getBaseClass());
+		} else if (info.getRefBaseClass() != null) {
+			return getTypeInfo(info.getRefBaseClass());
+		} else {
+			return null;
+		}
+	}
 }