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/04/12 01:44:34 UTC

svn commit: r160985 - xmlbeans/branches/1.x/src/typeimpl/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java

Author: radup
Date: Mon Apr 11 16:44:34 2005
New Revision: 160985

URL: http://svn.apache.org/viewcvs?view=rev&rev=160985
Log:
Integ r155831 into the V1 branch, second try.

Modified:
    xmlbeans/branches/1.x/src/typeimpl/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java

Modified: xmlbeans/branches/1.x/src/typeimpl/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java
URL: http://svn.apache.org/viewcvs/xmlbeans/branches/1.x/src/typeimpl/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java?view=diff&r1=160984&r2=160985
==============================================================================
--- xmlbeans/branches/1.x/src/typeimpl/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java (original)
+++ xmlbeans/branches/1.x/src/typeimpl/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java Mon Apr 11 16:44:34 2005
@@ -772,7 +772,7 @@
                         {
                             // note: this guarantees that the limit is a valid number in the
                             // base data type!!
-                            state.error("Must be valid value in base type" + e.getMessage(), XmlErrorContext.FACET_VALUE_MALFORMED, facet);
+                            state.error("Must be valid value in base type: " + e.getMessage(), XmlErrorContext.FACET_VALUE_MALFORMED, facet);
 
                             // BUGBUG: if there are actual schemas that redefine min/maxExclusive,
                             // they will need this rule relaxed for them!!
@@ -818,13 +818,13 @@
                         XmlObject enumval;
                         try
                         {
-                            enumval = baseImpl.newValue(facet.getValue());
+                            enumval = baseImpl.newValue(facet.getValue(), true);
                             // enumval.set(facet.getValue());
                             // ((XmlObjectBase)enumval).setImmutable();
                         }
                         catch (XmlValueOutOfRangeException e)
                         {
-                            state.error("Enumerated value invalid in base type", XmlErrorContext.FACET_VALUE_MALFORMED, facet);
+                            state.error("Enumerated value invalid in base type: " + e.getMessage(), XmlErrorContext.FACET_VALUE_MALFORMED, facet);
                             continue;
                         }
                         if (enumeratedValues == null)



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org