You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by ce...@apache.org on 2004/08/04 23:51:18 UTC
cvs commit: xml-xmlbeans/v2/src/xmlconfig/org/apache/xmlbeans/impl/config SchemaConfig.java
cezar 2004/08/04 14:51:18
Modified: v2/src/typeimpl/org/apache/xmlbeans/impl/util
XsTypeConverter.java
v2/src/xmlconfig/org/apache/xmlbeans/impl/config
SchemaConfig.java
Log:
Fixed numeral parsing bug, and disable jam warnings.
checkintests pass
Revision Changes Path
1.10 +1 -1 xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/util/XsTypeConverter.java
Index: XsTypeConverter.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/util/XsTypeConverter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XsTypeConverter.java 21 Apr 2004 05:29:41 -0000 1.9
+++ XsTypeConverter.java 4 Aug 2004 21:51:17 -0000 1.10
@@ -670,7 +670,7 @@
if (v < 0)
throw new NumberFormatException("For input string: \"" + ch.toString() + "\"");
- if (result <= limit && v > limit2)
+ if (result < limit || (result==limit && v > limit2))
throw new NumberFormatException("For input string: \"" + ch.toString() + "\"");
result = result * 10 - v;
1.6 +4 -3 xml-xmlbeans/v2/src/xmlconfig/org/apache/xmlbeans/impl/config/SchemaConfig.java
Index: SchemaConfig.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/xmlconfig/org/apache/xmlbeans/impl/config/SchemaConfig.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SchemaConfig.java 12 May 2004 18:44:53 -0000 1.5
+++ SchemaConfig.java 4 Aug 2004 21:51:18 -0000 1.6
@@ -55,12 +55,12 @@
_qnameMap = Collections.EMPTY_MAP;
_extensionHolder = null;
}
-
+
public static SchemaConfig forConfigDocuments(Config[] configs, File[] javaFiles, File[] classpath)
{
return new SchemaConfig(configs, javaFiles, classpath);
}
-
+
private SchemaConfig(Config[] configs, File[] javaFiles, File[] classpath)
{
JamClassLoader jamLoader = getJamLoader(javaFiles, classpath);
@@ -81,7 +81,7 @@
recordNamespaceSetting(nsa[j].getUri(), nsa[j].getPrefix(), _prefixMap);
recordNamespaceSetting(nsa[j].getUri(), nsa[j].getSuffix(), _suffixMap);
}
-
+
Qnameconfig[] qnc = config.getQnameArray();
for (int j = 0; j < qnc.length; j++)
{
@@ -206,6 +206,7 @@
{
JamServiceFactory jf = JamServiceFactory.getInstance();
JamServiceParams params = jf.createServiceParams();
+ params.set14WarningsEnabled(false);
// process the included sources
if (javaFiles!=null)
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org