You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mi...@apache.org on 2006/10/31 22:56:19 UTC
svn commit: r469672 - /xalan/java/trunk/src/org/apache/xalan/extensions/
Author: minchau
Date: Tue Oct 31 13:56:19 2006
New Revision: 469672
URL: http://svn.apache.org/viewvc?view=rev&rev=469672
Log:
Committing Dave Brosius' patch in XALANJ-2224 that uses
get/add/remove rather than elementAt/addElement/removeElement
moving us from 1.1.x APIs on a java.util.Vector to
similar on a java.util.AbstractList.
The only point of this patch is that in the future we might
experiment with different kinds of Lists and not be stuck
with a Vector.
Modified:
xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionHandlerExsltFunction.java
xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionHandlerGeneral.java
xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionHandlerJavaClass.java
xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java
xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionNamespacesManager.java
xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionsTable.java
Modified: xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionHandlerExsltFunction.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionHandlerExsltFunction.java?view=diff&rev=469672&r1=469671&r2=469672
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionHandlerExsltFunction.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionHandlerExsltFunction.java Tue Oct 31 13:56:19 2006
@@ -196,7 +196,7 @@
{
for (int i = 0; i < methodArgs.length; i++)
{
- methodArgs[i] = XObject.create(args.elementAt(i));
+ methodArgs[i] = XObject.create(args.get(i));
}
ElemExsltFunction elemFunc = getFunction(extFunction.getFunctionName());
Modified: xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionHandlerGeneral.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionHandlerGeneral.java?view=diff&rev=469672&r1=469671&r2=469672
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionHandlerGeneral.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionHandlerGeneral.java Tue Oct 31 13:56:19 2006
@@ -284,7 +284,7 @@
for (int i = 0; i < argArray.length; i++)
{
- Object o = args.elementAt(i);
+ Object o = args.get(i);
argArray[i] = (o instanceof XObject) ? ((XObject) o).object() : o;
o = argArray[i];
@@ -376,8 +376,8 @@
{
Vector argv = new Vector(2);
- argv.addElement(xpc);
- argv.addElement(element);
+ argv.add(xpc);
+ argv.add(element);
result = callFunction(localPart, argv, methodKey,
transformer.getXPathContext().getExpressionContext());
Modified: xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionHandlerJavaClass.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionHandlerJavaClass.java?view=diff&rev=469672&r1=469671&r2=469672
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionHandlerJavaClass.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionHandlerJavaClass.java Tue Oct 31 13:56:19 2006
@@ -201,7 +201,7 @@
convertedArgs = new Object[1][];
for (int i = 0; i < methodArgs.length; i++)
{
- methodArgs[i] = args.elementAt(i);
+ methodArgs[i] = args.get(i);
}
Constructor c = null;
if (methodKey != null)
@@ -258,7 +258,7 @@
convertedArgs = new Object[1][];
for (int i = 0; i < methodArgs.length; i++)
{
- methodArgs[i] = args.elementAt(i);
+ methodArgs[i] = args.get(i);
}
Method m = null;
if (methodKey != null)
Modified: xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java?view=diff&rev=469672&r1=469671&r2=469672
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java Tue Oct 31 13:56:19 2006
@@ -226,7 +226,7 @@
convertedArgs = new Object[1][];
for (int i = 0; i < methodArgs.length; i++)
{
- methodArgs[i] = args.elementAt(i);
+ methodArgs[i] = args.get(i);
}
Constructor c = (methodKey != null) ?
@@ -286,7 +286,7 @@
convertedArgs = new Object[1][];
for (int i = 0; i < methodArgs.length; i++)
{
- methodArgs[i] = args.elementAt(i);
+ methodArgs[i] = args.get(i);
}
Method m = (methodKey != null) ?
(Method) getFromCache(methodKey, null, methodArgs) : null;
@@ -350,14 +350,14 @@
throw new TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_INSTANCE_MTHD_CALL_REQUIRES, new Object[]{funcName })); //"Instance method call to method " + funcName
//+ " requires an Object instance as first argument");
}
- targetObject = args.elementAt(0);
+ targetObject = args.get(0);
if (targetObject instanceof XObject) // Next level down for XObjects
targetObject = ((XObject) targetObject).object();
methodArgs = new Object[args.size() - 1];
convertedArgs = new Object[1][];
for (int i = 0; i < methodArgs.length; i++)
{
- methodArgs[i] = args.elementAt(i+1);
+ methodArgs[i] = args.get(i+1);
}
Method m = (methodKey != null) ?
(Method) getFromCache(methodKey, targetObject, methodArgs) : null;
Modified: xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionNamespacesManager.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionNamespacesManager.java?view=diff&rev=469672&r1=469671&r2=469672
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionNamespacesManager.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionNamespacesManager.java Tue Oct 31 13:56:19 2006
@@ -73,9 +73,9 @@
{
int predef = namespaceIndex(namespace, m_predefExtensions);
if (predef !=-1)
- m_extensions.addElement(m_predefExtensions.elementAt(predef));
+ m_extensions.add(m_predefExtensions.get(predef));
else if (!(m_unregisteredExtensions.contains(namespace)))
- m_unregisteredExtensions.addElement(namespace);
+ m_unregisteredExtensions.add(namespace);
}
}
@@ -89,9 +89,9 @@
String namespace = extNsSpt.getNamespace();
if (namespaceIndex(namespace, m_extensions) == -1)
{
- m_extensions.addElement(extNsSpt);
+ m_extensions.add(extNsSpt);
if (m_unregisteredExtensions.contains(namespace))
- m_unregisteredExtensions.removeElement(namespace);
+ m_unregisteredExtensions.remove(namespace);
}
}
@@ -104,7 +104,7 @@
{
for (int i = 0; i < extensions.size(); i++)
{
- if (((ExtensionNamespaceSupport)extensions.elementAt(i)).getNamespace().equals(namespace))
+ if (((ExtensionNamespaceSupport)extensions.get(i)).getNamespace().equals(namespace))
return i;
}
return -1;
@@ -128,10 +128,10 @@
{
for (int i = 0; i < m_unregisteredExtensions.size(); i++)
{
- String ns = (String)m_unregisteredExtensions.elementAt(i);
+ String ns = (String)m_unregisteredExtensions.get(i);
ExtensionNamespaceSupport extNsSpt = defineJavaNamespace(ns);
if (extNsSpt != null)
- m_extensions.addElement(extNsSpt);
+ m_extensions.add(extNsSpt);
}
}
@@ -211,42 +211,42 @@
String handlerClassName = "org.apache.xalan.extensions.ExtensionHandlerJavaPackage";
String lang = "javapackage";
String lib = "";
- m_predefExtensions.addElement(new ExtensionNamespaceSupport(uri, handlerClassName,
+ m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
new Object[]{uri, lang, lib}));
uri = Constants.S_EXTENSIONS_OLD_JAVA_URL;
- m_predefExtensions.addElement(new ExtensionNamespaceSupport(uri, handlerClassName,
+ m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
new Object[]{uri, lang, lib}));
uri = Constants.S_EXTENSIONS_LOTUSXSL_JAVA_URL;
- m_predefExtensions.addElement(new ExtensionNamespaceSupport(uri, handlerClassName,
+ m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
new Object[]{uri, lang, lib}));
uri = Constants.S_BUILTIN_EXTENSIONS_URL;
handlerClassName = "org.apache.xalan.extensions.ExtensionHandlerJavaClass";
lang = "javaclass"; // for remaining predefined extension namespaces.
lib = "org.apache.xalan.lib.Extensions";
- m_predefExtensions.addElement(new ExtensionNamespaceSupport(uri, handlerClassName,
+ m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
new Object[]{uri, lang, lib}));
uri = Constants.S_BUILTIN_OLD_EXTENSIONS_URL;
- m_predefExtensions.addElement(new ExtensionNamespaceSupport(uri, handlerClassName,
+ m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
new Object[]{uri, lang, lib}));
// Xalan extension namespaces (redirect, pipe and SQL).
uri = Constants.S_EXTENSIONS_REDIRECT_URL;
lib = "org.apache.xalan.lib.Redirect";
- m_predefExtensions.addElement(new ExtensionNamespaceSupport(uri, handlerClassName,
+ m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
new Object[]{uri, lang, lib}));
uri = Constants.S_EXTENSIONS_PIPE_URL;
lib = "org.apache.xalan.lib.PipeDocument";
- m_predefExtensions.addElement(new ExtensionNamespaceSupport(uri, handlerClassName,
+ m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
new Object[]{uri, lang, lib}));
uri = Constants.S_EXTENSIONS_SQL_URL;
lib = "org.apache.xalan.lib.sql.XConnection";
- m_predefExtensions.addElement(new ExtensionNamespaceSupport(uri, handlerClassName,
+ m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
new Object[]{uri, lang, lib}));
@@ -254,32 +254,32 @@
// registered by the associated ElemFunction.
uri = Constants.S_EXSLT_COMMON_URL;
lib = "org.apache.xalan.lib.ExsltCommon";
- m_predefExtensions.addElement(new ExtensionNamespaceSupport(uri, handlerClassName,
+ m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
new Object[]{uri, lang, lib}));
uri = Constants.S_EXSLT_MATH_URL;
lib = "org.apache.xalan.lib.ExsltMath";
- m_predefExtensions.addElement(new ExtensionNamespaceSupport(uri, handlerClassName,
+ m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
new Object[]{uri, lang, lib}));
uri = Constants.S_EXSLT_SETS_URL;
lib = "org.apache.xalan.lib.ExsltSets";
- m_predefExtensions.addElement(new ExtensionNamespaceSupport(uri, handlerClassName,
+ m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
new Object[]{uri, lang, lib}));
uri = Constants.S_EXSLT_DATETIME_URL;
lib = "org.apache.xalan.lib.ExsltDatetime";
- m_predefExtensions.addElement(new ExtensionNamespaceSupport(uri, handlerClassName,
+ m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
new Object[]{uri, lang, lib}));
uri = Constants.S_EXSLT_DYNAMIC_URL;
lib = "org.apache.xalan.lib.ExsltDynamic";
- m_predefExtensions.addElement(new ExtensionNamespaceSupport(uri, handlerClassName,
+ m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
new Object[]{uri, lang, lib}));
uri = Constants.S_EXSLT_STRINGS_URL;
lib = "org.apache.xalan.lib.ExsltStrings";
- m_predefExtensions.addElement(new ExtensionNamespaceSupport(uri, handlerClassName,
+ m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
new Object[]{uri, lang, lib}));
}
Modified: xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionsTable.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionsTable.java?view=diff&rev=469672&r1=469671&r2=469672
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionsTable.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/extensions/ExtensionsTable.java Tue Oct 31 13:56:19 2006
@@ -62,7 +62,7 @@
for (int i = 0; i < extensions.size(); i++)
{
ExtensionNamespaceSupport extNamespaceSpt =
- (ExtensionNamespaceSupport)extensions.elementAt(i);
+ (ExtensionNamespaceSupport)extensions.get(i);
ExtensionHandler extHandler = extNamespaceSpt.launch();
if (extHandler != null)
addExtensionNamespace(extNamespaceSpt.getNamespace(), extHandler);
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org