Issue highsource/jsonix-schema-compiler#60.

highsource · highsource · commit 3d12364fe893 · 2015-12-27T22:02:44.000+01:00
diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassInfo.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassInfo.java
@@ -5,20 +5,19 @@
 import javax.xml.namespace.QName;
 
 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 T> extends MClassTypeInfo<T, C>,
-		MOriginated<MClassInfoOrigin> {
+public interface MClassInfo<T, C extends T> extends
+		MClassTypeInfo<T, C, MClassInfoOrigin> {
 
-	public MClassTypeInfo<T, C> getBaseTypeInfo();
+	public MClassTypeInfo<T, C, ?> getBaseTypeInfo();
 
 	public List<MPropertyInfo<T, C>> getProperties();
 
 	public MPropertyInfo<T, C> getProperty(String publicName);
 
 	public QName getElementName();
 
-	public MElementInfo<T, C> createElementInfo(MTypeInfo<T, C> scope,
+	public MElementInfo<T, C> createElementInfo(MClassInfo<T, C> scope,
 			QName substitutionHead);
 
 	public void addProperty(MPropertyInfo<T, C> propertyInfo);
diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassRef.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassRef.java
@@ -1,4 +1,7 @@
 package org.jvnet.jaxb2_commons.xml.bind.model;
 
-public interface MClassRef<T, C extends T> extends MClassTypeInfo<T, C> {
+import org.jvnet.jaxb2_commons.xml.bind.model.origin.MClassRefOrigin;
+
+public interface MClassRef<T, C extends T> extends
+		MClassTypeInfo<T, C, MClassRefOrigin> {
 }
diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfo.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfo.java
@@ -1,7 +1,9 @@
 package org.jvnet.jaxb2_commons.xml.bind.model;
 
-public interface MClassTypeInfo<T, C extends T> extends
-		MPackagedTypeInfo<T, C>, MTypeInfo<T, C>, MContainer {
+import org.jvnet.jaxb2_commons.xml.bind.model.origin.MOriginated;
+
+public interface MClassTypeInfo<T, C extends T, O> extends
+		MPackagedTypeInfo<T, C>, MTypeInfo<T, C>, MOriginated<O>, MContainer {
 
 	public C getTargetType();
 
diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementInfo.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementInfo.java
@@ -3,15 +3,14 @@
 import javax.xml.namespace.QName;
 
 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 T> extends
 		MElementTypeInfo<T, C, MElementInfoOrigin>, MPackaged, MContained,
 		MContainer {
 
 	public QName getElementName();
 
-	public MTypeInfo<T, C> getScope();
+	public MClassInfo<T, C> getScope();
 
 	public QName getSubstitutionHead();
 
diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MEnumLeafInfo.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MEnumLeafInfo.java
@@ -22,7 +22,7 @@ public interface MEnumLeafInfo<T, C extends T> extends MPackagedTypeInfo<T, C>,
 
 	public QName getElementName();
 
-	public MElementInfo<T, C> createElementInfo(MTypeInfo<T, C> scope,
+	public MElementInfo<T, C> createElementInfo(MClassInfo<T, C> scope,
 			QName substitutionHead);
 
 }
diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassInfo.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassInfo.java
@@ -17,7 +17,6 @@
 import org.jvnet.jaxb2_commons.xml.bind.model.MElementInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfo;
-import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfoVisitor;
 import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.ClassInfoOrigin;
 import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.PropertyInfoOrigin;
@@ -35,7 +34,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 MClassTypeInfo<T, C> baseTypeInfo;
+	private final MClassTypeInfo<T, C, ?> baseTypeInfo;
 	private final QName elementName;
 
 	private Map<String, MPropertyInfo<T, C>> propertiesMap = new HashMap<String, MPropertyInfo<T, C>>();
@@ -46,7 +45,7 @@ public class CMClassInfo<T, C extends T> implements MClassInfo<T, C> {
 
 	public CMClassInfo(MClassInfoOrigin origin, C targetType,
 			MPackageInfo _package, MContainer container, String localName,
-			MClassTypeInfo<T, C> baseTypeInfo, QName elementName, QName typeName) {
+			MClassTypeInfo<T, C, ?> baseTypeInfo, QName elementName, QName typeName) {
 		super();
 		Validate.notNull(origin);
 		Validate.notNull(targetType);
@@ -85,7 +84,7 @@ public boolean isSimpleType() {
 		return false;
 	}
 
-	public MElementInfo<T, C> createElementInfo(MTypeInfo<T, C> scope,
+	public MElementInfo<T, C> createElementInfo(MClassInfo<T, C> scope,
 			QName substitutionHead) {
 		return new CMElementInfo<T, C>(getOrigin().createElementInfoOrigin(),
 				getPackageInfo(), getContainer(), getLocalName(),
@@ -125,11 +124,7 @@ public String getContainerLocalName(String delimiter) {
 		}
 	}
 
-	public MContainer getScope() {
-		return container;
-	}
-
-	public MClassTypeInfo<T, C> getBaseTypeInfo() {
+	public MClassTypeInfo<T, C, ?> getBaseTypeInfo() {
 		return baseTypeInfo;
 	}
 
diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassRef.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassRef.java
@@ -9,11 +9,13 @@
 import org.jvnet.jaxb2_commons.xml.bind.model.MCustomizations;
 import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfoVisitor;
+import org.jvnet.jaxb2_commons.xml.bind.model.origin.MClassRefOrigin;
 import org.jvnet.jaxb2_commons.xml.bind.model.util.XmlTypeUtils;
 
 public class CMClassRef<T, C extends T> implements MClassRef<T, C> {
 
 	private CMCustomizations customizations = new CMCustomizations();
+	private final MClassRefOrigin origin;
 	private final C targetType;
 	private final Class<?> targetClass;
 	private final MPackageInfo _package;
@@ -22,15 +24,15 @@ public class CMClassRef<T, C extends T> implements MClassRef<T, C> {
 	private final MContainer container;
 	private final QName typeName;
 
-	public CMClassRef(/* MClassInfoOrigin origin, */C targetType,
+	public CMClassRef(MClassRefOrigin origin, C targetType,
 			Class<?> targetClass, MPackageInfo _package, MContainer container,
 			String localName) {
 		super();
-		// Validate.notNull(origin);
+		Validate.notNull(origin);
 		Validate.notNull(targetType);
 		Validate.notNull(_package);
 		Validate.notNull(localName);
-		// this.origin = origin;
+		this.origin = origin;
 		this.targetType = targetType;
 		this.name = _package.getPackagedName(localName);
 		this.localName = localName;
@@ -41,6 +43,11 @@ public CMClassRef(/* MClassInfoOrigin origin, */C targetType,
 				.getTypeName(targetClass);
 	}
 
+	@Override
+	public MClassRefOrigin getOrigin() {
+		return this.origin;
+	}
+
 	public String getName() {
 		return name;
 	}
diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementInfo.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementInfo.java
@@ -6,6 +6,7 @@
 import javax.xml.namespace.QName;
 
 import org.jvnet.jaxb2_commons.lang.Validate;
+import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo;
 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.MPackageInfo;
@@ -24,7 +25,7 @@ public class CMElementInfo<T, C extends T> implements MElementInfo<T, C> {
 
 	private final QName elementName;
 
-	private final MTypeInfo<T, C> scope;
+	private final MClassInfo<T, C> scope;
 
 	private final MTypeInfo<T, C> typeInfo;
 
@@ -36,7 +37,7 @@ public class CMElementInfo<T, C extends T> implements MElementInfo<T, C> {
 
 	public CMElementInfo(MElementInfoOrigin origin, MPackageInfo _package,
 			MContainer container, String localName, QName elementName,
-			MTypeInfo<T, C> scope, MTypeInfo<T, C> typeInfo,
+			MClassInfo<T, C> scope, MTypeInfo<T, C> typeInfo,
 			QName substitutionHead, String defaultValue,
 			NamespaceContext defaultValueNamespaceContext) {
 		super();
@@ -92,7 +93,7 @@ public QName getElementName() {
 		return elementName;
 	}
 
-	public MTypeInfo<T, C> getScope() {
+	public MClassInfo<T, C> getScope() {
 		return scope;
 	}
 
diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumLeafInfo.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumLeafInfo.java
@@ -9,6 +9,7 @@
 import javax.xml.namespace.QName;
 
 import org.jvnet.jaxb2_commons.lang.Validate;
+import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MContainer;
 import org.jvnet.jaxb2_commons.xml.bind.model.MCustomizable;
 import org.jvnet.jaxb2_commons.xml.bind.model.MCustomizations;
@@ -89,7 +90,7 @@ public boolean isSimpleType() {
 		return true;
 	}
 
-	public MElementInfo<T, C> createElementInfo(MTypeInfo<T, C> scope,
+	public MElementInfo<T, C> createElementInfo(MClassInfo<T, C> scope,
 			QName substitutionHead) {
 		return new CMElementInfo<T, C>(getOrigin().createElementInfoOrigin(),
 				getPackageInfo(), getContainer(), getLocalName(),
diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMInfoFactory.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMInfoFactory.java
@@ -110,6 +110,10 @@ public CMInfoFactory(TIS typeInfoSet) {
 		this.typeInfoSet = typeInfoSet;
 
 	}
+	
+	public TIS getTypeInfoSet() {
+		return typeInfoSet;
+	}
 
 	public MModelInfo<T, C> createModel() {
 		final CMModel<T, C> model = new CMModel<T, C>(
@@ -309,7 +313,7 @@ private void populateClassInfo(CI info, MClassInfo<T, C> classInfo) {
 		}
 	}
 
-	protected MClassTypeInfo<T, C> createBaseTypeInfo(CI info) {
+	protected MClassTypeInfo<T, C, ?> createBaseTypeInfo(CI info) {
 		return info.getBaseClass() == null ? null : getTypeInfo((CI) info
 				.getBaseClass());
 	}
@@ -601,7 +605,7 @@ protected MElementOrigin createElementOrigin(E info) {
 		return new CMElementOrigin<T, C, E>(info);
 	}
 
-	private MElementTypeRefOrigin createElementTypeRefOrigin(EPI ep,
+	protected MElementTypeRefOrigin createElementTypeRefOrigin(EPI ep,
 			TR typeRef) {
 		return new CMElementTypeRefOrigin<T, C, EPI, TR>(ep, typeRef);
 	}
diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMModel.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMModel.java
@@ -197,6 +197,7 @@ public void addClassInfo(MClassInfo<T, C> classInfo) {
 
 		final QName elementName = classInfo.getElementName();
 		if (elementName != null) {
+			// TODO why null, null?
 			final MElementInfo<T, C> elementInfo = classInfo.createElementInfo(
 					null, null);
 			this.elementInfos.add(elementInfo);
diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MClassRefOrigin.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MClassRefOrigin.java
@@ -0,0 +1,5 @@
+package org.jvnet.jaxb2_commons.xml.bind.model.origin;
+
+public interface MClassRefOrigin {
+
+}
diff --git a/tools/src/main/java/org/hisrc/xml/xsom/FindXSElementDeclVisitor.java b/tools/src/main/java/org/hisrc/xml/xsom/FindXSElementDeclVisitor.java
@@ -0,0 +1,103 @@
+package org.hisrc.xml.xsom;
+
+import javax.xml.namespace.QName;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
+
+import com.sun.xml.xsom.XSAnnotation;
+import com.sun.xml.xsom.XSAttGroupDecl;
+import com.sun.xml.xsom.XSAttributeDecl;
+import com.sun.xml.xsom.XSAttributeUse;
+import com.sun.xml.xsom.XSComplexType;
+import com.sun.xml.xsom.XSContentType;
+import com.sun.xml.xsom.XSElementDecl;
+import com.sun.xml.xsom.XSFacet;
+import com.sun.xml.xsom.XSIdentityConstraint;
+import com.sun.xml.xsom.XSModelGroup;
+import com.sun.xml.xsom.XSModelGroupDecl;
+import com.sun.xml.xsom.XSNotation;
+import com.sun.xml.xsom.XSParticle;
+import com.sun.xml.xsom.XSSchema;
+import com.sun.xml.xsom.XSSimpleType;
+import com.sun.xml.xsom.XSWildcard;
+import com.sun.xml.xsom.XSXPath;
+import com.sun.xml.xsom.visitor.XSVisitor;
+
+public class FindXSElementDeclVisitor implements XSVisitor {
+
+	private final QName name;
+
+	private XSElementDecl elementDecl = null;
+
+	public FindXSElementDeclVisitor(final QName name) {
+		Validate.notNull(name);
+		this.name = name;
+	}
+
+	public XSElementDecl getElementDecl() {
+		return elementDecl;
+	}
+
+	public void annotation(XSAnnotation ann) {
+	}
+
+	public void attGroupDecl(XSAttGroupDecl decl) {
+	}
+
+	public void attributeDecl(XSAttributeDecl decl) {
+	}
+
+	public void attributeUse(XSAttributeUse use) {
+	}
+
+	public void complexType(XSComplexType type) {
+	}
+
+	public void facet(XSFacet facet) {
+	}
+
+	public void identityConstraint(XSIdentityConstraint decl) {
+	}
+
+	public void notation(XSNotation notation) {
+	}
+
+	public void schema(XSSchema schema) {
+	}
+
+	public void xpath(XSXPath xp) {
+	}
+
+	public void elementDecl(XSElementDecl decl) {
+		final QName declName = StringUtils.isEmpty(decl.getTargetNamespace()) ? new QName(
+				decl.getName()) : new QName(decl.getTargetNamespace(),
+				decl.getName());
+		if (this.name.equals(declName)) {
+			this.elementDecl = decl;
+		}
+	}
+
+	public void modelGroup(XSModelGroup group) {
+		for (XSParticle child : group.getChildren()) {
+			child.visit(this);
+		}
+	}
+
+	public void modelGroupDecl(XSModelGroupDecl decl) {
+		decl.getModelGroup().visit(this);
+	}
+
+	public void wildcard(XSWildcard wc) {
+	}
+
+	public void empty(XSContentType empty) {
+	}
+
+	public void particle(XSParticle particle) {
+		particle.getTerm().visit(this);
+	}
+
+	public void simpleType(XSSimpleType simpleType) {
+	}
+}
diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/XJCCMInfoFactory.java b/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/XJCCMInfoFactory.java
diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMClassRefOrigin.java b/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMClassRefOrigin.java
diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementInfoOrigin.java b/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementInfoOrigin.java
diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementOrigin.java b/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementOrigin.java
diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementTypeRefOrigin.java b/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementTypeRefOrigin.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`	`1`	`package org.jvnet.jaxb2_commons.xml.bind.model;`
`2`	`2`
`3`		`-public interface MClassRef<T, C extends T> extends MClassTypeInfo<T, C> {`
	`3`	`+import org.jvnet.jaxb2_commons.xml.bind.model.origin.MClassRefOrigin;`
	`4`	`+`
	`5`	`+public interface MClassRef<T, C extends T> extends`
	`6`	`+ MClassTypeInfo<T, C, MClassRefOrigin> {`
`4`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public interface MEnumLeafInfo<T, C extends T> extends MPackagedTypeInfo<T, C>,`
`22`	`22`
`23`	`23`	`public QName getElementName();`
`24`	`24`
`25`		`- public MElementInfo<T, C> createElementInfo(MTypeInfo<T, C> scope,`
	`25`	`+ public MElementInfo<T, C> createElementInfo(MClassInfo<T, C> scope,`
`26`	`26`	`QName substitutionHead);`
`27`	`27`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,10 @@ public CMInfoFactory(TIS typeInfoSet) {`
`110`	`110`	`this.typeInfoSet = typeInfoSet;`
`111`	`111`
`112`	`112`	`}`
	`113`	`+`
	`114`	`+ public TIS getTypeInfoSet() {`
	`115`	`+ return typeInfoSet;`
	`116`	`+ }`
`113`	`117`
`114`	`118`	`public MModelInfo<T, C> createModel() {`
`115`	`119`	`final CMModel<T, C> model = new CMModel<T, C>(`
`@@ -309,7 +313,7 @@ private void populateClassInfo(CI info, MClassInfo<T, C> classInfo) {`
`309`	`313`	`}`
`310`	`314`	`}`
`311`	`315`
`312`		`- protected MClassTypeInfo<T, C> createBaseTypeInfo(CI info) {`
	`316`	`+ protected MClassTypeInfo<T, C, ?> createBaseTypeInfo(CI info) {`
`313`	`317`	`return info.getBaseClass() == null ? null : getTypeInfo((CI) info`
`314`	`318`	`.getBaseClass());`
`315`	`319`	`}`
`@@ -601,7 +605,7 @@ protected MElementOrigin createElementOrigin(E info) {`
`601`	`605`	`return new CMElementOrigin<T, C, E>(info);`
`602`	`606`	`}`
`603`	`607`
`604`		`- private MElementTypeRefOrigin createElementTypeRefOrigin(EPI ep,`
	`608`	`+ protected MElementTypeRefOrigin createElementTypeRefOrigin(EPI ep,`
`605`	`609`	`TR typeRef) {`
`606`	`610`	`return new CMElementTypeRefOrigin<T, C, EPI, TR>(ep, typeRef);`
`607`	`611`	`}`