You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mr...@apache.org on 2010/08/05 06:52:39 UTC
svn commit: r982468 - in
/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs: ./
models/
Author: mrglavas
Date: Thu Aug 5 04:52:38 2010
New Revision: 982468
URL: http://svn.apache.org/viewvc?rev=982468&view=rev
Log:
Reorganization before fixing XERCESJ-1463.
Added:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSElementDeclHelper.java
- copied, changed from r982430, xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XCMValidatorHelper.java
Removed:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XCMValidatorHelper.java
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/models/XS11AllCM.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSAllCM.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSCMValidator.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSDFACM.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSEmptyCM.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=982468&r1=982467&r2=982468&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 Thu Aug 5 04:52:38 2010
@@ -51,7 +51,6 @@ import org.apache.xerces.impl.xs.identit
import org.apache.xerces.impl.xs.identity.XPathMatcher;
import org.apache.xerces.impl.xs.models.CMBuilder;
import org.apache.xerces.impl.xs.models.CMNodeFactory;
-import org.apache.xerces.impl.xs.models.XCMValidatorHelper;
import org.apache.xerces.impl.xs.models.XSCMValidator;
import org.apache.xerces.util.AugmentationsImpl;
import org.apache.xerces.util.IntStack;
@@ -113,7 +112,7 @@ import org.xml.sax.SAXNotSupportedExcept
* @version $Id$
*/
public class XMLSchemaValidator
- implements XMLComponent, XMLDocumentFilter, FieldActivator, RevalidationHandler, XCMValidatorHelper {
+ implements XMLComponent, XMLDocumentFilter, FieldActivator, RevalidationHandler, XSElementDeclHelper {
//
// Constants
@@ -1699,7 +1698,7 @@ public class XMLSchemaValidator
matcher.startDocumentFragment();
}
- // Implements XCMValidatorHelper interface
+ // Implements XSElementDeclHelper interface
public XSElementDecl getGlobalElementDecl(QName element) {
final SchemaGrammar sGrammar =
findSchemaGrammar(
Copied: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSElementDeclHelper.java (from r982430, xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XCMValidatorHelper.java)
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSElementDeclHelper.java?p2=xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSElementDeclHelper.java&p1=xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XCMValidatorHelper.java&r1=982430&r2=982468&rev=982468&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XCMValidatorHelper.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSElementDeclHelper.java Thu Aug 5 04:52:38 2010
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.xerces.impl.xs.models;
+package org.apache.xerces.impl.xs;
-import org.apache.xerces.impl.xs.XSElementDecl;
import org.apache.xerces.xni.QName;
/**
@@ -25,7 +24,7 @@ import org.apache.xerces.xni.QName;
*
* @version $Id$
*/
-public interface XCMValidatorHelper {
+public interface XSElementDeclHelper {
public XSElementDecl getGlobalElementDecl(QName element);
}
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XS11AllCM.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XS11AllCM.java?rev=982468&r1=982467&r2=982468&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XS11AllCM.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XS11AllCM.java Thu Aug 5 04:52:38 2010
@@ -24,6 +24,7 @@ import org.apache.xerces.impl.xs.Substit
import org.apache.xerces.impl.xs.XMLSchemaException;
import org.apache.xerces.impl.xs.XSConstraints;
import org.apache.xerces.impl.xs.XSElementDecl;
+import org.apache.xerces.impl.xs.XSElementDeclHelper;
import org.apache.xerces.impl.xs.XSOpenContentDecl;
import org.apache.xerces.impl.xs.XSParticleDecl;
import org.apache.xerces.impl.xs.XSWildcardDecl;
@@ -150,12 +151,12 @@ public class XS11AllCM implements XSCMVa
private boolean allowExpandedName(XSWildcardDecl wildcard,
QName curElem,
SubstitutionGroupHandler subGroupHandler,
- XCMValidatorHelper xcmHelper) {
+ XSElementDeclHelper eDeclHelper) {
if (wildcard.allowQName(curElem)) {
if (wildcard.fDisallowedSibling && findMatchingElemDecl(curElem, subGroupHandler) != null) {
return false;
}
- if (wildcard.fDisallowedDefined && xcmHelper.getGlobalElementDecl(curElem) != null) {
+ if (wildcard.fDisallowedDefined && eDeclHelper.getGlobalElementDecl(curElem) != null) {
return false;
}
return true;
@@ -171,7 +172,7 @@ public class XS11AllCM implements XSCMVa
* @return an element decl object
*/
public Object oneTransition (QName elementName, int[] currentState,
- SubstitutionGroupHandler subGroupHandler, XCMValidatorHelper xcmHelper) {
+ SubstitutionGroupHandler subGroupHandler, XSElementDeclHelper eDeclHelper) {
// error state
if (currentState[0] < 0) {
currentState[0] = XSCMValidator.SUBSEQUENT_ERROR;
@@ -180,7 +181,7 @@ public class XS11AllCM implements XSCMVa
// open content - suffix mode
if (currentState[0] == STATE_SUFFIX) {
- if (allowExpandedName(fOpenContent.fWildcard, elementName, subGroupHandler, xcmHelper)) {
+ if (allowExpandedName(fOpenContent.fWildcard, elementName, subGroupHandler, eDeclHelper)) {
return fOpenContent;
}
else { // error
@@ -210,7 +211,7 @@ public class XS11AllCM implements XSCMVa
if (currentState[i + 1] == fDeclsOccurs[declMaxOccurs]) {
continue;
}
- if (allowExpandedName((XSWildcardDecl)fAllDecls[i], elementName, subGroupHandler, xcmHelper)) {
+ if (allowExpandedName((XSWildcardDecl)fAllDecls[i], elementName, subGroupHandler, eDeclHelper)) {
// found the decl, mark this element as "seen".
++currentState[i + 1];
return fAllDecls[i];
@@ -228,7 +229,7 @@ public class XS11AllCM implements XSCMVa
return findMatchingDecl(elementName, subGroupHandler);
}
}
- if (allowExpandedName(fOpenContent.fWildcard, elementName, subGroupHandler, xcmHelper)) {
+ if (allowExpandedName(fOpenContent.fWildcard, elementName, subGroupHandler, eDeclHelper)) {
//if (fOpenContent.fWildcard.allowQName(elementName)) {
return fOpenContent;
}
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSAllCM.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSAllCM.java?rev=982468&r1=982467&r2=982468&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSAllCM.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSAllCM.java Thu Aug 5 04:52:38 2010
@@ -23,6 +23,7 @@ import org.apache.xerces.impl.xs.Substit
import org.apache.xerces.impl.xs.XMLSchemaException;
import org.apache.xerces.impl.xs.XSConstraints;
import org.apache.xerces.impl.xs.XSElementDecl;
+import org.apache.xerces.impl.xs.XSElementDeclHelper;
import org.apache.xerces.xni.QName;
/**
@@ -113,7 +114,7 @@ public class XSAllCM implements XSCMVali
* @param currentState Current state
* @return an element decl object
*/
- public Object oneTransition (QName elementName, int[] currentState, SubstitutionGroupHandler subGroupHandler, XCMValidatorHelper xcmHelper) {
+ public Object oneTransition (QName elementName, int[] currentState, SubstitutionGroupHandler subGroupHandler, XSElementDeclHelper eDeclHelper) {
// error state
if (currentState[0] < 0) {
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSCMValidator.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSCMValidator.java?rev=982468&r1=982467&r2=982468&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSCMValidator.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSCMValidator.java Thu Aug 5 04:52:38 2010
@@ -22,6 +22,7 @@ import java.util.Vector;
import org.apache.xerces.impl.xs.SubstitutionGroupHandler;
import org.apache.xerces.impl.xs.XMLSchemaException;
import org.apache.xerces.impl.xs.XSConstraints;
+import org.apache.xerces.impl.xs.XSElementDeclHelper;
import org.apache.xerces.xni.QName;
/**
@@ -57,11 +58,11 @@ public interface XSCMValidator {
*
* @param elementName
* @param state Current state
- * @param xcmHelper A helper that allows inquiry of global element declarations
+ * @param eDeclHelper A helper that allows inquiry of global element declarations
* @return element decl or wildcard decl that
* corresponds to the element from the Schema grammar
*/
- public Object oneTransition (QName elementName, int[] state, SubstitutionGroupHandler subGroupHandler, XCMValidatorHelper xcmHelper);
+ public Object oneTransition (QName elementName, int[] state, SubstitutionGroupHandler subGroupHandler, XSElementDeclHelper eDeclHelper);
/**
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSDFACM.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSDFACM.java?rev=982468&r1=982467&r2=982468&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSDFACM.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSDFACM.java Thu Aug 5 04:52:38 2010
@@ -28,6 +28,7 @@ import org.apache.xerces.impl.xs.Substit
import org.apache.xerces.impl.xs.XMLSchemaException;
import org.apache.xerces.impl.xs.XSConstraints;
import org.apache.xerces.impl.xs.XSElementDecl;
+import org.apache.xerces.impl.xs.XSElementDeclHelper;
import org.apache.xerces.impl.xs.XSModelGroupImpl;
import org.apache.xerces.impl.xs.XSOpenContentDecl;
import org.apache.xerces.impl.xs.XSParticleDecl;
@@ -268,7 +269,7 @@ public class XSDFACM
*
* @exception RuntimeException thrown on error
*/
- public Object oneTransition(QName curElem, int[] state, SubstitutionGroupHandler subGroupHandler, XCMValidatorHelper xcmHelper) {
+ public Object oneTransition(QName curElem, int[] state, SubstitutionGroupHandler subGroupHandler, XSElementDeclHelper eDeclHelper) {
int curState = state[0];
if(curState == XSCMValidator.FIRST_ERROR || curState == XSCMValidator.SUBSEQUENT_ERROR) {
@@ -282,7 +283,7 @@ public class XSDFACM
}
// apply open content - suffix mode
else if (state[3] == STATE_SUFFIX) {
- if (allowExpandedName(fOpenContent.fWildcard, curElem, subGroupHandler, xcmHelper)) {//if (fOpenContent.fWildcard.allowQName(curElem)) {
+ if (allowExpandedName(fOpenContent.fWildcard, curElem, subGroupHandler, eDeclHelper)) {//if (fOpenContent.fWildcard.allowQName(curElem)) {
return fOpenContent;
}
@@ -316,7 +317,7 @@ public class XSDFACM
}
}
// XML Schema 1.1
- else if (allowExpandedName((XSWildcardDecl)fElemMap[elemIndex], curElem, subGroupHandler, xcmHelper)) {
+ else if (allowExpandedName((XSWildcardDecl)fElemMap[elemIndex], curElem, subGroupHandler, eDeclHelper)) {
matchingDecl = fElemMap[elemIndex];
// Element has precedence over a wildcard
// if no occurences or we reached minOccurs, keep looking for
@@ -355,7 +356,7 @@ public class XSDFACM
if (matchingDecl == null) {
// XML Schema 1.1
// Validate against Open Content
- if (fOpenContent != null && matchOpenContentModel(curElem, state, subGroupHandler, curState, xcmHelper)) {
+ if (fOpenContent != null && matchOpenContentModel(curElem, state, subGroupHandler, curState, eDeclHelper)) {
return fOpenContent;
}
@@ -394,7 +395,7 @@ public class XSDFACM
// we've already seen enough instances of the first "foo" perhaps there is
// another element declaration or wildcard deeper in the element map which
// matches.
- return findMatchingDecl(curElem, state, subGroupHandler, elemIndex, xcmHelper);
+ return findMatchingDecl(curElem, state, subGroupHandler, elemIndex, eDeclHelper);
}
}
else if (state[2] < o.minOccurs) {
@@ -449,7 +450,7 @@ public class XSDFACM
return null;
} // findMatchingDecl(QName, SubstitutionGroupHandler): Object
- Object findMatchingDecl(QName curElem, int[] state, SubstitutionGroupHandler subGroupHandler, int elemIndex, XCMValidatorHelper xcmHelper) {
+ Object findMatchingDecl(QName curElem, int[] state, SubstitutionGroupHandler subGroupHandler, int elemIndex, XSElementDeclHelper eDeclHelper) {
int curState = state[0];
int nextState = 0;
@@ -476,7 +477,7 @@ public class XSDFACM
}
}
// XML Schema 1.1
- else if (allowExpandedName((XSWildcardDecl)fElemMap[elemIndex], curElem, subGroupHandler, xcmHelper)) {
+ else if (allowExpandedName((XSWildcardDecl)fElemMap[elemIndex], curElem, subGroupHandler, eDeclHelper)) {
matchingDecl = fElemMap[elemIndex];
// Element has precedence over a wildcard
// if no occurences or we reached minOccurs, keep looking for
@@ -513,7 +514,7 @@ public class XSDFACM
if (matchingDecl == null) {
// XML Schema 1.1
// Validate against Open Content
- if (fOpenContent != null && matchOpenContentModel(curElem, state, subGroupHandler, curState, xcmHelper)) {
+ if (fOpenContent != null && matchOpenContentModel(curElem, state, subGroupHandler, curState, eDeclHelper)) {
return fOpenContent;
}
@@ -548,12 +549,12 @@ public class XSDFACM
return null;
} // findMatchingDecl(QName, SubstitutionGroupHandler): Object
- boolean allowExpandedName(XSWildcardDecl wildcard, QName curElem, SubstitutionGroupHandler subGroupHandler, XCMValidatorHelper xcmHelper) {
+ boolean allowExpandedName(XSWildcardDecl wildcard, QName curElem, SubstitutionGroupHandler subGroupHandler, XSElementDeclHelper eDeclHelper) {
if (wildcard.allowQName(curElem)) {
if (wildcard.fDisallowedSibling && findMatchingElemDecl(curElem, subGroupHandler) != null) {
return false;
}
- if (wildcard.fDisallowedDefined && xcmHelper.getGlobalElementDecl(curElem) != null) {
+ if (wildcard.fDisallowedDefined && eDeclHelper.getGlobalElementDecl(curElem) != null) {
return false;
}
return true;
@@ -561,7 +562,7 @@ public class XSDFACM
return false;
}
- boolean matchOpenContentModel(QName curElem, int[] state, SubstitutionGroupHandler subGroupHandler, int curState, XCMValidatorHelper xcmHelper) {
+ boolean matchOpenContentModel(QName curElem, int[] state, SubstitutionGroupHandler subGroupHandler, int curState, XSElementDeclHelper eDeclHelper) {
// if suffix mode, we should have reached a final state
if (fOpenContent.fMode == XSOpenContentDecl.MODE_SUFFIX) {
if (fFinalStateFlags[curState]) {
@@ -577,7 +578,7 @@ public class XSDFACM
return false;
}
}
- if (allowExpandedName(fOpenContent.fWildcard, curElem, subGroupHandler, xcmHelper)) {
+ if (allowExpandedName(fOpenContent.fWildcard, curElem, subGroupHandler, eDeclHelper)) {
return true;
}
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSEmptyCM.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSEmptyCM.java?rev=982468&r1=982467&r2=982468&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSEmptyCM.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSEmptyCM.java Thu Aug 5 04:52:38 2010
@@ -22,6 +22,7 @@ import java.util.Vector;
import org.apache.xerces.impl.xs.SubstitutionGroupHandler;
import org.apache.xerces.impl.xs.XMLSchemaException;
import org.apache.xerces.impl.xs.XSConstraints;
+import org.apache.xerces.impl.xs.XSElementDeclHelper;
import org.apache.xerces.impl.xs.XSOpenContentDecl;
import org.apache.xerces.impl.xs.XSWildcardDecl;
import org.apache.xerces.xni.QName;
@@ -91,7 +92,7 @@ public class XSEmptyCM implements XSCMVa
* @param subGroupHandler the substitution group handler
* @return element index corresponding to the element from the Schema grammar
*/
- public Object oneTransition (QName elementName, int[] currentState, SubstitutionGroupHandler subGroupHandler, XCMValidatorHelper xcmHelper){
+ public Object oneTransition (QName elementName, int[] currentState, SubstitutionGroupHandler subGroupHandler, XSElementDeclHelper eDeclHelper){
// error state
if (currentState[0] < 0) {
@@ -100,7 +101,7 @@ public class XSEmptyCM implements XSCMVa
}
if (fOpenContent != null) {
- if (allowExpandedName(fOpenContent.fWildcard, elementName, subGroupHandler, xcmHelper)) {
+ if (allowExpandedName(fOpenContent.fWildcard, elementName, subGroupHandler, eDeclHelper)) {
return fOpenContent;
}
}
@@ -169,9 +170,9 @@ public class XSEmptyCM implements XSCMVa
private boolean allowExpandedName(XSWildcardDecl wildcard,
QName curElem,
SubstitutionGroupHandler subGroupHandler,
- XCMValidatorHelper xcmHelper) {
+ XSElementDeclHelper eDeclHelper) {
if (wildcard.allowQName(curElem)) {
- if (wildcard.fDisallowedDefined && xcmHelper.getGlobalElementDecl(curElem) != null) {
+ if (wildcard.fDisallowedDefined && eDeclHelper.getGlobalElementDecl(curElem) != null) {
return false;
}
return true;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org