From 1568e0b3565f0ea53688a53df518b64c18ce13e6 Mon Sep 17 00:00:00 2001 From: samskivert Date: Mon, 17 Aug 2009 21:09:38 +0000 Subject: [PATCH] Some @Override annotations from Charlie. git-svn-id: https://samskivert.googlecode.com/svn/trunk@2610 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- src/java/com/samskivert/util/BaseArrayList.java | 3 +-- src/java/com/samskivert/util/HashIntMap.java | 2 +- src/java/com/samskivert/util/IntIntMap.java | 2 +- src/java/com/samskivert/util/Interval.java | 4 ++-- src/java/com/samskivert/util/WeakObserverList.java | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/java/com/samskivert/util/BaseArrayList.java b/src/java/com/samskivert/util/BaseArrayList.java index 74cfcdf2..2ed2f121 100644 --- a/src/java/com/samskivert/util/BaseArrayList.java +++ b/src/java/com/samskivert/util/BaseArrayList.java @@ -24,7 +24,6 @@ import java.io.Serializable; import java.util.AbstractList; import java.util.ArrayList; -import java.util.List; import java.util.RandomAccess; import java.lang.reflect.Array; @@ -37,7 +36,7 @@ import static com.samskivert.Log.log; * made the instance variables private). */ public abstract class BaseArrayList extends AbstractList - implements List, RandomAccess, Cloneable, Serializable + implements RandomAccess, Cloneable, Serializable { @Override public int size () diff --git a/src/java/com/samskivert/util/HashIntMap.java b/src/java/com/samskivert/util/HashIntMap.java index c34014fa..6b0e55da 100644 --- a/src/java/com/samskivert/util/HashIntMap.java +++ b/src/java/com/samskivert/util/HashIntMap.java @@ -397,7 +397,7 @@ public class HashIntMap extends AbstractMap // damn Sun bastards made the 'keySet' variable with default access, so we can't share it if (_keySet == null) { _keySet = new AbstractIntSet() { - public Interator interator () { + @Override public Interator interator () { return new Interator () { public boolean hasNext () { return i.hasNext(); diff --git a/src/java/com/samskivert/util/IntIntMap.java b/src/java/com/samskivert/util/IntIntMap.java index b103c63e..b96b59eb 100644 --- a/src/java/com/samskivert/util/IntIntMap.java +++ b/src/java/com/samskivert/util/IntIntMap.java @@ -312,7 +312,7 @@ public class IntIntMap public IntSet keySet () { return new AbstractIntSet() { - public Interator interator () { + @Override public Interator interator () { return IntIntMap.this.keys(); } diff --git a/src/java/com/samskivert/util/Interval.java b/src/java/com/samskivert/util/Interval.java index ea793312..8c913be6 100644 --- a/src/java/com/samskivert/util/Interval.java +++ b/src/java/com/samskivert/util/Interval.java @@ -52,7 +52,7 @@ public abstract class Interval public static Interval create (final Runnable onExpired) { return new Interval() { - public void expired () { + @Override public void expired () { onExpired.run(); } }; @@ -68,7 +68,7 @@ public abstract class Interval // runbuddy reposting and whatever and just create a non-runqueue interval that posts the // supplied runnable to the runqueue when it expires, but we'll just punt on that for now return new Interval(runQueue) { - public void expired () { + @Override public void expired () { onExpired.run(); } }; diff --git a/src/java/com/samskivert/util/WeakObserverList.java b/src/java/com/samskivert/util/WeakObserverList.java index e6a9c817..ada9ee2d 100644 --- a/src/java/com/samskivert/util/WeakObserverList.java +++ b/src/java/com/samskivert/util/WeakObserverList.java @@ -84,7 +84,7 @@ public class WeakObserverList extends AbstractList { // dereference the elements when searching for a value _wrappedList = new ObserverList>(notifyPolicy, allowDups) { - public int indexOf (Object element) { + @Override public int indexOf (Object element) { @SuppressWarnings("unchecked") WeakReference ref = (WeakReference)element; T value = ref.get(); @@ -95,7 +95,7 @@ public class WeakObserverList extends AbstractList } return -1; } - public int lastIndexOf (Object element) { + @Override public int lastIndexOf (Object element) { @SuppressWarnings("unchecked") WeakReference ref = (WeakReference)element; T value = ref.get();