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 2007/01/20 21:40:07 UTC
svn commit: r498163 - in /webservices/jaxme/branches/b0_5:
src/xs/org/apache/ws/jaxme/xs/xml/XsBlockSet.java
src/xs/org/apache/ws/jaxme/xs/xml/impl/XsESchemaImpl.java status.xml
Author: jochen
Date: Sat Jan 20 12:40:06 2007
New Revision: 498163
URL: http://svn.apache.org/viewvc?view=rev&rev=498163
Log:
The "blockDefaults" handling has been inverted.
Submitted-by: Brian Uri, buri@fgm.com
Modified:
webservices/jaxme/branches/b0_5/src/xs/org/apache/ws/jaxme/xs/xml/XsBlockSet.java
webservices/jaxme/branches/b0_5/src/xs/org/apache/ws/jaxme/xs/xml/impl/XsESchemaImpl.java
webservices/jaxme/branches/b0_5/status.xml
Modified: webservices/jaxme/branches/b0_5/src/xs/org/apache/ws/jaxme/xs/xml/XsBlockSet.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/src/xs/org/apache/ws/jaxme/xs/xml/XsBlockSet.java?view=diff&rev=498163&r1=498162&r2=498163
==============================================================================
--- webservices/jaxme/branches/b0_5/src/xs/org/apache/ws/jaxme/xs/xml/XsBlockSet.java (original)
+++ webservices/jaxme/branches/b0_5/src/xs/org/apache/ws/jaxme/xs/xml/XsBlockSet.java Sat Jan 20 12:40:06 2007
@@ -105,18 +105,21 @@
*/
public XsBlockSet(String pValue) {
if ("#all".equals(pValue)) {
+ setExtensionAllowed(false);
+ setRestrictionAllowed(false);
+ setSubstitutionAllowed(false);
+ } else {
setExtensionAllowed(true);
setRestrictionAllowed(true);
setSubstitutionAllowed(true);
- } else {
for (StringTokenizer st = new StringTokenizer(pValue, " "); st.hasMoreTokens(); ) {
String s = st.nextToken();
if ("extension".equals(s)) {
- setExtensionAllowed(true);
+ setExtensionAllowed(false);
} else if ("restriction".equals(s)) {
- setRestrictionAllowed(true);
+ setRestrictionAllowed(false);
} else if ("substitution".equals(s)) {
- setSubstitutionAllowed(true);
+ setSubstitutionAllowed(false);
} else {
throw new IllegalArgumentException("Invalid block set value: " + pValue + "; the token " + s + " did not resolve to either of 'extension', 'restriction', or 'substitution'.");
}
Modified: webservices/jaxme/branches/b0_5/src/xs/org/apache/ws/jaxme/xs/xml/impl/XsESchemaImpl.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/src/xs/org/apache/ws/jaxme/xs/xml/impl/XsESchemaImpl.java?view=diff&rev=498163&r1=498162&r2=498163
==============================================================================
--- webservices/jaxme/branches/b0_5/src/xs/org/apache/ws/jaxme/xs/xml/impl/XsESchemaImpl.java (original)
+++ webservices/jaxme/branches/b0_5/src/xs/org/apache/ws/jaxme/xs/xml/impl/XsESchemaImpl.java Sat Jan 20 12:40:06 2007
@@ -116,7 +116,7 @@
private String targetNamespacePrefix;
private XsToken version;
private XsDerivationSet finalDefault = new XsDerivationSet("");
- private XsBlockSet blockDefault = new XsBlockSet("#all");
+ private XsBlockSet blockDefault = new XsBlockSet("");
private XsFormChoice attributeFormDefault = XsFormChoice.UNQUALIFIED;
private XsFormChoice elementFormDefault = XsFormChoice.UNQUALIFIED;
private XsID id;
Modified: webservices/jaxme/branches/b0_5/status.xml
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/status.xml?view=diff&rev=498163&r1=498162&r2=498163
==============================================================================
--- webservices/jaxme/branches/b0_5/status.xml (original)
+++ webservices/jaxme/branches/b0_5/status.xml Sat Jan 20 12:40:06 2007
@@ -49,6 +49,10 @@
"extends C1, C2, ...".
(Andreas Neumann, Andreas.Neumann@arvato-mobile.de, JAXME-89)
</action>
+ <action dev="JW" type="fix" context="xs">
+ The "blockDefaults" handling has been inverted.
+ (Brian Uri, buri@fgm.com)
+ </action>
</release>
<release version="0.5.2" date="25-Oct-2006">
<action dev="JW" type="enhancement" context="generator">
---------------------------------------------------------------------
To unsubscribe, e-mail: jaxme-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: jaxme-dev-help@ws.apache.org