You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mu...@apache.org on 2010/07/31 14:00:38 UTC
svn commit: r981040 -
/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/SchemaDOMParser.java
Author: mukulg
Date: Sat Jul 31 12:00:38 2010
New Revision: 981040
URL: http://svn.apache.org/viewvc?rev=981040&view=rev
Log:
doing few improvements to comments and formatting
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/SchemaDOMParser.java
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/SchemaDOMParser.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/SchemaDOMParser.java?rev=981040&r1=981039&r2=981040&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/SchemaDOMParser.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/SchemaDOMParser.java Sat Jul 31 12:00:38 2010
@@ -243,7 +243,7 @@ public class SchemaDOMParser extends Def
fDepth++;
// conditional inclusion
- // We ignore descendants if parent is being ignored (mismatch of version supported)
+ // We ignore descendants if parent is being ignored
if (fPerformConditionalInclusion) {
if (fIgnoreDepth > -1) {
fIgnoreDepth++;
@@ -687,7 +687,7 @@ public class SchemaDOMParser extends Def
typeAvailableList,
Constants.IS_TYPE,
Constants.TYPE_AND_FACET_AVAILABILITY);
- boolean typeUnAvlAllowsIgnore = (typeUnavailableList == null) ? false :
+ boolean typeUnavlAllowsIgnore = (typeUnavailableList == null) ? false :
typeAndFacetAvailableAllowsExclude(
typeUnavailableList,
Constants.IS_TYPE,
@@ -703,7 +703,7 @@ public class SchemaDOMParser extends Def
Constants.IS_FACET,
Constants.TYPE_AND_FACET_UNAVAILABILITY);
- if (minMaxSchemaVerAllowsIgnore || typeAvlAllowsIgnore || typeUnAvlAllowsIgnore |
+ if (minMaxSchemaVerAllowsIgnore || typeAvlAllowsIgnore || typeUnavlAllowsIgnore |
facetAvlAllowsIgnore || facetUnavlAllowsIgnore) {
ignoreSchemaComponent = true;
}
@@ -770,13 +770,14 @@ public class SchemaDOMParser extends Def
short typeOrFacet,
short availaibilityUnavlCheck) {
- // either of the following boolean values should be returned from this
+ // either of the following boolean values would be returned from this
// method, depending on whether availability or unavailability check is
// asked for.
boolean typeOrFacetAvlAllowsIgnore = false;
boolean typeOrFacetUnavlAllowsIgnore = true;
- for (Iterator iter = typeOrFacetList.iterator(); iter.hasNext(); ) {
+ // iterate all the items of type/facet list
+ for (Iterator iter = typeOrFacetList.iterator(); iter.hasNext(); ) {
String typeOrFacetRawValue = (String) iter.next();
String typeOrFacetLocalName = null;
String typeOrFacetUri = null;
@@ -822,8 +823,9 @@ public class SchemaDOMParser extends Def
typeOrFacetUnavlAllowsIgnore = false;
break;
}
- }
- }
+ }
+
+ } // end of list iteration
if (availaibilityUnavlCheck == Constants.TYPE_AND_FACET_AVAILABILITY) {
if (typeOrFacetAvlAllowsIgnore) {
@@ -859,6 +861,7 @@ public class SchemaDOMParser extends Def
return tokenizedList;
} // tokenizeString
+
/**
* A simple boolean based stack.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org