knielsen 01/08/09 01:19:17
Modified: util/src/java/org/apache/commons/util ObjectUtils.java
Added: util/src/java/org/apache/commons/util MapUtils.java
Log:
minor changes
Revision Changes Path
1.3 +4 -46
jakarta-commons-sandbox/util/src/java/org/apache/commons/util/ObjectUtils.java
Index: ObjectUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/util/src/java/org/apache/commons/util/ObjectUtils.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ObjectUtils.java 2001/08/08 23:56:48 1.2
+++ ObjectUtils.java 2001/08/09 08:19:17 1.3
@@ -59,14 +59,12 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
-import java.util.Hashtable;
-import java.util.Vector;
/**
* This is where common Object manipulation routines should go.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Nissim Karpenstein</a>
- * @version $Id: ObjectUtils.java,v 1.2 2001/08/08 23:56:48 knielsen Exp $
+ * @version $Id: ObjectUtils.java,v 1.3 2001/08/09 08:19:17 knielsen Exp $
*/
public class ObjectUtils
{
@@ -91,22 +89,6 @@
}
/**
- * Adds an object to a vector, making sure the object is in the
- * vector only once.
- *
- * @param v The vector.
- * @param o The object.
- */
- public static void addOnce(Vector v,
- Object o)
- {
- if (! v.contains( o ))
- {
- v.addElement( o );
- }
- }
-
- /**
* Deserializes a single object from an array of bytes.
*
* @param objectData The serialized object.
@@ -151,13 +133,12 @@
}
/**
- * Compares two Objects, returns true if their values are the
- * same. It checks for null values prior to an o1.equals(o2)
- * check
+ * Compares two objects for equality where either one or both objects
+ * may be null.
*
* @param o1 The first object.
* @param o2 The second object.
- * @return True if the values of both xstrings are the same.
+ * @return True if the values of both objects are the same.
*/
public static boolean equals( Object o1,
Object o2 )
@@ -176,27 +157,4 @@
return o1.equals(o2);
}
}
-
- /**
- * Nice method for adding data to a Hashtable in such a way
- * as to not get NPE's. The point being that if the
- * value is null, Hashtable.put() will throw an exception.
- * That blows in the case of this class cause you may want to
- * essentially treat put("Not Null", null ) == put("Not Null", "")
- * We will still throw a NPE if the key is null cause that should
- * never happen.
- */
- public static final void safeAddToHashtable(Hashtable hash, Object key, Object
value)
- throws NullPointerException
- {
- if (value == null)
- {
- hash.put ( key, "" );
- }
- else
- {
- hash.put ( key, value );
- }
- }
-
}
1.1
jakarta-commons-sandbox/util/src/java/org/apache/commons/util/MapUtils.java
Index: MapUtils.java
===================================================================
package org.apache.commons.util;
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001 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 acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Turbine" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* 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/>.
*/
import java.util.Map;
/**
* This is where common Map manipulation routines should go.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Nissim Karpenstein</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Kasper Nielsen</a>
* @version $Id: MapUtils.java,v 1.1 2001/08/09 08:19:17 knielsen Exp $
*/
public class MapUtils
{
/**
* Nice method for adding data to a map in such a way
* as to not get NPE's. The point being that if the
* value is null, map.put() will throw an exception.
* That blows in the case of this class cause you may want to
* essentially treat put("Not Null", null ) == put("Not Null", "")
* We will still throw a NPE if the key is null cause that should
* never happen.
*/
public static final void safeAddToMap(Map map, Object key, Object value)
throws NullPointerException
{
if (value == null)
{
map.put ( key, "" );
}
else
{
map.put ( key, value );
}
}
}
