From 8d7dea7d2531f76b0e0dd98addee635dcda995a1 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Thu, 4 Apr 2002 13:30:00 +0000 Subject: [PATCH] Add class for collection utilities, implement emulation of Vector.equals, use it in Manifest. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272214 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tools/ant/taskdefs/Manifest.java | 8 +- .../tools/ant/util/CollectionUtils.java | 96 +++++++++++++++++++ 2 files changed, 101 insertions(+), 3 deletions(-) create mode 100644 src/main/org/apache/tools/ant/util/CollectionUtils.java diff --git a/src/main/org/apache/tools/ant/taskdefs/Manifest.java b/src/main/org/apache/tools/ant/taskdefs/Manifest.java index d58ca9de5..adbafba78 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Manifest.java +++ b/src/main/org/apache/tools/ant/taskdefs/Manifest.java @@ -72,6 +72,7 @@ import java.io.UnsupportedEncodingException; 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 @@ public class Manifest extends Task { 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 @@ public class Manifest extends Task { 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; } } diff --git a/src/main/org/apache/tools/ant/util/CollectionUtils.java b/src/main/org/apache/tools/ant/util/CollectionUtils.java new file mode 100644 index 000000000..63cca4ff0 --- /dev/null +++ b/src/main/org/apache/tools/ant/util/CollectionUtils.java @@ -0,0 +1,96 @@ +/* + * 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 + * . + */ +package org.apache.tools.ant.util; + +import java.util.Enumeration; +import java.util.Vector; + +/** + * A set of helper methods related to collection manipulation. + * + * @author Stefan Bodewig + * + * @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; + } +}