From f810412d75047478f09420d4b312f88432aca87c Mon Sep 17 00:00:00 2001
From: asivache <asivache@348d0f76-0448-11de-a6fe-93d51630548a>
Date: Fri, 20 Mar 2009 05:13:07 +0000
Subject: [PATCH] equals(), hashCode() updated/added, also a few minor changes

git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@110 348d0f76-0448-11de-a6fe-93d51630548a
---
 .../broadinstitute/sting/utils/CountedObject.java   | 13 +++++++++++--
 .../sting/utils/CountedObjectComparatorAdapter.java |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/playground/java/src/org/broadinstitute/sting/utils/CountedObject.java b/playground/java/src/org/broadinstitute/sting/utils/CountedObject.java
index 671b5c5a8..d3eb27585 100755
--- a/playground/java/src/org/broadinstitute/sting/utils/CountedObject.java
+++ b/playground/java/src/org/broadinstitute/sting/utils/CountedObject.java
@@ -20,6 +20,7 @@ public class CountedObject<T> {
 	 * @param o object to start counting for
 	 */
 	public CountedObject(T o) {
+        assert o!=null : "Can not create counted object over null";
 		mObject = o;
 		mCounter = 1;
 	}
@@ -30,6 +31,7 @@ public class CountedObject<T> {
 	 * @param n initial count
 	 */
 	public CountedObject(T o, int n) {
+        assert o!=null : "Can not create counted object over null";
 		mObject = o;
 		mCounter = n;
 	}
@@ -40,11 +42,18 @@ public class CountedObject<T> {
 	public void increment(int n) { mCounter+=n; }
 	public void decrement() { mCounter--; }
 	public void decrement(int n) { mCounter -= n; }
+
     @Override
     public boolean equals(Object o) {
         if ( this == o ) return true;
-        if ( ! ( o instanceof CountedObject )) return false;
-        return mObject.equals(o);
+        if ( ! ( o instanceof CountedObject ) ) return false;
+        if ( ((CountedObject)o).mObject.getClass() != this.mObject.getClass() ) return false;
+        return mObject.equals(((CountedObject<T>)o).getObject());
+    }
+
+    @Override
+    public int hashCode() {
+        return mObject.hashCode();
     }
 
 }
diff --git a/playground/java/src/org/broadinstitute/sting/utils/CountedObjectComparatorAdapter.java b/playground/java/src/org/broadinstitute/sting/utils/CountedObjectComparatorAdapter.java
index affc8fd1a..80120f083 100755
--- a/playground/java/src/org/broadinstitute/sting/utils/CountedObjectComparatorAdapter.java
+++ b/playground/java/src/org/broadinstitute/sting/utils/CountedObjectComparatorAdapter.java
@@ -11,10 +11,10 @@ package org.broadinstitute.sting.utils;
  */
 public class CountedObjectComparatorAdapter<T>  implements java.util.Comparator<CountedObject<T>> {
 	
-	private java.util.Comparator<T> mComp;
+	private java.util.Comparator<? super T> mComp;
 
     /** Initializes comparator adapter with a comparator for objects of trype T */
-	public CountedObjectComparatorAdapter(java.util.Comparator<T> adaptee) {
+	public CountedObjectComparatorAdapter(java.util.Comparator<? super T> adaptee) {
 		mComp = adaptee;
 	}