忘记改包名

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/ArrayStack.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Bag.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/BagUtils.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/BidiMap.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/BoundedCollection.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/BoundedMap.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Closure.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/ClosureUtils.java

@@ -14,21 +14,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4;
+package com.fr.third.org.apache.commons.collections4;
 
 import java.util.Collection;
 import java.util.Map;
 
-import org.apache.commons.collections4.functors.ChainedClosure;
-import org.apache.commons.collections4.functors.EqualPredicate;
-import org.apache.commons.collections4.functors.ExceptionClosure;
-import org.apache.commons.collections4.functors.ForClosure;
-import org.apache.commons.collections4.functors.IfClosure;
-import org.apache.commons.collections4.functors.InvokerTransformer;
-import org.apache.commons.collections4.functors.NOPClosure;
-import org.apache.commons.collections4.functors.SwitchClosure;
-import org.apache.commons.collections4.functors.TransformerClosure;
-import org.apache.commons.collections4.functors.WhileClosure;
+import com.fr.third.org.apache.commons.collections4.functors.ChainedClosure;
+import com.fr.third.org.apache.commons.collections4.functors.EqualPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.ExceptionClosure;
+import com.fr.third.org.apache.commons.collections4.functors.ForClosure;
+import com.fr.third.org.apache.commons.collections4.functors.IfClosure;
+import com.fr.third.org.apache.commons.collections4.functors.InvokerTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.NOPClosure;
+import com.fr.third.org.apache.commons.collections4.functors.SwitchClosure;
+import com.fr.third.org.apache.commons.collections4.functors.TransformerClosure;
+import com.fr.third.org.apache.commons.collections4.functors.WhileClosure;
+import com.fr.third.org.apache.commons.collections4.functors.ChainedClosure;
+import com.fr.third.org.apache.commons.collections4.functors.EqualPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.ExceptionClosure;
+import com.fr.third.org.apache.commons.collections4.functors.ForClosure;
+import com.fr.third.org.apache.commons.collections4.functors.IfClosure;
+import com.fr.third.org.apache.commons.collections4.functors.InvokerTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.NOPClosure;
+import com.fr.third.org.apache.commons.collections4.functors.SwitchClosure;
+import com.fr.third.org.apache.commons.collections4.functors.TransformerClosure;
+import com.fr.third.org.apache.commons.collections4.functors.WhileClosure;
 
 /**
  * <code>ClosureUtils</code> provides reference implementations and utilities
@@ -68,7 +78,7 @@ public class ClosureUtils {
      * Gets a Closure that always throws an exception.
      * This could be useful during testing as a placeholder.
      *
-     * @see org.apache.commons.collections4.functors.ExceptionClosure
+     * @see ExceptionClosure
      *
      * @param <E>  the type that the closure acts on
      * @return the closure
@@ -81,7 +91,7 @@ public class ClosureUtils {
      * Gets a Closure that will do nothing.
      * This could be useful during testing as a placeholder.
      *
-     * @see org.apache.commons.collections4.functors.NOPClosure
+     * @see NOPClosure
      *
      * @param <E>  the type that the closure acts on
      * @return the closure
@@ -95,7 +105,7 @@ public class ClosureUtils {
      * The transformer will be called using the closure's input object.
      * The transformer's result will be ignored.
      *
-     * @see org.apache.commons.collections4.functors.TransformerClosure
+     * @see TransformerClosure
      *
      * @param <E>  the type that the closure acts on
      * @param transformer  the transformer to run each time in the closure, null means nop
@@ -110,7 +120,7 @@ public class ClosureUtils {
      * <p>
      * A null closure or zero count returns the <code>NOPClosure</code>.
      *
-     * @see org.apache.commons.collections4.functors.ForClosure
+     * @see ForClosure
      *
      * @param <E>  the type that the closure acts on
      * @param count  the number of times to loop
@@ -125,7 +135,7 @@ public class ClosureUtils {
      * Creates a Closure that will call the closure repeatedly until the
      * predicate returns false.
      *
-     * @see org.apache.commons.collections4.functors.WhileClosure
+     * @see WhileClosure
      *
      * @param <E>  the type that the closure acts on
      * @param predicate  the predicate to use as an end of loop test, not null
@@ -141,7 +151,7 @@ public class ClosureUtils {
      * Creates a Closure that will call the closure once and then repeatedly
      * until the predicate returns false.
      *
-     * @see org.apache.commons.collections4.functors.WhileClosure
+     * @see WhileClosure
      *
      * @param <E>  the type that the closure acts on
      * @param closure  the closure to call repeatedly, not null
@@ -158,8 +168,8 @@ public class ClosureUtils {
      * Creates a Closure that will invoke a specific method on the closure's
      * input object by reflection.
      *
-     * @see org.apache.commons.collections4.functors.InvokerTransformer
-     * @see org.apache.commons.collections4.functors.TransformerClosure
+     * @see InvokerTransformer
+     * @see TransformerClosure
      *
      * @param <E>  the type that the closure acts on
      * @param methodName  the name of the method
@@ -175,8 +185,8 @@ public class ClosureUtils {
      * Creates a Closure that will invoke a specific method on the closure's
      * input object by reflection.
      *
-     * @see org.apache.commons.collections4.functors.InvokerTransformer
-     * @see org.apache.commons.collections4.functors.TransformerClosure
+     * @see InvokerTransformer
+     * @see TransformerClosure
      *
      * @param <E>  the type that the closure acts on
      * @param methodName  the name of the method
@@ -196,7 +206,7 @@ public class ClosureUtils {
      * Create a new Closure that calls each closure in turn, passing the
      * result into the next closure.
      *
-     * @see org.apache.commons.collections4.functors.ChainedClosure
+     * @see ChainedClosure
      *
      * @param <E>  the type that the closure acts on
      * @param closures  an array of closures to chain
@@ -213,7 +223,7 @@ public class ClosureUtils {
      * result into the next closure. The ordering is that of the iterator()
      * method on the collection.
      *
-     * @see org.apache.commons.collections4.functors.ChainedClosure
+     * @see ChainedClosure
      *
      * @param <E>  the type that the closure acts on
      * @param closures  a collection of closures to chain
@@ -230,7 +240,7 @@ public class ClosureUtils {
      * Create a new Closure that calls another closure based on the
      * result of the specified predicate.
      *
-     * @see org.apache.commons.collections4.functors.IfClosure
+     * @see IfClosure
      *
      * @param <E>  the type that the closure acts on
      * @param predicate  the validating predicate
@@ -248,7 +258,7 @@ public class ClosureUtils {
      * Create a new Closure that calls one of two closures depending
      * on the specified predicate.
      *
-     * @see org.apache.commons.collections4.functors.IfClosure
+     * @see IfClosure
      *
      * @param <E>  the type that the closure acts on
      * @param predicate  the predicate to switch on
@@ -271,7 +281,7 @@ public class ClosureUtils {
      * location 0 returned true. Each predicate is evaluated
      * until one returns true.
      *
-     * @see org.apache.commons.collections4.functors.SwitchClosure
+     * @see SwitchClosure
      *
      * @param <E>  the type that the closure acts on
      * @param predicates  an array of predicates to check, not null
@@ -295,7 +305,7 @@ public class ClosureUtils {
      * until one returns true. If no predicates evaluate to true, the default
      * closure is called.
      *
-     * @see org.apache.commons.collections4.functors.SwitchClosure
+     * @see SwitchClosure
      *
      * @param <E>  the type that the closure acts on
      * @param predicates  an array of predicates to check, not null
@@ -323,7 +333,7 @@ public class ClosureUtils {
      * null key. The ordering is that of the iterator() method on the entryset
      * collection of the map.
      *
-     * @see org.apache.commons.collections4.functors.SwitchClosure
+     * @see SwitchClosure
      *
      * @param <E>  the type that the closure acts on
      * @param predicatesAndClosures  a map of predicates to closures
@@ -346,7 +356,7 @@ public class ClosureUtils {
      * default closure is called. The default closure is set in the map
      * using a null key.
      *
-     * @see org.apache.commons.collections4.functors.SwitchClosure
+     * @see SwitchClosure
      *
      * @param <E>  the type that the closure acts on
      * @param objectsAndClosures  a map of objects to closures

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/CollectionUtils.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/ComparatorUtils.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/EnumerationUtils.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Equator.java

@@ -8,7 +8,9 @@
  * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
  * for the specific language governing permissions and limitations under the License.
  */
