Apache
/
commons-collections
mirror of https://github.com/apache/commons-collections.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[COLLECTIONS-452] Change package to o.a.c.collections4. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1469004 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Neidhart 2013-04-17 17:37:03 +00:00
parent 6a12cf861d
commit a8d1066b5e
712 changed files with 2035 additions and 1750 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
findbugs-exclude-filter.xml
View File

@ -25,7 +25,7 @@
<!-- explicit return of a null value for type Boolean is intended --> <!-- explicit return of a null value for type Boolean is intended -->
<Match> <Match>
<Class name="org.apache.commons.collections.MapUtils" /> <Class name="org.apache.commons.collections4.MapUtils" />
<Method name="getBoolean" params="java.util.Map, java.lang.Object" returns="java.lang.Boolean" /> <Method name="getBoolean" params="java.util.Map, java.lang.Object" returns="java.lang.Boolean" />
<Bug pattern="NP_BOOLEAN_RETURN_NULL" /> <Bug pattern="NP_BOOLEAN_RETURN_NULL" />
</Match> </Match>
@ -45,7 +45,7 @@
<!-- Load first tries ISO_8859_1 encoding, and reverts to the system's default if not available --> <!-- Load first tries ISO_8859_1 encoding, and reverts to the system's default if not available -->
<Match> <Match>
<Class name="org.apache.commons.collections.ExtendedProperties" /> <Class name="org.apache.commons.collections4.ExtendedProperties" />
<Method name="load" params="java.io.InputStream, java.lang.String" returns="void" /> <Method name="load" params="java.io.InputStream, java.lang.String" returns="void" />
<Bug pattern="DM_DEFAULT_ENCODING" /> <Bug pattern="DM_DEFAULT_ENCODING" />
</Match> </Match>
@ -53,15 +53,15 @@
<!-- TreeBidiMap implements equals by delegating to another method for re-usability --> <!-- TreeBidiMap implements equals by delegating to another method for re-usability -->
<Match> <Match>
<Or> <Or>
<Class name="org.apache.commons.collections.bidimap.TreeBidiMap" /> <Class name="org.apache.commons.collections4.bidimap.TreeBidiMap" />
<Class name="org.apache.commons.collections.bidimap.TreeBidiMap$Inverse" /> <Class name="org.apache.commons.collections4.bidimap.TreeBidiMap$Inverse" />
</Or> </Or>
<Bug pattern="EQ_UNUSUAL" /> <Bug pattern="EQ_UNUSUAL" />
</Match> </Match>
<!-- The compare method in ComparatorChain has to handle a corner-case for Integer.MIN_VALUE --> <!-- The compare method in ComparatorChain has to handle a corner-case for Integer.MIN_VALUE -->
<Match> <Match>
<Class name="org.apache.commons.collections.comparators.ComparatorChain" /> <Class name="org.apache.commons.collections4.comparators.ComparatorChain" />
<Method name="compare" params="java.lang.Object, java.lang.Object" returns="int" /> <Method name="compare" params="java.lang.Object, java.lang.Object" returns="int" />
<Bug pattern="RV_CHECK_COMPARETO_FOR_SPECIFIC_RETURN_VALUE" /> <Bug pattern="RV_CHECK_COMPARETO_FOR_SPECIFIC_RETURN_VALUE" />
</Match> </Match>

2
src/main/java/org/apache/commons/collections/ArrayStack.java → src/main/java/org/apache/commons/collections4/ArrayStack.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.EmptyStackException; import java.util.EmptyStackException;

2
src/main/java/org/apache/commons/collections/Bag.java → src/main/java/org/apache/commons/collections4/Bag.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.Collection; import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;

22
src/main/java/org/apache/commons/collections/BagUtils.java → src/main/java/org/apache/commons/collections4/BagUtils.java
View File

