Remove redundant super-interfaces, already defined by super-types.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1543167 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary D. Gregory 2013-11-18 21:21:32 +00:00
parent b1834e87a6
commit 69aa3946d2
34 changed files with 36 additions and 55 deletions

View File

@ -19,7 +19,6 @@ package org.apache.commons.collections4.bag;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Collection;
import java.util.Iterator;
@ -31,8 +30,7 @@ import org.apache.commons.collections4.Bag;
* @since 4.0
* @version $Id$
*/
public final class CollectionBag<E>
extends AbstractBagDecorator<E> implements Serializable {
public final class CollectionBag<E> extends AbstractBagDecorator<E> {
/** Serialization version */
private static final long serialVersionUID = -2560033712679053143L;

View File

@ -19,7 +19,6 @@ package org.apache.commons.collections4.bag;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Collection;
import java.util.Iterator;
@ -31,8 +30,7 @@ import org.apache.commons.collections4.SortedBag;
* @since 4.0
* @version $Id$
*/
public final class CollectionSortedBag<E>
extends AbstractSortedBagDecorator<E> implements Serializable {
public final class CollectionSortedBag<E> extends AbstractSortedBagDecorator<E> {
/** Serialization version */
private static final long serialVersionUID = -2560033712679053143L;

View File

@ -38,7 +38,7 @@ import org.apache.commons.collections4.Bag;
* @since 3.0 (previously in main package v2.0)
* @version $Id$
*/
public class HashBag<E> extends AbstractMapBag<E> implements Bag<E>, Serializable {
public class HashBag<E> extends AbstractMapBag<E> implements Serializable {
/** Serial version lock */
private static final long serialVersionUID = -6561115435802554013L;

View File

@ -19,15 +19,14 @@ package org.apache.commons.collections4.bag;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Collection;
import java.util.Iterator;
import java.util.Set;
import org.apache.commons.collections4.set.UnmodifiableSet;
import org.apache.commons.collections4.Bag;
import org.apache.commons.collections4.Unmodifiable;
import org.apache.commons.collections4.iterators.UnmodifiableIterator;
import org.apache.commons.collections4.set.UnmodifiableSet;
/**
* Decorates another {@link Bag} to ensure it can't be altered.
@ -40,7 +39,7 @@ import org.apache.commons.collections4.iterators.UnmodifiableIterator;
* @version $Id$
*/
public final class UnmodifiableBag<E>
extends AbstractBagDecorator<E> implements Unmodifiable, Serializable {
extends AbstractBagDecorator<E> implements Unmodifiable {
/** Serialization version */
private static final long serialVersionUID = -1873799975157099624L;

View File

@ -19,15 +19,14 @@ package org.apache.commons.collections4.bag;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Collection;
import java.util.Iterator;
import java.util.Set;
import org.apache.commons.collections4.set.UnmodifiableSet;
import org.apache.commons.collections4.SortedBag;
import org.apache.commons.collections4.Unmodifiable;
import org.apache.commons.collections4.iterators.UnmodifiableIterator;
import org.apache.commons.collections4.set.UnmodifiableSet;
/**
* Decorates another {@link SortedBag} to ensure it can't be altered.
@ -40,7 +39,7 @@ import org.apache.commons.collections4.iterators.UnmodifiableIterator;
* @version $Id$
*/
public final class UnmodifiableSortedBag<E>
extends AbstractSortedBagDecorator<E> implements Unmodifiable, Serializable {
extends AbstractSortedBagDecorator<E> implements Unmodifiable {
/** Serialization version */
private static final long serialVersionUID = -3190437252665717841L;

View File

@ -26,7 +26,7 @@ import org.apache.commons.collections4.Predicate;
* @since 4.0
* @version $Id$
*/
public abstract class AbstractQuantifierPredicate<T> implements Predicate<T>, PredicateDecorator<T>, Serializable {
public abstract class AbstractQuantifierPredicate<T> implements PredicateDecorator<T>, Serializable {
/** Serial version UID */
private static final long serialVersionUID = -3094696765038308799L;

View File

@ -20,7 +20,6 @@ import static org.apache.commons.collections4.functors.FunctorUtils.coerce;
import static org.apache.commons.collections4.functors.FunctorUtils.validate;
import static org.apache.commons.collections4.functors.TruePredicate.truePredicate;
import java.io.Serializable;
import java.util.Collection;
import org.apache.commons.collections4.Predicate;
@ -36,7 +35,7 @@ import org.apache.commons.collections4.Predicate;
* @since 3.0
* @version $Id$
*/
public final class AllPredicate<T> extends AbstractQuantifierPredicate<T> implements Serializable {
public final class AllPredicate<T> extends AbstractQuantifierPredicate<T> {
/** Serial version UID */
private static final long serialVersionUID = -3094696765038308799L;

View File

@ -26,7 +26,7 @@ import org.apache.commons.collections4.Predicate;
* @since 3.0
* @version $Id$
*/
public final class AndPredicate<T> implements Predicate<T>, PredicateDecorator<T>, Serializable {
public final class AndPredicate<T> implements PredicateDecorator<T>, Serializable {
/** Serial version UID */
private static final long serialVersionUID = 4189014213763186912L;

View File

@ -16,7 +16,6 @@
*/
package org.apache.commons.collections4.functors;
import java.io.Serializable;
import java.util.Collection;
import org.apache.commons.collections4.Predicate;
@ -32,7 +31,7 @@ import org.apache.commons.collections4.Predicate;
* @since 3.0
* @version $Id$
*/
public final class AnyPredicate<T> extends AbstractQuantifierPredicate<T> implements Serializable {
public final class AnyPredicate<T> extends AbstractQuantifierPredicate<T> {
/** Serial version UID */
private static final long serialVersionUID = 7429999530934647542L;

View File

@ -16,7 +16,6 @@
*/
package org.apache.commons.collections4.functors;
import java.io.Serializable;
import java.util.Collection;
import org.apache.commons.collections4.Predicate;
@ -32,7 +31,7 @@ import org.apache.commons.collections4.Predicate;
* @since 3.0
* @version $Id$
*/
public final class NonePredicate<T> extends AbstractQuantifierPredicate<T> implements Serializable {
public final class NonePredicate<T> extends AbstractQuantifierPredicate<T> {
/** Serial version UID */
private static final long serialVersionUID = 2007613066565892961L;

View File

@ -26,7 +26,7 @@ import org.apache.commons.collections4.Predicate;
* @since 3.0
* @version $Id$
*/
public final class NotPredicate<T> implements Predicate<T>, PredicateDecorator<T>, Serializable {
public final class NotPredicate<T> implements PredicateDecorator<T>, Serializable {
/** Serial version UID */
private static final long serialVersionUID = -2654603322338049674L;

View File

@ -27,7 +27,7 @@ import org.apache.commons.collections4.Predicate;
* @since 3.0
* @version $Id$
*/
public final class NullIsExceptionPredicate<T> implements Predicate<T>, PredicateDecorator<T>, Serializable {
public final class NullIsExceptionPredicate<T> implements PredicateDecorator<T>, Serializable {
/** Serial version UID */
private static final long serialVersionUID = 3243449850504576071L;

View File

@ -26,7 +26,7 @@ import org.apache.commons.collections4.Predicate;
* @since 3.0
* @version $Id$
*/
public final class NullIsFalsePredicate<T> implements Predicate<T>, PredicateDecorator<T>, Serializable {
public final class NullIsFalsePredicate<T> implements PredicateDecorator<T>, Serializable {
/** Serial version UID */
private static final long serialVersionUID = -2997501534564735525L;

View File

@ -26,7 +26,7 @@ import org.apache.commons.collections4.Predicate;
* @since 3.0
* @version $Id$
*/
public final class NullIsTruePredicate<T> implements Predicate<T>, PredicateDecorator<T>, Serializable {
public final class NullIsTruePredicate<T> implements PredicateDecorator<T>, Serializable {
/** Serial version UID */
private static final long serialVersionUID = -7625133768987126273L;

View File

@ -16,7 +16,6 @@
*/
package org.apache.commons.collections4.functors;
import java.io.Serializable;
import java.util.Collection;
import org.apache.commons.collections4.Predicate;
@ -32,7 +31,7 @@ import org.apache.commons.collections4.Predicate;
* @since 3.0
* @version $Id$
*/
public final class OnePredicate<T> extends AbstractQuantifierPredicate<T> implements Serializable {
public final class OnePredicate<T> extends AbstractQuantifierPredicate<T> {
/** Serial version UID */
private static final long serialVersionUID = -8125389089924745785L;

View File

@ -26,7 +26,7 @@ import org.apache.commons.collections4.Predicate;
* @since 3.0
* @version $Id$
*/
public final class OrPredicate<T> implements Predicate<T>, PredicateDecorator<T>, Serializable {
public final class OrPredicate<T> implements PredicateDecorator<T>, Serializable {
/** Serial version UID */
private static final long serialVersionUID = -8791518325735182855L;

View File

@ -28,7 +28,7 @@ import org.apache.commons.collections4.Transformer;
* @since 3.1
* @version $Id$
*/
public final class TransformedPredicate<T> implements Predicate<T>, PredicateDecorator<T>, Serializable {
public final class TransformedPredicate<T> implements PredicateDecorator<T>, Serializable {
/** Serial version UID */
private static final long serialVersionUID = -5596090919668315834L;

View File

@ -41,7 +41,7 @@ import org.apache.commons.collections4.ResettableListIterator;
* @version $Id$
*/
public class ArrayListIterator<E> extends ArrayIterator<E>
implements ListIterator<E>, ResettableListIterator<E> {
implements ResettableListIterator<E> {
/**
* Holds the index of the last item returned by a call to <code>next()</code>

View File

@ -33,8 +33,7 @@ import org.apache.commons.collections4.ResettableIterator;
* @since 3.0
* @version $Id$
*/
public class ObjectArrayIterator<E>
implements Iterator<E>, ResettableIterator<E> {
public class ObjectArrayIterator<E> implements ResettableIterator<E> {
/** The array */
final E[] array;

View File

@ -38,7 +38,7 @@ import org.apache.commons.collections4.ResettableListIterator;
* @version $Id$
*/
public class ObjectArrayListIterator<E> extends ObjectArrayIterator<E>
implements ListIterator<E>, ResettableListIterator<E> {
implements ResettableListIterator<E> {
/**
* Holds the index of the last item returned by a call to <code>next()</code>

View File

@ -29,7 +29,7 @@ import org.apache.commons.collections4.ResettableIterator;
* @version $Id$
*/
public class SingletonIterator<E>
implements Iterator<E>, ResettableIterator<E> {
implements ResettableIterator<E> {
/** Whether remove is allowed */
private final boolean removeAllowed;

View File

@ -28,7 +28,7 @@ import org.apache.commons.collections4.ResettableListIterator;
* @since 2.1
* @version $Id$
*/
public class SingletonListIterator<E> implements ListIterator<E>, ResettableListIterator<E> {
public class SingletonListIterator<E> implements ResettableListIterator<E> {
private boolean beforeFirst = true;
private boolean nextCalled = false;

View File

@ -19,7 +19,6 @@ package org.apache.commons.collections4.list;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
@ -30,8 +29,7 @@ import java.util.List;
* @version $Id$
*/
public abstract class AbstractSerializableListDecorator<E>
extends AbstractListDecorator<E>
implements Serializable {
extends AbstractListDecorator<E> {
/** Serialization version */
private static final long serialVersionUID = 2684959196747496299L;

View File

@ -54,7 +54,7 @@ import org.apache.commons.collections4.collection.UnmodifiableCollection;
*/
public class FixedSizeMap<K, V>
extends AbstractMapDecorator<K, V>
implements Map<K, V>, BoundedMap<K, V>, Serializable {
implements BoundedMap<K, V>, Serializable {
/** Serialization version */
private static final long serialVersionUID = 7450927208116179316L;

View File

@ -56,7 +56,7 @@ import org.apache.commons.collections4.collection.UnmodifiableCollection;
*/
public class FixedSizeSortedMap<K, V>
extends AbstractSortedMapDecorator<K, V>
implements SortedMap<K, V>, BoundedMap<K, V>, Serializable {
implements BoundedMap<K, V>, Serializable {
/** Serialization version */
private static final long serialVersionUID = 3126019624511683653L;

View File

@ -59,7 +59,7 @@ import org.apache.commons.collections4.functors.FactoryTransformer;
* @since 3.0
* @version $Id$
*/
public class LazyMap<K, V> extends AbstractMapDecorator<K, V> implements Map<K, V>, Serializable {
public class LazyMap<K, V> extends AbstractMapDecorator<K, V> implements Serializable {
/** Serialization version */
private static final long serialVersionUID = 7990956402564206740L;

View File

@ -22,7 +22,6 @@ import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Map;
import org.apache.commons.collections4.IterableMap;
import org.apache.commons.collections4.MapIterator;
import org.apache.commons.collections4.keyvalue.MultiKey;
@ -76,7 +75,7 @@ import org.apache.commons.collections4.keyvalue.MultiKey;
* @version $Id$
*/
public class MultiKeyMap<K, V> extends AbstractMapDecorator<MultiKey<? extends K>, V>
implements IterableMap<MultiKey<? extends K>, V>, Serializable, Cloneable {
implements Serializable, Cloneable {
/** Serialisation version */
private static final long serialVersionUID = -1788199231038721040L;

View File

@ -44,7 +44,7 @@ import org.apache.commons.collections4.iterators.UnmodifiableMapIterator;
*/
public final class UnmodifiableMap<K, V>
extends AbstractMapDecorator<K, V>
implements IterableMap<K, V>, Unmodifiable, Serializable {
implements Unmodifiable, Serializable {
/** Serialization version */
private static final long serialVersionUID = 2737023427269031941L;

View File

@ -19,7 +19,6 @@ package org.apache.commons.collections4.queue;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Collection;
import java.util.Iterator;
import java.util.Queue;
@ -37,7 +36,7 @@ import org.apache.commons.collections4.iterators.UnmodifiableIterator;
*/
public final class UnmodifiableQueue<E>
extends AbstractQueueDecorator<E>
implements Unmodifiable, Serializable {
implements Unmodifiable {
/** Serialization version */
private static final long serialVersionUID = 1832948656215393357L;

View File

@ -19,7 +19,6 @@ package org.apache.commons.collections4.set;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Collection;
import java.util.Set;
@ -30,8 +29,7 @@ import java.util.Set;
* @version $Id$
*/
public abstract class AbstractSerializableSetDecorator<E>
extends AbstractSetDecorator<E>
implements Serializable {
extends AbstractSetDecorator<E> {
/** Serialization version */
private static final long serialVersionUID = 1229469966212206107L;

View File

@ -51,8 +51,7 @@ import org.apache.commons.collections4.list.UnmodifiableList;
* @version $Id$
*/
public class ListOrderedSet<E>
extends AbstractSerializableSetDecorator<E>
implements Set<E> {
extends AbstractSerializableSetDecorator<E> {
/** Serialization version */
private static final long serialVersionUID = -228664372470420141L;

View File

@ -19,7 +19,6 @@ package org.apache.commons.collections4.set;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Collection;
import java.util.Iterator;
import java.util.SortedSet;
@ -39,7 +38,7 @@ import org.apache.commons.collections4.iterators.UnmodifiableIterator;
*/
public final class UnmodifiableSortedSet<E>
extends AbstractSortedSetDecorator<E>
implements Unmodifiable, Serializable {
implements Unmodifiable {
/** Serialization version */
private static final long serialVersionUID = -725356885467962424L;

View File

@ -43,7 +43,7 @@ import org.apache.commons.collections4.Trie;
* @since 4.0
* @version $Id$
*/
abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> implements Trie<K, V> {
abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> {
private static final long serialVersionUID = 5155253417231339498L;

View File

@ -55,7 +55,7 @@ import org.apache.commons.collections4.trie.analyzer.StringKeyAnalyzer;
* @since 4.0
* @version $Id$
*/
public class PatriciaTrie<E> extends AbstractPatriciaTrie<String, E> implements Trie<String, E> {
public class PatriciaTrie<E> extends AbstractPatriciaTrie<String, E> {
private static final long serialVersionUID = 4446367780901817838L;