-package org.apache.commons.collections4;
+package com.fr.third.org.apache.commons.collections4;
+
+import com.fr.third.org.apache.commons.collections4.map.HashedMap;
 
 /**
  * An equation function, which determines equality between objects of type T.
@@ -34,7 +36,7 @@ public interface Equator<T> {
      * Calculates the hash for the object, based on the method of equality used in the equate
      * method. This is used for classes that delegate their {@link Object#equals(Object) equals(Object)} method to an
      * Equator (and so must also delegate their {@link Object#hashCode() hashCode()} method), or for implementations
-     * of {@link org.apache.commons.collections4.map.HashedMap} that use an Equator for the key objects.
+     * of {@link HashedMap} that use an Equator for the key objects.
      *
      * @param o the object to calculate the hash for.
      * @return the hash of the object.

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Factory.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/FactoryUtils.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/FluentIterable.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4;
+package com.fr.third.org.apache.commons.collections4;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -23,7 +23,7 @@ import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.collections4.iterators.SingletonIterator;
+import com.fr.third.org.apache.commons.collections4.iterators.SingletonIterator;
 
 /**
  * A FluentIterable provides a powerful yet simple API for manipulating

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/FunctorException.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Get.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/IterableGet.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/IterableMap.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/IterableSortedMap.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/IterableUtils.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4;
+package com.fr.third.org.apache.commons.collections4;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,10 +24,12 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.collections4.functors.EqualPredicate;
-import org.apache.commons.collections4.iterators.LazyIteratorChain;
-import org.apache.commons.collections4.iterators.ReverseListIterator;
-import org.apache.commons.collections4.iterators.UniqueFilterIterator;
+import com.fr.third.org.apache.commons.collections4.functors.EqualPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.NullPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.EqualPredicate;
+import com.fr.third.org.apache.commons.collections4.iterators.LazyIteratorChain;
+import com.fr.third.org.apache.commons.collections4.iterators.ReverseListIterator;
+import com.fr.third.org.apache.commons.collections4.iterators.UniqueFilterIterator;
 
 /**
  * Provides utility methods and decorators for {@link Iterable} instances.
@@ -721,7 +723,7 @@ public class IterableUtils {
      * <p>
      * A <code>null</code> or empty iterable returns false.
      * A <code>null</code> object will not be passed to the equator, instead a
-     * {@link org.apache.commons.collections4.functors.NullPredicate NullPredicate}
+     * {@link NullPredicate NullPredicate}
      * will be used.
      *
      * @param <E> the type of object the {@link Iterable} contains

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/IteratorUtils.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/KeyValue.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/ListUtils.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4;
+package com.fr.third.org.apache.commons.collections4;
 
 import java.util.AbstractList;
 import java.util.ArrayList;
@@ -24,16 +24,26 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.collections4.bag.HashBag;
-import org.apache.commons.collections4.functors.DefaultEquator;
-import org.apache.commons.collections4.list.FixedSizeList;
-import org.apache.commons.collections4.list.LazyList;
-import org.apache.commons.collections4.list.PredicatedList;
-import org.apache.commons.collections4.list.TransformedList;
-import org.apache.commons.collections4.list.UnmodifiableList;
-import org.apache.commons.collections4.sequence.CommandVisitor;
-import org.apache.commons.collections4.sequence.EditScript;
-import org.apache.commons.collections4.sequence.SequencesComparator;
+import com.fr.third.org.apache.commons.collections4.bag.HashBag;
+import com.fr.third.org.apache.commons.collections4.functors.DefaultEquator;
+import com.fr.third.org.apache.commons.collections4.list.FixedSizeList;
+import com.fr.third.org.apache.commons.collections4.list.LazyList;
+import com.fr.third.org.apache.commons.collections4.list.PredicatedList;
+import com.fr.third.org.apache.commons.collections4.list.TransformedList;
+import com.fr.third.org.apache.commons.collections4.list.UnmodifiableList;
+import com.fr.third.org.apache.commons.collections4.sequence.CommandVisitor;
+import com.fr.third.org.apache.commons.collections4.sequence.EditScript;
+import com.fr.third.org.apache.commons.collections4.sequence.SequencesComparator;
+import com.fr.third.org.apache.commons.collections4.bag.HashBag;
+import com.fr.third.org.apache.commons.collections4.functors.DefaultEquator;
+import com.fr.third.org.apache.commons.collections4.list.FixedSizeList;
+import com.fr.third.org.apache.commons.collections4.list.LazyList;
+import com.fr.third.org.apache.commons.collections4.list.PredicatedList;
+import com.fr.third.org.apache.commons.collections4.list.TransformedList;
+import com.fr.third.org.apache.commons.collections4.list.UnmodifiableList;
+import com.fr.third.org.apache.commons.collections4.sequence.CommandVisitor;
+import com.fr.third.org.apache.commons.collections4.sequence.EditScript;
+import com.fr.third.org.apache.commons.collections4.sequence.SequencesComparator;
 
 /**
  * Provides utility methods and decorators for {@link List} instances.

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/ListValuedMap.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/MapIterator.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/MapUtils.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/MultiMap.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/MultiMapUtils.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4;
+package com.fr.third.org.apache.commons.collections4;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -22,11 +22,16 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.collections4.bag.HashBag;
-import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
-import org.apache.commons.collections4.multimap.HashSetValuedHashMap;
-import org.apache.commons.collections4.multimap.TransformedMultiValuedMap;
-import org.apache.commons.collections4.multimap.UnmodifiableMultiValuedMap;
+import com.fr.third.org.apache.commons.collections4.bag.HashBag;
+import com.fr.third.org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
+import com.fr.third.org.apache.commons.collections4.multimap.HashSetValuedHashMap;
+import com.fr.third.org.apache.commons.collections4.multimap.TransformedMultiValuedMap;
+import com.fr.third.org.apache.commons.collections4.multimap.UnmodifiableMultiValuedMap;
+import com.fr.third.org.apache.commons.collections4.bag.HashBag;
+import com.fr.third.org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
+import com.fr.third.org.apache.commons.collections4.multimap.HashSetValuedHashMap;
+import com.fr.third.org.apache.commons.collections4.multimap.TransformedMultiValuedMap;
+import com.fr.third.org.apache.commons.collections4.multimap.UnmodifiableMultiValuedMap;
 
 /**
  * Provides utility methods and decorators for {@link MultiValuedMap} instances.

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/MultiSet.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/MultiSetUtils.java

@@ -14,12 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4;
+package com.fr.third.org.apache.commons.collections4;
 
-import org.apache.commons.collections4.multiset.HashMultiSet;
-import org.apache.commons.collections4.multiset.PredicatedMultiSet;
-import org.apache.commons.collections4.multiset.SynchronizedMultiSet;
-import org.apache.commons.collections4.multiset.UnmodifiableMultiSet;
+import com.fr.third.org.apache.commons.collections4.multiset.HashMultiSet;
+import com.fr.third.org.apache.commons.collections4.multiset.PredicatedMultiSet;
+import com.fr.third.org.apache.commons.collections4.multiset.SynchronizedMultiSet;
+import com.fr.third.org.apache.commons.collections4.multiset.UnmodifiableMultiSet;
+import com.fr.third.org.apache.commons.collections4.multiset.HashMultiSet;
+import com.fr.third.org.apache.commons.collections4.multiset.PredicatedMultiSet;
+import com.fr.third.org.apache.commons.collections4.multiset.SynchronizedMultiSet;
+import com.fr.third.org.apache.commons.collections4.multiset.UnmodifiableMultiSet;
 
 /**
  * Provides utility methods and decorators for {@link MultiSet} instances.

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/MultiValuedMap.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/OrderedBidiMap.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/OrderedIterator.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/OrderedMap.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/OrderedMapIterator.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Predicate.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/PredicateUtils.java

@@ -14,32 +14,54 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4;
+package com.fr.third.org.apache.commons.collections4;
 
 import java.util.Collection;
 
-import org.apache.commons.collections4.functors.AllPredicate;
-import org.apache.commons.collections4.functors.AndPredicate;
-import org.apache.commons.collections4.functors.AnyPredicate;
-import org.apache.commons.collections4.functors.EqualPredicate;
-import org.apache.commons.collections4.functors.ExceptionPredicate;
-import org.apache.commons.collections4.functors.FalsePredicate;
-import org.apache.commons.collections4.functors.IdentityPredicate;
-import org.apache.commons.collections4.functors.InstanceofPredicate;
-import org.apache.commons.collections4.functors.InvokerTransformer;
-import org.apache.commons.collections4.functors.NonePredicate;
-import org.apache.commons.collections4.functors.NotNullPredicate;
-import org.apache.commons.collections4.functors.NotPredicate;
-import org.apache.commons.collections4.functors.NullIsExceptionPredicate;
-import org.apache.commons.collections4.functors.NullIsFalsePredicate;
-import org.apache.commons.collections4.functors.NullIsTruePredicate;
-import org.apache.commons.collections4.functors.NullPredicate;
-import org.apache.commons.collections4.functors.OnePredicate;
-import org.apache.commons.collections4.functors.OrPredicate;
-import org.apache.commons.collections4.functors.TransformedPredicate;
-import org.apache.commons.collections4.functors.TransformerPredicate;
-import org.apache.commons.collections4.functors.TruePredicate;
-import org.apache.commons.collections4.functors.UniquePredicate;
+import com.fr.third.org.apache.commons.collections4.functors.AllPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.AndPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.AnyPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.EqualPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.ExceptionPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.FalsePredicate;
+import com.fr.third.org.apache.commons.collections4.functors.IdentityPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.InstanceofPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.InvokerTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.NonePredicate;
+import com.fr.third.org.apache.commons.collections4.functors.NotNullPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.NotPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.NullIsExceptionPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.NullIsFalsePredicate;
+import com.fr.third.org.apache.commons.collections4.functors.NullIsTruePredicate;
+import com.fr.third.org.apache.commons.collections4.functors.NullPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.OnePredicate;
+import com.fr.third.org.apache.commons.collections4.functors.OrPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.TransformedPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.TransformerPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.TruePredicate;
+import com.fr.third.org.apache.commons.collections4.functors.UniquePredicate;
+import com.fr.third.org.apache.commons.collections4.functors.AllPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.AndPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.AnyPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.EqualPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.ExceptionPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.FalsePredicate;
+import com.fr.third.org.apache.commons.collections4.functors.IdentityPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.InstanceofPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.InvokerTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.NonePredicate;
+import com.fr.third.org.apache.commons.collections4.functors.NotNullPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.NotPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.NullIsExceptionPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.NullIsFalsePredicate;
+import com.fr.third.org.apache.commons.collections4.functors.NullIsTruePredicate;
+import com.fr.third.org.apache.commons.collections4.functors.NullPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.OnePredicate;
+import com.fr.third.org.apache.commons.collections4.functors.OrPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.TransformedPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.TransformerPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.TruePredicate;
+import com.fr.third.org.apache.commons.collections4.functors.UniquePredicate;
 
 /**
  * <code>PredicateUtils</code> provides reference implementations and utilities

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Put.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/QueueUtils.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/ResettableIterator.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/ResettableListIterator.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/SetUtils.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4;
+package com.fr.third.org.apache.commons.collections4;
 
 import java.util.AbstractSet;
 import java.util.Collection;
@@ -27,16 +27,26 @@ import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.apache.commons.collections4.set.ListOrderedSet;
-import org.apache.commons.collections4.set.PredicatedNavigableSet;
-import org.apache.commons.collections4.set.PredicatedSet;
-import org.apache.commons.collections4.set.PredicatedSortedSet;
-import org.apache.commons.collections4.set.TransformedNavigableSet;
-import org.apache.commons.collections4.set.TransformedSet;
-import org.apache.commons.collections4.set.TransformedSortedSet;
-import org.apache.commons.collections4.set.UnmodifiableNavigableSet;
-import org.apache.commons.collections4.set.UnmodifiableSet;
-import org.apache.commons.collections4.set.UnmodifiableSortedSet;
+import com.fr.third.org.apache.commons.collections4.set.ListOrderedSet;
+import com.fr.third.org.apache.commons.collections4.set.PredicatedNavigableSet;
+import com.fr.third.org.apache.commons.collections4.set.PredicatedSet;
+import com.fr.third.org.apache.commons.collections4.set.PredicatedSortedSet;
+import com.fr.third.org.apache.commons.collections4.set.TransformedNavigableSet;
+import com.fr.third.org.apache.commons.collections4.set.TransformedSet;
+import com.fr.third.org.apache.commons.collections4.set.TransformedSortedSet;
+import com.fr.third.org.apache.commons.collections4.set.UnmodifiableNavigableSet;
+import com.fr.third.org.apache.commons.collections4.set.UnmodifiableSet;
+import com.fr.third.org.apache.commons.collections4.set.UnmodifiableSortedSet;
+import com.fr.third.org.apache.commons.collections4.set.ListOrderedSet;
+import com.fr.third.org.apache.commons.collections4.set.PredicatedNavigableSet;
+import com.fr.third.org.apache.commons.collections4.set.PredicatedSet;
+import com.fr.third.org.apache.commons.collections4.set.PredicatedSortedSet;
+import com.fr.third.org.apache.commons.collections4.set.TransformedNavigableSet;
+import com.fr.third.org.apache.commons.collections4.set.TransformedSet;
+import com.fr.third.org.apache.commons.collections4.set.TransformedSortedSet;
+import com.fr.third.org.apache.commons.collections4.set.UnmodifiableNavigableSet;
+import com.fr.third.org.apache.commons.collections4.set.UnmodifiableSet;
+import com.fr.third.org.apache.commons.collections4.set.UnmodifiableSortedSet;
 
 /**
  * Provides utility methods and decorators for

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/SetValuedMap.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/SortedBag.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/SortedBidiMap.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/SplitMapUtils.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Transformer.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/TransformerUtils.java

@@ -14,26 +14,41 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4;
+package com.fr.third.org.apache.commons.collections4;
 
 import java.util.Collection;
 import java.util.Map;
 
-import org.apache.commons.collections4.functors.ChainedTransformer;
-import org.apache.commons.collections4.functors.CloneTransformer;
-import org.apache.commons.collections4.functors.ClosureTransformer;
-import org.apache.commons.collections4.functors.ConstantTransformer;
-import org.apache.commons.collections4.functors.EqualPredicate;
-import org.apache.commons.collections4.functors.ExceptionTransformer;
-import org.apache.commons.collections4.functors.FactoryTransformer;
-import org.apache.commons.collections4.functors.IfTransformer;
-import org.apache.commons.collections4.functors.InstantiateTransformer;
-import org.apache.commons.collections4.functors.InvokerTransformer;
-import org.apache.commons.collections4.functors.MapTransformer;
-import org.apache.commons.collections4.functors.NOPTransformer;
-import org.apache.commons.collections4.functors.PredicateTransformer;
-import org.apache.commons.collections4.functors.StringValueTransformer;
-import org.apache.commons.collections4.functors.SwitchTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.ChainedTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.CloneTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.ClosureTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.ConstantTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.EqualPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.ExceptionTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.FactoryTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.IfTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.InstantiateTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.InvokerTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.MapTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.NOPTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.PredicateTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.StringValueTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.SwitchTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.ChainedTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.CloneTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.ClosureTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.ConstantTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.EqualPredicate;
+import com.fr.third.org.apache.commons.collections4.functors.ExceptionTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.FactoryTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.IfTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.InstantiateTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.InvokerTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.MapTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.NOPTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.PredicateTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.StringValueTransformer;
+import com.fr.third.org.apache.commons.collections4.functors.SwitchTransformer;
 
 /**
  * <code>TransformerUtils</code> provides reference implementations and

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Trie.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/TrieUtils.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Unmodifiable.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/AbstractBagDecorator.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/AbstractMapBag.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/CollectionBag.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.bag;
+package com.fr.third.org.apache.commons.collections4.bag;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -22,7 +22,7 @@ import java.io.ObjectOutputStream;
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.apache.commons.collections4.Bag;
+import com.fr.third.org.apache.commons.collections4.Bag;
 
 /**
  * Decorates another {@link Bag} to comply with the Collection contract.

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/CollectionSortedBag.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.bag;
+package com.fr.third.org.apache.commons.collections4.bag;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -22,7 +22,7 @@ import java.io.ObjectOutputStream;
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.apache.commons.collections4.SortedBag;
+import com.fr.third.org.apache.commons.collections4.SortedBag;
 
 /**
  * Decorates another {@link SortedBag} to comply with the Collection contract.

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/HashBag.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.bag;
+package com.fr.third.org.apache.commons.collections4.bag;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/PredicatedBag.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/PredicatedSortedBag.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/SynchronizedBag.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/SynchronizedSortedBag.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/TransformedBag.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/TransformedSortedBag.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/TreeBag.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.bag;
+package com.fr.third.org.apache.commons.collections4.bag;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -25,7 +25,7 @@ import java.util.Comparator;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import org.apache.commons.collections4.SortedBag;
+import com.fr.third.org.apache.commons.collections4.SortedBag;
 
 /**
  * Implements {@link SortedBag}, using a {@link TreeMap} to provide the data storage.

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/UnmodifiableBag.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/package-info.java

@@ -36,4 +36,4 @@
  *
  * @version $Id: package-info.java 1540804 2013-11-11 18:58:31Z tn $
  */
