Issue #23. Added getTypeName() to MTypeInfo. Made C extends T.

Author: highsource

runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAnyAttributePropertyInfo.java

@@ -1,5 +1,5 @@
 package org.jvnet.jaxb2_commons.xml.bind.model;
 
-public interface MAnyAttributePropertyInfo<T, C> extends MPropertyInfo<T, C> {
+public interface MAnyAttributePropertyInfo<T, C extends T> extends MPropertyInfo<T, C> {
 
 }

runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAnyElementPropertyInfo.java

@@ -1,6 +1,6 @@
 package org.jvnet.jaxb2_commons.xml.bind.model;
 
-public interface MAnyElementPropertyInfo<T, C> extends MPropertyInfo<T, C>,
+public interface MAnyElementPropertyInfo<T, C extends T> extends MPropertyInfo<T, C>,
 		MWildcard, MMixable {
 
 }

runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAttributePropertyInfo.java

@@ -2,7 +2,7 @@
 
 import javax.xml.namespace.QName;
 
-public interface MAttributePropertyInfo<T, C> extends
+public interface MAttributePropertyInfo<T, C extends T> extends
 		MSingleTypePropertyInfo<T, C> {
 
 	public QName getAttributeName();

runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MBuiltinLeafInfo.java

@@ -1,13 +1,9 @@
 package org.jvnet.jaxb2_commons.xml.bind.model;
 
-import javax.xml.namespace.QName;
-
 import org.jvnet.jaxb2_commons.xml.bind.model.origin.MBuiltinLeafInfoOrigin;
 import org.jvnet.jaxb2_commons.xml.bind.model.origin.MOriginated;
 
-public interface MBuiltinLeafInfo<T, C> extends MTypeInfo<T, C>,
+public interface MBuiltinLeafInfo<T, C extends T> extends MTypeInfo<T, C>,
 		MOriginated<MBuiltinLeafInfoOrigin> {
 
-	public QName getTypeName();
-
 }

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

@@ -7,7 +7,7 @@
 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 MClassTypeInfo<T, C>,
+public interface MClassInfo<T, C extends T> extends MClassTypeInfo<T, C>,
 		MOriginated<MClassInfoOrigin> {
 
 	public MClassTypeInfo<T, C> getBaseTypeInfo();

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

@@ -1,4 +1,4 @@
 package org.jvnet.jaxb2_commons.xml.bind.model;
 
-public interface MClassRef<T, C> extends MClassTypeInfo<T, C> {
+public interface MClassRef<T, C extends T> extends MClassTypeInfo<T, C> {
 }

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

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

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

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

runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementInfo.java

@@ -5,7 +5,7 @@
 import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementInfoOrigin;
 import org.jvnet.jaxb2_commons.xml.bind.model.origin.MOriginated;
 
-public interface MElementInfo<T, C> extends MElementTypeInfo<T, C>, MPackaged,
+public interface MElementInfo<T, C extends T> extends MElementTypeInfo<T, C>, MPackaged,
 		MOriginated<MElementInfoOrigin>, MContained, MContainer {
 
 	public QName getElementName();

runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementPropertyInfo.java

@@ -1,6 +1,6 @@
 package org.jvnet.jaxb2_commons.xml.bind.model;
 
-public interface MElementPropertyInfo<T, C> extends MPropertyInfo<T, C>,
+public interface MElementPropertyInfo<T, C extends T> extends MPropertyInfo<T, C>,
 		MWrappable, MElementTypeInfo<T, C> {
 
 }