Remove remaining abstract overrides in java.util
Change-Id: Icbb4ed15a6d121fc6a33510da987136f30afc3be
diff --git a/tools/api-checker/config/gwt27_28userApi.conf b/tools/api-checker/config/gwt27_28userApi.conf
index 44ce6ec..1b40f2d 100644
--- a/tools/api-checker/config/gwt27_28userApi.conf
+++ b/tools/api-checker/config/gwt27_28userApi.conf
@@ -208,4 +208,14 @@
java.util.Collections::finalize() MISSING
java.util.Collections::getClass() MISSING
java.util.Collections::hashCode() MISSING
-java.util.Collections::toString() MISSING
\ No newline at end of file
+java.util.Collections::toString() MISSING
+
+# Remove unnecessary abstract overrides in Collections
+java.util.AbstractCollection::iterator() MISSING
+java.util.AbstractCollection::size() MISSING
+java.util.AbstractList::get(I) MISSING
+java.util.AbstractMap::entrySet() MISSING
+java.util.AbstractQueue::offer(Ljava/lang/Object;) MISSING
+java.util.AbstractQueue::peek() MISSING
+java.util.AbstractQueue::poll() MISSING
+java.util.AbstractSequentialList::size() MISSING
\ No newline at end of file
diff --git a/user/super/com/google/gwt/emul/java/util/AbstractCollection.java b/user/super/com/google/gwt/emul/java/util/AbstractCollection.java
index 4c8067d..b3a2379 100644
--- a/user/super/com/google/gwt/emul/java/util/AbstractCollection.java
+++ b/user/super/com/google/gwt/emul/java/util/AbstractCollection.java
@@ -79,9 +79,6 @@
}
@Override
- public abstract Iterator<E> iterator();
-
- @Override
public boolean remove(Object o) {
return advanceToFind(o, true);
}
@@ -117,9 +114,6 @@
}
@Override
- public abstract int size();
-
- @Override
public Object[] toArray() {
return toArray(new Object[size()]);
}
diff --git a/user/super/com/google/gwt/emul/java/util/AbstractList.java b/user/super/com/google/gwt/emul/java/util/AbstractList.java
index f7aaac3..1455e86 100644
--- a/user/super/com/google/gwt/emul/java/util/AbstractList.java
+++ b/user/super/com/google/gwt/emul/java/util/AbstractList.java
@@ -231,9 +231,6 @@
}
@Override
- public abstract E get(int index);
-
- @Override
public int hashCode() {
return Collections.hashCode(this);
}
diff --git a/user/super/com/google/gwt/emul/java/util/AbstractMap.java b/user/super/com/google/gwt/emul/java/util/AbstractMap.java
index efe6ebb..03c0343 100644
--- a/user/super/com/google/gwt/emul/java/util/AbstractMap.java
+++ b/user/super/com/google/gwt/emul/java/util/AbstractMap.java
@@ -155,9 +155,6 @@
}
@Override
- public abstract Set<Entry<K, V>> entrySet();
-
- @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
diff --git a/user/super/com/google/gwt/emul/java/util/AbstractQueue.java b/user/super/com/google/gwt/emul/java/util/AbstractQueue.java
index 14fee85..92e3278 100644
--- a/user/super/com/google/gwt/emul/java/util/AbstractQueue.java
+++ b/user/super/com/google/gwt/emul/java/util/AbstractQueue.java
@@ -62,15 +62,6 @@
}
@Override
- public abstract boolean offer(E o);
-
- @Override
- public abstract E peek();
-
- @Override
- public abstract E poll();
-
- @Override
public E remove() {
E e = poll();
checkElement(e != null, "Queue is empty");
diff --git a/user/super/com/google/gwt/emul/java/util/AbstractSequentialList.java b/user/super/com/google/gwt/emul/java/util/AbstractSequentialList.java
index 397a318..2fc1c21 100644
--- a/user/super/com/google/gwt/emul/java/util/AbstractSequentialList.java
+++ b/user/super/com/google/gwt/emul/java/util/AbstractSequentialList.java
@@ -65,9 +65,6 @@
}
@Override
- public abstract ListIterator<E> listIterator(int index);
-
- @Override
public E remove(int index) {
ListIterator<E> iter = listIterator(index);
try {
@@ -91,7 +88,4 @@
}
}
- @Override
- public abstract int size();
-
}
diff --git a/user/super/com/google/gwt/emul/java/util/ListIterator.java b/user/super/com/google/gwt/emul/java/util/ListIterator.java
index 8d05ef2..550027c 100644
--- a/user/super/com/google/gwt/emul/java/util/ListIterator.java
+++ b/user/super/com/google/gwt/emul/java/util/ListIterator.java
@@ -29,22 +29,13 @@
void add(E o);
- @Override
- boolean hasNext();
-
boolean hasPrevious();
- @Override
- E next();
-
int nextIndex();
E previous();
int previousIndex();
- @Override
- void remove();
-
void set(E o);
}
