Minor fix to improve maintainability of ExtensionUtil and ExtensionSet
within the package org.apache.tools.ant.taskdefs.optional.extension.
These classes didn't use interfaces to manipulate java.util.ArrayLists.
There are more cases within the code (direct java.util.Vector use could
be changed to java.util.List as well with some code changes). Let me
know if there is interest (or if I'm wasting my time:) in this type of
refactoring. Thanks!
Tim Halloran
Carnegie Mellon University
Index:
src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java,v
retrieving revision 1.1
diff -u -r1.1 ExtensionSet.java
--- src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java
30 Apr 2002 03:45:39 -0000 1.1
+++ src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java
13 Jun 2002 19:17:53 -0000
@@ -54,6 +54,7 @@
package org.apache.tools.ant.taskdefs.optional.extension;
import java.util.ArrayList;
+import java.util.List;
import java.util.Arrays;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
@@ -120,7 +121,7 @@
public Extension[] toExtensions( final Project project )
throws BuildException
{
- final ArrayList extensions = ExtensionUtil.toExtensions( m_extensions
);
+ final List extensions = ExtensionUtil.toExtensions( m_extensions );
ExtensionUtil.extractExtensions( project, extensions,
m_extensionsFilesets );
return (Extension[])extensions.toArray( new Extension[
extensions.size() ] );
}
Index:
src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
===================================================================
RCS file:
/home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java,v
retrieving revision 1.2
diff -u -r1.2 ExtensionUtil.java
---
src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
30 Apr 2002 07:54:19 -0000 1.2
+++
src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
13 Jun 2002 19:17:55 -0000
@@ -56,6 +56,7 @@
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.List;
import java.util.Iterator;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
@@ -78,10 +79,10 @@
* @param adapters the list of ExtensionAdapterss to add to convert
* @throws BuildException if an error occurs
*/
- static ArrayList toExtensions( final ArrayList adapters )
+ static List toExtensions( final List adapters )
throws BuildException
{
- final ArrayList results = new ArrayList();
+ final List results = new ArrayList();
final int size = adapters.size();
for( int i = 0; i < size; i++ )
@@ -103,8 +104,8 @@
* @throws BuildException if an error occurs
*/
static void extractExtensions( final Project project,
- final ArrayList librarys,
- final ArrayList fileset )
+ final List librarys,
+ final List fileset )
throws BuildException
{
if( !fileset.isEmpty() )
@@ -126,10 +127,10 @@
* @throws BuildException if failing to scan librarys
*/
private static Extension[] getExtensions( final Project project,
- final ArrayList librarys )
+ final List librarys )
throws BuildException
{
- final ArrayList extensions = new ArrayList();
+ final List extensions = new ArrayList();
final Iterator iterator = librarys.iterator();
while( iterator.hasNext() )
{
@@ -165,7 +166,7 @@
* @throws BuildException if there is an error
*/
private static void loadExtensions( final File file,
- final ArrayList extensionList,
+ final List extensionList,
final boolean includeImpl,
final boolean includeURL )
throws BuildException
@@ -198,7 +199,7 @@
* @param includeImpl false to exclude implementation details
* @param includeURL false to exclude implementation URL
*/
- private static void addExtension( final ArrayList extensionList,
+ private static void addExtension( final List extensionList,
final Extension originalExtension,
final boolean includeImpl,
final boolean includeURL )
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
