You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jaxme-dev@ws.apache.org by jo...@apache.org on 2004/09/15 20:19:40 UTC
cvs commit: ws-jaxme/src/xs/org/apache/ws/jaxme/xs/impl XSElementImpl.java
jochen 2004/09/15 11:19:40
Modified: src/xs/org/apache/ws/jaxme/xs XSElement.java
. status.xml
src/xs/org/apache/ws/jaxme/xs/impl XSElementImpl.java
Log:
Added XSElement.isNillable()
PR: JAXME-35
Submitted by: Mik Lernout (mik at futurestreet.org)
Revision Changes Path
1.6 +4 -0 ws-jaxme/src/xs/org/apache/ws/jaxme/xs/XSElement.java
Index: XSElement.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/XSElement.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSElement.java 16 Feb 2004 23:39:48 -0000 1.5
+++ XSElement.java 15 Sep 2004 18:19:40 -0000 1.6
@@ -31,6 +31,10 @@
/** <p>Returns whether the element is global or not.</p>
*/
public boolean isGlobal();
+
+ /** <p>Returns whether the element is nillable or not.</p>
+ */
+ public boolean isNillable();
/** <p>Returns the elements name. Note that, unlike types,
* an element always has a name.</p>
1.31 +6 -1 ws-jaxme/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/ws-jaxme/status.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- status.xml 13 Sep 2004 18:49:31 -0000 1.30
+++ status.xml 15 Sep 2004 18:19:40 -0000 1.31
@@ -44,7 +44,12 @@
<action dev="JW" type="fix">
An empty complex type with value true for the mixed attribute
is now exposed as content type "mixed", and not "empty".
- (Mik Lernot, mik at futurestreet.org)
+ (Mik Lernout, mik at futurestreet.org)
+ </action>
+ <action dev="JW" type="fix">
+ An empty complex type with value true for the mixed attribute
+ is now exposed as content type "mixed", and not "empty".
+ (Mik Lernout, mik at futurestreet.org)
</action>
</release>
<release version="0.3.1" date="2004-Sep-03">
1.8 +9 -0 ws-jaxme/src/xs/org/apache/ws/jaxme/xs/impl/XSElementImpl.java
Index: XSElementImpl.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/impl/XSElementImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XSElementImpl.java 27 Aug 2004 00:48:49 -0000 1.7
+++ XSElementImpl.java 15 Sep 2004 18:19:40 -0000 1.8
@@ -57,6 +57,7 @@
private final boolean isGlobal;
private XSAnnotation[] annotations;
private boolean isValidated;
+ private boolean isNillable;
private XSType type;
private XSGroup substitutionGroup;
private XSIdentityConstraint[] identityConstraints;
@@ -119,6 +120,7 @@
name = qName;
isGlobal = isReference() || (pBaseElement instanceof XsTTopLevelElement);
+ isNillable = pBaseElement.getNillable();
annotations = getXSSchema().getXSObjectFactory().newXSAnnotations(
this,
@@ -129,6 +131,10 @@
public boolean isGlobal() {
return isGlobal;
}
+
+ public boolean isNillable() {
+ return isNillable;
+ }
public XsQName getName() {
return name;
@@ -160,7 +166,9 @@
getLocator());
}
element.validate();
+ isNillable = element.isNillable();
myType = element.getType();
+
} else {
XsTElement element = getXsTElement();
if (isInnerSimpleType()) {
@@ -181,6 +189,7 @@
}
}
this.type = myType;
+
myType.validate();
validateAllIn( annotations );
---------------------------------------------------------------------
To unsubscribe, e-mail: jaxme-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: jaxme-dev-help@ws.apache.org