--- old/src/java.base/share/classes/java/util/AbstractList.java	2015-02-04 10:44:09.336980974 +0100
+++ new/src/java.base/share/classes/java/util/AbstractList.java	2015-02-04 10:44:09.224983051 +0100
@@ -23,7 +23,13 @@
  * questions.
  */
 
-package java.util;
+package javany.util;
+
+import java.util.ConcurrentModificationException;
+import java.util.NoSuchElementException;
+import java.util.RandomAccess;
+
+import javany.util.function.*;
 
 /**
  * This class provides a skeletal implementation of the {@link List}
@@ -68,7 +74,7 @@
  * @since 1.2
  */
 
-public abstract class AbstractList<E> extends AbstractCollection<E> implements List<E> {
+public abstract class AbstractList<any E> extends AbstractCollection<E> implements List<E> {
     /**
      * Sole constructor.  (For invocation by subclass constructors, typically
      * implicit.)
@@ -180,17 +186,30 @@
      * @throws NullPointerException {@inheritDoc}
      */
     public int indexOf(Object o) {
-        ListIterator<E> it = listIterator();
-        if (o==null) {
-            while (it.hasNext())
-                if (it.next()==null)
-                    return it.previousIndex();
-        } else {
+        __WhereVal(E) {
+            if (o == null) {
+                return -1;
+            }
+            ListIterator<E> it = listIterator();
+            Function<E, Object> box = Any.converter();
             while (it.hasNext())
-                if (o.equals(it.next()))
+                if (o.equals(box.apply(it.next()))) // boxing
                     return it.previousIndex();
+            return -1;
+        }
+        __WhereRef(E) {
+            ListIterator<E> it = listIterator();
+            if (o == null) {
+                while (it.hasNext())
+                    if (it.next() == null)
+                        return it.previousIndex();
+            } else {
+                while (it.hasNext())
+                    if (o.equals(it.next()))
+                        return it.previousIndex();
+            }
+            return -1;
         }
-        return -1;
     }
 
     /**
@@ -206,17 +225,30 @@
      * @throws NullPointerException {@inheritDoc}
      */
     public int lastIndexOf(Object o) {
-        ListIterator<E> it = listIterator(size());
-        if (o==null) {
-            while (it.hasPrevious())
-                if (it.previous()==null)
-                    return it.nextIndex();
-        } else {
+        __WhereVal(E) {
+            if (o == null) {
+                return -1;
+            }
+            ListIterator<E> it = listIterator(size());
+            Function<E, Object> box = Any.converter();
             while (it.hasPrevious())
-                if (o.equals(it.previous()))
+                if (o.equals(box.apply(it.previous()))) // boxing
                     return it.nextIndex();
+            return -1;
+        }
+        __WhereRef(E) {
+            ListIterator<E> it = listIterator(size());
+            if (o == null) {
+                while (it.hasPrevious())
+                    if (it.previous() == null)
+                        return it.nextIndex();
+            } else {
+                while (it.hasPrevious())
+                    if (o.equals(it.previous()))
+                        return it.nextIndex();
+            }
+            return -1;
         }
-        return -1;
     }
 
 
@@ -264,7 +296,9 @@
     public boolean addAll(int index, Collection<? extends E> c) {
         rangeCheckForAdd(index);
         boolean modified = false;
-        for (E e : c) {
+        Iterator<? extends E> it = c.iterator();
+        while (it.hasNext()) {
+            E e = it.next();
             add(index++, e);
             modified = true;
         }
@@ -522,18 +556,17 @@
      * @param o the object to be compared for equality with this list
      * @return {@code true} if the specified object is equal to this list
      */
+    @SuppressWarnings("unchecked")
     public boolean equals(Object o) {
         if (o == this)
             return true;
-        if (!(o instanceof List))
+        if (!(o instanceof List<E>))
             return false;
 
         ListIterator<E> e1 = listIterator();
-        ListIterator<?> e2 = ((List<?>) o).listIterator();
+        ListIterator<? extends E> e2 = ((List<? extends E>) o).listIterator();
         while (e1.hasNext() && e2.hasNext()) {
-            E o1 = e1.next();
-            Object o2 = e2.next();
-            if (!(o1==null ? o2==null : o1.equals(o2)))
+            if (!Any.equals(e1.next(), e2.next()))
                 return false;
         }
         return !(e1.hasNext() || e2.hasNext());
@@ -551,8 +584,11 @@
      */
     public int hashCode() {
         int hashCode = 1;
-        for (E e : this)
-            hashCode = 31*hashCode + (e==null ? 0 : e.hashCode());
+        Iterator<E> it = iterator();
+        while (it.hasNext()) {
+            E e = it.next();
+            hashCode = 31 * hashCode + Any.hashCode(e);
+        }
         return hashCode;
     }
 
@@ -625,7 +661,7 @@
     }
 }
 
-class SubList<E> extends AbstractList<E> {
+class SubList<any E> extends AbstractList<E> {
     private final AbstractList<E> l;
     private final int offset;
     private int size;
@@ -785,7 +821,7 @@
     }
 }
 
-class RandomAccessSubList<E> extends SubList<E> implements RandomAccess {
+class RandomAccessSubList<any E> extends SubList<E> implements RandomAccess {
     RandomAccessSubList(AbstractList<E> list, int fromIndex, int toIndex) {
         super(list, fromIndex, toIndex);
     }