svn commit: r1479074 - in /xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs: XMLSchemaValidator.java XSDTypeAlternativeValidator.java

[mukulg]

Author: mukulg
Date: Sat May  4 11:02:02 2013
New Revision: 1479074

URL: http://svn.apache.org/r1479074
Log:
committing a minor change, similar to the previous commit

Modified:
    
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
    
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSDTypeAlternativeValidator.java

Modified: 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
URL: 
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java?rev=1479074&r1=1479073&r2=1479074&view=diff
==============================================================================
--- 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
 (original)
+++ 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
 Sat May  4 11:02:02 2013
@@ -5139,16 +5139,24 @@ public class XMLSchemaValidator
         return fIsAssertProcessingNeededForSTUnionElem;
     }
 
-    void setIsAssertProcessingNeededForSTUnionElem(boolean 
fIsAssertProcessingNeededForSTUnionElem) {
-        this.fIsAssertProcessingNeededForSTUnionElem = 
fIsAssertProcessingNeededForSTUnionElem;
+    void setIsAssertProcessingNeededForSTUnionElem(boolean 
isAssertProcessingNeededForSTUnionElem) {
+        this.fIsAssertProcessingNeededForSTUnionElem = 
isAssertProcessingNeededForSTUnionElem;
     }
 
     List getIsAssertProcessingNeededForSTUnionAttrs() {
         return fIsAssertProcessingNeededForSTUnionAttrs;
     }
 
-    void setIsAssertProcessingNeededForSTUnionAttrs(List 
fIsAssertProcessingNeededForSTUnionAttrs) {
-        this.fIsAssertProcessingNeededForSTUnionAttrs = 
fIsAssertProcessingNeededForSTUnionAttrs;
+    void setIsAssertProcessingNeededForSTUnionAttrs(List 
isAssertProcessingNeededForSTUnionAttrs) {
+        this.fIsAssertProcessingNeededForSTUnionAttrs = 
isAssertProcessingNeededForSTUnionAttrs;
+    }
+    
+    Vector getInheritableAttrList() {
+        return fInheritableAttrList;
+    }
+
+    void setInheritableAttrList(Vector inheritableAttrList) {
+        this.fInheritableAttrList = inheritableAttrList;
     }
     
 } // class XMLSchemaValidator

Modified: 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSDTypeAlternativeValidator.java
URL: 
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSDTypeAlternativeValidator.java?rev=1479074&r1=1479073&r2=1479074&view=diff
==============================================================================
--- 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSDTypeAlternativeValidator.java
 (original)
+++ 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSDTypeAlternativeValidator.java
 Sat May  4 11:02:02 2013
@@ -149,7 +149,7 @@ public class XSDTypeAlternativeValidator
                     XSAttributeDeclaration attrDecl = (XSAttributeDeclaration) 
attrUse.getAttrDeclaration();
                     Augmentations attrAugs = 
attributes.getAugmentations(attrDecl.getNamespace(), attrDecl.getName());
                     if (attrAugs != null) {
-                        
fXmlSchemaValidator.fInheritableAttrList.add((AttributePSVI)attrAugs.getItem(Constants.ATTRIBUTE_PSVI));
+                        
(fXmlSchemaValidator.getInheritableAttrList()).add((AttributePSVI)attrAugs.getItem(Constants.ATTRIBUTE_PSVI));
                     }
                 }
             }                      
@@ -163,11 +163,12 @@ public class XSDTypeAlternativeValidator
     ObjectList getInheritedAttributesForPSVI() {
         
         ObjectList inheritedAttributesList = null;
+        Vector inheritableAttrList = 
fXmlSchemaValidator.getInheritableAttrList();
         
-        if (fXmlSchemaValidator.fInheritableAttrList.size() > 0) {
-            Object[] inheritedAttributesArray = new 
Object[fXmlSchemaValidator.fInheritableAttrList.size()]; 
-            for (int inhrAttrIdx = 0; inhrAttrIdx < 
fXmlSchemaValidator.fInheritableAttrList.size(); inhrAttrIdx++) {
-                inheritedAttributesArray[inhrAttrIdx] = 
fXmlSchemaValidator.fInheritableAttrList.get(inhrAttrIdx);  
+        if (inheritableAttrList.size() > 0) {
+            Object[] inheritedAttributesArray = new 
Object[inheritableAttrList.size()]; 
+            for (int inhrAttrIdx = 0; inhrAttrIdx < 
inheritableAttrList.size(); inhrAttrIdx++) {
+                inheritedAttributesArray[inhrAttrIdx] = 
inheritableAttrList.get(inhrAttrIdx);  
             }  
             inheritedAttributesList = new 
ObjectListImpl(inheritedAttributesArray, inheritedAttributesArray.length); 
         } 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@xerces.apache.org
For additional commands, e-mail: commits-h...@xerces.apache.org