xmlbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ce...@apache.org
Subject svn commit: r694227 - in /xmlbeans/trunk/src: store/org/apache/xmlbeans/impl/store/Path.java typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java typeimpl/org/apache/xmlbeans/impl/validator/ValidatingXMLStreamReader.java
Date Thu, 11 Sep 2008 12:43:12 GMT
Author: cezar
Date: Thu Sep 11 05:43:10 2008
New Revision: 694227

URL: http://svn.apache.org/viewvc?rev=694227&view=rev
Log:
Fix for validation bug - no error for required attribute - in streaming validator.
checkintest passes


Modified:
    xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Path.java
    xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
    xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/validator/ValidatingXMLStreamReader.java

Modified: xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Path.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Path.java?rev=694227&r1=694226&r2=694227&view=diff
==============================================================================
--- xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Path.java (original)
+++ xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Path.java Thu Sep 11 05:43:10
2008
@@ -374,7 +374,9 @@
         }
     }
 
-    private static final class XbeanPathEngine extends ExecutionContext implements PathEngine
+    private static final class XbeanPathEngine
+        extends ExecutionContext
+        implements PathEngine
     {
         XbeanPathEngine(XPath xpath, Cur c)
         {
@@ -482,7 +484,8 @@
         private Cur _cur;
     }
 
-    private static final class DelegatePathImpl extends Path
+    private static final class DelegatePathImpl
+        extends Path
     {
         private PathDelegate.SelectPathInterface _xpathImpl;
 
@@ -617,7 +620,5 @@
             private boolean _firstCall = true;
             private long _version;
         }
-
     }
-
 }

Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java?rev=694227&r1=694226&r2=694227&view=diff
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
(original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
Thu Sep 11 05:43:10 2008
@@ -914,7 +914,7 @@
         _name = "schema" + METADATA_PACKAGE_GEN + ".system." + nameForSystem;
         _basePackage = nameToPathString(_name);
         _classloader = null;
-
+        //System.out.println("             _base: " + _basePackage);
     }
 
     public void loadFromBuilder(SchemaGlobalElement[] globalElements,

Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/validator/ValidatingXMLStreamReader.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/validator/ValidatingXMLStreamReader.java?rev=694227&r1=694226&r2=694227&view=diff
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/validator/ValidatingXMLStreamReader.java
(original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/validator/ValidatingXMLStreamReader.java
Thu Sep 11 05:43:10 2008
@@ -539,7 +539,7 @@
     public int next() throws XMLStreamException
     {
         int evType = super.next();
-//        debugEvent(evType);
+        //debugEvent(evType);
 
         validate_event(evType);
 
@@ -779,7 +779,6 @@
     private void addError(String msg)
     {
         String source = null;
-//        Location location = null;
         Location location = getLocation();
 
         if (location != null)
@@ -800,6 +799,7 @@
         {
             validate_attribute(i);
         }
+        _validator.nextEvent(Validator.ENDATTRS, _simpleEvent);
     }
 
     protected void validate_attribute(int attIndex)



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


Mime
View raw message