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 2007/09/02 19:55:44 UTC

svn commit: r572055 - in /xerces/java/trunk/src/org/apache/xerces/impl: ./ dtd/

Author: mrglavas
Date: Sun Sep  2 10:55:43 2007
New Revision: 572055

URL: http://svn.apache.org/viewvc?rev=572055&view=rev
Log:
Marking many fields final.

Modified:
    xerces/java/trunk/src/org/apache/xerces/impl/XML11DTDScannerImpl.java
    xerces/java/trunk/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java
    xerces/java/trunk/src/org/apache/xerces/impl/XMLDTDScannerImpl.java
    xerces/java/trunk/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java
    xerces/java/trunk/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java
    xerces/java/trunk/src/org/apache/xerces/impl/XMLNamespaceBinder.java
    xerces/java/trunk/src/org/apache/xerces/impl/XMLScanner.java
    xerces/java/trunk/src/org/apache/xerces/impl/XMLVersionDetector.java
    xerces/java/trunk/src/org/apache/xerces/impl/dtd/DTDGrammar.java
    xerces/java/trunk/src/org/apache/xerces/impl/dtd/DTDGrammarBucket.java
    xerces/java/trunk/src/org/apache/xerces/impl/dtd/XML11NSDTDValidator.java
    xerces/java/trunk/src/org/apache/xerces/impl/dtd/XMLDTDProcessor.java
    xerces/java/trunk/src/org/apache/xerces/impl/dtd/XMLDTDValidator.java
    xerces/java/trunk/src/org/apache/xerces/impl/dtd/XMLNSDTDValidator.java

