API additions for compatibility with harmony's java.util package

classpath/java/io/ObjectInputStream.java

@@ -80,6 +80,10 @@ public class ObjectInputStream extends InputStream {
     return readDoubleToken();
   }
   
+  public void defaultReadObject() throws IOException {
+    throw new UnsupportedOperationException();
+  }
+
   private void skipSpace() throws IOException {
     int c;
     while ((c = r.read()) != -1 && Character.isWhitespace((char) c));

classpath/java/io/ObjectOutputStream.java

@@ -82,6 +82,10 @@ public class ObjectOutputStream extends OutputStream {
     out.print(v);
   }
 
+  public void defaultWriteObject() throws IOException {
+    throw new UnsupportedOperationException();
+  }
+  
   private void writeObject(Object o, IdentityHashMap<Object, Integer> map,
                            int nextId)
     throws IOException

classpath/java/util/Arrays.java

@@ -149,4 +149,10 @@ public class Arrays {
     }
   }
   
+  public static <T> void fill(T[] array, T value) {
+    for (int i=0;i<array.length;i++) {
+      array[i] = value;
+    }
+  }
+
 }

classpath/java/util/Collections.java

@@ -11,6 +11,7 @@
 package java.util;
 
 public class Collections {
+
   private Collections() { }
 
   public static void shuffle(List list, Random random) {
@@ -84,6 +85,10 @@ public class Collections {
     return new IteratorEnumeration<T> (c.iterator());
   }
 
+  public static <T> Comparator<T> reverseOrder(Comparator<T> cmp) {
+    return new ReverseComparator<T>(cmp);
+  }
+  
   static class IteratorEnumeration<T> implements Enumeration<T> {
     private final Iterator<T> it;
 
@@ -379,4 +384,20 @@ public class Collections {
       it.remove();
     }
   }
+  
+  private static final class ReverseComparator<T> implements Comparator<T> {
+
+    Comparator<T> cmp;
+    
+    public ReverseComparator(Comparator<T> cmp) {
+      this.cmp = cmp;
+    }
+    
+    @Override
+    public int compare(T o1, T o2) {
+      return - cmp.compare(o1, o2);
+    }
+
+  }
+
 }

classpath/java/util/ConcurrentModificationException.java

@@ -0,0 +1,47 @@
+/* Copyright (c) 2010, Avian Contributors
+
+   Permission to use, copy, modify, and/or distribute this software
+   for any purpose with or without fee is hereby granted, provided
+   that the above copyright notice and this permission notice appear
+   in all copies.
+
+   There is NO WARRANTY for this software.  See license.txt for
+   details. */
+
+package java.util;
+
+/**
+ * @author zsombor
+ *
+ */
+public class ConcurrentModificationException extends RuntimeException {
+
+  /**
+   * @param message
+   * @param cause
+   */
+  public ConcurrentModificationException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  /**
+   * @param message
+   */
+  public ConcurrentModificationException(String message) {
+    super(message);
+  }
+
+  /**
+   * @param cause
+   */
+  public ConcurrentModificationException(Throwable cause) {
+    super(cause);
+  }
+
+  /**
+   * 
+   */
+  public ConcurrentModificationException() {
+  }
+
+}

classpath/java/util/HashMap.java

@@ -269,8 +269,10 @@ public class HashMap<K, V> implements Map<K, V> {
       return value;
     }
 
-    public void setValue(V value) {
+    public V setValue(V value) {
+      V old = this.value;
       this.value = value;
+      return old;
     }
 
     public HashMap.Cell<K, V> next() {

classpath/java/util/Map.java

@@ -40,6 +40,6 @@ public interface Map<K, V> {
 
     public V getValue();
 
-    public void setValue(V value);
+    public V setValue(V value);
   }
 }

classpath/java/util/TreeMap.java

@@ -112,9 +112,12 @@ public class TreeMap<K,V> implements Map<K,V> {
       return value;
     }
 
-    public void setValue(V value) {
+    public V setValue(V value) {
+      V old = this.value;
       this.value = value;
+      return old;
     }
+    
   }
 
   private class KeySet implements Set<K> {

classpath/java/util/WeakHashMap.java

@@ -114,8 +114,10 @@ public class WeakHashMap<K, V> implements Map<K, V> {
       return value;
     }
 
-    public void setValue(V value) {
+    public V setValue(V value) {
+      V old = this.value;
       this.value = value;
+      return old;
     }
 
     public HashMap.Cell<K, V> next() {