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/12/12 05:22:36 UTC

svn commit: r603456 - in /xerces/java/branches/xml-schema-1.1-dev/src/org/apache: xerces/dom/ xerces/impl/xs/ xerces/parsers/ xml/serialize/

Author: mrglavas
Date: Tue Dec 11 20:22:35 2007
New Revision: 603456

URL: http://svn.apache.org/viewvc?rev=603456&view=rev
Log:
Minor performance improvement. Use an (unsynchronized) ArrayList
instead of a Vector as the container for the strings in the DOMStringList.

Modified:
    xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMConfigurationImpl.java
    xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMStringListImpl.java
    xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java
    xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/parsers/DOMParserImpl.java
    xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xml/serialize/DOMSerializerImpl.java

Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMConfigurationImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMConfigurationImpl.java?rev=603456&r1=603455&r2=603456&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMConfigurationImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMConfigurationImpl.java Tue Dec 11 20:22:35 2007
@@ -22,11 +22,6 @@
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.w3c.dom.DOMConfiguration;
-import org.w3c.dom.DOMErrorHandler;
-import org.w3c.dom.DOMStringList;
 
 import org.apache.xerces.impl.Constants;
 import org.apache.xerces.impl.XMLEntityManager;
@@ -51,7 +46,10 @@
 import org.apache.xerces.xni.parser.XMLErrorHandler;
 import org.apache.xerces.xni.parser.XMLInputSource;
 import org.apache.xerces.xni.parser.XMLParserConfiguration;
+import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.DOMErrorHandler;
 import org.w3c.dom.DOMException;
+import org.w3c.dom.DOMStringList;
 import org.w3c.dom.ls.LSResourceResolver;
 
 /**
@@ -1091,7 +1089,7 @@
      */
 	public DOMStringList getParameterNames() {
 	    if (fRecognizedParameters == null){
-	        Vector parameters = new Vector();
+	        ArrayList parameters = new ArrayList();
 
 	        //Add DOM recognized parameters
 	        //REVISIT: Would have been nice to have a list of

Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMStringListImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMStringListImpl.java?rev=603456&r1=603455&r2=603456&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMStringListImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMStringListImpl.java Tue Dec 11 20:22:35 2007
@@ -17,6 +17,7 @@
 
 package org.apache.xerces.dom;
 
+import java.util.ArrayList;
 import java.util.Vector;
 
 import org.w3c.dom.DOMStringList;
@@ -32,30 +33,38 @@
  */
 public class DOMStringListImpl implements DOMStringList {
 	
-	//A collection of DOMString values
-    private Vector fStrings;
+	// A collection of DOMString values
+    private final ArrayList fStrings;
 
     /** 
      * Construct an empty list of DOMStringListImpl
      */ 
     public DOMStringListImpl() {
-        fStrings = new Vector();    
+        fStrings = new ArrayList();    
     }
 
     /** 
-     * Construct an empty list of DOMStringListImpl
+     * Construct a DOMStringListImpl from an ArrayList
      */ 
-    public DOMStringListImpl(Vector params) {
+    public DOMStringListImpl(ArrayList params) {
         fStrings = params;    
     }
+    
+    /** 
+     * Construct a DOMStringListImpl from a Vector
+     */ 
+    public DOMStringListImpl(Vector params) {
+        fStrings = new ArrayList(params);
+    }
         
 	/**
 	 * @see org.w3c.dom.DOMStringList#item(int)
 	 */
 	public String item(int index) {
         try {
-            return (String) fStrings.elementAt(index);
-        } catch (ArrayIndexOutOfBoundsException e) {
+            return (String) fStrings.get(index);
+        } 
+        catch (ArrayIndexOutOfBoundsException e) {
             return null;
         }
 	}

Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java?rev=603456&r1=603455&r2=603456&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java Tue Dec 11 20:22:35 2007
@@ -29,7 +29,6 @@
 import java.util.Hashtable;
 import java.util.Locale;
 import java.util.StringTokenizer;
-import java.util.Vector;
 import java.util.WeakHashMap;
 
 import org.apache.xerces.dom.DOMErrorImpl;
@@ -1225,7 +1224,7 @@
      */
     public DOMStringList getParameterNames() {
         if (fRecognizedParameters == null){
-            Vector v = new Vector();
+            ArrayList v = new ArrayList();
             v.add(Constants.DOM_VALIDATE);
             v.add(Constants.DOM_ERROR_HANDLER);
             v.add(Constants.DOM_RESOURCE_RESOLVER);

Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/parsers/DOMParserImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/parsers/DOMParserImpl.java?rev=603456&r1=603455&r2=603456&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/parsers/DOMParserImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/parsers/DOMParserImpl.java Tue Dec 11 20:22:35 2007
@@ -18,6 +18,7 @@
 package org.apache.xerces.parsers;
 
 import java.io.StringReader;
+import java.util.ArrayList;
 import java.util.Locale;
 import java.util.Stack;
 import java.util.StringTokenizer;
@@ -879,7 +880,7 @@
      */
     public DOMStringList getParameterNames () {
         if (fRecognizedParameters == null){
-            Vector parameters = new Vector();
+            ArrayList parameters = new ArrayList();
             
             // REVISIT: add Xerces recognized properties/features
             parameters.add(Constants.DOM_NAMESPACES);

Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xml/serialize/DOMSerializerImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xml/serialize/DOMSerializerImpl.java?rev=603456&r1=603455&r2=603456&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xml/serialize/DOMSerializerImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xml/serialize/DOMSerializerImpl.java Tue Dec 11 20:22:35 2007
@@ -23,7 +23,7 @@
 import java.io.UnsupportedEncodingException;
 import java.io.Writer;
 import java.lang.reflect.Method;
-import java.util.Vector;
+import java.util.ArrayList;
 
 import org.apache.xerces.dom.CoreDocumentImpl;
 import org.apache.xerces.dom.DOMErrorImpl;
@@ -337,7 +337,7 @@
     public DOMStringList getParameterNames() {
     	
      	if (fRecognizedParameters == null){
-			Vector parameters = new Vector();
+			ArrayList parameters = new ArrayList();
 
 			//Add DOM recognized parameters
 			//REVISIT: Would have been nice to have a list of 



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