From 80f62bd7a6968e0d3b0831c120d58b4822e83515 Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Thu, 25 Dec 2003 00:50:10 +0000 Subject: [PATCH] Convert inner classes to package scope so they are not in API at present git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@131455 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/commons/collections/list/FixedSizeList.java | 9 +++------ .../apache/commons/collections/list/SetUniqueList.java | 10 ++++------ .../apache/commons/collections/map/PredicatedMap.java | 10 +++++----- .../apache/commons/collections/map/TransformedMap.java | 10 +++++----- .../apache/commons/collections/set/ListOrderedSet.java | 6 +++--- 5 files changed, 20 insertions(+), 25 deletions(-) diff --git a/src/java/org/apache/commons/collections/list/FixedSizeList.java b/src/java/org/apache/commons/collections/list/FixedSizeList.java index 58f329872..78a369ebb 100644 --- a/src/java/org/apache/commons/collections/list/FixedSizeList.java +++ b/src/java/org/apache/commons/collections/list/FixedSizeList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/list/FixedSizeList.java,v 1.2 2003/12/11 23:00:32 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/list/FixedSizeList.java,v 1.3 2003/12/25 00:46:02 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -73,7 +73,7 @@ import org.apache.commons.collections.iterators.AbstractListIteratorDecorator; * The set method is allowed (as it doesn't change the list size). * * @since Commons Collections 3.0 - * @version $Revision: 1.2 $ $Date: 2003/12/11 23:00:32 $ + * @version $Revision: 1.3 $ $Date: 2003/12/25 00:46:02 $ * * @author Stephen Colebourne * @author Paul Jack @@ -174,7 +174,7 @@ public class FixedSizeList extends AbstractListDecorator implements BoundedColle /** * List iterator that only permits changes via set() */ - protected static class FixedSizeListIterator extends AbstractListIteratorDecorator { + static class FixedSizeListIterator extends AbstractListIteratorDecorator { protected FixedSizeListIterator(ListIterator iterator) { super(iterator); } @@ -184,9 +184,6 @@ public class FixedSizeList extends AbstractListDecorator implements BoundedColle public void add(Object object) { throw new UnsupportedOperationException("List is fixed size"); } - public void remove(Object object) { - throw new UnsupportedOperationException("List is fixed size"); - } } public boolean isFull() { diff --git a/src/java/org/apache/commons/collections/list/SetUniqueList.java b/src/java/org/apache/commons/collections/list/SetUniqueList.java index 6608ddab2..fa2a36004 100644 --- a/src/java/org/apache/commons/collections/list/SetUniqueList.java +++ b/src/java/org/apache/commons/collections/list/SetUniqueList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/list/SetUniqueList.java,v 1.2 2003/12/03 11:37:44 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/list/SetUniqueList.java,v 1.3 2003/12/25 00:46:02 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -83,7 +83,7 @@ import org.apache.commons.collections.set.UnmodifiableSet; * This class offers the List interface implementation as well. * * @since Commons Collections 3.0 - * @version $Revision: 1.2 $ $Date: 2003/12/03 11:37:44 $ + * @version $Revision: 1.3 $ $Date: 2003/12/25 00:46:02 $ * * @author Matthew Hawthorne * @author Stephen Colebourne @@ -307,7 +307,7 @@ public class SetUniqueList extends AbstractListDecorator { /** * Inner class iterator. */ - protected static class SetListIterator extends AbstractIteratorDecorator { + static class SetListIterator extends AbstractIteratorDecorator { protected final Set set; protected Object last = null; @@ -327,13 +327,12 @@ public class SetUniqueList extends AbstractListDecorator { set.remove(last); last = null; } - } /** * Inner class iterator. */ - protected static class SetListListIterator extends AbstractListIteratorDecorator { + static class SetListListIterator extends AbstractListIteratorDecorator { protected final Set set; protected Object last = null; @@ -369,7 +368,6 @@ public class SetUniqueList extends AbstractListDecorator { public void set(Object object) { throw new UnsupportedOperationException("ListIterator does not support set"); } - } } diff --git a/src/java/org/apache/commons/collections/map/PredicatedMap.java b/src/java/org/apache/commons/collections/map/PredicatedMap.java index 5012fd6a5..5e45f9341 100644 --- a/src/java/org/apache/commons/collections/map/PredicatedMap.java +++ b/src/java/org/apache/commons/collections/map/PredicatedMap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/PredicatedMap.java,v 1.2 2003/12/05 20:23:57 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/PredicatedMap.java,v 1.3 2003/12/25 00:49:14 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -75,7 +75,7 @@ import org.apache.commons.collections.keyvalue.AbstractMapEntryDecorator; * is thrown. * * @since Commons Collections 3.0 - * @version $Revision: 1.2 $ $Date: 2003/12/05 20:23:57 $ + * @version $Revision: 1.3 $ $Date: 2003/12/25 00:49:14 $ * * @author Stephen Colebourne * @author Paul Jack @@ -163,7 +163,7 @@ public class PredicatedMap extends AbstractMapDecorator { /** * Implementation of an entry set that checks (predicates) additions. */ - protected static class PredicatedMapEntrySet extends AbstractCollectionDecorator implements Set { + static class PredicatedMapEntrySet extends AbstractCollectionDecorator implements Set { /** The predicate to use */ private final Predicate valuePredicate; @@ -214,7 +214,7 @@ public class PredicatedMap extends AbstractMapDecorator { /** * Implementation of an entry set iterator. */ - protected static class PredicatedMapEntrySetIterator extends AbstractIteratorDecorator { + static class PredicatedMapEntrySetIterator extends AbstractIteratorDecorator { /** The predicate to use */ private final Predicate valuePredicate; @@ -233,7 +233,7 @@ public class PredicatedMap extends AbstractMapDecorator { /** * Implementation of a map entry that checks (predicates) additions. */ - protected static class PredicatedMapEntry extends AbstractMapEntryDecorator { + static class PredicatedMapEntry extends AbstractMapEntryDecorator { /** The predicate to use */ private final Predicate predicate; diff --git a/src/java/org/apache/commons/collections/map/TransformedMap.java b/src/java/org/apache/commons/collections/map/TransformedMap.java index 0cf9ed85a..327f9a1f6 100644 --- a/src/java/org/apache/commons/collections/map/TransformedMap.java +++ b/src/java/org/apache/commons/collections/map/TransformedMap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/TransformedMap.java,v 1.2 2003/12/05 20:23:57 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/TransformedMap.java,v 1.3 2003/12/25 00:49:14 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -77,7 +77,7 @@ import org.apache.commons.collections.keyvalue.AbstractMapEntryDecorator; * use the Integer form to remove objects. * * @since Commons Collections 3.0 - * @version $Revision: 1.2 $ $Date: 2003/12/05 20:23:57 $ + * @version $Revision: 1.3 $ $Date: 2003/12/25 00:49:14 $ * * @author Stephen Colebourne */ @@ -192,7 +192,7 @@ public class TransformedMap extends AbstractMapDecorator { /** * Implementation of an entry set that uses a transforming map entry. */ - protected static class TransformedMapEntrySet extends AbstractCollectionDecorator implements Set { + static class TransformedMapEntrySet extends AbstractCollectionDecorator implements Set { /** The transformer to use */ private final Transformer valueTransformer; @@ -243,7 +243,7 @@ public class TransformedMap extends AbstractMapDecorator { /** * Implementation of an entry set iterator. */ - protected static class TransformedMapEntrySetIterator extends AbstractIteratorDecorator { + static class TransformedMapEntrySetIterator extends AbstractIteratorDecorator { /** The transformer to use */ private final Transformer valueTransformer; @@ -262,7 +262,7 @@ public class TransformedMap extends AbstractMapDecorator { /** * Implementation of a map entry that transforms additions. */ - protected static class TransformedMapEntry extends AbstractMapEntryDecorator { + static class TransformedMapEntry extends AbstractMapEntryDecorator { /** The transformer to use */ private final Transformer valueTransformer; diff --git a/src/java/org/apache/commons/collections/set/ListOrderedSet.java b/src/java/org/apache/commons/collections/set/ListOrderedSet.java index 527a9ee28..ea5b8a877 100644 --- a/src/java/org/apache/commons/collections/set/ListOrderedSet.java +++ b/src/java/org/apache/commons/collections/set/ListOrderedSet.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/set/ListOrderedSet.java,v 1.2 2003/12/03 11:37:44 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/set/ListOrderedSet.java,v 1.3 2003/12/25 00:50:10 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -84,7 +84,7 @@ import org.apache.commons.collections.list.UnmodifiableList; * various interface methods (notably equals/hashCode) are incompatable with a set. * * @since Commons Collections 3.0 - * @version $Revision: 1.2 $ $Date: 2003/12/03 11:37:44 $ + * @version $Revision: 1.3 $ $Date: 2003/12/25 00:50:10 $ * * @author Stephen Colebourne * @author Henning P. Schmiedehausen @@ -281,7 +281,7 @@ public class ListOrderedSet extends AbstractSetDecorator implements Set { /** * Internal iterator handle remove. */ - protected static class OrderedSetIterator extends AbstractIteratorDecorator { + static class OrderedSetIterator extends AbstractIteratorDecorator { /** Object we iterate on */ protected final Collection set;