Modified: xerces/java/trunk/src/org/apache/xerces/impl/XML11DTDScannerImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/XML11DTDScannerImpl.java?rev=572055&r1=572054&r2=572055&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/XML11DTDScannerImpl.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/XML11DTDScannerImpl.java Sun Sep  2 10:55:43 2007
@@ -55,7 +55,7 @@
     extends XMLDTDScannerImpl {
 
     /** String buffer. */
-    private XMLStringBuffer fStringBuffer = new XMLStringBuffer();
+    private final XMLStringBuffer fStringBuffer = new XMLStringBuffer();
     
     //
     // Constructors

Modified: xerces/java/trunk/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java?rev=572055&r1=572054&r2=572055&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java Sun Sep  2 10:55:43 2007
@@ -58,12 +58,12 @@
     extends XMLDocumentScannerImpl {
 
     /** String. */
-    private XMLString fString = new XMLString();
+    private final XMLString fString = new XMLString();
 
     /** String buffer. */
-    private XMLStringBuffer fStringBuffer = new XMLStringBuffer();
-    private XMLStringBuffer fStringBuffer2 = new XMLStringBuffer();
-    private XMLStringBuffer fStringBuffer3 = new XMLStringBuffer();
+    private final XMLStringBuffer fStringBuffer = new XMLStringBuffer();
+    private final XMLStringBuffer fStringBuffer2 = new XMLStringBuffer();
+    private final XMLStringBuffer fStringBuffer3 = new XMLStringBuffer();
 
     //
     // Constructors

Modified: xerces/java/trunk/src/org/apache/xerces/impl/XMLDTDScannerImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/XMLDTDScannerImpl.java?rev=572055&r1=572054&r2=572055&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/XMLDTDScannerImpl.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/XMLDTDScannerImpl.java Sun Sep  2 10:55:43 2007
@@ -175,22 +175,22 @@
     // temporary variables
 
     /** Array of 3 strings. */
-    private String[] fStrings = new String[3];
+    private final String[] fStrings = new String[3];
 
     /** String. */
-    private XMLString fString = new XMLString();
+    private final XMLString fString = new XMLString();
 
     /** String buffer. */
-    private XMLStringBuffer fStringBuffer = new XMLStringBuffer();
+    private final XMLStringBuffer fStringBuffer = new XMLStringBuffer();
 
     /** String buffer. */
-    private XMLStringBuffer fStringBuffer2 = new XMLStringBuffer();
+    private final XMLStringBuffer fStringBuffer2 = new XMLStringBuffer();
 
     /** Literal text. */
-    private XMLString fLiteral = new XMLString();
+    private final XMLString fLiteral = new XMLString();
 
     /** Literal text. */
-    private XMLString fLiteral2 = new XMLString();
+    private final XMLString fLiteral2 = new XMLString();
 
     /** Enumeration values. */
     private String[] fEnumeration = new String[5];
@@ -199,7 +199,7 @@
     private int fEnumerationCount;
 
     /** Ignore conditional section buffer. */
-    private XMLStringBuffer fIgnoreConditionalBuffer = new XMLStringBuffer(128);
+    private final XMLStringBuffer fIgnoreConditionalBuffer = new XMLStringBuffer(128);
 
     //
     // Constructors

Modified: xerces/java/trunk/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java?rev=572055&r1=572054&r2=572055&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java Sun Sep  2 10:55:43 2007
@@ -209,7 +209,7 @@
     protected QName fCurrentElement;
 
     /** Element stack. */
-    protected ElementStack fElementStack = new ElementStack();
+    protected final ElementStack fElementStack = new ElementStack();
 
     // other info
 
@@ -229,7 +229,7 @@
     protected Dispatcher fDispatcher;
 
     /** Content dispatcher. */
-    protected Dispatcher fContentDispatcher = createContentDispatcher();
+    protected final Dispatcher fContentDispatcher = createContentDispatcher();
 
     // temporary variables
 

Modified: xerces/java/trunk/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java?rev=572055&r1=572054&r2=572055&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java Sun Sep  2 10:55:43 2007
@@ -193,16 +193,16 @@
     // dispatchers
 
     /** XML declaration dispatcher. */
-    protected Dispatcher fXMLDeclDispatcher = new XMLDeclDispatcher();
+    protected final Dispatcher fXMLDeclDispatcher = new XMLDeclDispatcher();
 
     /** Prolog dispatcher. */
-    protected Dispatcher fPrologDispatcher = new PrologDispatcher();
+    protected final Dispatcher fPrologDispatcher = new PrologDispatcher();
 
     /** DTD dispatcher. */
-    protected Dispatcher fDTDDispatcher = new DTDDispatcher();
+    protected final Dispatcher fDTDDispatcher = new DTDDispatcher();
 
     /** Trailing miscellaneous section dispatcher. */
-    protected Dispatcher fTrailingMiscDispatcher = new TrailingMiscDispatcher();
+    protected final Dispatcher fTrailingMiscDispatcher = new TrailingMiscDispatcher();
 
     // temporary variables
 

Modified: xerces/java/trunk/src/org/apache/xerces/impl/XMLNamespaceBinder.java
URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/XMLNamespaceBinder.java?rev=572055&r1=572054&r2=572055&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/XMLNamespaceBinder.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/XMLNamespaceBinder.java Sun Sep  2 10:55:43 2007
@@ -139,7 +139,7 @@
     // temp vars
 
     /** Attribute QName. */
-    private QName fAttributeQName = new QName();
+    private final QName fAttributeQName = new QName();
 
     //
     // Constructors

Modified: xerces/java/trunk/src/org/apache/xerces/impl/XMLScanner.java
URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/XMLScanner.java?rev=572055&r1=572054&r2=572055&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/XMLScanner.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/XMLScanner.java Sun Sep  2 10:55:43 2007
@@ -186,19 +186,19 @@
     //       possibility.
 
     /** String. */
-    private XMLString fString = new XMLString();
+    private final XMLString fString = new XMLString();
 
     /** String buffer. */
-    private XMLStringBuffer fStringBuffer = new XMLStringBuffer();
+    private final XMLStringBuffer fStringBuffer = new XMLStringBuffer();
 
     /** String buffer. */
-    private XMLStringBuffer fStringBuffer2 = new XMLStringBuffer();
+    private final XMLStringBuffer fStringBuffer2 = new XMLStringBuffer();
 
     /** String buffer. */
-    private XMLStringBuffer fStringBuffer3 = new XMLStringBuffer();
+    private final XMLStringBuffer fStringBuffer3 = new XMLStringBuffer();
 
     // temporary location for Resource identification information.
-    protected XMLResourceIdentifierImpl fResourceIdentifier = new XMLResourceIdentifierImpl();
+    protected final XMLResourceIdentifierImpl fResourceIdentifier = new XMLResourceIdentifierImpl();
 
     //
     // XMLComponent methods

Modified: xerces/java/trunk/src/org/apache/xerces/impl/XMLVersionDetector.java
URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/XMLVersionDetector.java?rev=572055&r1=572054&r2=572055&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/XMLVersionDetector.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/XMLVersionDetector.java Sun Sep  2 10:55:43 2007
@@ -45,8 +45,7 @@
     // Constants
     //
 
-    private final static char[] XML11_VERSION = new char[]{'1', '.', '1'};
-
+    private static final char[] XML11_VERSION = new char[]{'1', '.', '1'};
 
     // property identifiers
 
@@ -67,7 +66,7 @@
     //
 
     /** Symbol: "version". */
-    protected final static String fVersionSymbol = "version".intern();
+    protected static final String fVersionSymbol = "version".intern();
 
     // symbol:  [xml]:
     protected static final String fXMLSymbol = "[xml]".intern();

Modified: xerces/java/trunk/src/org/apache/xerces/impl/dtd/DTDGrammar.java
URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/dtd/DTDGrammar.java?rev=572055&r1=572054&r2=572055&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/dtd/DTDGrammar.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/dtd/DTDGrammar.java Sun Sep  2 10:55:43 2007
@@ -221,13 +221,13 @@
     private boolean fMixed;
 
     /** Temporary qualified name. */
-    private QName fQName = new QName();
+    private final QName fQName = new QName();
     
     /** Temporary qualified name. */
-    private QName fQName2 = new QName();
+    private final QName fQName2 = new QName();
 
     /** Temporary Attribute decl. */
-    protected XMLAttributeDecl fAttributeDecl = new XMLAttributeDecl();
+    protected final XMLAttributeDecl fAttributeDecl = new XMLAttributeDecl();
 
     // for buildSyntaxTree method
 

Modified: xerces/java/trunk/src/org/apache/xerces/impl/dtd/DTDGrammarBucket.java
URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/dtd/DTDGrammarBucket.java?rev=572055&r1=572054&r2=572055&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/dtd/DTDGrammarBucket.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/dtd/DTDGrammarBucket.java Sun Sep  2 10:55:43 2007
@@ -44,7 +44,7 @@
     //
 
     /** Grammars associated with element root name. */
-    protected Hashtable fGrammars;
+    protected final Hashtable fGrammars;
 
     // the unique grammar from fGrammars (or that we're
     // building) that is used in validation.

Modified: xerces/java/trunk/src/org/apache/xerces/impl/dtd/XML11NSDTDValidator.java
URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/dtd/XML11NSDTDValidator.java?rev=572055&r1=572054&r2=572055&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/dtd/XML11NSDTDValidator.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/dtd/XML11NSDTDValidator.java Sun Sep  2 10:55:43 2007
@@ -60,7 +60,7 @@
 public class XML11NSDTDValidator extends XML11DTDValidator {
 
     /** Attribute QName. */
-    private QName fAttributeQName = new QName();
+    private final QName fAttributeQName = new QName();
 
     /** Bind namespaces */
     protected final void startNamespaceScope(QName element, XMLAttributes attributes, Augmentations augs)

Modified: xerces/java/trunk/src/org/apache/xerces/impl/dtd/XMLDTDProcessor.java
URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/dtd/XMLDTDProcessor.java?rev=572055&r1=572054&r2=572055&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/dtd/XMLDTDProcessor.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/dtd/XMLDTDProcessor.java Sun Sep  2 10:55:43 2007
@@ -232,19 +232,19 @@
     // temporary variables
 
     /** Temporary entity declaration. */
-    private XMLEntityDecl fEntityDecl = new XMLEntityDecl();
+    private final XMLEntityDecl fEntityDecl = new XMLEntityDecl();
 
     /** Notation declaration hash. */
-    private Hashtable fNDataDeclNotations = new Hashtable();
+    private final Hashtable fNDataDeclNotations = new Hashtable();
 
     /** DTD element declaration name. */
     private String fDTDElementDeclName = null;
 
     /** Mixed element type "hash". */
-    private Vector fMixedElementTypes = new Vector();
+    private final Vector fMixedElementTypes = new Vector();
 
     /** Element declarations in DTD. */
-    private Vector fDTDElementDecls = new Vector();
+    private final Vector fDTDElementDecls = new Vector();
 
     // to check for duplicate ID or ANNOTATION attribute declare in
     // ATTLIST, and misc VCs

Modified: xerces/java/trunk/src/org/apache/xerces/impl/dtd/XMLDTDValidator.java
URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/dtd/XMLDTDValidator.java?rev=572055&r1=572054&r2=572055&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/dtd/XMLDTDValidator.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/dtd/XMLDTDValidator.java Sun Sep  2 10:55:43 2007
@@ -195,7 +195,7 @@
     protected ValidationManager fValidationManager = null;
     
     // validation state
-    protected ValidationState   fValidationState   = new ValidationState();
+    protected final ValidationState fValidationState = new ValidationState();
 
     // features
 

Modified: xerces/java/trunk/src/org/apache/xerces/impl/dtd/XMLNSDTDValidator.java
URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/dtd/XMLNSDTDValidator.java?rev=572055&r1=572054&r2=572055&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/dtd/XMLNSDTDValidator.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/dtd/XMLNSDTDValidator.java Sun Sep  2 10:55:43 2007
@@ -61,8 +61,7 @@
               extends XMLDTDValidator{
 
     /** Attribute QName. */
-    private QName fAttributeQName = new QName();
-
+    private final QName fAttributeQName = new QName();
 
     /** Bind namespaces */
     protected final void startNamespaceScope (QName element, XMLAttributes attributes,



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