Author: mrglavas
Date: Sun Sep 2 11:03:20 2007
New Revision: 572057
URL: http://svn.apache.org/viewvc?rev=572057&view=rev
Log:
Marking many fields final.
Modified:
xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMAny.java
xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMBinOp.java
xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMLeaf.java
xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMNode.java
xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMUniOp.java
xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/DFAContentModel.java
xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/MixedContentModel.java
xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/SimpleContentModel.java
Modified: xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMAny.java
URL:
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMAny.java?rev=572057&r1=572056&r2=572057&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMAny.java
(original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMAny.java Sun Sep
2 11:03:20 2007
@@ -38,7 +38,7 @@
* XMLContentSpec.CONTENTSPECNODE_ANY_OTHER,
* XMLContentSpec.CONTENTSPECNODE_ANY_LOCAL.
*/
- private int fType;
+ private final int fType;
/**
* URI of the any content model. This value is set if the type is
@@ -46,7 +46,7 @@
* XMLContentSpec.CONTENTSPECNODE_ANY,
* XMLContentSpec.CONTENTSPECNODE_ANY_OTHER.
*/
- private String fURI;
+ private final String fURI;
/**
* Part of the algorithm to convert a regex directly to a DFA
Modified: xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMBinOp.java
URL:
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMBinOp.java?rev=572057&r1=572056&r2=572057&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMBinOp.java
(original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMBinOp.java Sun
Sep 2 11:03:20 2007
@@ -143,7 +143,7 @@
// These are the references to the two nodes that are on either
// side of this binary operation.
// -------------------------------------------------------------------
- private CMNode fLeftChild;
- private CMNode fRightChild;
+ private final CMNode fLeftChild;
+ private final CMNode fRightChild;
};
Modified: xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMLeaf.java
URL:
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMLeaf.java?rev=572057&r1=572056&r2=572057&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMLeaf.java
(original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMLeaf.java Sun Sep
2 11:03:20 2007
@@ -35,7 +35,7 @@
//
/** This is the element that this leaf represents. */
- private QName fElement = new QName();
+ private final QName fElement = new QName();
/**
* Part of the algorithm to convert a regex directly to a DFA
Modified: xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMNode.java
URL:
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMNode.java?rev=572057&r1=572056&r2=572057&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMNode.java
(original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMNode.java Sun Sep
2 11:03:20 2007
@@ -121,11 +121,11 @@
// init to to -1 so it will cause an error if its used without
// being initialized.
// -------------------------------------------------------------------
- private int fType;
- private CMStateSet fFirstPos = null;
- private CMStateSet fFollowPos = null;
- private CMStateSet fLastPos = null;
- private int fMaxStates = -1;
+ private final int fType;
+ private CMStateSet fFirstPos = null;
+ private CMStateSet fFollowPos = null;
+ private CMStateSet fLastPos = null;
+ private int fMaxStates = -1;
};
Modified: xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMUniOp.java
URL:
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMUniOp.java?rev=572057&r1=572056&r2=572057&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMUniOp.java
(original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/CMUniOp.java Sun
Sep 2 11:03:20 2007
@@ -96,6 +96,6 @@
// This is the reference to the one child that we have for this
// unary operation.
// -------------------------------------------------------------------
- private CMNode fChild;
+ private final CMNode fChild;
};
Modified:
xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/DFAContentModel.java
URL:
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/DFAContentModel.java?rev=572057&r1=572056&r2=572057&view=diff
==============================================================================
---
xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/DFAContentModel.java
(original)
+++
xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/DFAContentModel.java
Sun Sep 2 11:03:20 2007
@@ -175,7 +175,7 @@
// temp variables
/** Temporary qualified name. */
- private QName fQName = new QName();
+ private final QName fQName = new QName();
//
// Constructors
Modified:
xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/MixedContentModel.java
URL:
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/MixedContentModel.java?rev=572057&r1=572056&r2=572057&view=diff
==============================================================================
---
xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/MixedContentModel.java
(original)
+++
xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/MixedContentModel.java
Sun Sep 2 11:03:20 2007
@@ -46,13 +46,13 @@
//
/** The count of possible children that we have to deal with. */
- private int fCount;
+ private final int fCount;
/** The list of possible children that we have to accept. */
- private QName fChildren[];
+ private final QName fChildren[];
/** The type of the children to support ANY. */
- private int fChildrenType[];
+ private final int fChildrenType[];
/* this is the EquivClassComparator object */
//private EquivClassComparator comparator = null;
@@ -61,7 +61,7 @@
* True if mixed content model is ordered. DTD mixed content models
* are <em>always</em> unordered.
*/
- private boolean fOrdered;
+ private final boolean fOrdered;
//
// Constructors
Modified:
xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/SimpleContentModel.java
URL:
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/SimpleContentModel.java?rev=572057&r1=572056&r2=572057&view=diff
==============================================================================
---
xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/SimpleContentModel.java
(original)
+++
xerces/java/trunk/src/org/apache/xerces/impl/dtd/models/SimpleContentModel.java
Sun Sep 2 11:03:20 2007
@@ -68,14 +68,14 @@
* child node. The operation code tells us whether the second child
* is used or not.
*/
- private QName fFirstChild = new QName();
+ private final QName fFirstChild = new QName();
/**
* The element decl pool indices of the first (and optional second)
* child node. The operation code tells us whether the second child
* is used or not.
*/
- private QName fSecondChild = new QName();
+ private final QName fSecondChild = new QName();
/**
* The operation that this object represents. Since this class only
@@ -83,7 +83,7 @@
* involved (i.e. the children of the operation are always one or
* two leafs.) This is one of the XMLDTDParams.CONTENTSPECNODE_XXX values.
*/
- private int fOperator;
+ private final int fOperator;
/* this is the EquivClassComparator object */
//private EquivClassComparator comparator = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
