Skip to content

Commit 39ad9e3

Browse files
highsourcehighsource
committed
1 parent b64a89b commit 39ad9e3

23 files changed

+230
-53
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package org.jvnet.jaxb2_commons.xml.bind.model;
2+
3+
import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementOrigin;
4+
5+
public interface MElement<T, C extends T> extends
6+
MElementTypeInfo<T, C, MElementOrigin> {
7+
8+
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementInfoOrigin;
66
import org.jvnet.jaxb2_commons.xml.bind.model.origin.MOriginated;
77

8-
public interface MElementInfo<T, C extends T> extends MElementTypeInfo<T, C>, MPackaged,
9-
MOriginated<MElementInfoOrigin>, MContained, MContainer {
8+
public interface MElementInfo<T, C extends T> extends
9+
MElementTypeInfo<T, C, MElementInfoOrigin>, MPackaged, MContained,
10+
MContainer {
1011

1112
public QName getElementName();
1213

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package org.jvnet.jaxb2_commons.xml.bind.model;
22

3+
import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin;
4+
35
public interface MElementPropertyInfo<T, C extends T> extends MPropertyInfo<T, C>,
4-
MWrappable, MElementTypeInfo<T, C> {
6+
MWrappable, MElementTypeInfo<T, C, MPropertyInfoOrigin> {
57

68
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package org.jvnet.jaxb2_commons.xml.bind.model;
22

3+
import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin;
4+
35
public interface MElementRefPropertyInfo<T, C extends T> extends MPropertyInfo<T, C>,
4-
MMixable, MWrappable, MWildcard, MElementTypeInfo<T, C> {
6+
MMixable, MWrappable, MWildcard, MElementTypeInfo<T, C, MPropertyInfoOrigin> {
57

68
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package org.jvnet.jaxb2_commons.xml.bind.model;
22

3+
import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementOrigin;
34

4-
public interface MElementRefsPropertyInfo<T, C extends T> extends MPropertyInfo<T, C>,
5-
MMixable, MWrappable, MWildcard, MElementTypeInfos<T, C> {
5+
public interface MElementRefsPropertyInfo<T, C extends T> extends
6+
MPropertyInfo<T, C>, MMixable, MWrappable, MWildcard,
7+
MElementTypeInfos<T, C, MElement<T, C>, MElementOrigin> {
68

79
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import javax.xml.namespace.QName;
44

5-
public interface MElementTypeInfo<T, C extends T> extends MTyped<T, C>,
6-
MNillable, MDefaultValue {
5+
import org.jvnet.jaxb2_commons.xml.bind.model.origin.MOriginated;
6+
7+
public interface MElementTypeInfo<T, C extends T, O> extends MTyped<T, C>,
8+
MNillable, MDefaultValue, MOriginated<O> {
79

810
public QName getElementName();
911

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
import java.util.List;
44

5-
public interface MElementTypeInfos<T, C extends T> {
6-
public List<MElementTypeInfo<T, C>> getElementTypeInfos();
5+
public interface MElementTypeInfos<T, C extends T, M extends MElementTypeInfo<T, C, O>, O> {
6+
public List<M> getElementTypeInfos();
77
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package org.jvnet.jaxb2_commons.xml.bind.model;
2+
3+
import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementTypeRefOrigin;
4+
5+
public interface MElementTypeRef<T, C extends T> extends
6+
MElementTypeInfo<T, C, MElementTypeRefOrigin> {
7+
8+
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package org.jvnet.jaxb2_commons.xml.bind.model;
22

3+
import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementTypeRefOrigin;
34

4-
public interface MElementsPropertyInfo<T, C extends T> extends MPropertyInfo<T, C>,
5-
MWrappable, MElementTypeInfos<T, C> {
5+
public interface MElementsPropertyInfo<T, C extends T> extends
6+
MPropertyInfo<T, C>, MWrappable,
7+
MElementTypeInfos<T, C, MElementTypeRef<T, C>, MElementTypeRefOrigin> {
68

79
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import javax.xml.namespace.QName;
44

5+
import org.jvnet.jaxb2_commons.xml.bind.model.origin.MOriginated;
6+
57
public interface MTypeInfo<T, C extends T> extends MCustomizable {
68

79
public QName getTypeName();

0 commit comments

Comments
 (0)