-package org.apache.commons.collections4.bag;
+package com.fr.third.org.apache.commons.collections4.bag;

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/DualHashBidiMap.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.bidimap;
+package com.fr.third.org.apache.commons.collections4.bidimap;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -23,7 +23,7 @@ import java.io.Serializable;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.commons.collections4.BidiMap;
+import com.fr.third.org.apache.commons.collections4.BidiMap;
 
 /**
  * Implementation of <code>BidiMap</code> that uses two <code>LinkedHashMap</code> instances.

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/TreeBidiMap.java

@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.bidimap;
+package com.fr.third.org.apache.commons.collections4.bidimap;
 
-import static org.apache.commons.collections4.bidimap.TreeBidiMap.DataElement.KEY;
-import static org.apache.commons.collections4.bidimap.TreeBidiMap.DataElement.VALUE;
+import static com.fr.third.org.apache.commons.collections4.bidimap.TreeBidiMap.DataElement.KEY;
+import static com.fr.third.org.apache.commons.collections4.bidimap.TreeBidiMap.DataElement.VALUE;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -30,13 +30,14 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
 
-import org.apache.commons.collections4.KeyValue;
-import org.apache.commons.collections4.MapIterator;
-import org.apache.commons.collections4.OrderedBidiMap;
-import org.apache.commons.collections4.OrderedIterator;
-import org.apache.commons.collections4.OrderedMapIterator;
-import org.apache.commons.collections4.iterators.EmptyOrderedMapIterator;
-import org.apache.commons.collections4.keyvalue.UnmodifiableMapEntry;
+import com.fr.third.org.apache.commons.collections4.keyvalue.UnmodifiableMapEntry;
+import com.fr.third.org.apache.commons.collections4.KeyValue;
+import com.fr.third.org.apache.commons.collections4.MapIterator;
+import com.fr.third.org.apache.commons.collections4.OrderedBidiMap;
+import com.fr.third.org.apache.commons.collections4.OrderedIterator;
+import com.fr.third.org.apache.commons.collections4.OrderedMapIterator;
+import com.fr.third.org.apache.commons.collections4.iterators.EmptyOrderedMapIterator;
+import com.fr.third.org.apache.commons.collections4.keyvalue.UnmodifiableMapEntry;
 
 /**
  * Red-Black tree-based implementation of BidiMap where all objects added

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/package-info.java

@@ -38,4 +38,4 @@
  *
  * @version $Id: package-info.java 1477745 2013-04-30 18:08:32Z tn $
  */