@ -14,18 +14,18 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import org.apache.commons.collections.bag.HashBag; import org.apache.commons.collections4.bag.HashBag;
import org.apache.commons.collections.bag.PredicatedBag; import org.apache.commons.collections4.bag.PredicatedBag;
import org.apache.commons.collections.bag.PredicatedSortedBag; import org.apache.commons.collections4.bag.PredicatedSortedBag;
import org.apache.commons.collections.bag.SynchronizedBag; import org.apache.commons.collections4.bag.SynchronizedBag;
import org.apache.commons.collections.bag.SynchronizedSortedBag; import org.apache.commons.collections4.bag.SynchronizedSortedBag;
import org.apache.commons.collections.bag.TransformedBag; import org.apache.commons.collections4.bag.TransformedBag;
import org.apache.commons.collections.bag.TransformedSortedBag; import org.apache.commons.collections4.bag.TransformedSortedBag;
import org.apache.commons.collections.bag.TreeBag; import org.apache.commons.collections4.bag.TreeBag;
import org.apache.commons.collections.bag.UnmodifiableBag; import org.apache.commons.collections4.bag.UnmodifiableBag;
import org.apache.commons.collections.bag.UnmodifiableSortedBag; import org.apache.commons.collections4.bag.UnmodifiableSortedBag;
/** /**
* Provides utility methods and decorators for {@link Bag} and {@link SortedBag} instances. * Provides utility methods and decorators for {@link Bag} and {@link SortedBag} instances.

2
src/main/java/org/apache/commons/collections/BidiMap.java → src/main/java/org/apache/commons/collections4/BidiMap.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
/** /**
* Defines a map that allows bidirectional lookup between key and values. * Defines a map that allows bidirectional lookup between key and values.

2
src/main/java/org/apache/commons/collections/BoundedCollection.java → src/main/java/org/apache/commons/collections4/BoundedCollection.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.Collection; import java.util.Collection;

2
src/main/java/org/apache/commons/collections/BoundedMap.java → src/main/java/org/apache/commons/collections4/BoundedMap.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
/** /**
* Defines a map that is bounded in size. * Defines a map that is bounded in size.

2
src/main/java/org/apache/commons/collections/Closure.java → src/main/java/org/apache/commons/collections4/Closure.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
/** /**
* Defines a functor interface implemented by classes that do something. * Defines a functor interface implemented by classes that do something.

60
src/main/java/org/apache/commons/collections/ClosureUtils.java → src/main/java/org/apache/commons/collections4/ClosureUtils.java
View File

@ -14,21 +14,21 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.Collection; import java.util.Collection;
import java.util.Map; import java.util.Map;
import org.apache.commons.collections.functors.ChainedClosure; import org.apache.commons.collections4.functors.ChainedClosure;
import org.apache.commons.collections.functors.EqualPredicate; import org.apache.commons.collections4.functors.EqualPredicate;
import org.apache.commons.collections.functors.ExceptionClosure; import org.apache.commons.collections4.functors.ExceptionClosure;
import org.apache.commons.collections.functors.ForClosure; import org.apache.commons.collections4.functors.ForClosure;
import org.apache.commons.collections.functors.IfClosure; import org.apache.commons.collections4.functors.IfClosure;
import org.apache.commons.collections.functors.InvokerTransformer; import org.apache.commons.collections4.functors.InvokerTransformer;
import org.apache.commons.collections.functors.NOPClosure; import org.apache.commons.collections4.functors.NOPClosure;
import org.apache.commons.collections.functors.SwitchClosure; import org.apache.commons.collections4.functors.SwitchClosure;
import org.apache.commons.collections.functors.TransformerClosure; import org.apache.commons.collections4.functors.TransformerClosure;
import org.apache.commons.collections.functors.WhileClosure; import org.apache.commons.collections4.functors.WhileClosure;
/** /**
* <code>ClosureUtils</code> provides reference implementations and utilities * <code>ClosureUtils</code> provides reference implementations and utilities
@ -61,7 +61,7 @@ public class ClosureUtils {
* Gets a Closure that always throws an exception. * Gets a Closure that always throws an exception.
* This could be useful during testing as a placeholder. * This could be useful during testing as a placeholder.
* *
* @see org.apache.commons.collections.functors.ExceptionClosure * @see org.apache.commons.collections4.functors.ExceptionClosure
* *
* @param <E> the type that the closure acts on * @param <E> the type that the closure acts on
* @return the closure * @return the closure
@ -74,7 +74,7 @@ public class ClosureUtils {
* Gets a Closure that will do nothing. * Gets a Closure that will do nothing.
* This could be useful during testing as a placeholder. * This could be useful during testing as a placeholder.
* *
* @see org.apache.commons.collections.functors.NOPClosure * @see org.apache.commons.collections4.functors.NOPClosure
* *
* @param <E> the type that the closure acts on * @param <E> the type that the closure acts on
* @return the closure * @return the closure
@ -88,7 +88,7 @@ public class ClosureUtils {
* The transformer will be called using the closure's input object. * The transformer will be called using the closure's input object.
* The transformer's result will be ignored. * The transformer's result will be ignored.
* *
* @see org.apache.commons.collections.functors.TransformerClosure * @see org.apache.commons.collections4.functors.TransformerClosure
* *
* @param <E> the type that the closure acts on * @param <E> the type that the closure acts on
* @param transformer the transformer to run each time in the closure, null means nop * @param transformer the transformer to run each time in the closure, null means nop
@ -103,7 +103,7 @@ public class ClosureUtils {
* <p> * <p>
* A null closure or zero count returns the <code>NOPClosure</code>. * A null closure or zero count returns the <code>NOPClosure</code>.
* *
* @see org.apache.commons.collections.functors.ForClosure * @see org.apache.commons.collections4.functors.ForClosure
* *
* @param <E> the type that the closure acts on * @param <E> the type that the closure acts on
* @param count the number of times to loop * @param count the number of times to loop
@ -118,7 +118,7 @@ public class ClosureUtils {
* Creates a Closure that will call the closure repeatedly until the * Creates a Closure that will call the closure repeatedly until the
* predicate returns false. * predicate returns false.
* *
* @see org.apache.commons.collections.functors.WhileClosure * @see org.apache.commons.collections4.functors.WhileClosure
* *
* @param <E> the type that the closure acts on * @param <E> the type that the closure acts on
* @param predicate the predicate to use as an end of loop test, not null * @param predicate the predicate to use as an end of loop test, not null
@ -134,7 +134,7 @@ public class ClosureUtils {
* Creates a Closure that will call the closure once and then repeatedly * Creates a Closure that will call the closure once and then repeatedly
* until the predicate returns false. * until the predicate returns false.
* *
* @see org.apache.commons.collections.functors.WhileClosure * @see org.apache.commons.collections4.functors.WhileClosure
* *
* @param <E> the type that the closure acts on * @param <E> the type that the closure acts on
* @param closure the closure to call repeatedly, not null * @param closure the closure to call repeatedly, not null
@ -151,8 +151,8 @@ public class ClosureUtils {
* Creates a Closure that will invoke a specific method on the closure's * Creates a Closure that will invoke a specific method on the closure's
* input object by reflection. * input object by reflection.
* *
* @see org.apache.commons.collections.functors.InvokerTransformer * @see org.apache.commons.collections4.functors.InvokerTransformer
* @see org.apache.commons.collections.functors.TransformerClosure * @see org.apache.commons.collections4.functors.TransformerClosure
* *
* @param <E> the type that the closure acts on * @param <E> the type that the closure acts on
* @param methodName the name of the method * @param methodName the name of the method
@ -168,8 +168,8 @@ public class ClosureUtils {
* Creates a Closure that will invoke a specific method on the closure's * Creates a Closure that will invoke a specific method on the closure's
* input object by reflection. * input object by reflection.
* *
* @see org.apache.commons.collections.functors.InvokerTransformer * @see org.apache.commons.collections4.functors.InvokerTransformer
* @see org.apache.commons.collections.functors.TransformerClosure * @see org.apache.commons.collections4.functors.TransformerClosure
* *
* @param <E> the type that the closure acts on * @param <E> the type that the closure acts on
* @param methodName the name of the method * @param methodName the name of the method
@ -189,7 +189,7 @@ public class ClosureUtils {
* Create a new Closure that calls two Closures, passing the result of * Create a new Closure that calls two Closures, passing the result of
* the first into the second. * the first into the second.
* *
* @see org.apache.commons.collections.functors.ChainedClosure * @see org.apache.commons.collections4.functors.ChainedClosure
* *
* @param <E> the type that the closure acts on * @param <E> the type that the closure acts on
* @param closure1 the first closure * @param closure1 the first closure
@ -205,7 +205,7 @@ public class ClosureUtils {
* Create a new Closure that calls each closure in turn, passing the * Create a new Closure that calls each closure in turn, passing the
* result into the next closure. * result into the next closure.
* *
* @see org.apache.commons.collections.functors.ChainedClosure * @see org.apache.commons.collections4.functors.ChainedClosure
* *
* @param <E> the type that the closure acts on * @param <E> the type that the closure acts on
* @param closures an array of closures to chain * @param closures an array of closures to chain
@ -222,7 +222,7 @@ public class ClosureUtils {
* result into the next closure. The ordering is that of the iterator() * result into the next closure. The ordering is that of the iterator()
* method on the collection. * method on the collection.
* *
* @see org.apache.commons.collections.functors.ChainedClosure * @see org.apache.commons.collections4.functors.ChainedClosure
* *
* @param <E> the type that the closure acts on * @param <E> the type that the closure acts on
* @param closures a collection of closures to chain * @param closures a collection of closures to chain
@ -239,7 +239,7 @@ public class ClosureUtils {
* Create a new Closure that calls another closure based on the * Create a new Closure that calls another closure based on the
* result of the specified predicate. * result of the specified predicate.
* *
* @see org.apache.commons.collections.functors.IfClosure * @see org.apache.commons.collections4.functors.IfClosure
* *
* @param <E> the type that the closure acts on * @param <E> the type that the closure acts on
* @param predicate the validating predicate * @param predicate the validating predicate
@ -258,7 +258,7 @@ public class ClosureUtils {
* Create a new Closure that calls one of two closures depending * Create a new Closure that calls one of two closures depending
* on the specified predicate. * on the specified predicate.
* *
* @see org.apache.commons.collections.functors.IfClosure * @see org.apache.commons.collections4.functors.IfClosure
* *
* @param <E> the type that the closure acts on * @param <E> the type that the closure acts on
* @param predicate the predicate to switch on * @param predicate the predicate to switch on
@ -282,7 +282,7 @@ public class ClosureUtils {
* location 0 returned true. Each predicate is evaluated * location 0 returned true. Each predicate is evaluated
* until one returns true. * until one returns true.
* *
* @see org.apache.commons.collections.functors.SwitchClosure * @see org.apache.commons.collections4.functors.SwitchClosure
* *
* @param <E> the type that the closure acts on * @param <E> the type that the closure acts on
* @param predicates an array of predicates to check, not null * @param predicates an array of predicates to check, not null
@ -306,7 +306,7 @@ public class ClosureUtils {
* until one returns true. If no predicates evaluate to true, the default * until one returns true. If no predicates evaluate to true, the default
* closure is called. * closure is called.
* *
* @see org.apache.commons.collections.functors.SwitchClosure * @see org.apache.commons.collections4.functors.SwitchClosure
* *
* @param <E> the type that the closure acts on * @param <E> the type that the closure acts on
* @param predicates an array of predicates to check, not null * @param predicates an array of predicates to check, not null
@ -334,7 +334,7 @@ public class ClosureUtils {
* null key. The ordering is that of the iterator() method on the entryset * null key. The ordering is that of the iterator() method on the entryset
* collection of the map. * collection of the map.
* *
* @see org.apache.commons.collections.functors.SwitchClosure * @see org.apache.commons.collections4.functors.SwitchClosure
* *
* @param <E> the type that the closure acts on * @param <E> the type that the closure acts on
* @param predicatesAndClosures a map of predicates to closures * @param predicatesAndClosures a map of predicates to closures
@ -357,7 +357,7 @@ public class ClosureUtils {
* default closure is called. The default closure is set in the map * default closure is called. The default closure is set in the map
* using a null key. * using a null key.
* *
* @see org.apache.commons.collections.functors.SwitchClosure * @see org.apache.commons.collections4.functors.SwitchClosure
* *
* @param <E> the type that the closure acts on * @param <E> the type that the closure acts on
* @param objectsAndClosures a map of objects to closures * @param objectsAndClosures a map of objects to closures

18
src/main/java/org/apache/commons/collections/CollectionUtils.java → src/main/java/org/apache/commons/collections4/CollectionUtils.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.util.ArrayList; import java.util.ArrayList;
@ -28,14 +28,14 @@ import java.util.ListIterator;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.apache.commons.collections.bag.HashBag; import org.apache.commons.collections4.bag.HashBag;
import org.apache.commons.collections.collection.PredicatedCollection; import org.apache.commons.collections4.collection.PredicatedCollection;
import org.apache.commons.collections.collection.SynchronizedCollection; import org.apache.commons.collections4.collection.SynchronizedCollection;
import org.apache.commons.collections.collection.TransformedCollection; import org.apache.commons.collections4.collection.TransformedCollection;
import org.apache.commons.collections.collection.UnmodifiableBoundedCollection; import org.apache.commons.collections4.collection.UnmodifiableBoundedCollection;
import org.apache.commons.collections.collection.UnmodifiableCollection; import org.apache.commons.collections4.collection.UnmodifiableCollection;
import org.apache.commons.collections.functors.Equator; import org.apache.commons.collections4.functors.Equator;
import org.apache.commons.collections.functors.TruePredicate; import org.apache.commons.collections4.functors.TruePredicate;
/** /**
* Provides utility methods and decorators for {@link Collection} instances. * Provides utility methods and decorators for {@link Collection} instances.

14
src/main/java/org/apache/commons/collections/ComparatorUtils.java → src/main/java/org/apache/commons/collections4/ComparatorUtils.java
View File

@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.Collection; import java.util.Collection;
import java.util.Comparator; import java.util.Comparator;
import org.apache.commons.collections.comparators.BooleanComparator; import org.apache.commons.collections4.comparators.BooleanComparator;
import org.apache.commons.collections.comparators.ComparableComparator; import org.apache.commons.collections4.comparators.ComparableComparator;
import org.apache.commons.collections.comparators.ComparatorChain; import org.apache.commons.collections4.comparators.ComparatorChain;
import org.apache.commons.collections.comparators.NullComparator; import org.apache.commons.collections4.comparators.NullComparator;
import org.apache.commons.collections.comparators.ReverseComparator; import org.apache.commons.collections4.comparators.ReverseComparator;
import org.apache.commons.collections.comparators.TransformingComparator; import org.apache.commons.collections4.comparators.TransformingComparator;
/** /**
* Provides convenient static utility methods for <Code>Comparator</Code> * Provides convenient static utility methods for <Code>Comparator</Code>

4
src/main/java/org/apache/commons/collections/EnumerationUtils.java → src/main/java/org/apache/commons/collections4/EnumerationUtils.java
View File

@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.List; import java.util.List;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.apache.commons.collections.iterators.EnumerationIterator; import org.apache.commons.collections4.iterators.EnumerationIterator;
/** /**
* Provides utility methods for {@link Enumeration} instances. * Provides utility methods for {@link Enumeration} instances.

2
src/main/java/org/apache/commons/collections/Factory.java → src/main/java/org/apache/commons/collections4/Factory.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
/** /**
* Defines a functor interface implemented by classes that create objects. * Defines a functor interface implemented by classes that create objects.

22
src/main/java/org/apache/commons/collections/FactoryUtils.java → src/main/java/org/apache/commons/collections4/FactoryUtils.java
View File

@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import org.apache.commons.collections.functors.ConstantFactory; import org.apache.commons.collections4.functors.ConstantFactory;
import org.apache.commons.collections.functors.InstantiateFactory; import org.apache.commons.collections4.functors.ExceptionFactory;
import org.apache.commons.collections.functors.ExceptionFactory; import org.apache.commons.collections4.functors.InstantiateFactory;
import org.apache.commons.collections.functors.PrototypeFactory; import org.apache.commons.collections4.functors.PrototypeFactory;
/** /**
* <code>FactoryUtils</code> provides reference implementations and utilities * <code>FactoryUtils</code> provides reference implementations and utilities
@ -47,7 +47,7 @@ public class FactoryUtils {
* Gets a Factory that always throws an exception. * Gets a Factory that always throws an exception.
* This could be useful during testing as a placeholder. * This could be useful during testing as a placeholder.
* *
* @see org.apache.commons.collections.functors.ExceptionFactory * @see org.apache.commons.collections4.functors.ExceptionFactory
* *
* @param <T> the type that the factory creates * @param <T> the type that the factory creates
* @return the factory * @return the factory
@ -60,7 +60,7 @@ public class FactoryUtils {
* Gets a Factory that will return null each time the factory is used. * Gets a Factory that will return null each time the factory is used.
* This could be useful during testing as a placeholder. * This could be useful during testing as a placeholder.
* *
* @see org.apache.commons.collections.functors.ConstantFactory * @see org.apache.commons.collections4.functors.ConstantFactory
* @param <T> the "type" of null object the factory should return. * @param <T> the "type" of null object the factory should return.
* @return the factory * @return the factory
*/ */
@ -74,7 +74,7 @@ public class FactoryUtils {
* immutable objects should use the constant factory. Mutable objects should * immutable objects should use the constant factory. Mutable objects should
* use the prototype factory. * use the prototype factory.
* *
* @see org.apache.commons.collections.functors.ConstantFactory * @see org.apache.commons.collections4.functors.ConstantFactory
* *
* @param <T> the type that the factory creates * @param <T> the type that the factory creates
* @param constantToReturn the constant object to return each time in the factory * @param constantToReturn the constant object to return each time in the factory
@ -94,7 +94,7 @@ public class FactoryUtils {
* <li>serialization clone * <li>serialization clone
* <ul> * <ul>
* *
* @see org.apache.commons.collections.functors.PrototypeFactory * @see org.apache.commons.collections4.functors.PrototypeFactory
* *
* @param <T> the type that the factory creates * @param <T> the type that the factory creates
* @param prototype the object to clone each time in the factory * @param prototype the object to clone each time in the factory
@ -110,7 +110,7 @@ public class FactoryUtils {
* Creates a Factory that can create objects of a specific type using * Creates a Factory that can create objects of a specific type using
* a no-args constructor. * a no-args constructor.
* *
* @see org.apache.commons.collections.functors.InstantiateFactory * @see org.apache.commons.collections4.functors.InstantiateFactory
* *
* @param <T> the type that the factory creates * @param <T> the type that the factory creates
* @param classToInstantiate the Class to instantiate each time in the factory * @param classToInstantiate the Class to instantiate each time in the factory
@ -125,7 +125,7 @@ public class FactoryUtils {
* Creates a Factory that can create objects of a specific type using * Creates a Factory that can create objects of a specific type using
* the arguments specified to this method. * the arguments specified to this method.
* *
* @see org.apache.commons.collections.functors.InstantiateFactory * @see org.apache.commons.collections4.functors.InstantiateFactory
* *
* @param <T> the type that the factory creates * @param <T> the type that the factory creates
* @param classToInstantiate the Class to instantiate each time in the factory * @param classToInstantiate the Class to instantiate each time in the factory

2
src/main/java/org/apache/commons/collections/FunctorException.java → src/main/java/org/apache/commons/collections4/FunctorException.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
/** /**
* Runtime exception thrown from functors. * Runtime exception thrown from functors.

2
src/main/java/org/apache/commons/collections/Get.java → src/main/java/org/apache/commons/collections4/Get.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.Collection; import java.util.Collection;
import java.util.Set; import java.util.Set;

2
src/main/java/org/apache/commons/collections/IterableGet.java → src/main/java/org/apache/commons/collections4/IterableGet.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
/** /**
* The "read" subset of the {@link java.util.Map} interface. * The "read" subset of the {@link java.util.Map} interface.

2
src/main/java/org/apache/commons/collections/IterableMap.java → src/main/java/org/apache/commons/collections4/IterableMap.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.Map; import java.util.Map;

2
src/main/java/org/apache/commons/collections/IterableSortedMap.java → src/main/java/org/apache/commons/collections4/IterableSortedMap.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.SortedMap; import java.util.SortedMap;

56
src/main/java/org/apache/commons/collections/IteratorUtils.java → src/main/java/org/apache/commons/collections4/IteratorUtils.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
@ -29,33 +29,33 @@ import java.util.List;
import java.util.ListIterator; import java.util.ListIterator;
import java.util.Map; import java.util.Map;
import org.apache.commons.collections.iterators.ArrayIterator; import org.apache.commons.collections4.iterators.ArrayIterator;
import org.apache.commons.collections.iterators.ArrayListIterator; import org.apache.commons.collections4.iterators.ArrayListIterator;
import org.apache.commons.collections.iterators.CollatingIterator; import org.apache.commons.collections4.iterators.CollatingIterator;
import org.apache.commons.collections.iterators.EmptyIterator; import org.apache.commons.collections4.iterators.EmptyIterator;
import org.apache.commons.collections.iterators.EmptyListIterator; import org.apache.commons.collections4.iterators.EmptyListIterator;
import org.apache.commons.collections.iterators.EmptyMapIterator; import org.apache.commons.collections4.iterators.EmptyMapIterator;
import org.apache.commons.collections.iterators.EmptyOrderedIterator; import org.apache.commons.collections4.iterators.EmptyOrderedIterator;
import org.apache.commons.collections.iterators.EmptyOrderedMapIterator; import org.apache.commons.collections4.iterators.EmptyOrderedMapIterator;
import org.apache.commons.collections.iterators.EnumerationIterator; import org.apache.commons.collections4.iterators.EnumerationIterator;
import org.apache.commons.collections.iterators.FilterIterator; import org.apache.commons.collections4.iterators.FilterIterator;
import org.apache.commons.collections.iterators.FilterListIterator; import org.apache.commons.collections4.iterators.FilterListIterator;
import org.apache.commons.collections.iterators.IteratorChain; import org.apache.commons.collections4.iterators.IteratorChain;
import org.apache.commons.collections.iterators.IteratorEnumeration; import org.apache.commons.collections4.iterators.IteratorEnumeration;
import org.apache.commons.collections.iterators.IteratorIterable; import org.apache.commons.collections4.iterators.IteratorIterable;
import org.apache.commons.collections.iterators.ListIteratorWrapper; import org.apache.commons.collections4.iterators.ListIteratorWrapper;
import org.apache.commons.collections.iterators.LoopingIterator; import org.apache.commons.collections4.iterators.LoopingIterator;
import org.apache.commons.collections.iterators.LoopingListIterator; import org.apache.commons.collections4.iterators.LoopingListIterator;
import org.apache.commons.collections.iterators.NodeListIterator; import org.apache.commons.collections4.iterators.NodeListIterator;
import org.apache.commons.collections.iterators.ObjectArrayIterator; import org.apache.commons.collections4.iterators.ObjectArrayIterator;
import org.apache.commons.collections.iterators.ObjectArrayListIterator; import org.apache.commons.collections4.iterators.ObjectArrayListIterator;
import org.apache.commons.collections.iterators.ObjectGraphIterator; import org.apache.commons.collections4.iterators.ObjectGraphIterator;
import org.apache.commons.collections.iterators.SingletonIterator; import org.apache.commons.collections4.iterators.SingletonIterator;
import org.apache.commons.collections.iterators.SingletonListIterator; import org.apache.commons.collections4.iterators.SingletonListIterator;
import org.apache.commons.collections.iterators.TransformIterator; import org.apache.commons.collections4.iterators.TransformIterator;
import org.apache.commons.collections.iterators.UnmodifiableIterator; import org.apache.commons.collections4.iterators.UnmodifiableIterator;
import org.apache.commons.collections.iterators.UnmodifiableListIterator; import org.apache.commons.collections4.iterators.UnmodifiableListIterator;
import org.apache.commons.collections.iterators.UnmodifiableMapIterator; import org.apache.commons.collections4.iterators.UnmodifiableMapIterator;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;

2
src/main/java/org/apache/commons/collections/KeyValue.java → src/main/java/org/apache/commons/collections4/KeyValue.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
/** /**
* Defines a simple key value pair. * Defines a simple key value pair.

14
src/main/java/org/apache/commons/collections/ListUtils.java → src/main/java/org/apache/commons/collections4/ListUtils.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.AbstractList; import java.util.AbstractList;
import java.util.ArrayList; import java.util.ArrayList;
@ -24,12 +24,12 @@ import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import org.apache.commons.collections.bag.HashBag; import org.apache.commons.collections4.bag.HashBag;
import org.apache.commons.collections.list.FixedSizeList; import org.apache.commons.collections4.list.FixedSizeList;
import org.apache.commons.collections.list.LazyList; import org.apache.commons.collections4.list.LazyList;
import org.apache.commons.collections.list.PredicatedList; import org.apache.commons.collections4.list.PredicatedList;
import org.apache.commons.collections.list.TransformedList; import org.apache.commons.collections4.list.TransformedList;
import org.apache.commons.collections.list.UnmodifiableList; import org.apache.commons.collections4.list.UnmodifiableList;
/** /**
* Provides utility methods and decorators for {@link List} instances. * Provides utility methods and decorators for {@link List} instances.

2
src/main/java/org/apache/commons/collections/MapIterator.java → src/main/java/org/apache/commons/collections4/MapIterator.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.Iterator; import java.util.Iterator;

30
src/main/java/org/apache/commons/collections/MapUtils.java → src/main/java/org/apache/commons/collections4/MapUtils.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.io.PrintStream; import java.io.PrintStream;
import java.text.NumberFormat; import java.text.NumberFormat;
@ -31,20 +31,20 @@ import java.util.ResourceBundle;
import java.util.SortedMap; import java.util.SortedMap;
import java.util.TreeMap; import java.util.TreeMap;
import org.apache.commons.collections.map.AbstractMapDecorator; import org.apache.commons.collections4.map.AbstractMapDecorator;
import org.apache.commons.collections.map.AbstractSortedMapDecorator; import org.apache.commons.collections4.map.AbstractSortedMapDecorator;
import org.apache.commons.collections.map.FixedSizeMap; import org.apache.commons.collections4.map.FixedSizeMap;
import org.apache.commons.collections.map.FixedSizeSortedMap; import org.apache.commons.collections4.map.FixedSizeSortedMap;
import org.apache.commons.collections.map.LazyMap; import org.apache.commons.collections4.map.LazyMap;
import org.apache.commons.collections.map.LazySortedMap; import org.apache.commons.collections4.map.LazySortedMap;
import org.apache.commons.collections.map.ListOrderedMap; import org.apache.commons.collections4.map.ListOrderedMap;
import org.apache.commons.collections.map.MultiValueMap; import org.apache.commons.collections4.map.MultiValueMap;
import org.apache.commons.collections.map.PredicatedMap; import org.apache.commons.collections4.map.PredicatedMap;
import org.apache.commons.collections.map.PredicatedSortedMap; import org.apache.commons.collections4.map.PredicatedSortedMap;
import org.apache.commons.collections.map.TransformedMap; import org.apache.commons.collections4.map.TransformedMap;
import org.apache.commons.collections.map.TransformedSortedMap; import org.apache.commons.collections4.map.TransformedSortedMap;
import org.apache.commons.collections.map.UnmodifiableMap; import org.apache.commons.collections4.map.UnmodifiableMap;
import org.apache.commons.collections.map.UnmodifiableSortedMap; import org.apache.commons.collections4.map.UnmodifiableSortedMap;
/** /**
* Provides utility methods and decorators for * Provides utility methods and decorators for

2
src/main/java/org/apache/commons/collections/MultiMap.java → src/main/java/org/apache/commons/collections4/MultiMap.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.Collection; import java.util.Collection;

2
src/main/java/org/apache/commons/collections/OrderedBidiMap.java → src/main/java/org/apache/commons/collections4/OrderedBidiMap.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
/** /**
* Defines a map that allows bidirectional lookup between key and values * Defines a map that allows bidirectional lookup between key and values

2
src/main/java/org/apache/commons/collections/OrderedIterator.java → src/main/java/org/apache/commons/collections4/OrderedIterator.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.Iterator; import java.util.Iterator;

2
src/main/java/org/apache/commons/collections/OrderedMap.java → src/main/java/org/apache/commons/collections4/OrderedMap.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
/** /**
* Defines a map that maintains order and allows both forward and backward * Defines a map that maintains order and allows both forward and backward

2
src/main/java/org/apache/commons/collections/OrderedMapIterator.java → src/main/java/org/apache/commons/collections4/OrderedMapIterator.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
/** /**
* Defines an iterator that operates over an ordered <code>Map</code>. * Defines an iterator that operates over an ordered <code>Map</code>.

2
src/main/java/org/apache/commons/collections/Predicate.java → src/main/java/org/apache/commons/collections4/Predicate.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
/** /**
* Defines a functor interface implemented by classes that perform a predicate * Defines a functor interface implemented by classes that perform a predicate

108
src/main/java/org/apache/commons/collections/PredicateUtils.java → src/main/java/org/apache/commons/collections4/PredicateUtils.java
View File

@ -14,32 +14,32 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.Collection; import java.util.Collection;
import org.apache.commons.collections.functors.AllPredicate; import org.apache.commons.collections4.functors.AllPredicate;
import org.apache.commons.collections.functors.AndPredicate; import org.apache.commons.collections4.functors.AndPredicate;
import org.apache.commons.collections.functors.AnyPredicate; import org.apache.commons.collections4.functors.AnyPredicate;
import org.apache.commons.collections.functors.EqualPredicate; import org.apache.commons.collections4.functors.EqualPredicate;
import org.apache.commons.collections.functors.ExceptionPredicate; import org.apache.commons.collections4.functors.ExceptionPredicate;
import org.apache.commons.collections.functors.FalsePredicate; import org.apache.commons.collections4.functors.FalsePredicate;
import org.apache.commons.collections.functors.IdentityPredicate; import org.apache.commons.collections4.functors.IdentityPredicate;
import org.apache.commons.collections.functors.InstanceofPredicate; import org.apache.commons.collections4.functors.InstanceofPredicate;
import org.apache.commons.collections.functors.InvokerTransformer; import org.apache.commons.collections4.functors.InvokerTransformer;
import org.apache.commons.collections.functors.NonePredicate; import org.apache.commons.collections4.functors.NonePredicate;
import org.apache.commons.collections.functors.NotNullPredicate; import org.apache.commons.collections4.functors.NotNullPredicate;
import org.apache.commons.collections.functors.NotPredicate; import org.apache.commons.collections4.functors.NotPredicate;
import org.apache.commons.collections.functors.NullIsExceptionPredicate; import org.apache.commons.collections4.functors.NullIsExceptionPredicate;
import org.apache.commons.collections.functors.NullIsFalsePredicate; import org.apache.commons.collections4.functors.NullIsFalsePredicate;
import org.apache.commons.collections.functors.NullIsTruePredicate; import org.apache.commons.collections4.functors.NullIsTruePredicate;
import org.apache.commons.collections.functors.NullPredicate; import org.apache.commons.collections4.functors.NullPredicate;
import org.apache.commons.collections.functors.OnePredicate; import org.apache.commons.collections4.functors.OnePredicate;
import org.apache.commons.collections.functors.OrPredicate; import org.apache.commons.collections4.functors.OrPredicate;
import org.apache.commons.collections.functors.TransformedPredicate; import org.apache.commons.collections4.functors.TransformedPredicate;
import org.apache.commons.collections.functors.TransformerPredicate; import org.apache.commons.collections4.functors.TransformerPredicate;
import org.apache.commons.collections.functors.TruePredicate; import org.apache.commons.collections4.functors.TruePredicate;
import org.apache.commons.collections.functors.UniquePredicate; import org.apache.commons.collections4.functors.UniquePredicate;
/** /**
* <code>PredicateUtils</code> provides reference implementations and utilities * <code>PredicateUtils</code> provides reference implementations and utilities
@ -85,7 +85,7 @@ public class PredicateUtils {
* *
* @param <T> the type that the predicate queries * @param <T> the type that the predicate queries
* @return the predicate * @return the predicate
* @see org.apache.commons.collections.functors.ExceptionPredicate * @see org.apache.commons.collections4.functors.ExceptionPredicate
*/ */
public static <T> Predicate<T> exceptionPredicate() { public static <T> Predicate<T> exceptionPredicate() {
return ExceptionPredicate.<T>exceptionPredicate(); return ExceptionPredicate.<T>exceptionPredicate();
@ -96,7 +96,7 @@ public class PredicateUtils {
* *
* @param <T> the type that the predicate queries * @param <T> the type that the predicate queries
* @return the predicate * @return the predicate
* @see org.apache.commons.collections.functors.TruePredicate * @see org.apache.commons.collections4.functors.TruePredicate
*/ */
public static <T> Predicate<T> truePredicate() { public static <T> Predicate<T> truePredicate() {
return TruePredicate.truePredicate(); return TruePredicate.truePredicate();
@ -107,7 +107,7 @@ public class PredicateUtils {
* *
* @param <T> the type that the predicate queries * @param <T> the type that the predicate queries
* @return the predicate * @return the predicate
* @see org.apache.commons.collections.functors.FalsePredicate * @see org.apache.commons.collections4.functors.FalsePredicate
*/ */
public static <T> Predicate<T> falsePredicate() { public static <T> Predicate<T> falsePredicate() {
return FalsePredicate.<T> falsePredicate(); return FalsePredicate.<T> falsePredicate();
@ -118,7 +118,7 @@ public class PredicateUtils {
* *
* @param <T> the type that the predicate queries * @param <T> the type that the predicate queries
* @return the predicate * @return the predicate
* @see org.apache.commons.collections.functors.NullPredicate * @see org.apache.commons.collections4.functors.NullPredicate
*/ */
public static <T> Predicate<T> nullPredicate() { public static <T> Predicate<T> nullPredicate() {
return NullPredicate.nullPredicate(); return NullPredicate.nullPredicate();
@ -129,7 +129,7 @@ public class PredicateUtils {
* *
* @param <T> the type that the predicate queries * @param <T> the type that the predicate queries
* @return the predicate * @return the predicate
* @see org.apache.commons.collections.functors.NotNullPredicate * @see org.apache.commons.collections4.functors.NotNullPredicate
*/ */
public static <T> Predicate<T> notNullPredicate() { public static <T> Predicate<T> notNullPredicate() {
return NotNullPredicate.<T>notNullPredicate(); return NotNullPredicate.<T>notNullPredicate();
@ -142,7 +142,7 @@ public class PredicateUtils {
* @param <T> the type that the predicate queries * @param <T> the type that the predicate queries
* @param value the value to compare against * @param value the value to compare against
* @return the predicate * @return the predicate
* @see org.apache.commons.collections.functors.EqualPredicate * @see org.apache.commons.collections4.functors.EqualPredicate
*/ */
public static <T> Predicate<T> equalPredicate(final T value) { public static <T> Predicate<T> equalPredicate(final T value) {
return EqualPredicate.equalPredicate(value); return EqualPredicate.equalPredicate(value);
@ -155,7 +155,7 @@ public class PredicateUtils {
* @param <T> the type that the predicate queries * @param <T> the type that the predicate queries
* @param value the value to compare against * @param value the value to compare against
* @return the predicate * @return the predicate
* @see org.apache.commons.collections.functors.IdentityPredicate * @see org.apache.commons.collections4.functors.IdentityPredicate
*/ */
public static <T> Predicate<T> identityPredicate(final T value) { public static <T> Predicate<T> identityPredicate(final T value) {
return IdentityPredicate.<T>identityPredicate(value); return IdentityPredicate.<T>identityPredicate(value);
@ -169,7 +169,7 @@ public class PredicateUtils {
* @param type the type to check for, may not be null * @param type the type to check for, may not be null
* @return the predicate * @return the predicate
* @throws IllegalArgumentException if the class is null * @throws IllegalArgumentException if the class is null
* @see org.apache.commons.collections.functors.InstanceofPredicate * @see org.apache.commons.collections4.functors.InstanceofPredicate
*/ */
public static Predicate<Object> instanceofPredicate(final Class<?> type) { public static Predicate<Object> instanceofPredicate(final Class<?> type) {
return InstanceofPredicate.instanceOfPredicate(type); return InstanceofPredicate.instanceOfPredicate(type);
@ -184,7 +184,7 @@ public class PredicateUtils {
* *
* @param <T> the type that the predicate queries * @param <T> the type that the predicate queries
* @return the predicate * @return the predicate
* @see org.apache.commons.collections.functors.UniquePredicate * @see org.apache.commons.collections4.functors.UniquePredicate
*/ */
public static <T> Predicate<T> uniquePredicate() { public static <T> Predicate<T> uniquePredicate() {
// must return new instance each time // must return new instance each time
@ -205,8 +205,8 @@ public class PredicateUtils {
* @param methodName the method name to call on the input object, may not be null * @param methodName the method name to call on the input object, may not be null
* @return the predicate * @return the predicate
* @throws IllegalArgumentException if the methodName is null. * @throws IllegalArgumentException if the methodName is null.
* @see org.apache.commons.collections.functors.InvokerTransformer * @see org.apache.commons.collections4.functors.InvokerTransformer
* @see org.apache.commons.collections.functors.TransformerPredicate * @see org.apache.commons.collections4.functors.TransformerPredicate
*/ */
public static <T> Predicate<T> invokerPredicate(final String methodName) { public static <T> Predicate<T> invokerPredicate(final String methodName) {
// reuse transformer as it has caching - this is lazy really, should have inner class here // reuse transformer as it has caching - this is lazy really, should have inner class here
@ -230,8 +230,8 @@ public class PredicateUtils {
* @return the predicate * @return the predicate
* @throws IllegalArgumentException if the method name is null * @throws IllegalArgumentException if the method name is null
* @throws IllegalArgumentException if the paramTypes and args don't match * @throws IllegalArgumentException if the paramTypes and args don't match
* @see org.apache.commons.collections.functors.InvokerTransformer * @see org.apache.commons.collections4.functors.InvokerTransformer
* @see org.apache.commons.collections.functors.TransformerPredicate * @see org.apache.commons.collections4.functors.TransformerPredicate
*/ */
public static <T> Predicate<T> invokerPredicate(final String methodName, final Class<?>[] paramTypes, public static <T> Predicate<T> invokerPredicate(final String methodName, final Class<?>[] paramTypes,
final Object[] args) { final Object[] args) {
@ -251,7 +251,7 @@ public class PredicateUtils {
* @param predicate2 the second predicate, may not be null * @param predicate2 the second predicate, may not be null
* @return the <code>and</code> predicate * @return the <code>and</code> predicate
* @throws IllegalArgumentException if either predicate is null * @throws IllegalArgumentException if either predicate is null
* @see org.apache.commons.collections.functors.AndPredicate * @see org.apache.commons.collections4.functors.AndPredicate
*/ */
public static <T> Predicate<T> andPredicate(final Predicate<? super T> predicate1, public static <T> Predicate<T> andPredicate(final Predicate<? super T> predicate1,
final Predicate<? super T> predicate2) { final Predicate<? super T> predicate2) {
@ -268,7 +268,7 @@ public class PredicateUtils {
* @return the <code>all</code> predicate * @return the <code>all</code> predicate
* @throws IllegalArgumentException if the predicates array is null * @throws IllegalArgumentException if the predicates array is null
* @throws IllegalArgumentException if any predicate in the array is null * @throws IllegalArgumentException if any predicate in the array is null
* @see org.apache.commons.collections.functors.AllPredicate * @see org.apache.commons.collections4.functors.AllPredicate
*/ */
public static <T> Predicate<T> allPredicate(final Predicate<? super T>... predicates) { public static <T> Predicate<T> allPredicate(final Predicate<? super T>... predicates) {
return AllPredicate.allPredicate(predicates); return AllPredicate.allPredicate(predicates);
@ -284,7 +284,7 @@ public class PredicateUtils {
* @return the <code>all</code> predicate * @return the <code>all</code> predicate
* @throws IllegalArgumentException if the predicates collection is null * @throws IllegalArgumentException if the predicates collection is null
* @throws IllegalArgumentException if any predicate in the collection is null * @throws IllegalArgumentException if any predicate in the collection is null
* @see org.apache.commons.collections.functors.AllPredicate * @see org.apache.commons.collections4.functors.AllPredicate
*/ */
public static <T> Predicate<T> allPredicate(final Collection<? extends Predicate<T>> predicates) { public static <T> Predicate<T> allPredicate(final Collection<? extends Predicate<T>> predicates) {
return AllPredicate.allPredicate(predicates); return AllPredicate.allPredicate(predicates);
@ -299,7 +299,7 @@ public class PredicateUtils {
* @param predicate2 the second predicate, may not be null * @param predicate2 the second predicate, may not be null
* @return the <code>or</code> predicate * @return the <code>or</code> predicate
* @throws IllegalArgumentException if either predicate is null * @throws IllegalArgumentException if either predicate is null
* @see org.apache.commons.collections.functors.OrPredicate * @see org.apache.commons.collections4.functors.OrPredicate
*/ */
public static <T> Predicate<T> orPredicate(final Predicate<? super T> predicate1, public static <T> Predicate<T> orPredicate(final Predicate<? super T> predicate1,
final Predicate<? super T> predicate2) { final Predicate<? super T> predicate2) {
@ -316,7 +316,7 @@ public class PredicateUtils {
* @return the <code>any</code> predicate * @return the <code>any</code> predicate
* @throws IllegalArgumentException if the predicates array is null * @throws IllegalArgumentException if the predicates array is null
* @throws IllegalArgumentException if any predicate in the array is null * @throws IllegalArgumentException if any predicate in the array is null
* @see org.apache.commons.collections.functors.AnyPredicate * @see org.apache.commons.collections4.functors.AnyPredicate
*/ */
public static <T> Predicate<T> anyPredicate(final Predicate<? super T>... predicates) { public static <T> Predicate<T> anyPredicate(final Predicate<? super T>... predicates) {
return AnyPredicate.anyPredicate(predicates); return AnyPredicate.anyPredicate(predicates);
@ -332,7 +332,7 @@ public class PredicateUtils {
* @return the <code>any</code> predicate * @return the <code>any</code> predicate
* @throws IllegalArgumentException if the predicates collection is null * @throws IllegalArgumentException if the predicates collection is null
* @throws IllegalArgumentException if any predicate in the collection is null * @throws IllegalArgumentException if any predicate in the collection is null
* @see org.apache.commons.collections.functors.AnyPredicate * @see org.apache.commons.collections4.functors.AnyPredicate
*/ */
public static <T> Predicate<T> anyPredicate(final Collection<? extends Predicate<T>> predicates) { public static <T> Predicate<T> anyPredicate(final Collection<? extends Predicate<T>> predicates) {
return AnyPredicate.anyPredicate(predicates); return AnyPredicate.anyPredicate(predicates);
@ -347,7 +347,7 @@ public class PredicateUtils {
* @param predicate2 the second predicate, may not be null * @param predicate2 the second predicate, may not be null
* @return the <code>either</code> predicate * @return the <code>either</code> predicate
* @throws IllegalArgumentException if either predicate is null * @throws IllegalArgumentException if either predicate is null
* @see org.apache.commons.collections.functors.OnePredicate * @see org.apache.commons.collections4.functors.OnePredicate
*/ */
public static <T> Predicate<T> eitherPredicate(final Predicate<? super T> predicate1, public static <T> Predicate<T> eitherPredicate(final Predicate<? super T> predicate1,
final Predicate<? super T> predicate2) { final Predicate<? super T> predicate2) {
@ -366,7 +366,7 @@ public class PredicateUtils {
* @return the <code>one</code> predicate * @return the <code>one</code> predicate
* @throws IllegalArgumentException if the predicates array is null * @throws IllegalArgumentException if the predicates array is null
* @throws IllegalArgumentException if any predicate in the array is null * @throws IllegalArgumentException if any predicate in the array is null
* @see org.apache.commons.collections.functors.OnePredicate * @see org.apache.commons.collections4.functors.OnePredicate
*/ */
public static <T> Predicate<T> onePredicate(final Predicate<? super T>... predicates) { public static <T> Predicate<T> onePredicate(final Predicate<? super T>... predicates) {
return OnePredicate.onePredicate(predicates); return OnePredicate.onePredicate(predicates);
@ -382,7 +382,7 @@ public class PredicateUtils {
* @return the <code>one</code> predicate * @return the <code>one</code> predicate
* @throws IllegalArgumentException if the predicates collection is null * @throws IllegalArgumentException if the predicates collection is null
* @throws IllegalArgumentException if any predicate in the collection is null * @throws IllegalArgumentException if any predicate in the collection is null
* @see org.apache.commons.collections.functors.OnePredicate * @see org.apache.commons.collections4.functors.OnePredicate
*/ */
public static <T> Predicate<T> onePredicate(final Collection<Predicate<T>> predicates) { public static <T> Predicate<T> onePredicate(final Collection<Predicate<T>> predicates) {
return OnePredicate.onePredicate(predicates); return OnePredicate.onePredicate(predicates);
@ -397,7 +397,7 @@ public class PredicateUtils {
* @param predicate2 the second predicate, may not be null * @param predicate2 the second predicate, may not be null
* @return the <code>neither</code> predicate * @return the <code>neither</code> predicate
* @throws IllegalArgumentException if either predicate is null * @throws IllegalArgumentException if either predicate is null
* @see org.apache.commons.collections.functors.NonePredicate * @see org.apache.commons.collections4.functors.NonePredicate
*/ */
public static <T> Predicate<T> neitherPredicate(final Predicate<? super T> predicate1, public static <T> Predicate<T> neitherPredicate(final Predicate<? super T> predicate1,
final Predicate<? super T> predicate2) { final Predicate<? super T> predicate2) {
@ -416,7 +416,7 @@ public class PredicateUtils {
* @return the <code>none</code> predicate * @return the <code>none</code> predicate
* @throws IllegalArgumentException if the predicates array is null * @throws IllegalArgumentException if the predicates array is null
* @throws IllegalArgumentException if any predicate in the array is null * @throws IllegalArgumentException if any predicate in the array is null
* @see org.apache.commons.collections.functors.NonePredicate * @see org.apache.commons.collections4.functors.NonePredicate
*/ */
public static <T> Predicate<T> nonePredicate(final Predicate<? super T>... predicates) { public static <T> Predicate<T> nonePredicate(final Predicate<? super T>... predicates) {
return NonePredicate.nonePredicate(predicates); return NonePredicate.nonePredicate(predicates);
@ -432,7 +432,7 @@ public class PredicateUtils {
* @return the <code>none</code> predicate * @return the <code>none</code> predicate
* @throws IllegalArgumentException if the predicates collection is null * @throws IllegalArgumentException if the predicates collection is null
* @throws IllegalArgumentException if any predicate in the collection is null * @throws IllegalArgumentException if any predicate in the collection is null
* @see org.apache.commons.collections.functors.NonePredicate * @see org.apache.commons.collections4.functors.NonePredicate
*/ */
public static <T> Predicate<T> nonePredicate(final Collection<? extends Predicate<T>> predicates) { public static <T> Predicate<T> nonePredicate(final Collection<? extends Predicate<T>> predicates) {
return NonePredicate.nonePredicate(predicates); return NonePredicate.nonePredicate(predicates);
@ -446,7 +446,7 @@ public class PredicateUtils {
* @param predicate the predicate to not * @param predicate the predicate to not
* @return the <code>not</code> predicate * @return the <code>not</code> predicate
* @throws IllegalArgumentException if the predicate is null * @throws IllegalArgumentException if the predicate is null
* @see org.apache.commons.collections.functors.NotPredicate * @see org.apache.commons.collections4.functors.NotPredicate
*/ */
public static <T> Predicate<T> notPredicate(final Predicate<? super T> predicate) { public static <T> Predicate<T> notPredicate(final Predicate<? super T> predicate) {
return NotPredicate.notPredicate(predicate); return NotPredicate.notPredicate(predicate);
@ -464,7 +464,7 @@ public class PredicateUtils {
* @param transformer the transformer to wrap, may not be null * @param transformer the transformer to wrap, may not be null
* @return the transformer wrapping predicate * @return the transformer wrapping predicate
* @throws IllegalArgumentException if the transformer is null * @throws IllegalArgumentException if the transformer is null
* @see org.apache.commons.collections.functors.TransformerPredicate * @see org.apache.commons.collections4.functors.TransformerPredicate
*/ */
public static <T> Predicate<T> asPredicate(final Transformer<? super T, Boolean> transformer) { public static <T> Predicate<T> asPredicate(final Transformer<? super T, Boolean> transformer) {
return TransformerPredicate.transformerPredicate(transformer); return TransformerPredicate.transformerPredicate(transformer);
@ -482,7 +482,7 @@ public class PredicateUtils {
* @param predicate the predicate to wrap, may not be null * @param predicate the predicate to wrap, may not be null
* @return the predicate * @return the predicate
* @throws IllegalArgumentException if the predicate is null. * @throws IllegalArgumentException if the predicate is null.
* @see org.apache.commons.collections.functors.NullIsExceptionPredicate * @see org.apache.commons.collections4.functors.NullIsExceptionPredicate
*/ */
public static <T> Predicate<T> nullIsExceptionPredicate(final Predicate<? super T> predicate){ public static <T> Predicate<T> nullIsExceptionPredicate(final Predicate<? super T> predicate){
return NullIsExceptionPredicate.nullIsExceptionPredicate(predicate); return NullIsExceptionPredicate.nullIsExceptionPredicate(predicate);
@ -497,7 +497,7 @@ public class PredicateUtils {
* @param predicate the predicate to wrap, may not be null * @param predicate the predicate to wrap, may not be null
* @return the predicate * @return the predicate
* @throws IllegalArgumentException if the predicate is null. * @throws IllegalArgumentException if the predicate is null.
* @see org.apache.commons.collections.functors.NullIsFalsePredicate * @see org.apache.commons.collections4.functors.NullIsFalsePredicate
*/ */
public static <T> Predicate<T> nullIsFalsePredicate(final Predicate<? super T> predicate){ public static <T> Predicate<T> nullIsFalsePredicate(final Predicate<? super T> predicate){
return NullIsFalsePredicate.nullIsFalsePredicate(predicate); return NullIsFalsePredicate.nullIsFalsePredicate(predicate);
@ -512,7 +512,7 @@ public class PredicateUtils {
* @param predicate the predicate to wrap, may not be null * @param predicate the predicate to wrap, may not be null
* @return the predicate * @return the predicate
* @throws IllegalArgumentException if the predicate is null. * @throws IllegalArgumentException if the predicate is null.
* @see org.apache.commons.collections.functors.NullIsTruePredicate * @see org.apache.commons.collections4.functors.NullIsTruePredicate
*/ */
public static <T> Predicate<T> nullIsTruePredicate(final Predicate<? super T> predicate){ public static <T> Predicate<T> nullIsTruePredicate(final Predicate<? super T> predicate){
return NullIsTruePredicate.nullIsTruePredicate(predicate); return NullIsTruePredicate.nullIsTruePredicate(predicate);
@ -529,7 +529,7 @@ public class PredicateUtils {
* @param predicate the predicate to call with the result of the transform * @param predicate the predicate to call with the result of the transform
* @return the predicate * @return the predicate
* @throws IllegalArgumentException if the transformer or the predicate is null * @throws IllegalArgumentException if the transformer or the predicate is null
* @see org.apache.commons.collections.functors.TransformedPredicate * @see org.apache.commons.collections4.functors.TransformedPredicate
* @since 3.1 * @since 3.1
*/ */
public static <T> Predicate<T> transformedPredicate( public static <T> Predicate<T> transformedPredicate(

2
src/main/java/org/apache/commons/collections/Put.java → src/main/java/org/apache/commons/collections4/Put.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.Map; import java.util.Map;

8
src/main/java/org/apache/commons/collections/QueueUtils.java → src/main/java/org/apache/commons/collections4/QueueUtils.java
View File

@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Queue; import java.util.Queue;
import org.apache.commons.collections.queue.PredicatedQueue; import org.apache.commons.collections4.queue.PredicatedQueue;
import org.apache.commons.collections.queue.TransformedQueue; import org.apache.commons.collections4.queue.TransformedQueue;
import org.apache.commons.collections.queue.UnmodifiableQueue; import org.apache.commons.collections4.queue.UnmodifiableQueue;
/** /**
* Provides utility methods and decorators for {@link Queue} instances. * Provides utility methods and decorators for {@link Queue} instances.

2
src/main/java/org/apache/commons/collections/ResettableIterator.java → src/main/java/org/apache/commons/collections4/ResettableIterator.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.Iterator; import java.util.Iterator;

2
src/main/java/org/apache/commons/collections/ResettableListIterator.java → src/main/java/org/apache/commons/collections4/ResettableListIterator.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.ListIterator; import java.util.ListIterator;

16
src/main/java/org/apache/commons/collections/SetUtils.java → src/main/java/org/apache/commons/collections4/SetUtils.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
@ -22,13 +22,13 @@ import java.util.Set;
import java.util.SortedSet; import java.util.SortedSet;
import java.util.TreeSet; import java.util.TreeSet;
import org.apache.commons.collections.set.ListOrderedSet; import org.apache.commons.collections4.set.ListOrderedSet;
import org.apache.commons.collections.set.PredicatedSet; import org.apache.commons.collections4.set.PredicatedSet;
import org.apache.commons.collections.set.PredicatedSortedSet; import org.apache.commons.collections4.set.PredicatedSortedSet;
import org.apache.commons.collections.set.TransformedSet; import org.apache.commons.collections4.set.TransformedSet;
import org.apache.commons.collections.set.TransformedSortedSet; import org.apache.commons.collections4.set.TransformedSortedSet;
import org.apache.commons.collections.set.UnmodifiableSet; import org.apache.commons.collections4.set.UnmodifiableSet;
import org.apache.commons.collections.set.UnmodifiableSortedSet; import org.apache.commons.collections4.set.UnmodifiableSortedSet;
/** /**
* Provides utility methods and decorators for * Provides utility methods and decorators for

2
src/main/java/org/apache/commons/collections/SortedBag.java → src/main/java/org/apache/commons/collections4/SortedBag.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.Comparator; import java.util.Comparator;

2
src/main/java/org/apache/commons/collections/SortedBidiMap.java → src/main/java/org/apache/commons/collections4/SortedBidiMap.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.Comparator; import java.util.Comparator;
import java.util.SortedMap; import java.util.SortedMap;

12
src/main/java/org/apache/commons/collections/SplitMapUtils.java → src/main/java/org/apache/commons/collections4/SplitMapUtils.java
View File

@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.Collection; import java.util.Collection;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.apache.commons.collections.collection.UnmodifiableCollection; import org.apache.commons.collections4.set.UnmodifiableSet;
import org.apache.commons.collections.iterators.UnmodifiableMapIterator; import org.apache.commons.collections4.collection.UnmodifiableCollection;
import org.apache.commons.collections.map.EntrySetToMapIteratorAdapter; import org.apache.commons.collections4.iterators.UnmodifiableMapIterator;
import org.apache.commons.collections.map.UnmodifiableEntrySet; import org.apache.commons.collections4.map.EntrySetToMapIteratorAdapter;
import org.apache.commons.collections.set.UnmodifiableSet; import org.apache.commons.collections4.map.UnmodifiableEntrySet;
/** /**
* Utilities for working with "split maps:" objects that implement {@link Put} * Utilities for working with "split maps:" objects that implement {@link Put}

2
src/main/java/org/apache/commons/collections/Transformer.java → src/main/java/org/apache/commons/collections4/Transformer.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
/** /**
* Defines a functor interface implemented by classes that transform one * Defines a functor interface implemented by classes that transform one

74
src/main/java/org/apache/commons/collections/TransformerUtils.java → src/main/java/org/apache/commons/collections4/TransformerUtils.java
View File

@ -14,25 +14,25 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.Collection; import java.util.Collection;
import java.util.Map; import java.util.Map;
import org.apache.commons.collections.functors.ChainedTransformer; import org.apache.commons.collections4.functors.ChainedTransformer;
import org.apache.commons.collections.functors.CloneTransformer; import org.apache.commons.collections4.functors.CloneTransformer;
import org.apache.commons.collections.functors.ClosureTransformer; import org.apache.commons.collections4.functors.ClosureTransformer;
import org.apache.commons.collections.functors.ConstantTransformer; import org.apache.commons.collections4.functors.ConstantTransformer;
import org.apache.commons.collections.functors.EqualPredicate; import org.apache.commons.collections4.functors.EqualPredicate;
import org.apache.commons.collections.functors.ExceptionTransformer; import org.apache.commons.collections4.functors.ExceptionTransformer;
import org.apache.commons.collections.functors.FactoryTransformer; import org.apache.commons.collections4.functors.FactoryTransformer;
import org.apache.commons.collections.functors.InstantiateTransformer; import org.apache.commons.collections4.functors.InstantiateTransformer;
import org.apache.commons.collections.functors.InvokerTransformer; import org.apache.commons.collections4.functors.InvokerTransformer;
import org.apache.commons.collections.functors.MapTransformer; import org.apache.commons.collections4.functors.MapTransformer;
import org.apache.commons.collections.functors.NOPTransformer; import org.apache.commons.collections4.functors.NOPTransformer;
import org.apache.commons.collections.functors.PredicateTransformer; import org.apache.commons.collections4.functors.PredicateTransformer;
import org.apache.commons.collections.functors.StringValueTransformer; import org.apache.commons.collections4.functors.StringValueTransformer;
import org.apache.commons.collections.functors.SwitchTransformer; import org.apache.commons.collections4.functors.SwitchTransformer;
/** /**
* <code>TransformerUtils</code> provides reference implementations and * <code>TransformerUtils</code> provides reference implementations and
@ -73,7 +73,7 @@ public class TransformerUtils {
* @param <I> the input type * @param <I> the input type
* @param <O> the output type * @param <O> the output type
* @return the transformer * @return the transformer
* @see org.apache.commons.collections.functors.ExceptionTransformer * @see org.apache.commons.collections4.functors.ExceptionTransformer
*/ */
public static <I, O> Transformer<I, O> exceptionTransformer() { public static <I, O> Transformer<I, O> exceptionTransformer() {
return ExceptionTransformer.<I, O>exceptionTransformer(); return ExceptionTransformer.<I, O>exceptionTransformer();
@ -85,7 +85,7 @@ public class TransformerUtils {
* @param <I> the input type * @param <I> the input type
* @param <O> the output type * @param <O> the output type
* @return the transformer * @return the transformer
* @see org.apache.commons.collections.functors.ConstantTransformer * @see org.apache.commons.collections4.functors.ConstantTransformer
*/ */
public static <I, O> Transformer<I, O> nullTransformer() { public static <I, O> Transformer<I, O> nullTransformer() {
return ConstantTransformer.<I, O>nullTransformer(); return ConstantTransformer.<I, O>nullTransformer();
@ -98,7 +98,7 @@ public class TransformerUtils {
* *
* @param <T> the input/output type * @param <T> the input/output type
* @return the transformer * @return the transformer
* @see org.apache.commons.collections.functors.NOPTransformer * @see org.apache.commons.collections4.functors.NOPTransformer
*/ */
public static <T> Transformer<T, T> nopTransformer() { public static <T> Transformer<T, T> nopTransformer() {
return NOPTransformer.<T>nopTransformer(); return NOPTransformer.<T>nopTransformer();
@ -116,7 +116,7 @@ public class TransformerUtils {
* *
* @param <T> the input/output type * @param <T> the input/output type
* @return the transformer * @return the transformer
* @see org.apache.commons.collections.functors.CloneTransformer * @see org.apache.commons.collections4.functors.CloneTransformer
*/ */
public static <T> Transformer<T, T> cloneTransformer() { public static <T> Transformer<T, T> cloneTransformer() {
return CloneTransformer.<T>cloneTransformer(); return CloneTransformer.<T>cloneTransformer();
@ -130,7 +130,7 @@ public class TransformerUtils {
* @param <O> the output type * @param <O> the output type
* @param constantToReturn the constant object to return each time in the transformer * @param constantToReturn the constant object to return each time in the transformer
* @return the transformer. * @return the transformer.
* @see org.apache.commons.collections.functors.ConstantTransformer * @see org.apache.commons.collections4.functors.ConstantTransformer
*/ */
public static <I, O> Transformer<I, O> constantTransformer(final O constantToReturn) { public static <I, O> Transformer<I, O> constantTransformer(final O constantToReturn) {
return ConstantTransformer.constantTransformer(constantToReturn); return ConstantTransformer.constantTransformer(constantToReturn);
@ -144,7 +144,7 @@ public class TransformerUtils {
* @param closure the closure to run each time in the transformer, not null * @param closure the closure to run each time in the transformer, not null
* @return the transformer * @return the transformer
* @throws IllegalArgumentException if the closure is null * @throws IllegalArgumentException if the closure is null
* @see org.apache.commons.collections.functors.ClosureTransformer * @see org.apache.commons.collections4.functors.ClosureTransformer
*/ */
public static <T> Transformer<T, T> asTransformer(final Closure<? super T> closure) { public static <T> Transformer<T, T> asTransformer(final Closure<? super T> closure) {
return ClosureTransformer.closureTransformer(closure); return ClosureTransformer.closureTransformer(closure);
@ -158,7 +158,7 @@ public class TransformerUtils {
* @param predicate the predicate to run each time in the transformer, not null * @param predicate the predicate to run each time in the transformer, not null
* @return the transformer * @return the transformer
* @throws IllegalArgumentException if the predicate is null * @throws IllegalArgumentException if the predicate is null
* @see org.apache.commons.collections.functors.PredicateTransformer * @see org.apache.commons.collections4.functors.PredicateTransformer
*/ */
public static <T> Transformer<T, Boolean> asTransformer(final Predicate<? super T> predicate) { public static <T> Transformer<T, Boolean> asTransformer(final Predicate<? super T> predicate) {
return PredicateTransformer.predicateTransformer(predicate); return PredicateTransformer.predicateTransformer(predicate);
@ -173,7 +173,7 @@ public class TransformerUtils {
* @param factory the factory to run each time in the transformer, not null * @param factory the factory to run each time in the transformer, not null
* @return the transformer * @return the transformer
* @throws IllegalArgumentException if the factory is null * @throws IllegalArgumentException if the factory is null
* @see org.apache.commons.collections.functors.FactoryTransformer * @see org.apache.commons.collections4.functors.FactoryTransformer
*/ */
public static <I, O> Transformer<I, O> asTransformer(final Factory<? extends O> factory) { public static <I, O> Transformer<I, O> asTransformer(final Factory<? extends O> factory) {
return FactoryTransformer.factoryTransformer(factory); return FactoryTransformer.factoryTransformer(factory);
@ -188,7 +188,7 @@ public class TransformerUtils {
* @param transformer2 the second transformer * @param transformer2 the second transformer
* @return the transformer * @return the transformer
* @throws IllegalArgumentException if either transformer is null * @throws IllegalArgumentException if either transformer is null
* @see org.apache.commons.collections.functors.ChainedTransformer * @see org.apache.commons.collections4.functors.ChainedTransformer
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static <T> Transformer<T, T> chainedTransformer( public static <T> Transformer<T, T> chainedTransformer(
@ -205,7 +205,7 @@ public class TransformerUtils {
* @param transformers an array of transformers to chain * @param transformers an array of transformers to chain
* @return the transformer * @return the transformer
* @throws IllegalArgumentException if the transformers array or any of the transformers is null * @throws IllegalArgumentException if the transformers array or any of the transformers is null
* @see org.apache.commons.collections.functors.ChainedTransformer * @see org.apache.commons.collections4.functors.ChainedTransformer
*/ */
public static <T> Transformer<T, T> chainedTransformer(final Transformer<? super T, ? extends T>[] transformers) { public static <T> Transformer<T, T> chainedTransformer(final Transformer<? super T, ? extends T>[] transformers) {
return ChainedTransformer.chainedTransformer(transformers); return ChainedTransformer.chainedTransformer(transformers);
@ -220,7 +220,7 @@ public class TransformerUtils {
* @param transformers a collection of transformers to chain * @param transformers a collection of transformers to chain
* @return the transformer * @return the transformer
* @throws IllegalArgumentException if the transformers collection or any of the transformers is null * @throws IllegalArgumentException if the transformers collection or any of the transformers is null
* @see org.apache.commons.collections.functors.ChainedTransformer * @see org.apache.commons.collections4.functors.ChainedTransformer
*/ */
public static <T> Transformer<T, T> chainedTransformer( public static <T> Transformer<T, T> chainedTransformer(
final Collection<? extends Transformer<T, T>> transformers) { final Collection<? extends Transformer<T, T>> transformers) {
@ -238,7 +238,7 @@ public class TransformerUtils {
* @param falseTransformer the transformer called if the predicate is false * @param falseTransformer the transformer called if the predicate is false
* @return the transformer * @return the transformer
* @throws IllegalArgumentException if either the predicate or transformer is null * @throws IllegalArgumentException if either the predicate or transformer is null
* @see org.apache.commons.collections.functors.SwitchTransformer * @see org.apache.commons.collections4.functors.SwitchTransformer
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static <I, O> Transformer<I, O> switchTransformer(final Predicate<? super I> predicate, public static <I, O> Transformer<I, O> switchTransformer(final Predicate<? super I> predicate,
@ -262,7 +262,7 @@ public class TransformerUtils {
* @throws IllegalArgumentException if the either array is null or empty * @throws IllegalArgumentException if the either array is null or empty
* @throws IllegalArgumentException if any element in the arrays is null * @throws IllegalArgumentException if any element in the arrays is null
* @throws IllegalArgumentException if the arrays are different sizes * @throws IllegalArgumentException if the arrays are different sizes
* @see org.apache.commons.collections.functors.SwitchTransformer * @see org.apache.commons.collections4.functors.SwitchTransformer
*/ */
public static <I, O> Transformer<I, O> switchTransformer(final Predicate<? super I>[] predicates, public static <I, O> Transformer<I, O> switchTransformer(final Predicate<? super I>[] predicates,
final Transformer<? super I, ? extends O>[] transformers) { final Transformer<? super I, ? extends O>[] transformers) {
@ -285,7 +285,7 @@ public class TransformerUtils {
* @throws IllegalArgumentException if the either array is null or empty * @throws IllegalArgumentException if the either array is null or empty
* @throws IllegalArgumentException if any element in the arrays is null * @throws IllegalArgumentException if any element in the arrays is null
* @throws IllegalArgumentException if the arrays are different sizes * @throws IllegalArgumentException if the arrays are different sizes
* @see org.apache.commons.collections.functors.SwitchTransformer * @see org.apache.commons.collections4.functors.SwitchTransformer
*/ */
public static <I, O> Transformer<I, O> switchTransformer(final Predicate<? super I>[] predicates, public static <I, O> Transformer<I, O> switchTransformer(final Predicate<? super I>[] predicates,
final Transformer<? super I, ? extends O>[] transformers, final Transformer<? super I, ? extends O>[] transformers,
@ -312,7 +312,7 @@ public class TransformerUtils {
* @throws IllegalArgumentException if the map is null or empty * @throws IllegalArgumentException if the map is null or empty
* @throws IllegalArgumentException if any transformer in the map is null * @throws IllegalArgumentException if any transformer in the map is null
* @throws ClassCastException if the map elements are of the wrong type * @throws ClassCastException if the map elements are of the wrong type
* @see org.apache.commons.collections.functors.SwitchTransformer * @see org.apache.commons.collections4.functors.SwitchTransformer
*/ */
public static <I, O> Transformer<I, O> switchTransformer( public static <I, O> Transformer<I, O> switchTransformer(
final Map<Predicate<I>, Transformer<I, O>> predicatesAndTransformers) { final Map<Predicate<I>, Transformer<I, O>> predicatesAndTransformers) {
@ -334,7 +334,7 @@ public class TransformerUtils {
* @return the transformer * @return the transformer
* @throws IllegalArgumentException if the map is null or empty * @throws IllegalArgumentException if the map is null or empty
* @throws IllegalArgumentException if any transformer in the map is null * @throws IllegalArgumentException if any transformer in the map is null
* @see org.apache.commons.collections.functors.SwitchTransformer * @see org.apache.commons.collections4.functors.SwitchTransformer
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static <I, O> Transformer<I, O> switchMapTransformer( public static <I, O> Transformer<I, O> switchMapTransformer(
@ -360,7 +360,7 @@ public class TransformerUtils {
* *
* @param <T> the output type * @param <T> the output type
* @return the transformer * @return the transformer
* @see org.apache.commons.collections.functors.InstantiateTransformer * @see org.apache.commons.collections4.functors.InstantiateTransformer
*/ */
public static <T> Transformer<Class<? extends T>, T> instantiateTransformer() { public static <T> Transformer<Class<? extends T>, T> instantiateTransformer() {
return InstantiateTransformer.<T>instantiateTransformer(); return InstantiateTransformer.<T>instantiateTransformer();
@ -376,7 +376,7 @@ public class TransformerUtils {
* @param args the arguments to pass to the constructor, can be null * @param args the arguments to pass to the constructor, can be null
* @return the transformer * @return the transformer
* @throws IllegalArgumentException if the paramTypes and args don't match * @throws IllegalArgumentException if the paramTypes and args don't match
* @see org.apache.commons.collections.functors.InstantiateTransformer * @see org.apache.commons.collections4.functors.InstantiateTransformer
*/ */
public static <T> Transformer<Class<? extends T>, T> instantiateTransformer( public static <T> Transformer<Class<? extends T>, T> instantiateTransformer(
final Class<?>[] paramTypes, final Object[] args) { final Class<?>[] paramTypes, final Object[] args) {
@ -391,7 +391,7 @@ public class TransformerUtils {
* @param <O> the output type * @param <O> the output type
* @param map the map to use to transform the objects * @param map the map to use to transform the objects
* @return the transformer, or a {@link ConstantTransformer#NULL_INSTANCE} if the {@code map} is {@code null} * @return the transformer, or a {@link ConstantTransformer#NULL_INSTANCE} if the {@code map} is {@code null}
* @see org.apache.commons.collections.functors.MapTransformer * @see org.apache.commons.collections4.functors.MapTransformer
*/ */
public static <I, O> Transformer<I, O> mapTransformer(final Map<? super I, ? extends O> map) { public static <I, O> Transformer<I, O> mapTransformer(final Map<? super I, ? extends O> map) {
return MapTransformer.mapTransformer(map); return MapTransformer.mapTransformer(map);
@ -411,7 +411,7 @@ public class TransformerUtils {
* @param methodName the method name to call on the input object, may not be null * @param methodName the method name to call on the input object, may not be null
* @return the transformer * @return the transformer
* @throws IllegalArgumentException if the methodName is null. * @throws IllegalArgumentException if the methodName is null.
* @see org.apache.commons.collections.functors.InvokerTransformer * @see org.apache.commons.collections4.functors.InvokerTransformer
*/ */
public static <I, O> Transformer<I, O> invokerTransformer(final String methodName) { public static <I, O> Transformer<I, O> invokerTransformer(final String methodName) {
return InvokerTransformer.<I, O>invokerTransformer(methodName, null, null); return InvokerTransformer.<I, O>invokerTransformer(methodName, null, null);
@ -429,7 +429,7 @@ public class TransformerUtils {
* @param args the arguments * @param args the arguments
* @return the transformer * @return the transformer
* @throws IllegalArgumentException if the method name is null or the paramTypes and args don't match * @throws IllegalArgumentException if the method name is null or the paramTypes and args don't match
* @see org.apache.commons.collections.functors.InvokerTransformer * @see org.apache.commons.collections4.functors.InvokerTransformer
*/ */
public static <I, O> Transformer<I, O> invokerTransformer(final String methodName, final Class<?>[] paramTypes, public static <I, O> Transformer<I, O> invokerTransformer(final String methodName, final Class<?>[] paramTypes,
final Object[] args) { final Object[] args) {
@ -443,7 +443,7 @@ public class TransformerUtils {
* *
* @param <T> the input type * @param <T> the input type
* @return the transformer * @return the transformer
* @see org.apache.commons.collections.functors.StringValueTransformer * @see org.apache.commons.collections4.functors.StringValueTransformer
*/ */
public static <T> Transformer<T, String> stringValueTransformer() { public static <T> Transformer<T, String> stringValueTransformer() {
return StringValueTransformer.<T>stringValueTransformer(); return StringValueTransformer.<T>stringValueTransformer();

2
src/main/java/org/apache/commons/collections/Trie.java → src/main/java/org/apache/commons/collections4/Trie.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import java.util.Map; import java.util.Map;
import java.util.SortedMap; import java.util.SortedMap;

6
src/main/java/org/apache/commons/collections/TrieUtils.java → src/main/java/org/apache/commons/collections4/TrieUtils.java
View File

@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
import org.apache.commons.collections.trie.SynchronizedTrie; import org.apache.commons.collections4.trie.SynchronizedTrie;
import org.apache.commons.collections.trie.UnmodifiableTrie; import org.apache.commons.collections4.trie.UnmodifiableTrie;
/** /**
* A collection of {@link Trie} utilities. * A collection of {@link Trie} utilities.

2
src/main/java/org/apache/commons/collections/Unmodifiable.java → src/main/java/org/apache/commons/collections4/Unmodifiable.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections; package org.apache.commons.collections4;
/** /**
* Marker interface for collections, maps and iterators that are unmodifiable. * Marker interface for collections, maps and iterators that are unmodifiable.

6
src/main/java/org/apache/commons/collections/bag/AbstractBagDecorator.java → src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java
View File

@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bag; package org.apache.commons.collections4.bag;
import java.util.Set; import java.util.Set;
import org.apache.commons.collections.Bag; import org.apache.commons.collections4.Bag;
import org.apache.commons.collections.collection.AbstractCollectionDecorator; import org.apache.commons.collections4.collection.AbstractCollectionDecorator;
/** /**
* Decorates another <code>Bag</code> to provide additional behaviour. * Decorates another <code>Bag</code> to provide additional behaviour.

6
src/main/java/org/apache/commons/collections/bag/AbstractMapBag.java → src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bag; package org.apache.commons.collections4.bag;
import java.io.IOException; import java.io.IOException;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;
@ -27,8 +27,8 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import org.apache.commons.collections.Bag; import org.apache.commons.collections4.set.UnmodifiableSet;
import org.apache.commons.collections.set.UnmodifiableSet; import org.apache.commons.collections4.Bag;
/** /**
* Abstract implementation of the {@link Bag} interface to simplify the creation * Abstract implementation of the {@link Bag} interface to simplify the creation

4
src/main/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java → src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java
View File

@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bag; package org.apache.commons.collections4.bag;
import java.util.Comparator; import java.util.Comparator;
import org.apache.commons.collections.SortedBag; import org.apache.commons.collections4.SortedBag;
/** /**
* Decorates another <code>SortedBag</code> to provide additional behaviour. * Decorates another <code>SortedBag</code> to provide additional behaviour.

4
src/main/java/org/apache/commons/collections/bag/HashBag.java → src/main/java/org/apache/commons/collections4/bag/HashBag.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bag; package org.apache.commons.collections4.bag;
import java.io.IOException; import java.io.IOException;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;
@ -23,7 +23,7 @@ import java.io.Serializable;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import org.apache.commons.collections.Bag; import org.apache.commons.collections4.Bag;
/** /**
* Implements {@link Bag}, using a {@link HashMap} to provide the * Implements {@link Bag}, using a {@link HashMap} to provide the

8
src/main/java/org/apache/commons/collections/bag/PredicatedBag.java → src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java
View File

@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bag; package org.apache.commons.collections4.bag;
import java.util.Set; import java.util.Set;
import org.apache.commons.collections.Bag; import org.apache.commons.collections4.Bag;
import org.apache.commons.collections.Predicate; import org.apache.commons.collections4.Predicate;
import org.apache.commons.collections.collection.PredicatedCollection; import org.apache.commons.collections4.collection.PredicatedCollection;
/** /**
* Decorates another {@link Bag} to validate that additions * Decorates another {@link Bag} to validate that additions

6
src/main/java/org/apache/commons/collections/bag/PredicatedSortedBag.java → src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java
View File

@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bag; package org.apache.commons.collections4.bag;
import java.util.Comparator; import java.util.Comparator;
import org.apache.commons.collections.Predicate; import org.apache.commons.collections4.Predicate;
import org.apache.commons.collections.SortedBag; import org.apache.commons.collections4.SortedBag;
/** /**
* Decorates another {@link SortedBag} to validate that additions * Decorates another {@link SortedBag} to validate that additions

6
src/main/java/org/apache/commons/collections/bag/SynchronizedBag.java → src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java
View File

@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bag; package org.apache.commons.collections4.bag;
import java.util.Set; import java.util.Set;
import org.apache.commons.collections.Bag; import org.apache.commons.collections4.Bag;
import org.apache.commons.collections.collection.SynchronizedCollection; import org.apache.commons.collections4.collection.SynchronizedCollection;
/** /**
* Decorates another {@link Bag} to synchronize its behaviour * Decorates another {@link Bag} to synchronize its behaviour

6
src/main/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java → src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java
View File

@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bag; package org.apache.commons.collections4.bag;
import java.util.Comparator; import java.util.Comparator;
import org.apache.commons.collections.Bag; import org.apache.commons.collections4.Bag;
import org.apache.commons.collections.SortedBag; import org.apache.commons.collections4.SortedBag;
/** /**
* Decorates another {@link SortedBag} to synchronize its behaviour * Decorates another {@link SortedBag} to synchronize its behaviour

10
src/main/java/org/apache/commons/collections/bag/TransformedBag.java → src/main/java/org/apache/commons/collections4/bag/TransformedBag.java
View File

@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bag; package org.apache.commons.collections4.bag;
import java.util.Set; import java.util.Set;
import org.apache.commons.collections.Bag; import org.apache.commons.collections4.set.TransformedSet;
import org.apache.commons.collections.Transformer; import org.apache.commons.collections4.Bag;
import org.apache.commons.collections.collection.TransformedCollection; import org.apache.commons.collections4.Transformer;
import org.apache.commons.collections.set.TransformedSet; import org.apache.commons.collections4.collection.TransformedCollection;
/** /**
* Decorates another {@link Bag} to transform objects that are added. * Decorates another {@link Bag} to transform objects that are added.

6
src/main/java/org/apache/commons/collections/bag/TransformedSortedBag.java → src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java
View File

@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bag; package org.apache.commons.collections4.bag;
import java.util.Comparator; import java.util.Comparator;
import org.apache.commons.collections.SortedBag; import org.apache.commons.collections4.SortedBag;
import org.apache.commons.collections.Transformer; import org.apache.commons.collections4.Transformer;
/** /**
* Decorates another {@link SortedBag} to transform objects that are added. * Decorates another {@link SortedBag} to transform objects that are added.

6
src/main/java/org/apache/commons/collections/bag/TreeBag.java → src/main/java/org/apache/commons/collections4/bag/TreeBag.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bag; package org.apache.commons.collections4.bag;
import java.io.IOException; import java.io.IOException;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;
@ -25,7 +25,7 @@ import java.util.Comparator;
import java.util.SortedMap; import java.util.SortedMap;
import java.util.TreeMap; import java.util.TreeMap;
import org.apache.commons.collections.SortedBag; import org.apache.commons.collections4.SortedBag;
/** /**
* Implements {@link SortedBag}, using a {@link TreeMap} to provide * Implements {@link SortedBag}, using a {@link TreeMap} to provide
@ -34,7 +34,7 @@ import org.apache.commons.collections.SortedBag;
* Order will be maintained among the bag members and can be viewed through the * Order will be maintained among the bag members and can be viewed through the
* iterator. * iterator.
* <p> * <p>
* A {@link org.apache.commons.collections.Bag Bag} stores each object in the collection together with a count * A {@link org.apache.commons.collections4.Bag Bag} stores each object in the collection together with a count
* of occurrences. Extra methods on the interface allow multiple copies of an * of occurrences. Extra methods on the interface allow multiple copies of an
* object to be added or removed at once. It is important to read the interface * object to be added or removed at once. It is important to read the interface
* javadoc carefully as several methods violate the {@link Collection} * javadoc carefully as several methods violate the {@link Collection}

10
src/main/java/org/apache/commons/collections/bag/UnmodifiableBag.java → src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bag; package org.apache.commons.collections4.bag;
import java.io.IOException; import java.io.IOException;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;
@ -24,10 +24,10 @@ import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;
import org.apache.commons.collections.Bag; import org.apache.commons.collections4.set.UnmodifiableSet;
import org.apache.commons.collections.Unmodifiable; import org.apache.commons.collections4.Bag;
import org.apache.commons.collections.iterators.UnmodifiableIterator; import org.apache.commons.collections4.Unmodifiable;
import org.apache.commons.collections.set.UnmodifiableSet; import org.apache.commons.collections4.iterators.UnmodifiableIterator;
/** /**
* Decorates another {@link Bag} to ensure it can't be altered. * Decorates another {@link Bag} to ensure it can't be altered.

10
src/main/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java → src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bag; package org.apache.commons.collections4.bag;
import java.io.IOException; import java.io.IOException;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;
@ -24,10 +24,10 @@ import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;
import org.apache.commons.collections.SortedBag; import org.apache.commons.collections4.set.UnmodifiableSet;
import org.apache.commons.collections.Unmodifiable; import org.apache.commons.collections4.SortedBag;
import org.apache.commons.collections.iterators.UnmodifiableIterator; import org.apache.commons.collections4.Unmodifiable;
import org.apache.commons.collections.set.UnmodifiableSet; import org.apache.commons.collections4.iterators.UnmodifiableIterator;
/** /**
* Decorates another {@link SortedBag} to ensure it can't be altered. * Decorates another {@link SortedBag} to ensure it can't be altered.

6
src/main/java/org/apache/commons/collections/bag/package-info.java → src/main/java/org/apache/commons/collections4/bag/package-info.java
View File

@ -15,8 +15,8 @@
* limitations under the License. * limitations under the License.
*/ */
/** /**
* This package contains implementations of the {@link org.apache.commons.collections.Bag Bag} and * This package contains implementations of the {@link org.apache.commons.collections4.Bag Bag} and
* {@link org.apache.commons.collections.SortedBag SortedBag} interfaces. * {@link org.apache.commons.collections4.SortedBag SortedBag} interfaces.
* A bag stores an object and a count of the number of occurrences of the object. * A bag stores an object and a count of the number of occurrences of the object.
* <p> * <p>
* The following implementations are provided in the package: * The following implementations are provided in the package:
@ -35,4 +35,4 @@
* *
* @version $Id$ * @version $Id$
*/ */
package org.apache.commons.collections.bag; package org.apache.commons.collections4.bag;

8
src/main/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java → src/main/java/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java
View File

@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bidimap; package org.apache.commons.collections4.bidimap;
import org.apache.commons.collections.BidiMap; import org.apache.commons.collections4.BidiMap;
import org.apache.commons.collections.MapIterator; import org.apache.commons.collections4.MapIterator;
import org.apache.commons.collections.map.AbstractMapDecorator; import org.apache.commons.collections4.map.AbstractMapDecorator;
/** /**
* Provides a base decorator that enables additional functionality to be added * Provides a base decorator that enables additional functionality to be added

14
src/main/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java → src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java
View File

@ -14,19 +14,19 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bidimap; package org.apache.commons.collections4.bidimap;
import java.util.Collection; import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.apache.commons.collections.BidiMap; import org.apache.commons.collections4.BidiMap;
import org.apache.commons.collections.MapIterator; import org.apache.commons.collections4.MapIterator;
import org.apache.commons.collections.ResettableIterator; import org.apache.commons.collections4.ResettableIterator;
import org.apache.commons.collections.collection.AbstractCollectionDecorator; import org.apache.commons.collections4.collection.AbstractCollectionDecorator;
import org.apache.commons.collections.iterators.AbstractIteratorDecorator; import org.apache.commons.collections4.iterators.AbstractIteratorDecorator;
import org.apache.commons.collections.keyvalue.AbstractMapEntryDecorator; import org.apache.commons.collections4.keyvalue.AbstractMapEntryDecorator;
/** /**
* Abstract {@link BidiMap} implemented using two maps. * Abstract {@link BidiMap} implemented using two maps.

6
src/main/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java → src/main/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java
View File

@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bidimap; package org.apache.commons.collections4.bidimap;
import org.apache.commons.collections.OrderedBidiMap; import org.apache.commons.collections4.OrderedBidiMap;
import org.apache.commons.collections.OrderedMapIterator; import org.apache.commons.collections4.OrderedMapIterator;
/** /**
* Provides a base decorator that enables additional functionality to be added * Provides a base decorator that enables additional functionality to be added

4
src/main/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java → src/main/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java
View File

@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bidimap; package org.apache.commons.collections4.bidimap;
import java.util.Comparator; import java.util.Comparator;
import java.util.SortedMap; import java.util.SortedMap;
import org.apache.commons.collections.SortedBidiMap; import org.apache.commons.collections4.SortedBidiMap;
/** /**
* Provides a base decorator that enables additional functionality to be added * Provides a base decorator that enables additional functionality to be added

4
src/main/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java → src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bidimap; package org.apache.commons.collections4.bidimap;
import java.io.IOException; import java.io.IOException;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;
@ -23,7 +23,7 @@ import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.apache.commons.collections.BidiMap; import org.apache.commons.collections4.BidiMap;
/** /**
* Implementation of {@link BidiMap} that uses two {@link HashMap} instances. * Implementation of {@link BidiMap} that uses two {@link HashMap} instances.

4
src/main/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMap.java → src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java
View File

@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bidimap; package org.apache.commons.collections4.bidimap;
import org.apache.commons.collections.BidiMap; import org.apache.commons.collections4.BidiMap;
import java.io.IOException; import java.io.IOException;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;

16
src/main/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java → src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bidimap; package org.apache.commons.collections4.bidimap;
import java.io.IOException; import java.io.IOException;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;
@ -28,13 +28,13 @@ import java.util.Map;
import java.util.SortedMap; import java.util.SortedMap;
import java.util.TreeMap; import java.util.TreeMap;
import org.apache.commons.collections.BidiMap; import org.apache.commons.collections4.BidiMap;
import org.apache.commons.collections.OrderedBidiMap; import org.apache.commons.collections4.OrderedBidiMap;
import org.apache.commons.collections.OrderedMap; import org.apache.commons.collections4.OrderedMap;
import org.apache.commons.collections.OrderedMapIterator; import org.apache.commons.collections4.OrderedMapIterator;
import org.apache.commons.collections.ResettableIterator; import org.apache.commons.collections4.ResettableIterator;
import org.apache.commons.collections.SortedBidiMap; import org.apache.commons.collections4.SortedBidiMap;
import org.apache.commons.collections.map.AbstractSortedMapDecorator; import org.apache.commons.collections4.map.AbstractSortedMapDecorator;
/** /**
* Implementation of {@link BidiMap} that uses two {@link TreeMap} instances. * Implementation of {@link BidiMap} that uses two {@link TreeMap} instances.

22
src/main/java/org/apache/commons/collections/bidimap/TreeBidiMap.java → src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bidimap; package org.apache.commons.collections4.bidimap;
import java.util.AbstractSet; import java.util.AbstractSet;
import java.util.Collection; import java.util.Collection;
@ -24,16 +24,16 @@ import java.util.Map;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.Set; import java.util.Set;
import org.apache.commons.collections.KeyValue; import org.apache.commons.collections4.KeyValue;
import org.apache.commons.collections.MapIterator; import org.apache.commons.collections4.MapIterator;
import org.apache.commons.collections.OrderedBidiMap; import org.apache.commons.collections4.OrderedBidiMap;
import org.apache.commons.collections.OrderedIterator; import org.apache.commons.collections4.OrderedIterator;
import org.apache.commons.collections.OrderedMapIterator; import org.apache.commons.collections4.OrderedMapIterator;
import org.apache.commons.collections.iterators.EmptyOrderedMapIterator; import org.apache.commons.collections4.iterators.EmptyOrderedMapIterator;
import org.apache.commons.collections.keyvalue.UnmodifiableMapEntry; import org.apache.commons.collections4.keyvalue.UnmodifiableMapEntry;
import static org.apache.commons.collections.bidimap.TreeBidiMap.DataElement.KEY; import static org.apache.commons.collections4.bidimap.TreeBidiMap.DataElement.KEY;
import static org.apache.commons.collections.bidimap.TreeBidiMap.DataElement.VALUE; import static org.apache.commons.collections4.bidimap.TreeBidiMap.DataElement.VALUE;
/** /**
* Red-Black tree-based implementation of BidiMap where all objects added * Red-Black tree-based implementation of BidiMap where all objects added
@ -69,6 +69,8 @@ import static org.apache.commons.collections.bidimap.TreeBidiMap.DataElement.VAL
* not allow setValue() and will throw an * not allow setValue() and will throw an
* UnsupportedOperationException on attempts to call that method. * UnsupportedOperationException on attempts to call that method.
* *
* TODO: serialization does not work anymore
*
* @since 3.0 (previously DoubleOrderedMap v2.0) * @since 3.0 (previously DoubleOrderedMap v2.0)
* @version $Id$ * @version $Id$
*/ */

16
src/main/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java → src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java
View File

@ -14,19 +14,19 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bidimap; package org.apache.commons.collections4.bidimap;
import java.util.Collection; import java.util.Collection;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.apache.commons.collections.BidiMap; import org.apache.commons.collections4.set.UnmodifiableSet;
import org.apache.commons.collections.MapIterator; import org.apache.commons.collections4.BidiMap;
import org.apache.commons.collections.Unmodifiable; import org.apache.commons.collections4.MapIterator;
import org.apache.commons.collections.collection.UnmodifiableCollection; import org.apache.commons.collections4.Unmodifiable;
import org.apache.commons.collections.iterators.UnmodifiableMapIterator; import org.apache.commons.collections4.collection.UnmodifiableCollection;
import org.apache.commons.collections.map.UnmodifiableEntrySet; import org.apache.commons.collections4.iterators.UnmodifiableMapIterator;
import org.apache.commons.collections.set.UnmodifiableSet; import org.apache.commons.collections4.map.UnmodifiableEntrySet;
/** /**
* Decorates another {@link BidiMap} to ensure it can't be altered. * Decorates another {@link BidiMap} to ensure it can't be altered.

16
src/main/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java → src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java
View File

@ -14,19 +14,19 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bidimap; package org.apache.commons.collections4.bidimap;
import java.util.Collection; import java.util.Collection;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.apache.commons.collections.OrderedBidiMap; import org.apache.commons.collections4.set.UnmodifiableSet;
import org.apache.commons.collections.OrderedMapIterator; import org.apache.commons.collections4.OrderedBidiMap;
import org.apache.commons.collections.Unmodifiable; import org.apache.commons.collections4.OrderedMapIterator;
import org.apache.commons.collections.collection.UnmodifiableCollection; import org.apache.commons.collections4.Unmodifiable;
import org.apache.commons.collections.iterators.UnmodifiableOrderedMapIterator; import org.apache.commons.collections4.collection.UnmodifiableCollection;
import org.apache.commons.collections.map.UnmodifiableEntrySet; import org.apache.commons.collections4.iterators.UnmodifiableOrderedMapIterator;
import org.apache.commons.collections.set.UnmodifiableSet; import org.apache.commons.collections4.map.UnmodifiableEntrySet;
/** /**
* Decorates another {@link OrderedBidiMap} to ensure it can't be altered. * Decorates another {@link OrderedBidiMap} to ensure it can't be altered.

18
src/main/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java → src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java
View File

@ -14,21 +14,21 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.bidimap; package org.apache.commons.collections4.bidimap;
import java.util.Collection; import java.util.Collection;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.SortedMap; import java.util.SortedMap;
import org.apache.commons.collections.OrderedMapIterator; import org.apache.commons.collections4.set.UnmodifiableSet;
import org.apache.commons.collections.SortedBidiMap; import org.apache.commons.collections4.OrderedMapIterator;
import org.apache.commons.collections.Unmodifiable; import org.apache.commons.collections4.SortedBidiMap;
import org.apache.commons.collections.collection.UnmodifiableCollection; import org.apache.commons.collections4.Unmodifiable;
import org.apache.commons.collections.iterators.UnmodifiableOrderedMapIterator; import org.apache.commons.collections4.collection.UnmodifiableCollection;
import org.apache.commons.collections.map.UnmodifiableEntrySet; import org.apache.commons.collections4.iterators.UnmodifiableOrderedMapIterator;
import org.apache.commons.collections.map.UnmodifiableSortedMap; import org.apache.commons.collections4.map.UnmodifiableEntrySet;
import org.apache.commons.collections.set.UnmodifiableSet; import org.apache.commons.collections4.map.UnmodifiableSortedMap;
/** /**
* Decorates another {@link SortedBidiMap} to ensure it can't be altered. * Decorates another {@link SortedBidiMap} to ensure it can't be altered.

8
src/main/java/org/apache/commons/collections/bidimap/package-info.java → src/main/java/org/apache/commons/collections4/bidimap/package-info.java
View File

@ -16,9 +16,9 @@
*/ */
/** /**
* This package contains implementations of the * This package contains implementations of the
* {@link org.apache.commons.collections.BidiMap BidiMap}, * {@link org.apache.commons.collections4.BidiMap BidiMap},
* {@link org.apache.commons.collections.OrderedBidiMap OrderedBidiMap} and * {@link org.apache.commons.collections4.OrderedBidiMap OrderedBidiMap} and
* {@link org.apache.commons.collections.SortedBidiMap SortedBidiMap} interfaces. * {@link org.apache.commons.collections4.SortedBidiMap SortedBidiMap} interfaces.
* A BidiMap is an extension to Map that allows keys and values to be looked up with equal ease. * A BidiMap is an extension to Map that allows keys and values to be looked up with equal ease.
* One example usage is a system communicating to a legacy datasource that must convert codes * One example usage is a system communicating to a legacy datasource that must convert codes
* from the new format to the old format and vice versa. * from the new format to the old format and vice versa.
@ -38,4 +38,4 @@
* *
* @version $Id$ * @version $Id$
*/ */
package org.apache.commons.collections.bidimap; package org.apache.commons.collections4.bidimap;

2
src/main/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java → src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.collection; package org.apache.commons.collections4.collection;
import java.io.Serializable; import java.io.Serializable;
import java.util.Collection; import java.util.Collection;

2
src/main/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java → src/main/java/org/apache/commons/collections4/collection/AbstractUntypedCollectionDecorator.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.collection; package org.apache.commons.collections4.collection;
import java.io.Serializable; import java.io.Serializable;
import java.util.Collection; import java.util.Collection;

8
src/main/java/org/apache/commons/collections/collection/CompositeCollection.java → src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.collection; package org.apache.commons.collections4.collection;
import java.io.Serializable; import java.io.Serializable;
import java.lang.reflect.Array; import java.lang.reflect.Array;
@ -24,9 +24,9 @@ import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import org.apache.commons.collections.iterators.EmptyIterator; import org.apache.commons.collections4.iterators.EmptyIterator;
import org.apache.commons.collections.iterators.IteratorChain; import org.apache.commons.collections4.iterators.IteratorChain;
import org.apache.commons.collections.list.UnmodifiableList; import org.apache.commons.collections4.list.UnmodifiableList;
/** /**
* Decorates a collection of other collections to provide a single unified view. * Decorates a collection of other collections to provide a single unified view.

8
src/main/java/org/apache/commons/collections/collection/IndexedCollection.java → src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java
View File

@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.collection; package org.apache.commons.collections4.collection;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import org.apache.commons.collections.MultiMap; import org.apache.commons.collections4.MultiMap;
import org.apache.commons.collections.Transformer; import org.apache.commons.collections4.Transformer;
import org.apache.commons.collections.map.MultiValueMap; import org.apache.commons.collections4.map.MultiValueMap;
/** /**
* An IndexedCollection is a Map-like view onto a Collection. It accepts a * An IndexedCollection is a Map-like view onto a Collection. It accepts a

4
src/main/java/org/apache/commons/collections/collection/PredicatedCollection.java → src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java
View File

@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.collection; package org.apache.commons.collections4.collection;
import java.util.Collection; import java.util.Collection;
import org.apache.commons.collections.Predicate; import org.apache.commons.collections4.Predicate;
/** /**
* Decorates another {@link Collection} to validate that additions * Decorates another {@link Collection} to validate that additions

2
src/main/java/org/apache/commons/collections/collection/SynchronizedCollection.java → src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.collection; package org.apache.commons.collections4.collection;
import java.io.Serializable; import java.io.Serializable;
import java.util.Collection; import java.util.Collection;

4
src/main/java/org/apache/commons/collections/collection/TransformedCollection.java → src/main/java/org/apache/commons/collections4/collection/TransformedCollection.java
View File

@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.collection; package org.apache.commons.collections4.collection;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import org.apache.commons.collections.Transformer; import org.apache.commons.collections4.Transformer;
/** /**
* Decorates another {@link Collection} to transform objects that are added. * Decorates another {@link Collection} to transform objects that are added.

6
src/main/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java → src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java
View File

@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.collection; package org.apache.commons.collections4.collection;
import java.util.Collection; import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
import org.apache.commons.collections.BoundedCollection; import org.apache.commons.collections4.BoundedCollection;
import org.apache.commons.collections.iterators.UnmodifiableIterator; import org.apache.commons.collections4.iterators.UnmodifiableIterator;
/** /**
* {@link UnmodifiableBoundedCollection} decorates another * {@link UnmodifiableBoundedCollection} decorates another

6
src/main/java/org/apache/commons/collections/collection/UnmodifiableCollection.java → src/main/java/org/apache/commons/collections4/collection/UnmodifiableCollection.java
View File

@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.collection; package org.apache.commons.collections4.collection;
import java.util.Collection; import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
import org.apache.commons.collections.Unmodifiable; import org.apache.commons.collections4.Unmodifiable;
import org.apache.commons.collections.iterators.UnmodifiableIterator; import org.apache.commons.collections4.iterators.UnmodifiableIterator;
/** /**
* Decorates another {@link Collection} to ensure it can't be altered. * Decorates another {@link Collection} to ensure it can't be altered.

2
src/main/java/org/apache/commons/collections/collection/package-info.java → src/main/java/org/apache/commons/collections4/collection/package-info.java
View File

@ -33,4 +33,4 @@
* *
* @version $Id$ * @version $Id$
*/ */
package org.apache.commons.collections.collection; package org.apache.commons.collections4.collection;

2
src/main/java/org/apache/commons/collections/comparators/BooleanComparator.java → src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.comparators; package org.apache.commons.collections4.comparators;
import java.io.Serializable; import java.io.Serializable;
import java.util.Comparator; import java.util.Comparator;

2
src/main/java/org/apache/commons/collections/comparators/ComparableComparator.java → src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.comparators; package org.apache.commons.collections4.comparators;
import java.io.Serializable; import java.io.Serializable;
import java.util.Comparator; import java.util.Comparator;

2
src/main/java/org/apache/commons/collections/comparators/ComparatorChain.java → src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.comparators; package org.apache.commons.collections4.comparators;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;

2
src/main/java/org/apache/commons/collections/comparators/FixedOrderComparator.java → src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.comparators; package org.apache.commons.collections4.comparators;
import java.io.Serializable; import java.io.Serializable;
import java.util.Comparator; import java.util.Comparator;

4
src/main/java/org/apache/commons/collections/comparators/NullComparator.java → src/main/java/org/apache/commons/collections4/comparators/NullComparator.java
View File

@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.comparators; package org.apache.commons.collections4.comparators;
import java.io.Serializable; import java.io.Serializable;
import java.util.Comparator; import java.util.Comparator;
import org.apache.commons.collections.ComparatorUtils; import org.apache.commons.collections4.ComparatorUtils;
/** /**
* A Comparator that will compare nulls to be either lower or higher than * A Comparator that will compare nulls to be either lower or higher than

4
src/main/java/org/apache/commons/collections/comparators/ReverseComparator.java → src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java
View File

@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.comparators; package org.apache.commons.collections4.comparators;
import java.io.Serializable; import java.io.Serializable;
import java.util.Comparator; import java.util.Comparator;
import org.apache.commons.collections.ComparatorUtils; import org.apache.commons.collections4.ComparatorUtils;
/** /**
* Reverses the order of another comparator by reversing the arguments * Reverses the order of another comparator by reversing the arguments

10
src/main/java/org/apache/commons/collections/comparators/TransformingComparator.java → src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java
View File

@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.comparators; package org.apache.commons.collections4.comparators;
import java.io.Serializable; import java.io.Serializable;
import java.util.Comparator; import java.util.Comparator;
import org.apache.commons.collections.ComparatorUtils; import org.apache.commons.collections4.ComparatorUtils;
import org.apache.commons.collections.Transformer; import org.apache.commons.collections4.Transformer;
/** /**
* Decorates another Comparator with transformation behavior. That is, the * Decorates another Comparator with transformation behavior. That is, the
@ -32,8 +32,8 @@ import org.apache.commons.collections.Transformer;
* @since 2.1 * @since 2.1
* @version $Id$ * @version $Id$
* *
* @see org.apache.commons.collections.Transformer * @see org.apache.commons.collections4.Transformer
* @see org.apache.commons.collections.comparators.ComparableComparator * @see org.apache.commons.collections4.comparators.ComparableComparator
*/ */
public class TransformingComparator<I, O> implements Comparator<I>, Serializable { public class TransformingComparator<I, O> implements Comparator<I>, Serializable {

4
src/main/java/org/apache/commons/collections/comparators/package-info.java → src/main/java/org/apache/commons/collections4/comparators/package-info.java
View File

@ -19,10 +19,10 @@
* {@link java.util.Comparator Comparator} interface. * {@link java.util.Comparator Comparator} interface.
* <p> * <p>
* You may also consider using * You may also consider using
* {@link org.apache.commons.collections.ComparatorUtils ComparatorUtils}, * {@link org.apache.commons.collections4.ComparatorUtils ComparatorUtils},
* which is a single class that uses static methods to construct instances * which is a single class that uses static methods to construct instances
* of the classes in this package. * of the classes in this package.
* *
* @version $Id$ * @version $Id$
*/ */
package org.apache.commons.collections.comparators; package org.apache.commons.collections4.comparators;

2
src/main/java/org/apache/commons/collections/comparators/sequence/CommandVisitor.java → src/main/java/org/apache/commons/collections4/comparators/sequence/CommandVisitor.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.comparators.sequence; package org.apache.commons.collections4.comparators.sequence;
/** /**
* This interface should be implemented by user object to walk * This interface should be implemented by user object to walk

2
src/main/java/org/apache/commons/collections/comparators/sequence/DeleteCommand.java → src/main/java/org/apache/commons/collections4/comparators/sequence/DeleteCommand.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.comparators.sequence; package org.apache.commons.collections4.comparators.sequence;
/** /**
* Command representing the deletion of one object of the first sequence. * Command representing the deletion of one object of the first sequence.

2
src/main/java/org/apache/commons/collections/comparators/sequence/EditCommand.java → src/main/java/org/apache/commons/collections4/comparators/sequence/EditCommand.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.comparators.sequence; package org.apache.commons.collections4.comparators.sequence;
/** /**
* Abstract base class for all commands used to transform an objects sequence * Abstract base class for all commands used to transform an objects sequence

2
src/main/java/org/apache/commons/collections/comparators/sequence/EditScript.java → src/main/java/org/apache/commons/collections4/comparators/sequence/EditScript.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.comparators.sequence; package org.apache.commons.collections4.comparators.sequence;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

2
src/main/java/org/apache/commons/collections/comparators/sequence/InsertCommand.java → src/main/java/org/apache/commons/collections4/comparators/sequence/InsertCommand.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.comparators.sequence; package org.apache.commons.collections4.comparators.sequence;
/** /**
* Command representing the insertion of one object of the second sequence. * Command representing the insertion of one object of the second sequence.

2
src/main/java/org/apache/commons/collections/comparators/sequence/KeepCommand.java → src/main/java/org/apache/commons/collections4/comparators/sequence/KeepCommand.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.comparators.sequence; package org.apache.commons.collections4.comparators.sequence;
/** /**
* Command representing the keeping of one object present in both sequences. * Command representing the keeping of one object present in both sequences.

2
src/main/java/org/apache/commons/collections/comparators/sequence/ReplacementsFinder.java → src/main/java/org/apache/commons/collections4/comparators/sequence/ReplacementsFinder.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.comparators.sequence; package org.apache.commons.collections4.comparators.sequence;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

2
src/main/java/org/apache/commons/collections/comparators/sequence/ReplacementsHandler.java → src/main/java/org/apache/commons/collections4/comparators/sequence/ReplacementsHandler.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.comparators.sequence; package org.apache.commons.collections4.comparators.sequence;
import java.util.List; import java.util.List;

2
src/main/java/org/apache/commons/collections/comparators/sequence/SequencesComparator.java → src/main/java/org/apache/commons/collections4/comparators/sequence/SequencesComparator.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.comparators.sequence; package org.apache.commons.collections4.comparators.sequence;
import java.util.List; import java.util.List;

2
src/main/java/org/apache/commons/collections/comparators/sequence/Snake.java → src/main/java/org/apache/commons/collections4/comparators/sequence/Snake.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.comparators.sequence; package org.apache.commons.collections4.comparators.sequence;
/** /**
* This class is a simple placeholder to hold the end part of a path * This class is a simple placeholder to hold the end part of a path

2
src/main/java/org/apache/commons/collections/comparators/sequence/package-info.java → src/main/java/org/apache/commons/collections4/comparators/sequence/package-info.java
View File

@ -78,4 +78,4 @@
* *
* @version $Id$ * @version $Id$
*/ */
package org.apache.commons.collections.comparators.sequence; package org.apache.commons.collections4.comparators.sequence;

4
src/main/java/org/apache/commons/collections/functors/AbstractQuantifierPredicate.java → src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java
View File

@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.collections.functors; package org.apache.commons.collections4.functors;
import java.io.Serializable; import java.io.Serializable;
import org.apache.commons.collections.Predicate; import org.apache.commons.collections4.Predicate;
/** /**
* Abstract base class for quantification predicates, e.g. All, Any, None. * Abstract base class for quantification predicates, e.g. All, Any, None.

Some files were not shown because too many files have changed in this diff Show More