jochen 2005/05/19 13:30:52
Modified: . Tag: v0_4 status.xml
src/xs/org/apache/ws/jaxme/xs/impl Tag: v0_4 XSTypeImpl.java
Log:
The methods XSSimpleContentImpl.isEmpty(), XSSimpleContentImpl.isMixed(),
and XSSimpleContentImpl.isElementOnly() are no longer throwing an exception,
but return false.
Revision Changes Path
No revision
No revision
1.45.2.8 +7 -0 ws-jaxme/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/ws-jaxme/status.xml,v
retrieving revision 1.45.2.7
retrieving revision 1.45.2.8
diff -u -r1.45.2.7 -r1.45.2.8
--- status.xml 11 May 2005 02:42:25 -0000 1.45.2.7
+++ status.xml 19 May 2005 20:30:52 -0000 1.45.2.8
@@ -32,6 +32,13 @@
<changes>
<release version="0.4" date="Not yet published">
<action dev="JW" type="fix" context="xs">
+ The methods XSSimpleContentImpl.isEmpty(),
+ XSSimpleContentImpl.isMixed(), and
+ XSSimpleContentImpl.isElementOnly() are no longer
+ throwing an exception, but return false.
+ (Daniel Barclay, daniel at fgm.com)
+ </action>
+ <action dev="JW" type="fix" context="xs">
Fixed, that the DTD parser wasn't generating complex
types properly. (Richard Calmbach,
RichardCalmbach at fairisaac.com)
No revision
No revision
1.16.2.2 +10 -7
ws-jaxme/src/xs/org/apache/ws/jaxme/xs/impl/XSTypeImpl.java
Index: XSTypeImpl.java
===================================================================
RCS file:
/home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/impl/XSTypeImpl.java,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -r1.16.2.1 -r1.16.2.2
--- XSTypeImpl.java 18 May 2005 22:20:56 -0000 1.16.2.1
+++ XSTypeImpl.java 19 May 2005 20:30:52 -0000 1.16.2.2
@@ -54,11 +54,6 @@
protected XsTComplexType getXsTComplexType() { return myComplexType; }
protected XSType getOwner() { return owner; }
- public XsComplexContentType getComplexContentType() {
- throw new IllegalStateException("This complex type (" +
this.getClass().getName() +
- ") doesn't have complex content.");
- }
-
public boolean isSequence() { return false; }
public boolean isChoice() { return false; }
public boolean isAll() { return false; }
@@ -97,7 +92,11 @@
private final XSSimpleContentType simpleContentType;
private final XSAttributable[] attributes;
- public XSSimpleContentImpl(XSType pOwner, XsTComplexType pType,
XsESimpleContent pSimpleContent)
+ public boolean isElementOnly() { return false; }
+ public boolean isEmpty() { return false; }
+ public boolean isMixed() { return false; }
+
+ public XSSimpleContentImpl(XSType pOwner, XsTComplexType pType,
XsESimpleContent pSimpleContent)
throws SAXException {
super(pOwner, pType);
simpleContent = pSimpleContent;
@@ -164,6 +163,10 @@
public XSParticle getParticle() {
throw new IllegalStateException("This complex type doesn't have a
model group particle.");
}
+ public XsComplexContentType getComplexContentType() {
+ throw new IllegalStateException("This complex type (" +
this.getClass().getName() +
+ ") doesn't have complex content.");
+ }
}
public class XSComplexContentImpl extends XSComplexTypeImpl {
@@ -350,7 +353,7 @@
public boolean hasComplexContent() { return true; }
public XsComplexContentType getComplexContentType() {
- return complexContentType == null ? super.getComplexContentType() :
complexContentType;
+ return complexContentType;
}
public XSParticle getParticle() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
