Author: mrglavas
Date: Wed Oct 20 03:37:01 2010
New Revision: 1024515
URL: http://svn.apache.org/viewvc?rev=1024515&view=rev
Log:
The values of the open content and schema version fields never change so making
them final.
Modified:
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/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/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=1024515&r1=1024514&r2=1024515&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
Wed Oct 20 03:37:01 2010
@@ -54,7 +54,7 @@ public class XSAllCM implements XSCMVali
private final boolean fIsOptionalElement[];
private final boolean fHasOptionalContent;
private int fNumElements = 0;
- private short fSchemaVersion;
+ private final short fSchemaVersion;
//
// Constructors
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=1024515&r1=1024514&r2=1024515&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
Wed Oct 20 03:37:01 2010
@@ -130,12 +130,12 @@ public class XSDFACM
/**
* The open content model
*/
- private XSOpenContentDecl fOpenContent = null;
+ private final XSOpenContentDecl fOpenContent;
/**
* The XML Schema version
*/
- private short fSchemaVersion;
+ private final short fSchemaVersion;
/**
* Array containing occurrence information for looping states
@@ -1339,6 +1339,7 @@ public class XSDFACM
if (openContent == null) {
fNumTotal = 0;
fTransTable[0] = new int[0];
+ fOpenContent = null;
}
else {
fWildcards = new XSWildcardDecl[]{openContent.fWildcard};
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=1024515&r1=1024514&r2=1024515&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
Wed Oct 20 03:37:01 2010
@@ -53,14 +53,15 @@ public class XSEmptyCM implements XSCMVa
//
// Data
//
- private XSOpenContentDecl fOpenContent = null;
+ private final XSOpenContentDecl fOpenContent;
//
// Constructors
//
// Only one instance of an XSEmptyCM with no openContent will be created.
- public XSEmptyCM(){
+ public XSEmptyCM() {
+ fOpenContent = null;
}
// This constructor will be called when the complexType is empty but
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
