You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@apache.org on 2002/04/04 15:30:00 UTC
cvs commit: jakarta-ant/src/main/org/apache/tools/ant/util CollectionUtils.java
bodewig 02/04/04 05:30:00
Modified: src/main/org/apache/tools/ant/taskdefs Manifest.java
Added: src/main/org/apache/tools/ant/util CollectionUtils.java
Log:
Add class for collection utilities, implement emulation of
Vector.equals, use it in Manifest.
Revision Changes Path
1.29 +5 -3 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Manifest.java
Index: Manifest.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Manifest.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Manifest.java 27 Mar 2002 10:21:31 -0000 1.28
+++ Manifest.java 4 Apr 2002 13:30:00 -0000 1.29
@@ -72,6 +72,7 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.ant.util.CollectionUtils;
/**
* Class to manage Manifest information
@@ -183,7 +184,8 @@
Attribute rhsAttribute = (Attribute)rhs;
return (name != null && rhsAttribute.name != null &&
getKey().equals(rhsAttribute.getKey()) &&
- values != null && values.equals(rhsAttribute.values));
+ values != null &&
+ CollectionUtils.equals(values, rhsAttribute.values));
}
/**
@@ -652,9 +654,9 @@
for (Enumeration e = attributes.keys(); e.hasMoreElements();) {
String attributeName = (String)e.nextElement();
Object attributeValue = attributes.get(attributeName);
- Object rshAttributeValue
+ Object rhsAttributeValue
= rhsSection.attributes.get(attributeName);
- if (!attributeValue.equals(rshAttributeValue)) {
+ if (!attributeValue.equals(rhsAttributeValue)) {
return false;
}
}
1.1 jakarta-ant/src/main/org/apache/tools/ant/util/CollectionUtils.java
Index: CollectionUtils.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Ant", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.tools.ant.util;
import java.util.Enumeration;
import java.util.Vector;
/**
* A set of helper methods related to collection manipulation.
*
* @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
*
* @since Ant 1.5
*/
public class CollectionUtils {
/**
* Believe it or not, Vector.equals() doesn't do any good in 1.1
*
* @since 1.1, Ant 1.5
*/
public static boolean equals(Vector v1, Vector v2) {
if (v1 == v2) {
return true;
}
if (v1 == null || v2 == null) {
return false;
}
if (v1.size() != v2.size()) {
return false;
}
Enumeration e1 = v1.elements();
Enumeration e2 = v2.elements();
while (e1.hasMoreElements()) {
if (!e1.nextElement().equals(e2.nextElement())) {
return false;
}
}
return true;
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>