You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by ra...@apache.org on 2005/05/02 23:35:24 UTC
svn commit: r165700 - in /xmlbeans/trunk: external/lib/oldxbean.jar
src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java
src/xmlpublic/org/apache/xmlbeans/XmlOptions.java
src/xmlpublic/org/apache/xmlbeans/message.properties
Author: radup
Date: Mon May 2 14:35:19 2005
New Revision: 165700
URL: http://svn.apache.org/viewcvs?rev=165700&view=rev
Log:
Fixed issues http://issues.apache.org/jira/browse/XMLBEANS-125, http://issues.apache.org/jira/browse/XMLBEANS-118
Modified:
xmlbeans/trunk/external/lib/oldxbean.jar
xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlOptions.java
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/message.properties
Modified: xmlbeans/trunk/external/lib/oldxbean.jar
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/external/lib/oldxbean.jar?rev=165700&r1=165699&r2=165700&view=diff
==============================================================================
Binary files - no diff available.
Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java?rev=165700&r1=165699&r2=165700&view=diff
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java (original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java Mon May 2 14:35:19 2005
@@ -899,9 +899,9 @@
}
sghead = sghead.substitutionGroup();
}
+ */
if (type == null)
return BuiltinSchemaTypeSystem.ST_NO_TYPE;
- */
}
}
@@ -2346,18 +2346,16 @@
private static void computeWildcardSet(SchemaParticle model, QNameSetBuilder result)
{
+ if (model.getParticleType() == SchemaParticle.WILDCARD)
+ {
+ QNameSet cws = model.getWildcardSet();
+ result.addAll(cws);
+ return;
+ }
for (int i = 0; i < model.countOfParticleChild(); i++)
{
SchemaParticle child = model.getParticleChild(i);
- if (child.getParticleType()==SchemaParticle.WILDCARD)
- {
- QNameSet cws = child.getWildcardSet();
- result.addAll(cws);
- }
- else
- {
- computeWildcardSet(child, result);
- }
+ computeWildcardSet(child, result);
}
}
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlOptions.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlOptions.java?rev=165700&r1=165699&r2=165700&view=diff
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlOptions.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlOptions.java Mon May 2 14:35:19 2005
@@ -42,6 +42,43 @@
* System.out.println(xobj.xmlText(
* new XmlOptions().setSavePrettyPrint().setSavePrettyPrintIndent(4)));
* </pre>
+ *
+ * Table showing where each option gets used.
+ * Note that:
+ * <ul>
+ * <li>options available for <code>newInstance</code> methods will also
+ * apply for <code>parse</code> methods</li>
+ * <li>options used for <code>validate</code> methods are also used for
+ * <code>compile</code> methods, since compilation usually implies
+ * validation against Schema for Schemas</li>
+ * </ul>
+ *
+ * <table border="1">
+ * <tr>
+ * <th align="center"><code>newInstance</code> methods</th>
+ * <th align="center"><code>parse</code> methods</th>
+ * <th align="center"><code>validate</code> methods</th>
+ * <th align="center"><code>compile</code> methods</th>
+ * <th align="center"><code>save</code> and <code>xmlText</code>methods</th>
+ * </tr>
+ * <tr>
+ * <td align="center"><code>setDocumentType</code><br/>
+ * <code>setDocumentSourceName</code><br/>
+ * <code>setValidateOnSet</code><br/>
+ * <code>setUnsynchronized</code></td>
+ * <td align="center"><code>setLoad***</code><br/>
+ * <code>setEntityResolver</code></td>
+ * <td align="center"><code>setErrorListener</code><br/>
+ * <code>setValidateTreatLaxAsSkip</code></td>
+ * <td align="center"><code>setErrorListener</code><br/>
+ * <code>setCompile***</code><br/>
+ * <code>setEntityResolver</code><br/>
+ * <code>setGenerateJavaVersion</code></td>
+ * <td align="center"><code>setSave***</code><br/>
+ * <code>setUseDefaultNamespace</code><br/>
+ * <code>setCharacterEncoding</code></td>
+ * </tr>
+ * </table>
*/
public class XmlOptions implements java.io.Serializable
{
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/message.properties
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/message.properties?rev=165700&r1=165699&r2=165700&view=diff
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/message.properties (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/message.properties Mon May 2 14:35:19 2005
@@ -91,7 +91,7 @@
Element not allowed: {0}
cvc-complex-type.2.4c = \
-Expected {0,choice,1#element|1<elements} ''{1}'' at the end of the content
+Expected {0,choice,1#element|1<elements} ''{1}'' before the end of the content
cvc-complex-type.2.4d = \
Expected element(s)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org