From 379ed8a0e133bee650e0acb24f6b743f657a50d0 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Thu, 4 Aug 2011 16:08:49 +0200
Subject: Last bit of cleanup honest New castor and dependent commons libs

---
 source/com/c2kernel/utils/GTimeStampComparator.java | 6 ++----
 source/com/c2kernel/utils/SoftCache.java            | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'source/com/c2kernel/utils')

diff --git a/source/com/c2kernel/utils/GTimeStampComparator.java b/source/com/c2kernel/utils/GTimeStampComparator.java
index 3680a50..8701b0e 100644
--- a/source/com/c2kernel/utils/GTimeStampComparator.java
+++ b/source/com/c2kernel/utils/GTimeStampComparator.java
@@ -4,12 +4,10 @@ import java.util.Comparator;
 
 import com.c2kernel.common.GTimeStamp;
 
-public class GTimeStampComparator implements Comparator<Object> {
+public class GTimeStampComparator implements Comparator<GTimeStamp> {
 
 	@Override
-	public int compare(Object arg0, Object arg1) {
-		GTimeStamp t0 = (GTimeStamp)arg0;
-		GTimeStamp t1 = (GTimeStamp)arg1;
+	public int compare(GTimeStamp t0, GTimeStamp t1) {
 
 		int retVal = compareInt(t0.mYear, t1.mYear);
 		if (retVal == 0) retVal = compareInt(t0.mMonth, t1.mMonth);
diff --git a/source/com/c2kernel/utils/SoftCache.java b/source/com/c2kernel/utils/SoftCache.java
index 9c95f2e..ff71222 100644
--- a/source/com/c2kernel/utils/SoftCache.java
+++ b/source/com/c2kernel/utils/SoftCache.java
@@ -103,8 +103,8 @@ public class SoftCache<K, V> extends AbstractMap<K, V> {
      * Look for values that have been reaped, and remove their keys from the cache
      */
     private void processQueue() {
-        SoftValue<?> sv;
-        while ((sv = (SoftValue<?>) queue.poll()) != null) {
+        SoftValue<V> sv;
+        while ((sv = (SoftValue<V>) queue.poll()) != null) {
             hash.remove(sv.key);
         }
     }
-- 
cgit v1.2.3