package com.cosm.client.utils;

import java.util.Collection;

import com.cosm.client.model.ConnectedObject;

/**
 * Utility class to supplement Object
 * 
 * @author s0pau
 * 
 */
public class ObjectUtil
{
	/**
	 * @param one
	 * @param two
	 * @return if both collection are deeply equal - i.e. when both collection
	 *         is the same size and all objects in the collecion is equal by the
	 *         equal() method.
	 */
	public static <T extends ConnectedObject> boolean deepEquals(Collection<T> one, Collection<T> two)
	{
		if (!CollectionUtil.deepEquals(one, two))
		{
			return false;
		}

		int matchedCounts = 0;
		int i = 1;
		int quitEarlyThreshold = (int) Math.round(one.size() / 2 + 0.5);
		for (T obj1 : one)
		{
			if (i >= quitEarlyThreshold && matchedCounts < quitEarlyThreshold)
			{
				// optimisation - quit early over half of the collection objects
				// does not match
				return false;
			}

			for (T obj2 : two)
			{
				if (obj1.memberEquals((ConnectedObject) two))
				{
					matchedCounts++;
				}
			}
			i++;
		}

		return matchedCounts == one.size();
	}

	/**
	 * @param one
	 * @param two
	 * @return true if both objects are null or both equals(); false otherwise
	 */
	public static <T extends Object> boolean nullCheckEquals(T one, T two)
	{
		if (one == null)
		{
			if (two == null)
			{
				return true;
			}
		} else if (one.equals(two))
		{
			return true;
		}

		return false;
	}
}

@@ -588,24 +588,142 @@
 n false;%0A%09%09%7D
+ else if (one == null)%0A%09%09%7B%0A%09%09%09// if deep equal is true and one of them is null, they are both null%0A%09%09%09return true;%0A%09%09%7D
 %0A%0A%09%09int matc

fix null comparison