-package org.apache.commons.collections4.bidimap;
+package com.fr.third.org.apache.commons.collections4.bidimap;

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/CompositeCollection.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/IndexedCollection.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/PredicatedCollection.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.collection;
+package com.fr.third.org.apache.commons.collections4.collection;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -25,17 +25,28 @@ import java.util.List;
 import java.util.Queue;
 import java.util.Set;
 
-import org.apache.commons.collections4.Bag;
-import org.apache.commons.collections4.MultiSet;
-import org.apache.commons.collections4.Predicate;
-import org.apache.commons.collections4.bag.HashBag;
-import org.apache.commons.collections4.bag.PredicatedBag;
-import org.apache.commons.collections4.functors.NotNullPredicate;
-import org.apache.commons.collections4.list.PredicatedList;
-import org.apache.commons.collections4.multiset.HashMultiSet;
-import org.apache.commons.collections4.multiset.PredicatedMultiSet;
-import org.apache.commons.collections4.queue.PredicatedQueue;
-import org.apache.commons.collections4.set.PredicatedSet;
+import com.fr.third.org.apache.commons.collections4.Bag;
+import com.fr.third.org.apache.commons.collections4.MultiSet;
+import com.fr.third.org.apache.commons.collections4.Predicate;
+import com.fr.third.org.apache.commons.collections4.bag.HashBag;
+import com.fr.third.org.apache.commons.collections4.bag.PredicatedBag;
+import com.fr.third.org.apache.commons.collections4.functors.NotNullPredicate;
+import com.fr.third.org.apache.commons.collections4.list.PredicatedList;
+import com.fr.third.org.apache.commons.collections4.multiset.HashMultiSet;
+import com.fr.third.org.apache.commons.collections4.multiset.PredicatedMultiSet;
+import com.fr.third.org.apache.commons.collections4.queue.PredicatedQueue;
+import com.fr.third.org.apache.commons.collections4.set.PredicatedSet;
+import com.fr.third.org.apache.commons.collections4.Bag;
+import com.fr.third.org.apache.commons.collections4.MultiSet;
+import com.fr.third.org.apache.commons.collections4.Predicate;
+import com.fr.third.org.apache.commons.collections4.bag.HashBag;
+import com.fr.third.org.apache.commons.collections4.bag.PredicatedBag;
+import com.fr.third.org.apache.commons.collections4.functors.NotNullPredicate;
+import com.fr.third.org.apache.commons.collections4.list.PredicatedList;
+import com.fr.third.org.apache.commons.collections4.multiset.HashMultiSet;
+import com.fr.third.org.apache.commons.collections4.multiset.PredicatedMultiSet;
+import com.fr.third.org.apache.commons.collections4.queue.PredicatedQueue;
+import com.fr.third.org.apache.commons.collections4.set.PredicatedSet;
 
 /**
  * Decorates another {@link Collection} to validate that additions

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/SynchronizedCollection.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/TransformedCollection.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/UnmodifiableCollection.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/package-info.java

@@ -33,4 +33,4 @@
  *
  * @version $Id: package-info.java 1477746 2013-04-30 18:11:20Z tn $
  */
