Supporting MClassRef as baseTypeInfo.

Author: lexi

basics/trunk/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassInfo.java

@@ -7,16 +7,10 @@
 import org.jvnet.jaxb2_commons.xml.bind.model.origin.MClassInfoOrigin;
 import org.jvnet.jaxb2_commons.xml.bind.model.origin.MOriginated;
 
-public interface MClassInfo<T, C> extends MPackagedTypeInfo<T, C>,
-		MOriginated<MClassInfoOrigin>, MContainer {
+public interface MClassInfo<T, C> extends MClassTypeInfo<T, C>,
+		MOriginated<MClassInfoOrigin> {
 
-	public C getTargetClass();
-
-	public MClassInfo<T, C> getBaseTypeInfo();
-
-	public String getName();
-
-	public String getLocalName();
+	public MClassTypeInfo<T, C> getBaseTypeInfo();
 
 	public List<MPropertyInfo<T, C>> getProperties();
 

basics/trunk/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassRef.java

@@ -1,31 +1,4 @@
 package org.jvnet.jaxb2_commons.xml.bind.model;
 
-
-public interface MClassRef<T, C> extends MPackagedTypeInfo<T, C>, MContainer /*
-																 * ,
-																 * MOriginated<
-																 * MClassInfoOrigin
-																 * >, MContainer
-																 */
-{
-
-	public C getTargetClass();
-/*
-	public MClassRef<T, C> getBaseTypeInfo();
-
-	public String getName();
-
-	public String getLocalName();
-
-	public List<MPropertyInfo<T, C>> getProperties();
-
-	public QName getElementName();
-
-	public MElementInfo<T, C> createElementInfo(MTypeInfo<T, C> scope,
-			QName substitutionHead);
-
-	public void addProperty(MPropertyInfo<T, C> propertyInfo);
-
-	public void removeProperty(MPropertyInfo<T, C> propertyInfo);*/
-
+public interface MClassRef<T, C> extends MClassTypeInfo<T, C> {
 }

basics/trunk/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfo.java

@@ -0,0 +1,11 @@
+package org.jvnet.jaxb2_commons.xml.bind.model;
+
+public interface MClassTypeInfo<T, C> extends MPackagedTypeInfo<T, C>,
+		MContainer {
+
+	public C getTargetClass();
+
+	public <V> V acceptClassTypeInfoVisitor(
+			MClassTypeInfoVisitor<T, C, V> visitor);
+
+}

basics/trunk/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfoVisitor.java

@@ -0,0 +1,9 @@
+package org.jvnet.jaxb2_commons.xml.bind.model;
+
+public interface MClassTypeInfoVisitor<T, C, V> {
+
+	public V visitClassInfo(MClassInfo<T, C> info);
+
+	public V visitClassRef(MClassRef<T, C> info);
+
+}

basics/trunk/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTypeInfoVisitor.java

@@ -1,6 +1,7 @@
 package org.jvnet.jaxb2_commons.xml.bind.model;
 
-public interface MTypeInfoVisitor<T, C, V> {
+public interface MTypeInfoVisitor<T, C, V> extends
+		MClassTypeInfoVisitor<T, C, V> {
 
 	public V visitList(MList<T, C> info);
 
@@ -16,7 +17,4 @@ public interface MTypeInfoVisitor<T, C, V> {
 
 	public V visitWildcardTypeInfo(MWildcardTypeInfo<T, C> info);
 
-	public V visitClassInfo(MClassInfo<T, C> info);
-
-	public V visitClassRef(MClassRef<T, C> info);
 }

basics/trunk/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassInfo.java

@@ -8,6 +8,8 @@
 
 import org.jvnet.jaxb2_commons.lang.Validate;
 import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo;
+import org.jvnet.jaxb2_commons.xml.bind.model.MClassTypeInfo;
+import org.jvnet.jaxb2_commons.xml.bind.model.MClassTypeInfoVisitor;
 import org.jvnet.jaxb2_commons.xml.bind.model.MContainer;
 import org.jvnet.jaxb2_commons.xml.bind.model.MCustomizations;
 import org.jvnet.jaxb2_commons.xml.bind.model.MElementInfo;
@@ -31,7 +33,7 @@ public class CMClassInfo<T, C extends T> implements MClassInfo<T, C> {
 	private final String name;
 	private final String localName;
 	private final MContainer container;
-	private final MClassInfo<T, C> baseTypeInfo;
+	private final MClassTypeInfo<T, C> baseTypeInfo;
 	private final QName elementName;
 
 	private List<MPropertyInfo<T, C>> properties = new ArrayList<MPropertyInfo<T, C>>();
@@ -40,7 +42,7 @@ public class CMClassInfo<T, C extends T> implements MClassInfo<T, C> {
 
 	public CMClassInfo(MClassInfoOrigin origin, C targetClass,
 			MPackageInfo _package, MContainer container, String localName,
-			MClassInfo<T, C> baseTypeInfo, QName elementName) {
+			MClassTypeInfo<T, C> baseTypeInfo, QName elementName) {
 		super();
 		Validate.notNull(origin);
 		Validate.notNull(targetClass);
@@ -116,7 +118,7 @@ public MContainer getScope() {
 		return container;
 	}
 
-	public MClassInfo<T, C> getBaseTypeInfo() {
+	public MClassTypeInfo<T, C> getBaseTypeInfo() {
 		return baseTypeInfo;
 	}
 
@@ -155,4 +157,10 @@ public String toString() {
 	public <V> V acceptTypeInfoVisitor(MTypeInfoVisitor<T, C, V> visitor) {
 		return visitor.visitClassInfo(this);
 	}
+	
+	@Override
+	public <V> V acceptClassTypeInfoVisitor(
+			MClassTypeInfoVisitor<T, C, V> visitor) {
+		return visitor.visitClassInfo(this);
+	}
 }

basics/trunk/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassRef.java

@@ -2,6 +2,7 @@
 
 import org.jvnet.jaxb2_commons.lang.Validate;
 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.MContainer;
 import org.jvnet.jaxb2_commons.xml.bind.model.MCustomizations;
 import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo;
@@ -16,10 +17,10 @@ public class CMClassRef<T, C extends T> implements MClassRef<T, C> {
 	private final String localName;
 	private final MContainer container;
 
-	public CMClassRef(/*MClassInfoOrigin origin, */C targetClass,
+	public CMClassRef(/* MClassInfoOrigin origin, */C targetClass,
 			MPackageInfo _package, MContainer container, String localName) {
 		super();
-//		Validate.notNull(origin);
+		// Validate.notNull(origin);
 		Validate.notNull(targetClass);
 		Validate.notNull(_package);
 		Validate.notNull(localName);
@@ -80,4 +81,10 @@ public C getTargetClass() {
 		return targetClass;
 	}
 
+	@Override
+	public <V> V acceptClassTypeInfoVisitor(
+			MClassTypeInfoVisitor<T, C, V> visitor) {
+		return visitor.visitClassRef(this);
+	}
+
 }

basics/trunk/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMInfoFactory.java

@@ -13,6 +13,7 @@
 import org.jvnet.jaxb2_commons.lang.Validate;
 import org.jvnet.jaxb2_commons.xml.bind.model.MBuiltinLeafInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo;
+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.MElementInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MElementTypeInfo;
@@ -252,12 +253,16 @@ protected MElementInfo<T, C> getElementInfo(EI info) {
 
 	protected MClassInfo<T, C> createClassInfo(CI info) {
 		return new CMClassInfo<T, C>(createClassInfoOrigin(info),
-				info.getClazz(), getPackage(info), getContainer(info), getLocalName(info),
-				info.getBaseClass() == null ? null : getTypeInfo((CI) info
-						.getBaseClass()),
+				info.getClazz(), getPackage(info), getContainer(info),
+				getLocalName(info), createBaseTypeInfo(info),
 				info.isElement() ? info.getElementName() : null);
 	}
 
+	protected MClassTypeInfo<T, C> createBaseTypeInfo(CI info) {
+		return info.getBaseClass() == null ? null : getTypeInfo((CI) info
+				.getBaseClass());
+	}
+
 	private MPropertyInfo<T, C> createPropertyInfo(
 			final MClassInfo<T, C> classInfo, PI p) {