Small change because of highsource/jaxb2-basics#23.

Author: highsource

compiler/src/main/java/org/hisrc/jsonix/analysis/DefaultInfoVertexVisitor.java

@@ -1,6 +1,6 @@
 package org.hisrc.jsonix.analysis;
 
-public class DefaultInfoVertexVisitor<T, C, V> implements InfoVertexVisitor<T, C, V> {
+public class DefaultInfoVertexVisitor<T, C extends T, V> implements InfoVertexVisitor<T, C, V> {
 
 	@Override
 	public V visitPackageInfoVertex(PackageInfoVertex<T, C> vertex) {

compiler/src/main/java/org/hisrc/jsonix/analysis/ElementInfoVertex.java

@@ -9,7 +9,7 @@
 import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo;
 
-public class ElementInfoVertex<T, C> extends InfoVertex<T,C> {
+public class ElementInfoVertex<T, C extends T> extends InfoVertex<T,C> {
 
 	private final MPackageInfo packageInfo;
 	private final MElementInfo<T, C> elementInfo;

compiler/src/main/java/org/hisrc/jsonix/analysis/InfoVertex.java

@@ -2,7 +2,7 @@
 
 import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo;
 
-public abstract class InfoVertex<T, C> {
+public abstract class InfoVertex<T, C extends T> {
 
 	public abstract MPackageInfo getPackageInfo();
 

compiler/src/main/java/org/hisrc/jsonix/analysis/InfoVertexVisitor.java

@@ -1,6 +1,6 @@
 package org.hisrc.jsonix.analysis;
 
-public interface InfoVertexVisitor<T, C, V> {
+public interface InfoVertexVisitor<T, C extends T, V> {
 
 	public V visitPackageInfoVertex(PackageInfoVertex<T, C> vertex);
 

compiler/src/main/java/org/hisrc/jsonix/analysis/MTypeInfoToString.java

@@ -15,9 +15,9 @@
 import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfoVisitor;
 import org.jvnet.jaxb2_commons.xml.bind.model.MWildcardTypeInfo;
 
-public class MTypeInfoToString<T, C> implements MTypeInfoVisitor<T, C, String> {
+public class MTypeInfoToString<T, C extends T> implements MTypeInfoVisitor<T, C, String> {
 
-	public static <X, Y> MTypeInfoVisitor<X, Y, String> instance() {
+	public static <X, Y extends X> MTypeInfoVisitor<X, Y, String> instance() {
 		@SuppressWarnings("unchecked")
 		final MTypeInfoVisitor<X, Y, String> instance = (MTypeInfoVisitor<X, Y, String>) INSTANCE;
 		return instance;

compiler/src/main/java/org/hisrc/jsonix/analysis/ModelInfoGraphAnalyzer.java

@@ -21,7 +21,7 @@
 import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo;
 
-public class ModelInfoGraphAnalyzer<T, C> {
+public class ModelInfoGraphAnalyzer<T, C extends T> {
 
 	private final DirectedGraph<InfoVertex<T, C>, DependencyEdge> graph;
 

compiler/src/main/java/org/hisrc/jsonix/analysis/ModelInfoGraphBuilder.java

@@ -16,7 +16,7 @@
 import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo;
 import org.slf4j.Logger;
 
-public class ModelInfoGraphBuilder<T, C> {
+public class ModelInfoGraphBuilder<T, C extends T> {
 
 	private final Logger logger;
 	private final MModelInfo<T, C> modelInfo;

compiler/src/main/java/org/hisrc/jsonix/analysis/PackageInfoVertex.java

@@ -5,7 +5,7 @@
 import org.apache.commons.lang3.Validate;
 import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo;
 
-public class PackageInfoVertex<T, C> extends InfoVertex<T,C> {
+public class PackageInfoVertex<T, C extends T> extends InfoVertex<T,C> {
 
 	private final MPackageInfo packageInfo;
 

compiler/src/main/java/org/hisrc/jsonix/analysis/PropertyInfoGraphBuilder.java

@@ -18,7 +18,7 @@
 import org.jvnet.jaxb2_commons.xml.bind.model.MTyped;
 import org.jvnet.jaxb2_commons.xml.bind.model.MValuePropertyInfo;
 
-public final class PropertyInfoGraphBuilder<T, C> implements
+public final class PropertyInfoGraphBuilder<T, C extends T> implements
 		MPropertyInfoVisitor<T, C, PropertyInfoVertex<T, C>> {
 
 	private final ModelInfoGraphBuilder<T, C> modelInfoGraphBuilder;

compiler/src/main/java/org/hisrc/jsonix/analysis/PropertyInfoVertex.java

@@ -7,7 +7,7 @@
 import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfo;
 
-public class PropertyInfoVertex<T, C> extends InfoVertex<T,C> {
+public class PropertyInfoVertex<T, C extends T> extends InfoVertex<T,C> {
 
 	private final MPackageInfo packageInfo;
 	private final MClassInfo<T, C> classInfo;