-package org.apache.commons.collections4.collection;
+package com.fr.third.org.apache.commons.collections4.collection;

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/BooleanComparator.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/ComparableComparator.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/ComparatorChain.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/FixedOrderComparator.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/NullComparator.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/ReverseComparator.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/TransformingComparator.java

@@ -14,13 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.comparators;
+package com.fr.third.org.apache.commons.collections4.comparators;
 
 import java.io.Serializable;
 import java.util.Comparator;
 
-import org.apache.commons.collections4.ComparatorUtils;
-import org.apache.commons.collections4.Transformer;
+import com.fr.third.org.apache.commons.collections4.ComparatorUtils;
+import com.fr.third.org.apache.commons.collections4.Transformer;
+import com.fr.third.org.apache.commons.collections4.ComparatorUtils;
+import com.fr.third.org.apache.commons.collections4.Transformer;
 
 /**
  * Decorates another Comparator with transformation behavior. That is, the
@@ -32,7 +34,7 @@ import org.apache.commons.collections4.Transformer;
  * @since 2.1
  * @version $Id: TransformingComparator.java 1683951 2015-06-06 20:19:03Z tn $
  *
- * @see org.apache.commons.collections4.Transformer
+ * @see Transformer
  * @see org.apache.commons.collections4.comparators.ComparableComparator
  */
 public class TransformingComparator<I, O> implements Comparator<I>, Serializable {

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/package-info.java

@@ -19,10 +19,10 @@
  * {@link java.util.Comparator Comparator} interface.
  * <p>
  * You may also consider using
- * {@link org.apache.commons.collections4.ComparatorUtils ComparatorUtils},
+ * {@link com.fr.third.org.apache.commons.collections4.ComparatorUtils ComparatorUtils},
  * which is a single class that uses static methods to construct instances
  * of the classes in this package.
  *
  * @version $Id: package-info.java 1477747 2013-04-30 18:16:48Z tn $
  */
-package org.apache.commons.collections4.comparators;
+package com.fr.third.org.apache.commons.collections4.comparators;

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java

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

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/AllPredicate.java

@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.functors;
+package com.fr.third.org.apache.commons.collections4.functors;
 
-import static org.apache.commons.collections4.functors.FunctorUtils.coerce;
-import static org.apache.commons.collections4.functors.FunctorUtils.validate;
-import static org.apache.commons.collections4.functors.TruePredicate.truePredicate;
+import static com.fr.third.org.apache.commons.collections4.functors.FunctorUtils.coerce;
+import static com.fr.third.org.apache.commons.collections4.functors.FunctorUtils.validate;
+import static com.fr.third.org.apache.commons.collections4.functors.TruePredicate.truePredicate;
 
 import java.util.Collection;
 
-import org.apache.commons.collections4.Predicate;
+import com.fr.third.org.apache.commons.collections4.Predicate;
 
 /**
  * Predicate implementation that returns true if all the
@@ -55,7 +55,7 @@ public final class AllPredicate<T> extends AbstractQuantifierPredicate<T> {
     public static <T> Predicate<T> allPredicate(final Predicate<? super T>... predicates) {
         FunctorUtils.validate(predicates);
         if (predicates.length == 0) {
-            return truePredicate();
+            return TruePredicate.truePredicate();
         }
         if (predicates.length == 1) {
             return coerce(predicates[0]);
@@ -79,7 +79,7 @@ public final class AllPredicate<T> extends AbstractQuantifierPredicate<T> {
     public static <T> Predicate<T> allPredicate(final Collection<? extends Predicate<? super T>> predicates) {
         final Predicate<? super T>[] preds = validate(predicates);
         if (preds.length == 0) {
-            return truePredicate();
+            return TruePredicate.truePredicate();
         }
         if (preds.length == 1) {
             return coerce(preds[0]);

fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/AndPredicate.java

@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.functors;
+package com.fr.third.org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections4.Predicate;
+import com.fr.third.org.apache.commons.collections4.Predicate;
 
 /**
  * Predicate implementation that returns true if both the predicates return true.