From 333ec4c4395578d661a1eac2bc2d5b8e681ce5ed Mon Sep 17 00:00:00 2001
From: mdb <mdb@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Tue, 11 Apr 2006 04:06:32 +0000
Subject: [PATCH] Removed reference to 1.5-specific Collections; fixed
 ArrayList override.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@1818 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 src/java/com/samskivert/util/ComparableArrayList.java | 6 +++++-
 src/java/com/samskivert/util/ObserverList.java        | 2 +-
 src/java/com/samskivert/util/QuickSort.java           | 8 ++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/java/com/samskivert/util/ComparableArrayList.java b/src/java/com/samskivert/util/ComparableArrayList.java
index c266b10c..f5f91670 100644
--- a/src/java/com/samskivert/util/ComparableArrayList.java
+++ b/src/java/com/samskivert/util/ComparableArrayList.java
@@ -50,7 +50,11 @@ public class ComparableArrayList<T extends Comparable<? super T>>
      */
     public void rsort ()
     {
-        sort(java.util.Collections.reverseOrder(_comp));
+        sort(new Comparator<T>() {
+            public int compare (T o1, T o2) {
+                return _comp.compare(o2, o1);
+            }
+        });
     }
 
     /**
diff --git a/src/java/com/samskivert/util/ObserverList.java b/src/java/com/samskivert/util/ObserverList.java
index 69e94d88..6736271d 100644
--- a/src/java/com/samskivert/util/ObserverList.java
+++ b/src/java/com/samskivert/util/ObserverList.java
@@ -137,7 +137,7 @@ public class ObserverList<T> extends ArrayList<T>
     }
 
     // documentation inherited
-    public void add (int index, Object element)
+    public void add (int index, T element)
     {
         throw new UnsupportedOperationException(UNSUPPORTED_ADD_MESSAGE);
     }
diff --git a/src/java/com/samskivert/util/QuickSort.java b/src/java/com/samskivert/util/QuickSort.java
index 1e9d36cb..40a1da01 100644
--- a/src/java/com/samskivert/util/QuickSort.java
+++ b/src/java/com/samskivert/util/QuickSort.java
@@ -385,9 +385,13 @@ public class QuickSort
      * Sort the elements in the specified ArrayList according to the
      * reverse ordering imposed by the specified Comparator.
      */
-    public static <T> void rsort (ArrayList<T> a, Comparator<T> comp)
+    public static <T> void rsort (ArrayList<T> a, final Comparator<T> comp)
     {
-        sort(a, java.util.Collections.reverseOrder(comp));
+        sort(a, new Comparator<T>() {
+            public int compare (T o1, T o2) {
+                return comp.compare(o2, o1);
+            }
+        });
     }
 
     /**