diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/ArrayStack.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/ArrayStack.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/ArrayStack.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/ArrayStack.java index 2b3b36eed..eb8fc502c 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/ArrayStack.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/Bag.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Bag.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/Bag.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Bag.java index dd88ae79f..04dc42755 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/Bag.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/BagUtils.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/BagUtils.java similarity index 85% rename from fine-commons-collections4/src/org/apache/commons/collections4/BagUtils.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/BagUtils.java index 236f808f8..e309bc44e 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/BagUtils.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/BidiMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/BidiMap.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/BidiMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/BidiMap.java index 1bb252a23..2676ebb55 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/BidiMap.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/BoundedCollection.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/BoundedCollection.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/BoundedCollection.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/BoundedCollection.java index 6e668ea65..8add8c118 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/BoundedCollection.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/BoundedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/BoundedMap.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/BoundedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/BoundedMap.java index ce553aba6..1c1a5244f 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/BoundedMap.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/Closure.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Closure.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/Closure.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Closure.java index b71ae127f..f7b689ee3 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/Closure.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/ClosureUtils.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/ClosureUtils.java similarity index 87% rename from fine-commons-collections4/src/org/apache/commons/collections4/ClosureUtils.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/ClosureUtils.java index 86b224dee..fa1cb71ba 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/ClosureUtils.java +++ b/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; /** * ClosureUtils 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 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 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 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 { *

* A null closure or zero count returns the NOPClosure. * - * @see org.apache.commons.collections4.functors.ForClosure + * @see ForClosure * * @param 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 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 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 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 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 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 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 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 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 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 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 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 the type that the closure acts on * @param objectsAndClosures a map of objects to closures diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/CollectionUtils.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/CollectionUtils.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/CollectionUtils.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/CollectionUtils.java index 7575ea7e2..bb071fbb4 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/CollectionUtils.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/ComparatorUtils.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/ComparatorUtils.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/ComparatorUtils.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/ComparatorUtils.java index f70cc9090..067d477d1 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/ComparatorUtils.java +++ b/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 Comparator diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/EnumerationUtils.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/EnumerationUtils.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/EnumerationUtils.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/EnumerationUtils.java index ad77b76c0..02b508a34 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/EnumerationUtils.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/Equator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Equator.java similarity index 91% rename from fine-commons-collections4/src/org/apache/commons/collections4/Equator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Equator.java index 4ae85fc3d..59f7224ee 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/Equator.java +++ b/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 { * 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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/Factory.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Factory.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/Factory.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Factory.java index 159a50b62..c4e812d6c 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/Factory.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/FactoryUtils.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/FactoryUtils.java similarity index 86% rename from fine-commons-collections4/src/org/apache/commons/collections4/FactoryUtils.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/FactoryUtils.java index 4ddccd35d..75dad3466 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/FactoryUtils.java +++ b/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; /** * FactoryUtils 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 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 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 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 { *

  • serialization clone *
      * - * @see org.apache.commons.collections4.functors.PrototypeFactory + * @see PrototypeFactory * * @param 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 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 the type that the factory creates * @param classToInstantiate the Class to instantiate each time in the factory diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/FluentIterable.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/FluentIterable.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/FluentIterable.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/FluentIterable.java index 0a5420cb6..22c4067fb 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/FluentIterable.java +++ b/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 diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/FunctorException.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/FunctorException.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/FunctorException.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/FunctorException.java index 5b0406ec8..4f16415b4 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/FunctorException.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/Get.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Get.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/Get.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Get.java index 150c8d2ee..101fb3921 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/Get.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/IterableGet.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/IterableGet.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/IterableGet.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/IterableGet.java index 2035dd22f..7ddf32c56 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/IterableGet.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/IterableMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/IterableMap.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/IterableMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/IterableMap.java index c9ab72df2..4fc279921 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/IterableMap.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/IterableSortedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/IterableSortedMap.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/IterableSortedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/IterableSortedMap.java index a39a508d1..7183d26f3 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/IterableSortedMap.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/IterableUtils.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/IterableUtils.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/IterableUtils.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/IterableUtils.java index 01981452e..719fb454a 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/IterableUtils.java +++ b/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 { *

      * A null or empty iterable returns false. * A null 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 the type of object the {@link Iterable} contains diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/IteratorUtils.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/IteratorUtils.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/IteratorUtils.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/IteratorUtils.java index a2e77a2fb..5ea5e1479 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/IteratorUtils.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/KeyValue.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/KeyValue.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/KeyValue.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/KeyValue.java index 81d0a11fc..b50b4f4b3 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/KeyValue.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/ListUtils.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/ListUtils.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/ListUtils.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/ListUtils.java index d9a6be9af..6e7d79b01 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/ListUtils.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/ListValuedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/ListValuedMap.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/ListValuedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/ListValuedMap.java index 0f8d6efb8..f35f930c0 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/ListValuedMap.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/MapIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/MapIterator.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/MapIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/MapIterator.java index fc9a9a6f4..a1da3035c 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/MapIterator.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/MapUtils.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/MapUtils.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/MapUtils.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/MapUtils.java index 48a0f8c3a..a9106baec 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/MapUtils.java +++ b/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 diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/MultiMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/MultiMap.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/MultiMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/MultiMap.java index 079a63690..a7fce419b 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/MultiMap.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/MultiMapUtils.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/MultiMapUtils.java similarity index 91% rename from fine-commons-collections4/src/org/apache/commons/collections4/MultiMapUtils.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/MultiMapUtils.java index 95d9b8616..6e8ca19a2 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/MultiMapUtils.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/MultiSet.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/MultiSet.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/MultiSet.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/MultiSet.java index fd51b6320..fc2e25091 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/MultiSet.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/MultiSetUtils.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/MultiSetUtils.java similarity index 86% rename from fine-commons-collections4/src/org/apache/commons/collections4/MultiSetUtils.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/MultiSetUtils.java index ee4708856..774407c98 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/MultiSetUtils.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/MultiValuedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/MultiValuedMap.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/MultiValuedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/MultiValuedMap.java index 1021822c5..0b2b8f99c 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/MultiValuedMap.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/OrderedBidiMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/OrderedBidiMap.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/OrderedBidiMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/OrderedBidiMap.java index 1271c9e2f..29591365a 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/OrderedBidiMap.java +++ b/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 diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/OrderedIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/OrderedIterator.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/OrderedIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/OrderedIterator.java index 095f49473..52ca20794 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/OrderedIterator.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/OrderedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/OrderedMap.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/OrderedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/OrderedMap.java index b582a991e..e3a949dd9 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/OrderedMap.java +++ b/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 diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/OrderedMapIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/OrderedMapIterator.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/OrderedMapIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/OrderedMapIterator.java index 7e76ff274..e9d5c9a5d 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/OrderedMapIterator.java +++ b/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 Map. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/Predicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Predicate.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/Predicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Predicate.java index ce7df995a..dd5f0ae5c 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/Predicate.java +++ b/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 diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/PredicateUtils.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/PredicateUtils.java similarity index 86% rename from fine-commons-collections4/src/org/apache/commons/collections4/PredicateUtils.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/PredicateUtils.java index 788ac8283..3ba11e4af 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/PredicateUtils.java +++ b/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; /** * PredicateUtils provides reference implementations and utilities diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/Put.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Put.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/Put.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Put.java index 7fe31651d..dc6f65c3e 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/Put.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/QueueUtils.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/QueueUtils.java similarity index 89% rename from fine-commons-collections4/src/org/apache/commons/collections4/QueueUtils.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/QueueUtils.java index 04d319141..fc93c2cfa 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/QueueUtils.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/ResettableIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/ResettableIterator.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/ResettableIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/ResettableIterator.java index b3f810539..98743abde 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/ResettableIterator.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/ResettableListIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/ResettableListIterator.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/ResettableListIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/ResettableListIterator.java index 5fcac2dd8..f4747e91c 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/ResettableListIterator.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/SetUtils.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/SetUtils.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/SetUtils.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/SetUtils.java index b110fb0c3..8c4a2b584 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/SetUtils.java +++ b/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 diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/SetValuedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/SetValuedMap.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/SetValuedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/SetValuedMap.java index faf10173f..93d928056 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/SetValuedMap.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/SortedBag.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/SortedBag.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/SortedBag.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/SortedBag.java index b38a27d0c..51a6ca9cf 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/SortedBag.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/SortedBidiMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/SortedBidiMap.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/SortedBidiMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/SortedBidiMap.java index 115692ff9..c3272f6b7 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/SortedBidiMap.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/SplitMapUtils.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/SplitMapUtils.java similarity index 91% rename from fine-commons-collections4/src/org/apache/commons/collections4/SplitMapUtils.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/SplitMapUtils.java index 49830d466..5ea04657d 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/SplitMapUtils.java +++ b/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} diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/Transformer.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Transformer.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/Transformer.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Transformer.java index 138f6472e..d3310934e 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/Transformer.java +++ b/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 diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/TransformerUtils.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/TransformerUtils.java similarity index 89% rename from fine-commons-collections4/src/org/apache/commons/collections4/TransformerUtils.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/TransformerUtils.java index 96caa0f0f..2b48e67c7 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/TransformerUtils.java +++ b/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; /** * TransformerUtils provides reference implementations and diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/Trie.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Trie.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/Trie.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Trie.java index fe70e00af..6a32db75e 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/Trie.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/TrieUtils.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/TrieUtils.java similarity index 88% rename from fine-commons-collections4/src/org/apache/commons/collections4/TrieUtils.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/TrieUtils.java index baf5186e2..16a5aa73f 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/TrieUtils.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/Unmodifiable.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Unmodifiable.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/Unmodifiable.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/Unmodifiable.java index 1799462fa..2c4499bf5 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/Unmodifiable.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bag/AbstractBagDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/AbstractBagDecorator.java similarity index 92% rename from fine-commons-collections4/src/org/apache/commons/collections4/bag/AbstractBagDecorator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/AbstractBagDecorator.java index ed0d6d30f..ae9814013 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bag/AbstractBagDecorator.java +++ b/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 Bag to provide additional behaviour. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bag/AbstractMapBag.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/AbstractMapBag.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/bag/AbstractMapBag.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/AbstractMapBag.java index a271a5f3c..5637fd4f8 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bag/AbstractMapBag.java +++ b/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 diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java index bcd7472bc..aa9d116ac 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java +++ b/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 SortedBag to provide additional behaviour. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bag/CollectionBag.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/CollectionBag.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/bag/CollectionBag.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/CollectionBag.java index 662ecaaa0..a566027e5 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bag/CollectionBag.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bag/CollectionSortedBag.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/CollectionSortedBag.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/bag/CollectionSortedBag.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/CollectionSortedBag.java index 0af350bc0..1150a4622 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bag/CollectionSortedBag.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bag/HashBag.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/HashBag.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/bag/HashBag.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/HashBag.java index 64f2f3c13..610f60137 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bag/HashBag.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bag/PredicatedBag.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/PredicatedBag.java similarity index 92% rename from fine-commons-collections4/src/org/apache/commons/collections4/bag/PredicatedBag.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/PredicatedBag.java index 6a3c51eb8..efcb28385 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bag/PredicatedBag.java +++ b/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 diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bag/PredicatedSortedBag.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/PredicatedSortedBag.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/bag/PredicatedSortedBag.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/PredicatedSortedBag.java index 6af1881de..c9a8ed68b 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bag/PredicatedSortedBag.java +++ b/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 diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bag/SynchronizedBag.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/SynchronizedBag.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/bag/SynchronizedBag.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/SynchronizedBag.java index 7fb547229..64018ba0e 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bag/SynchronizedBag.java +++ b/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 diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bag/SynchronizedSortedBag.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/SynchronizedSortedBag.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/bag/SynchronizedSortedBag.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/SynchronizedSortedBag.java index f945f2896..f978663fb 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bag/SynchronizedSortedBag.java +++ b/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 diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bag/TransformedBag.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/TransformedBag.java similarity index 91% rename from fine-commons-collections4/src/org/apache/commons/collections4/bag/TransformedBag.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/TransformedBag.java index 50825c9ef..9b070c88a 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bag/TransformedBag.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bag/TransformedSortedBag.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/TransformedSortedBag.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/bag/TransformedSortedBag.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/TransformedSortedBag.java index 54557db87..81d70a2f3 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bag/TransformedSortedBag.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bag/TreeBag.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/TreeBag.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/bag/TreeBag.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/TreeBag.java index 3db2c7fb9..4f2ea6141 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bag/TreeBag.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bag/UnmodifiableBag.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/UnmodifiableBag.java similarity index 92% rename from fine-commons-collections4/src/org/apache/commons/collections4/bag/UnmodifiableBag.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/UnmodifiableBag.java index cd53fbf05..8c122c904 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bag/UnmodifiableBag.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java similarity index 92% rename from fine-commons-collections4/src/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java index f4465cd19..ecd437f68 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bag/package-info.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/package-info.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/bag/package-info.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bag/package-info.java index a8da5ca9a..a0ded827c 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bag/package-info.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java similarity index 91% rename from fine-commons-collections4/src/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java index f470916cd..80fa08aa2 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java +++ b/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 diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java index 7c24f5e38..db5adab6f 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java index ef7823fa4..992b4d1b8 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java +++ b/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 diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java index f4195df69..03539fc7f 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java +++ b/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 diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/DualHashBidiMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/DualHashBidiMap.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/bidimap/DualHashBidiMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/DualHashBidiMap.java index 3187ccda8..b2a41839f 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/DualHashBidiMap.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java index 0b77fbd20..9212061d6 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java +++ b/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 BidiMap that uses two LinkedHashMap instances. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java index f1872c15f..33686eefc 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/TreeBidiMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/TreeBidiMap.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/bidimap/TreeBidiMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/TreeBidiMap.java index 8a517e281..e509843f3 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/TreeBidiMap.java +++ b/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 diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java similarity index 89% rename from fine-commons-collections4/src/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java index 29911fa25..491d4aec8 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java similarity index 90% rename from fine-commons-collections4/src/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java index 2b4397fca..2c14a6606 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java similarity index 89% rename from fine-commons-collections4/src/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java index c2f795593..2664bfaa3 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/package-info.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/package-info.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/bidimap/package-info.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/bidimap/package-info.java index 1d70f6cf9..4e6782c22 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/bidimap/package-info.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java index e980e22ea..4efee44ef 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/collection/CompositeCollection.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/CompositeCollection.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/collection/CompositeCollection.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/CompositeCollection.java index 17c41528d..ca63a2437 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/collection/CompositeCollection.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/collection/IndexedCollection.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/IndexedCollection.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/collection/IndexedCollection.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/IndexedCollection.java index 3a6bc592e..4b14ce8f2 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/collection/IndexedCollection.java +++ b/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 diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/collection/PredicatedCollection.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/PredicatedCollection.java similarity index 91% rename from fine-commons-collections4/src/org/apache/commons/collections4/collection/PredicatedCollection.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/PredicatedCollection.java index f9d757ffe..b3a2b1bca 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/collection/PredicatedCollection.java +++ b/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 diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/collection/SynchronizedCollection.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/SynchronizedCollection.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/collection/SynchronizedCollection.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/SynchronizedCollection.java index 08cf956c7..0ab42254b 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/collection/SynchronizedCollection.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/collection/TransformedCollection.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/TransformedCollection.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/collection/TransformedCollection.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/TransformedCollection.java index 9c43eca5c..bc99bc420 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/collection/TransformedCollection.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java index ccbc3e3ab..7040ccafb 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java +++ b/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 diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/collection/UnmodifiableCollection.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/UnmodifiableCollection.java similarity index 92% rename from fine-commons-collections4/src/org/apache/commons/collections4/collection/UnmodifiableCollection.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/UnmodifiableCollection.java index 05e65f6d3..c0790644e 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/collection/UnmodifiableCollection.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/collection/package-info.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/package-info.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/collection/package-info.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/collection/package-info.java index e9c5bbff1..daf7c8287 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/collection/package-info.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/comparators/BooleanComparator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/BooleanComparator.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/comparators/BooleanComparator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/BooleanComparator.java index fb4fa764b..9ae563b08 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/comparators/BooleanComparator.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/comparators/ComparableComparator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/ComparableComparator.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/comparators/ComparableComparator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/ComparableComparator.java index 23bc9648a..c71411324 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/comparators/ComparableComparator.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/comparators/ComparatorChain.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/ComparatorChain.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/comparators/ComparatorChain.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/ComparatorChain.java index 651527a61..f00416b7c 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/comparators/ComparatorChain.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/comparators/FixedOrderComparator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/FixedOrderComparator.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/comparators/FixedOrderComparator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/FixedOrderComparator.java index 7212906e3..fba456cae 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/comparators/FixedOrderComparator.java +++ b/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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/comparators/NullComparator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/NullComparator.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/comparators/NullComparator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/NullComparator.java index 15093ec8e..abde289f0 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/comparators/NullComparator.java +++ b/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 diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/comparators/ReverseComparator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/ReverseComparator.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/comparators/ReverseComparator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/ReverseComparator.java index 4ea056bd9..70b4183fb 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/comparators/ReverseComparator.java +++ b/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 diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/comparators/TransformingComparator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/TransformingComparator.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/comparators/TransformingComparator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/TransformingComparator.java index fc3443575..fdbcd9a41 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/comparators/TransformingComparator.java +++ b/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 implements Comparator, Serializable { diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/comparators/package-info.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/package-info.java similarity index 87% rename from fine-commons-collections4/src/org/apache/commons/collections4/comparators/package-info.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/comparators/package-info.java index c1e554a9f..0e563ff23 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/comparators/package-info.java +++ b/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. *

      * 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; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java index 70e5fd8f9..2a98cb919 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/AllPredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/AllPredicate.java similarity index 88% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/AllPredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/AllPredicate.java index 2d1455c15..8b4983453 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/AllPredicate.java +++ b/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 extends AbstractQuantifierPredicate { public static Predicate allPredicate(final Predicate... 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 extends AbstractQuantifierPredicate { public static Predicate allPredicate(final Collection> predicates) { final Predicate[] preds = validate(predicates); if (preds.length == 0) { - return truePredicate(); + return TruePredicate.truePredicate(); } if (preds.length == 1) { return coerce(preds[0]); diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/AndPredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/AndPredicate.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/AndPredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/AndPredicate.java index 1ef0ec904..caff73b89 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/AndPredicate.java +++ b/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. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/AnyPredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/AnyPredicate.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/AnyPredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/AnyPredicate.java index 90973034e..161e923f4 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/AnyPredicate.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/AnyPredicate.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.util.Collection; -import org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.Predicate; /** * Predicate implementation that returns true if any of the diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java similarity index 92% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java index 5fb324041..902251fcf 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java @@ -14,10 +14,10 @@ * 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 org.apache.commons.collections4.Closure; -import org.apache.commons.collections4.FunctorException; +import com.fr.third.org.apache.commons.collections4.Closure; +import com.fr.third.org.apache.commons.collections4.FunctorException; /** * {@link Closure} that catches any checked exception and re-throws it as a diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/ChainedClosure.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ChainedClosure.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/ChainedClosure.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ChainedClosure.java index f6333d47b..15ad5920b 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/ChainedClosure.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ChainedClosure.java @@ -14,12 +14,12 @@ * 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 java.util.Collection; -import org.apache.commons.collections4.Closure; +import com.fr.third.org.apache.commons.collections4.Closure; /** * Closure implementation that chains the specified closures together. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/ChainedTransformer.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ChainedTransformer.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/ChainedTransformer.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ChainedTransformer.java index a5bdba1db..a099bc0db 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/ChainedTransformer.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ChainedTransformer.java @@ -14,12 +14,12 @@ * 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 java.util.Collection; -import org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Transformer implementation that chains the specified transformers together. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/CloneTransformer.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/CloneTransformer.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/CloneTransformer.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/CloneTransformer.java index 783f36e5f..eb59dea9f 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/CloneTransformer.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/CloneTransformer.java @@ -14,9 +14,9 @@ * 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 org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Transformer implementation that returns a clone of the input object. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/ClosureTransformer.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ClosureTransformer.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/ClosureTransformer.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ClosureTransformer.java index 5f4fa31ca..a351838a6 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/ClosureTransformer.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ClosureTransformer.java @@ -14,12 +14,12 @@ * 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.Closure; -import org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.Closure; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Transformer implementation that calls a Closure using the input object diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/ComparatorPredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ComparatorPredicate.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/ComparatorPredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ComparatorPredicate.java index 8f9819320..a793bc6a6 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/ComparatorPredicate.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ComparatorPredicate.java @@ -14,12 +14,12 @@ * 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 java.util.Comparator; -import org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.Predicate; /** * Predicate that compares the input object with the one stored in the predicate using a comparator. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/ConstantFactory.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ConstantFactory.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/ConstantFactory.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ConstantFactory.java index d38ce3144..7bd41ae2f 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/ConstantFactory.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ConstantFactory.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.Factory; +import com.fr.third.org.apache.commons.collections4.Factory; /** * Factory implementation that returns the same constant each time. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/ConstantTransformer.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ConstantTransformer.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/ConstantTransformer.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ConstantTransformer.java index b740c9260..46858dbb8 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/ConstantTransformer.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ConstantTransformer.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.Transformer; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Transformer implementation that returns the same constant each time. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/DefaultEquator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/DefaultEquator.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/DefaultEquator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/DefaultEquator.java index a27e2784c..835682223 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/DefaultEquator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/DefaultEquator.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.Equator; +import com.fr.third.org.apache.commons.collections4.Equator; /** * Default {@link Equator} implementation. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/EqualPredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/EqualPredicate.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/EqualPredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/EqualPredicate.java index 761eb7695..ff39d79b8 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/EqualPredicate.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/EqualPredicate.java @@ -14,12 +14,12 @@ * 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.Equator; -import org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.Equator; +import com.fr.third.org.apache.commons.collections4.Predicate; /** * Predicate implementation that returns true if the input is the same object diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/ExceptionClosure.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ExceptionClosure.java similarity index 91% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/ExceptionClosure.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ExceptionClosure.java index d1659ecbe..22bfaf5cc 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/ExceptionClosure.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ExceptionClosure.java @@ -14,12 +14,12 @@ * 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.Closure; -import org.apache.commons.collections4.FunctorException; +import com.fr.third.org.apache.commons.collections4.Closure; +import com.fr.third.org.apache.commons.collections4.FunctorException; /** * Closure implementation that always throws an exception. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/ExceptionFactory.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ExceptionFactory.java similarity index 91% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/ExceptionFactory.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ExceptionFactory.java index 6656b8da2..f9c28078d 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/ExceptionFactory.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ExceptionFactory.java @@ -14,12 +14,12 @@ * 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.Factory; -import org.apache.commons.collections4.FunctorException; +import com.fr.third.org.apache.commons.collections4.Factory; +import com.fr.third.org.apache.commons.collections4.FunctorException; /** * Factory implementation that always throws an exception. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/ExceptionPredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ExceptionPredicate.java similarity index 91% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/ExceptionPredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ExceptionPredicate.java index f35250501..7ad558a0b 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/ExceptionPredicate.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ExceptionPredicate.java @@ -14,12 +14,12 @@ * 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.FunctorException; -import org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.FunctorException; +import com.fr.third.org.apache.commons.collections4.Predicate; /** * Predicate implementation that always throws an exception. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/ExceptionTransformer.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ExceptionTransformer.java similarity index 92% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/ExceptionTransformer.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ExceptionTransformer.java index 52ca32906..d2a1b4e15 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/ExceptionTransformer.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ExceptionTransformer.java @@ -14,12 +14,12 @@ * 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.FunctorException; -import org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.FunctorException; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Transformer implementation that always throws an exception. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/FactoryTransformer.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/FactoryTransformer.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/FactoryTransformer.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/FactoryTransformer.java index c5929fdf8..a1ab9f05c 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/FactoryTransformer.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/FactoryTransformer.java @@ -14,12 +14,12 @@ * 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.Factory; -import org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.Factory; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Transformer implementation that calls a Factory and returns the result. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/FalsePredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/FalsePredicate.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/FalsePredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/FalsePredicate.java index a09e83ad7..1c48c904c 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/FalsePredicate.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/FalsePredicate.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 always returns false. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/ForClosure.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ForClosure.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/ForClosure.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ForClosure.java index 0f8c45ede..c47c7eec4 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/ForClosure.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/ForClosure.java @@ -14,9 +14,9 @@ * 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 org.apache.commons.collections4.Closure; +import com.fr.third.org.apache.commons.collections4.Closure; /** * Closure implementation that calls another closure n times, like a for loop. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/FunctorUtils.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/FunctorUtils.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/FunctorUtils.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/FunctorUtils.java index 41367443b..9d3c6513d 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/FunctorUtils.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/FunctorUtils.java @@ -14,13 +14,13 @@ * 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.util.Collection; -import org.apache.commons.collections4.Closure; -import org.apache.commons.collections4.Predicate; -import org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.Closure; +import com.fr.third.org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Internal utilities for functors. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/IdentityPredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/IdentityPredicate.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/IdentityPredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/IdentityPredicate.java index b3d66b608..d80e57534 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/IdentityPredicate.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/IdentityPredicate.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 the input is the same object diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/IfClosure.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/IfClosure.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/IfClosure.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/IfClosure.java index ce98a180e..569463395 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/IfClosure.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/IfClosure.java @@ -14,12 +14,12 @@ * 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.Closure; -import org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.Closure; +import com.fr.third.org.apache.commons.collections4.Predicate; /** * Closure implementation acts as an if statement calling one or other closure diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/IfTransformer.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/IfTransformer.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/IfTransformer.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/IfTransformer.java index f5a12dd31..528ac9ff3 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/IfTransformer.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/IfTransformer.java @@ -14,12 +14,12 @@ * 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 org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Transformer implementation that will call one of two closures based on whether a predicate evaluates diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/InstanceofPredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/InstanceofPredicate.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/InstanceofPredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/InstanceofPredicate.java index a5bf5ee48..c0a442038 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/InstanceofPredicate.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/InstanceofPredicate.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 the input is an instanceof diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/InstantiateFactory.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/InstantiateFactory.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/InstantiateFactory.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/InstantiateFactory.java index 9375422c0..58ad27727 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/InstantiateFactory.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/InstantiateFactory.java @@ -14,13 +14,13 @@ * 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.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import org.apache.commons.collections4.Factory; -import org.apache.commons.collections4.FunctorException; +import com.fr.third.org.apache.commons.collections4.Factory; +import com.fr.third.org.apache.commons.collections4.FunctorException; /** * Factory implementation that creates a new object instance by reflection. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/InstantiateTransformer.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/InstantiateTransformer.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/InstantiateTransformer.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/InstantiateTransformer.java index 7fabe0fee..796149dc4 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/InstantiateTransformer.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/InstantiateTransformer.java @@ -14,13 +14,13 @@ * 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.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import org.apache.commons.collections4.FunctorException; -import org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.FunctorException; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Transformer implementation that creates a new object instance by reflection. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/InvokerTransformer.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/InvokerTransformer.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/InvokerTransformer.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/InvokerTransformer.java index 32410009f..a9a66da4c 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/InvokerTransformer.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/InvokerTransformer.java @@ -14,13 +14,13 @@ * 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.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.apache.commons.collections4.FunctorException; -import org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.FunctorException; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Transformer implementation that creates a new object instance by reflection. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/MapTransformer.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/MapTransformer.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/MapTransformer.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/MapTransformer.java index 7eed02c6e..e39cf86e4 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/MapTransformer.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/MapTransformer.java @@ -14,12 +14,12 @@ * 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 java.util.Map; -import org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Transformer implementation that returns the value held in a specified map diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/NOPClosure.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NOPClosure.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/NOPClosure.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NOPClosure.java index 1a3091273..ee29ef37b 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/NOPClosure.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NOPClosure.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.Closure; +import com.fr.third.org.apache.commons.collections4.Closure; /** * Closure implementation that does nothing. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/NOPTransformer.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NOPTransformer.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/NOPTransformer.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NOPTransformer.java index 4c1d72690..5a2716fb8 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/NOPTransformer.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NOPTransformer.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.Transformer; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Transformer implementation that does nothing. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/NonePredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NonePredicate.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/NonePredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NonePredicate.java index f29f42041..1b0774d8e 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/NonePredicate.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NonePredicate.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.util.Collection; -import org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.Predicate; /** * Predicate implementation that returns true if none of the diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/NotNullPredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NotNullPredicate.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/NotNullPredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NotNullPredicate.java index 05a1b9d9e..556a4ab52 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/NotNullPredicate.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NotNullPredicate.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 the input is not null. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/NotPredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NotPredicate.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/NotPredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NotPredicate.java index 6a3924f95..a2d5d7354 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/NotPredicate.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NotPredicate.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 the opposite of the decorated predicate. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java index 77c34593d..06320177d 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java @@ -14,12 +14,12 @@ * 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.FunctorException; -import org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.FunctorException; +import com.fr.third.org.apache.commons.collections4.Predicate; /** * Predicate implementation that throws an exception if the input is null. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/NullIsFalsePredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NullIsFalsePredicate.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/NullIsFalsePredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NullIsFalsePredicate.java index 69eefaa20..9c9bdc596 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/NullIsFalsePredicate.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NullIsFalsePredicate.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 false if the input is null. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/NullIsTruePredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NullIsTruePredicate.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/NullIsTruePredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NullIsTruePredicate.java index a5e06beaa..918efcf6a 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/NullIsTruePredicate.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NullIsTruePredicate.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 the input is null. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/NullPredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NullPredicate.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/NullPredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NullPredicate.java index 5924bb6c9..d840c5bb6 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/NullPredicate.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/NullPredicate.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 the input is null. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/OnePredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/OnePredicate.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/OnePredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/OnePredicate.java index c4661cec9..4f0c3c8ec 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/OnePredicate.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/OnePredicate.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.util.Collection; -import org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.Predicate; /** * Predicate implementation that returns true if only one of the diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/OrPredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/OrPredicate.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/OrPredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/OrPredicate.java index 3a89a1fd4..0064397e0 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/OrPredicate.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/OrPredicate.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 either of the predicates return true. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/PredicateDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/PredicateDecorator.java similarity index 91% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/PredicateDecorator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/PredicateDecorator.java index 19917acdb..0c3bc1062 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/PredicateDecorator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/PredicateDecorator.java @@ -14,9 +14,9 @@ * 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 org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.Predicate; /** * Defines a predicate that decorates one or more other predicates. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/PredicateTransformer.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/PredicateTransformer.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/PredicateTransformer.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/PredicateTransformer.java index 058816b7a..11d49fecb 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/PredicateTransformer.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/PredicateTransformer.java @@ -14,12 +14,12 @@ * 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 org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Transformer implementation that calls a Predicate using the input object diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/PrototypeFactory.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/PrototypeFactory.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/PrototypeFactory.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/PrototypeFactory.java index b5d167621..dde3085cb 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/PrototypeFactory.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/PrototypeFactory.java @@ -14,7 +14,7 @@ * 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.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -25,8 +25,8 @@ import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.apache.commons.collections4.Factory; -import org.apache.commons.collections4.FunctorException; +import com.fr.third.org.apache.commons.collections4.Factory; +import com.fr.third.org.apache.commons.collections4.FunctorException; /** * Factory implementation that creates a new instance each time based on a prototype. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/StringValueTransformer.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/StringValueTransformer.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/StringValueTransformer.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/StringValueTransformer.java index f26a74c10..83c128159 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/StringValueTransformer.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/StringValueTransformer.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.Transformer; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Transformer implementation that returns the result of calling diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/SwitchClosure.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/SwitchClosure.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/SwitchClosure.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/SwitchClosure.java index b484dd7b8..42563d81f 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/SwitchClosure.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/SwitchClosure.java @@ -14,13 +14,13 @@ * 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 java.util.Map; -import org.apache.commons.collections4.Closure; -import org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.Closure; +import com.fr.third.org.apache.commons.collections4.Predicate; /** * Closure implementation calls the closure whose predicate returns true, diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/SwitchTransformer.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/SwitchTransformer.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/SwitchTransformer.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/SwitchTransformer.java index e83f10be2..c8d015ddd 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/SwitchTransformer.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/SwitchTransformer.java @@ -14,13 +14,13 @@ * 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 java.util.Map; -import org.apache.commons.collections4.Predicate; -import org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Transformer implementation calls the transformer whose predicate returns true, diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/TransformedPredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/TransformedPredicate.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/TransformedPredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/TransformedPredicate.java index a19fe8ba1..e2638beae 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/TransformedPredicate.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/TransformedPredicate.java @@ -14,12 +14,12 @@ * 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 org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Predicate implementation that transforms the given object before invoking diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/TransformerClosure.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/TransformerClosure.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/TransformerClosure.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/TransformerClosure.java index 77def81f3..da29918d6 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/TransformerClosure.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/TransformerClosure.java @@ -14,12 +14,12 @@ * 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.Closure; -import org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.Closure; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Closure implementation that calls a Transformer using the input object diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/TransformerPredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/TransformerPredicate.java similarity index 92% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/TransformerPredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/TransformerPredicate.java index 5dc95bb16..ed4f74543 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/TransformerPredicate.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/TransformerPredicate.java @@ -14,13 +14,13 @@ * 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.FunctorException; -import org.apache.commons.collections4.Predicate; -import org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.FunctorException; +import com.fr.third.org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Predicate implementation that returns the result of a transformer. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/TruePredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/TruePredicate.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/TruePredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/TruePredicate.java index 757f139fa..89cc1baa2 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/TruePredicate.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/TruePredicate.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 always returns true. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/UniquePredicate.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/UniquePredicate.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/UniquePredicate.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/UniquePredicate.java index 64be48cc8..c310315f1 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/UniquePredicate.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/UniquePredicate.java @@ -14,13 +14,13 @@ * 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 java.util.HashSet; import java.util.Set; -import org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.Predicate; /** * Predicate implementation that returns true the first time an object is diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/WhileClosure.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/WhileClosure.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/WhileClosure.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/WhileClosure.java index dcf2844bf..556e9ccba 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/WhileClosure.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/WhileClosure.java @@ -14,10 +14,10 @@ * 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 org.apache.commons.collections4.Closure; -import org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.Closure; +import com.fr.third.org.apache.commons.collections4.Predicate; /** * Closure implementation that executes a closure repeatedly until a condition is met, diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/functors/package-info.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/package-info.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/functors/package-info.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/package-info.java index f025519d4..01d95d040 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/functors/package-info.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/functors/package-info.java @@ -40,4 +40,4 @@ * * @version $Id: package-info.java 1714262 2015-11-13 20:08:45Z tn $ */ -package org.apache.commons.collections4.functors; +package com.fr.third.org.apache.commons.collections4.functors; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java index 8716cda84..a13375fdb 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.NoSuchElementException; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java index d45798a5e..441fdcb7e 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; /** * Provides an implementation of an empty map iterator. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java index 9b030dba1..776b029c2 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.Iterator; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java index a0771f0d7..506a73d7e 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.ListIterator; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java index bc2a23fe8..d338a1db2 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java @@ -14,9 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; -import org.apache.commons.collections4.MapIterator; +import com.fr.third.org.apache.commons.collections4.MapIterator; +import com.fr.third.org.apache.commons.collections4.MapIterator; /** * Provides basic behaviour for decorating a map iterator with extra functionality. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java index d3d748909..4392fd4ff 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java @@ -14,9 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; -import org.apache.commons.collections4.OrderedMapIterator; +import com.fr.third.org.apache.commons.collections4.OrderedMapIterator; +import com.fr.third.org.apache.commons.collections4.OrderedMapIterator; /** * Provides basic behaviour for decorating an ordered map iterator with extra functionality. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java index 87d232f2c..f09882ec8 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.Iterator; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/ArrayIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ArrayIterator.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/ArrayIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ArrayIterator.java index 52ec85bfb..1309b1ebc 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/ArrayIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ArrayIterator.java @@ -14,19 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.lang.reflect.Array; import java.util.NoSuchElementException; -import org.apache.commons.collections4.ResettableIterator; +import com.fr.third.org.apache.commons.collections4.ResettableIterator; +import com.fr.third.org.apache.commons.collections4.ResettableIterator; /** * Implements an {@link java.util.Iterator Iterator} over any array. *

      * The array can be either an array of object or of primitives. If you know * that you have an object array, the - * {@link org.apache.commons.collections4.iterators.ObjectArrayIterator ObjectArrayIterator} + * {@link ObjectArrayIterator ObjectArrayIterator} * class is a better choice, as it will perform better. *

      * The iterator implements a {@link #reset} method, allowing the reset of diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/ArrayListIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ArrayListIterator.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/ArrayListIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ArrayListIterator.java index 4d363e4ee..0181e64e7 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/ArrayListIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ArrayListIterator.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.lang.reflect.Array; import java.util.NoSuchElementException; -import org.apache.commons.collections4.ResettableListIterator; +import com.fr.third.org.apache.commons.collections4.ResettableListIterator; +import com.fr.third.org.apache.commons.collections4.ResettableListIterator; /** * Implements a {@link ListIterator} over an array. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/BoundedIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/BoundedIterator.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/BoundedIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/BoundedIterator.java index 16973bccc..9cba64a4b 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/BoundedIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/BoundedIterator.java @@ -11,7 +11,7 @@ * KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/CollatingIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/CollatingIterator.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/CollatingIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/CollatingIterator.java index e8649a40a..cd6ab90ad 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/CollatingIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/CollatingIterator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.ArrayList; import java.util.BitSet; @@ -24,7 +24,8 @@ import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; -import org.apache.commons.collections4.list.UnmodifiableList; +import com.fr.third.org.apache.commons.collections4.list.UnmodifiableList; +import com.fr.third.org.apache.commons.collections4.list.UnmodifiableList; /** diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/EmptyIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/EmptyIterator.java similarity index 91% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/EmptyIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/EmptyIterator.java index 8e19bb51d..821588f35 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/EmptyIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/EmptyIterator.java @@ -14,11 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.Iterator; -import org.apache.commons.collections4.ResettableIterator; +import com.fr.third.org.apache.commons.collections4.ResettableIterator; +import com.fr.third.org.apache.commons.collections4.ResettableIterator; /** * Provides an implementation of an empty iterator. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/EmptyListIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/EmptyListIterator.java similarity index 91% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/EmptyListIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/EmptyListIterator.java index c0e961974..1d215b66d 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/EmptyListIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/EmptyListIterator.java @@ -14,11 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.ListIterator; -import org.apache.commons.collections4.ResettableListIterator; +import com.fr.third.org.apache.commons.collections4.ResettableListIterator; +import com.fr.third.org.apache.commons.collections4.ResettableListIterator; /** * Provides an implementation of an empty list iterator. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/EmptyMapIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/EmptyMapIterator.java similarity index 89% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/EmptyMapIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/EmptyMapIterator.java index 6ec8ed83e..c7400263f 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/EmptyMapIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/EmptyMapIterator.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; -import org.apache.commons.collections4.MapIterator; -import org.apache.commons.collections4.ResettableIterator; +import com.fr.third.org.apache.commons.collections4.MapIterator; +import com.fr.third.org.apache.commons.collections4.ResettableIterator; /** * Provides an implementation of an empty map iterator. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java similarity index 82% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java index 8fbcca22f..a5596e6ce 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; -import org.apache.commons.collections4.OrderedIterator; -import org.apache.commons.collections4.ResettableIterator; +import com.fr.third.org.apache.commons.collections4.OrderedIterator; +import com.fr.third.org.apache.commons.collections4.ResettableIterator; +import com.fr.third.org.apache.commons.collections4.OrderedIterator; +import com.fr.third.org.apache.commons.collections4.ResettableIterator; /** * Provides an implementation of an empty ordered iterator. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java similarity index 83% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java index 614e602c8..d1c7d5211 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; -import org.apache.commons.collections4.OrderedMapIterator; -import org.apache.commons.collections4.ResettableIterator; +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.OrderedMapIterator; +import com.fr.third.org.apache.commons.collections4.ResettableIterator; /** * Provides an implementation of an empty ordered map iterator. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/EntrySetMapIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/EntrySetMapIterator.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/EntrySetMapIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/EntrySetMapIterator.java index bb9cdc8e0..bbfa7dda5 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/EntrySetMapIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/EntrySetMapIterator.java @@ -14,13 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.Iterator; import java.util.Map; -import org.apache.commons.collections4.MapIterator; -import org.apache.commons.collections4.ResettableIterator; +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.MapIterator; +import com.fr.third.org.apache.commons.collections4.ResettableIterator; /** * Implements a MapIterator using a Map entrySet. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/EnumerationIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/EnumerationIterator.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/EnumerationIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/EnumerationIterator.java index 8675de9ba..155363330 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/EnumerationIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/EnumerationIterator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.Collection; import java.util.Enumeration; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/FilterIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/FilterIterator.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/FilterIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/FilterIterator.java index a58f4ac99..ef363ce3e 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/FilterIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/FilterIterator.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.Iterator; import java.util.NoSuchElementException; -import org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.Predicate; /** * Decorates another {@link Iterator} using a predicate to filter elements. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/FilterListIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/FilterListIterator.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/FilterListIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/FilterListIterator.java index ffa25137f..2e1783f4e 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/FilterListIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/FilterListIterator.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.ListIterator; import java.util.NoSuchElementException; -import org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.Predicate; /** * Decorates another {@link ListIterator} using a predicate to filter elements. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/IteratorChain.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/IteratorChain.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/IteratorChain.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/IteratorChain.java index 6b58b4e46..025c4a047 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/IteratorChain.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/IteratorChain.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.Collection; import java.util.Iterator; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/IteratorEnumeration.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/IteratorEnumeration.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/IteratorEnumeration.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/IteratorEnumeration.java index 354991887..87d957f1f 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/IteratorEnumeration.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/IteratorEnumeration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.Enumeration; import java.util.Iterator; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/IteratorIterable.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/IteratorIterable.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/IteratorIterable.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/IteratorIterable.java index 4b7bb3cc4..969fc03c0 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/IteratorIterable.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/IteratorIterable.java @@ -11,11 +11,12 @@ * KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.Iterator; -import org.apache.commons.collections4.ResettableIterator; +import com.fr.third.org.apache.commons.collections4.ResettableIterator; +import com.fr.third.org.apache.commons.collections4.ResettableIterator; /** * Adapter to make an {@link Iterator Iterator} instance appear to be an diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/LazyIteratorChain.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/LazyIteratorChain.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/LazyIteratorChain.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/LazyIteratorChain.java index 818142cbe..449915941 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/LazyIteratorChain.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/LazyIteratorChain.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.Iterator; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/ListIteratorWrapper.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ListIteratorWrapper.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/ListIteratorWrapper.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ListIteratorWrapper.java index 1341051f2..7f68ab050 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/ListIteratorWrapper.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ListIteratorWrapper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.text.MessageFormat; import java.util.ArrayList; @@ -23,13 +23,15 @@ import java.util.List; import java.util.ListIterator; import java.util.NoSuchElementException; -import org.apache.commons.collections4.ResettableListIterator; +import com.fr.third.org.apache.commons.collections4.ResettableIterator; +import com.fr.third.org.apache.commons.collections4.ResettableListIterator; +import com.fr.third.org.apache.commons.collections4.ResettableListIterator; /** * Converts an {@link Iterator} into a {@link ResettableListIterator}. * For plain Iterators this is accomplished by caching the returned * elements. This class can also be used to simply add - * {@link org.apache.commons.collections4.ResettableIterator ResettableIterator} + * {@link ResettableIterator ResettableIterator} * functionality to a given {@link ListIterator}. *

      * The ListIterator interface has additional useful methods diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/LoopingIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/LoopingIterator.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/LoopingIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/LoopingIterator.java index 0a5ca4ecc..e811e8571 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/LoopingIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/LoopingIterator.java @@ -14,13 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.Collection; import java.util.Iterator; import java.util.NoSuchElementException; -import org.apache.commons.collections4.ResettableIterator; +import com.fr.third.org.apache.commons.collections4.ResettableIterator; +import com.fr.third.org.apache.commons.collections4.ResettableIterator; /** * An Iterator that restarts when it reaches the end. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/LoopingListIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/LoopingListIterator.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/LoopingListIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/LoopingListIterator.java index cdefbd644..5888e0d9c 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/LoopingListIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/LoopingListIterator.java @@ -14,13 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.List; import java.util.ListIterator; import java.util.NoSuchElementException; -import org.apache.commons.collections4.ResettableListIterator; +import com.fr.third.org.apache.commons.collections4.ResettableListIterator; +import com.fr.third.org.apache.commons.collections4.ResettableListIterator; /** * A ListIterator that restarts when it reaches the end or when it diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/NodeListIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/NodeListIterator.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/NodeListIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/NodeListIterator.java index a5c1575e1..5a07711eb 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/NodeListIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/NodeListIterator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/ObjectArrayIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ObjectArrayIterator.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/ObjectArrayIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ObjectArrayIterator.java index 4b853d164..b3a95348a 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/ObjectArrayIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ObjectArrayIterator.java @@ -14,11 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.NoSuchElementException; -import org.apache.commons.collections4.ResettableIterator; +import com.fr.third.org.apache.commons.collections4.ResettableIterator; +import com.fr.third.org.apache.commons.collections4.ResettableIterator; /** * An {@link Iterator} over an array of objects. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java index e681300dd..05612cc39 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java @@ -14,11 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.NoSuchElementException; -import org.apache.commons.collections4.ResettableListIterator; +import com.fr.third.org.apache.commons.collections4.ResettableListIterator; +import com.fr.third.org.apache.commons.collections4.ResettableListIterator; /** * Implements a {@link ListIterator} over an array of objects. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/ObjectGraphIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ObjectGraphIterator.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/ObjectGraphIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ObjectGraphIterator.java index d8b950c29..9a5db1e6a 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/ObjectGraphIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ObjectGraphIterator.java @@ -14,14 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.ArrayDeque; import java.util.Deque; import java.util.Iterator; import java.util.NoSuchElementException; -import org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * An Iterator that can traverse multiple iterators down an object graph. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/PeekingIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/PeekingIterator.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/PeekingIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/PeekingIterator.java index 080398fd4..232efde40 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/PeekingIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/PeekingIterator.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/PermutationIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/PermutationIterator.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/PermutationIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/PermutationIterator.java index 8193eadab..0960c8414 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/PermutationIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/PermutationIterator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.ArrayList; import java.util.Arrays; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/PushbackIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/PushbackIterator.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/PushbackIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/PushbackIterator.java index a177955ed..5c635580d 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/PushbackIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/PushbackIterator.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.ArrayDeque; import java.util.Deque; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/ReverseListIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ReverseListIterator.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/ReverseListIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ReverseListIterator.java index fdbc50f23..aa30eac3c 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/ReverseListIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ReverseListIterator.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.List; import java.util.ListIterator; -import org.apache.commons.collections4.ResettableListIterator; +import com.fr.third.org.apache.commons.collections4.ResettableListIterator; +import com.fr.third.org.apache.commons.collections4.ResettableListIterator; /** * Iterates backwards through a List, starting with the last element diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/SingletonIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/SingletonIterator.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/SingletonIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/SingletonIterator.java index 52606957e..6af93602e 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/SingletonIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/SingletonIterator.java @@ -14,11 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.NoSuchElementException; -import org.apache.commons.collections4.ResettableIterator; +import com.fr.third.org.apache.commons.collections4.ResettableIterator; +import com.fr.third.org.apache.commons.collections4.ResettableIterator; /** * SingletonIterator is an {@link Iterator} over a single diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/SingletonListIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/SingletonListIterator.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/SingletonListIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/SingletonListIterator.java index 20f9b5a35..479d4f205 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/SingletonListIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/SingletonListIterator.java @@ -14,11 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.NoSuchElementException; -import org.apache.commons.collections4.ResettableListIterator; +import com.fr.third.org.apache.commons.collections4.ResettableListIterator; +import com.fr.third.org.apache.commons.collections4.ResettableListIterator; /** * SingletonIterator is an {@link ListIterator} over a single diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/SkippingIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/SkippingIterator.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/SkippingIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/SkippingIterator.java index bee201f0e..2c240cc3c 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/SkippingIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/SkippingIterator.java @@ -11,7 +11,7 @@ * KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.Iterator; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/TransformIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/TransformIterator.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/TransformIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/TransformIterator.java index 554bab69f..ade3e6106 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/TransformIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/TransformIterator.java @@ -14,11 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.Iterator; -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 an iterator such that each element returned is transformed. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/UniqueFilterIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/UniqueFilterIterator.java similarity index 87% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/UniqueFilterIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/UniqueFilterIterator.java index 420e7ce52..5ef8fc78a 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/UniqueFilterIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/UniqueFilterIterator.java @@ -14,11 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.Iterator; -import org.apache.commons.collections4.functors.UniquePredicate; +import com.fr.third.org.apache.commons.collections4.functors.UniquePredicate; +import com.fr.third.org.apache.commons.collections4.functors.UniquePredicate; /** * A FilterIterator which only returns "unique" Objects. Internally, diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/UnmodifiableIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/UnmodifiableIterator.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/UnmodifiableIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/UnmodifiableIterator.java index 50fede344..6a00ed5b4 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/UnmodifiableIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/UnmodifiableIterator.java @@ -14,11 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.Iterator; -import org.apache.commons.collections4.Unmodifiable; +import com.fr.third.org.apache.commons.collections4.Unmodifiable; +import com.fr.third.org.apache.commons.collections4.Unmodifiable; /** * Decorates an iterator such that it cannot be modified. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java index 20cece1a5..1a3344836 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java @@ -14,11 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.ListIterator; -import org.apache.commons.collections4.Unmodifiable; +import com.fr.third.org.apache.commons.collections4.Unmodifiable; +import com.fr.third.org.apache.commons.collections4.Unmodifiable; /** * Decorates a list iterator such that it cannot be modified. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java similarity index 90% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java index 80bc1a081..a32f1e66b 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; -import org.apache.commons.collections4.MapIterator; -import org.apache.commons.collections4.Unmodifiable; +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.MapIterator; +import com.fr.third.org.apache.commons.collections4.Unmodifiable; /** * Decorates a map iterator such that it cannot be modified. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java similarity index 90% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java index d381d89ea..d6639bfdd 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; -import org.apache.commons.collections4.OrderedMapIterator; -import org.apache.commons.collections4.Unmodifiable; +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.OrderedMapIterator; +import com.fr.third.org.apache.commons.collections4.Unmodifiable; /** * Decorates an ordered map iterator such that it cannot be modified. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/ZippingIterator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ZippingIterator.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/ZippingIterator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ZippingIterator.java index f9d301557..725e0e9df 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/ZippingIterator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/ZippingIterator.java @@ -14,14 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; -import org.apache.commons.collections4.FluentIterable; +import com.fr.third.org.apache.commons.collections4.FluentIterable; +import com.fr.third.org.apache.commons.collections4.FluentIterable; /** * Provides an interleaved iteration over the elements contained in a diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/package-info.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/package-info.java similarity index 88% rename from fine-commons-collections4/src/org/apache/commons/collections4/iterators/package-info.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/package-info.java index fc5547ead..908ceb12b 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/iterators/package-info.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/iterators/package-info.java @@ -19,10 +19,10 @@ * {@link java.util.Iterator Iterator} interface. *

      * You may also consider using - * {@link org.apache.commons.collections4.IteratorUtils IteratorUtils}, + * {@link com.fr.third.org.apache.commons.collections4.IteratorUtils IteratorUtils}, * which is a single class that uses static methods to construct instances * of the classes in this package. * * @version $Id: package-info.java 1477802 2013-04-30 20:01:28Z tn $ */ -package org.apache.commons.collections4.iterators; +package com.fr.third.org.apache.commons.collections4.iterators; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java index e85662657..2dd966aff 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.keyvalue; +package com.fr.third.org.apache.commons.collections4.keyvalue; -import org.apache.commons.collections4.KeyValue; +import com.fr.third.org.apache.commons.collections4.KeyValue; /** * Abstract pair class to assist with creating KeyValue diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java index e9d3d0f60..f37014ca3 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.keyvalue; +package com.fr.third.org.apache.commons.collections4.keyvalue; import java.util.Map; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java index 8dc36d340..cb900027b 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.keyvalue; +package com.fr.third.org.apache.commons.collections4.keyvalue; import java.util.Map; -import org.apache.commons.collections4.KeyValue; +import com.fr.third.org.apache.commons.collections4.KeyValue; /** * Provides a base decorator that allows additional functionality to be diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java index 06054cc57..53907f901 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.keyvalue; +package com.fr.third.org.apache.commons.collections4.keyvalue; import java.util.Map; -import org.apache.commons.collections4.KeyValue; +import com.fr.third.org.apache.commons.collections4.KeyValue; /** * A mutable KeyValue pair that does not implement diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java index 893fb5c21..e033f6e96 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.keyvalue; +package com.fr.third.org.apache.commons.collections4.keyvalue; import java.util.Map; -import org.apache.commons.collections4.KeyValue; +import com.fr.third.org.apache.commons.collections4.KeyValue; /** * A restricted implementation of {@link java.util.Map.Entry Map.Entry} that prevents diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/MultiKey.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/MultiKey.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/MultiKey.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/MultiKey.java index 7a0b2947c..32c8fe7d5 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/MultiKey.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/MultiKey.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.keyvalue; +package com.fr.third.org.apache.commons.collections4.keyvalue; import java.io.Serializable; import java.util.Arrays; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/TiedMapEntry.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/TiedMapEntry.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/TiedMapEntry.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/TiedMapEntry.java index cf2b012c7..e292727a6 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/TiedMapEntry.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/TiedMapEntry.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.keyvalue; +package com.fr.third.org.apache.commons.collections4.keyvalue; import java.io.Serializable; import java.util.Map; -import org.apache.commons.collections4.KeyValue; +import com.fr.third.org.apache.commons.collections4.KeyValue; /** * A {@link java.util.Map.Entry Map.Entry} tied to a map underneath. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java similarity index 92% rename from fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java index 62850bebb..2b350cd6a 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.keyvalue; +package com.fr.third.org.apache.commons.collections4.keyvalue; import java.util.Map; -import org.apache.commons.collections4.KeyValue; -import org.apache.commons.collections4.Unmodifiable; +import com.fr.third.org.apache.commons.collections4.KeyValue; +import com.fr.third.org.apache.commons.collections4.Unmodifiable; /** * A {@link java.util.Map.Entry Map.Entry} that throws diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/package-info.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/package-info.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/package-info.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/package-info.java index da013fb72..800517445 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/keyvalue/package-info.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/keyvalue/package-info.java @@ -27,4 +27,4 @@ * * @version $Id: package-info.java 1469004 2013-04-17 17:37:03Z tn $ */ -package org.apache.commons.collections4.keyvalue; +package com.fr.third.org.apache.commons.collections4.keyvalue; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/list/AbstractLinkedList.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/AbstractLinkedList.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/list/AbstractLinkedList.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/AbstractLinkedList.java index 65c6c3ee4..df209bf7d 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/list/AbstractLinkedList.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/AbstractLinkedList.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.list; +package com.fr.third.org.apache.commons.collections4.list; import java.io.IOException; import java.io.ObjectInputStream; @@ -28,7 +28,7 @@ import java.util.List; import java.util.ListIterator; import java.util.NoSuchElementException; -import org.apache.commons.collections4.OrderedIterator; +import com.fr.third.org.apache.commons.collections4.OrderedIterator; /** * An abstract implementation of a linked list which provides numerous points for diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/list/AbstractListDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/AbstractListDecorator.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/list/AbstractListDecorator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/AbstractListDecorator.java index 45738baee..c658afaf3 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/list/AbstractListDecorator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/AbstractListDecorator.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.list; +package com.fr.third.org.apache.commons.collections4.list; import java.util.Collection; import java.util.List; import java.util.ListIterator; -import org.apache.commons.collections4.collection.AbstractCollectionDecorator; +import com.fr.third.org.apache.commons.collections4.collection.AbstractCollectionDecorator; /** * Decorates another {@link List} to provide additional behaviour. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java index 0b6c539b9..20d5ddbf3 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.list; +package com.fr.third.org.apache.commons.collections4.list; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/list/CursorableLinkedList.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/CursorableLinkedList.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/list/CursorableLinkedList.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/CursorableLinkedList.java index 3b21ce40f..673252095 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/list/CursorableLinkedList.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/CursorableLinkedList.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.list; +package com.fr.third.org.apache.commons.collections4.list; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/list/FixedSizeList.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/FixedSizeList.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/list/FixedSizeList.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/FixedSizeList.java index aa8ec6f70..fbb11f371 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/list/FixedSizeList.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/FixedSizeList.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.list; +package com.fr.third.org.apache.commons.collections4.list; import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.ListIterator; -import org.apache.commons.collections4.BoundedCollection; -import org.apache.commons.collections4.iterators.AbstractListIteratorDecorator; -import org.apache.commons.collections4.iterators.UnmodifiableIterator; +import com.fr.third.org.apache.commons.collections4.BoundedCollection; +import com.fr.third.org.apache.commons.collections4.iterators.AbstractListIteratorDecorator; +import com.fr.third.org.apache.commons.collections4.iterators.UnmodifiableIterator; /** * Decorates another List to fix the size preventing add/remove. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/list/GrowthList.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/GrowthList.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/list/GrowthList.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/GrowthList.java index 92c22819e..268a090ed 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/list/GrowthList.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/GrowthList.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.list; +package com.fr.third.org.apache.commons.collections4.list; import java.util.ArrayList; import java.util.Collection; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/list/LazyList.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/LazyList.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/list/LazyList.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/LazyList.java index c932209a5..ce60aaab6 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/list/LazyList.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/LazyList.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.list; +package com.fr.third.org.apache.commons.collections4.list; import java.util.List; -import org.apache.commons.collections4.Factory; +import com.fr.third.org.apache.commons.collections4.Factory; /** * Decorates another List to create objects in the list on demand. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/list/NodeCachingLinkedList.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/NodeCachingLinkedList.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/list/NodeCachingLinkedList.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/NodeCachingLinkedList.java index f7b84b154..20ec2ea73 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/list/NodeCachingLinkedList.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/NodeCachingLinkedList.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.list; +package com.fr.third.org.apache.commons.collections4.list; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/list/PredicatedList.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/PredicatedList.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/list/PredicatedList.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/PredicatedList.java index 22d21ddc7..4397d1059 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/list/PredicatedList.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/PredicatedList.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.list; +package com.fr.third.org.apache.commons.collections4.list; import java.util.Collection; import java.util.List; import java.util.ListIterator; -import org.apache.commons.collections4.Predicate; -import org.apache.commons.collections4.collection.PredicatedCollection; -import org.apache.commons.collections4.iterators.AbstractListIteratorDecorator; +import com.fr.third.org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.collection.PredicatedCollection; +import com.fr.third.org.apache.commons.collections4.iterators.AbstractListIteratorDecorator; /** * Decorates another List to validate that all additions diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/list/SetUniqueList.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/SetUniqueList.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/list/SetUniqueList.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/SetUniqueList.java index 63da3ea35..4fd62bdf9 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/list/SetUniqueList.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/SetUniqueList.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.list; +package com.fr.third.org.apache.commons.collections4.list; import java.util.ArrayList; import java.util.Collection; @@ -24,10 +24,12 @@ import java.util.List; import java.util.ListIterator; import java.util.Set; -import org.apache.commons.collections4.ListUtils; -import org.apache.commons.collections4.iterators.AbstractIteratorDecorator; -import org.apache.commons.collections4.iterators.AbstractListIteratorDecorator; -import org.apache.commons.collections4.set.UnmodifiableSet; +import com.fr.third.org.apache.commons.collections4.set.ListOrderedSet; +import com.fr.third.org.apache.commons.collections4.set.UnmodifiableSet; +import com.fr.third.org.apache.commons.collections4.ListUtils; +import com.fr.third.org.apache.commons.collections4.iterators.AbstractIteratorDecorator; +import com.fr.third.org.apache.commons.collections4.iterators.AbstractListIteratorDecorator; +import com.fr.third.org.apache.commons.collections4.set.UnmodifiableSet; /** * Decorates a List to ensure that no duplicates are present much @@ -39,7 +41,7 @@ import org.apache.commons.collections4.set.UnmodifiableSet; * should not affect you. Bear in mind that Sets require immutable objects to * function correctly. *

      - * The {@link org.apache.commons.collections4.set.ListOrderedSet ListOrderedSet} + * The {@link ListOrderedSet ListOrderedSet} * class provides an alternative approach, by wrapping an existing Set and * retaining insertion order in the iterator. *

      diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/list/TransformedList.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/TransformedList.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/list/TransformedList.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/TransformedList.java index c52793e6b..5949bf43d 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/list/TransformedList.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/TransformedList.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.list; +package com.fr.third.org.apache.commons.collections4.list; import java.util.Collection; import java.util.List; import java.util.ListIterator; -import org.apache.commons.collections4.Transformer; -import org.apache.commons.collections4.collection.TransformedCollection; -import org.apache.commons.collections4.iterators.AbstractListIteratorDecorator; +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.iterators.AbstractListIteratorDecorator; /** * Decorates another List to transform objects that are added. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/list/TreeList.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/TreeList.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/list/TreeList.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/TreeList.java index 5300d144b..b269487f5 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/list/TreeList.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/TreeList.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.list; +package com.fr.third.org.apache.commons.collections4.list; import java.util.AbstractList; import java.util.ArrayDeque; @@ -25,7 +25,7 @@ import java.util.Iterator; import java.util.ListIterator; import java.util.NoSuchElementException; -import org.apache.commons.collections4.OrderedIterator; +import com.fr.third.org.apache.commons.collections4.OrderedIterator; /** * A List implementation that is optimised for fast insertions and diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/list/UnmodifiableList.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/UnmodifiableList.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/list/UnmodifiableList.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/UnmodifiableList.java index d8ff163b3..73ea40dde 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/list/UnmodifiableList.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/UnmodifiableList.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.list; +package com.fr.third.org.apache.commons.collections4.list; import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.ListIterator; -import org.apache.commons.collections4.Unmodifiable; -import org.apache.commons.collections4.iterators.UnmodifiableIterator; -import org.apache.commons.collections4.iterators.UnmodifiableListIterator; +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.iterators.UnmodifiableListIterator; /** * Decorates another List to ensure it can't be altered. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/list/package-info.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/package-info.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/list/package-info.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/package-info.java index 133e80d17..56d9c6bf3 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/list/package-info.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/list/package-info.java @@ -37,4 +37,4 @@ * * @version $Id: package-info.java 1469004 2013-04-17 17:37:03Z tn $ */ -package org.apache.commons.collections4.list; +package com.fr.third.org.apache.commons.collections4.list; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractHashedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractHashedMap.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractHashedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractHashedMap.java index a111c4858..cb1fdd80b 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractHashedMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractHashedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -29,11 +29,12 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import org.apache.commons.collections4.IterableMap; -import org.apache.commons.collections4.KeyValue; -import org.apache.commons.collections4.MapIterator; -import org.apache.commons.collections4.iterators.EmptyIterator; -import org.apache.commons.collections4.iterators.EmptyMapIterator; +import com.fr.third.org.apache.commons.collections4.iterators.EmptyMapIterator; +import com.fr.third.org.apache.commons.collections4.IterableMap; +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.iterators.EmptyIterator; +import com.fr.third.org.apache.commons.collections4.iterators.EmptyMapIterator; /** * An abstract implementation of a hash-based map which provides numerous points for diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java index a862b5d0a..19267204b 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java @@ -14,16 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.lang.reflect.Array; import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.apache.commons.collections4.iterators.AbstractIteratorDecorator; -import org.apache.commons.collections4.keyvalue.AbstractMapEntryDecorator; -import org.apache.commons.collections4.set.AbstractSetDecorator; +import com.fr.third.org.apache.commons.collections4.keyvalue.AbstractMapEntryDecorator; +import com.fr.third.org.apache.commons.collections4.set.AbstractSetDecorator; +import com.fr.third.org.apache.commons.collections4.iterators.AbstractIteratorDecorator; +import com.fr.third.org.apache.commons.collections4.keyvalue.AbstractMapEntryDecorator; +import com.fr.third.org.apache.commons.collections4.set.AbstractSetDecorator; /** * An abstract base class that simplifies the task of creating map decorators. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractIterableMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractIterableMap.java similarity index 86% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractIterableMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractIterableMap.java index 27d712ab7..a2bb6104c 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractIterableMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractIterableMap.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; -import org.apache.commons.collections4.IterableMap; -import org.apache.commons.collections4.MapIterator; +import com.fr.third.org.apache.commons.collections4.IterableMap; +import com.fr.third.org.apache.commons.collections4.MapIterator; /** * Provide a basic {@link IterableMap} implementation. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractLinkedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractLinkedMap.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractLinkedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractLinkedMap.java index d7f515067..7e89b5d4a 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractLinkedMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractLinkedMap.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.Map; import java.util.NoSuchElementException; -import org.apache.commons.collections4.OrderedIterator; -import org.apache.commons.collections4.OrderedMap; -import org.apache.commons.collections4.OrderedMapIterator; -import org.apache.commons.collections4.ResettableIterator; -import org.apache.commons.collections4.iterators.EmptyOrderedIterator; -import org.apache.commons.collections4.iterators.EmptyOrderedMapIterator; +import com.fr.third.org.apache.commons.collections4.OrderedIterator; +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.iterators.EmptyOrderedIterator; +import com.fr.third.org.apache.commons.collections4.iterators.EmptyOrderedMapIterator; /** * An abstract implementation of a hash-based map that links entries to create an diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractMapDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractMapDecorator.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractMapDecorator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractMapDecorator.java index 6c48bdc3e..66e8dd251 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractMapDecorator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractMapDecorator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.util.Collection; import java.util.Map; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java index 7a0eaaf6a..73fd1e965 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; -import org.apache.commons.collections4.OrderedMap; -import org.apache.commons.collections4.OrderedMapIterator; +import com.fr.third.org.apache.commons.collections4.OrderedMap; +import com.fr.third.org.apache.commons.collections4.OrderedMapIterator; /** * Provides a base decorator that enables additional functionality to be added diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractReferenceMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractReferenceMap.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractReferenceMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractReferenceMap.java index 1b091f66b..37b3fbd6f 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractReferenceMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractReferenceMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -32,8 +32,9 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import org.apache.commons.collections4.MapIterator; -import org.apache.commons.collections4.keyvalue.DefaultMapEntry; +import com.fr.third.org.apache.commons.collections4.keyvalue.DefaultMapEntry; +import com.fr.third.org.apache.commons.collections4.MapIterator; +import com.fr.third.org.apache.commons.collections4.keyvalue.DefaultMapEntry; /** * An abstract implementation of a hash-based map that allows the entries to diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java index 1a63559d9..977dac86e 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.util.Comparator; import java.util.Iterator; @@ -23,9 +23,9 @@ import java.util.Map; import java.util.Set; import java.util.SortedMap; -import org.apache.commons.collections4.IterableSortedMap; -import org.apache.commons.collections4.OrderedMapIterator; -import org.apache.commons.collections4.iterators.ListIteratorWrapper; +import com.fr.third.org.apache.commons.collections4.IterableSortedMap; +import com.fr.third.org.apache.commons.collections4.OrderedMapIterator; +import com.fr.third.org.apache.commons.collections4.iterators.ListIteratorWrapper; /** * Provides a base decorator that enables additional functionality to be added diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/CaseInsensitiveMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/CaseInsensitiveMap.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/CaseInsensitiveMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/CaseInsensitiveMap.java index 5489c08cf..3672dad65 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/CaseInsensitiveMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/CaseInsensitiveMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/CompositeMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/CompositeMap.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/CompositeMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/CompositeMap.java index dcaa05d42..ca6d69257 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/CompositeMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/CompositeMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.Serializable; @@ -22,9 +22,10 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import org.apache.commons.collections4.set.CompositeSet; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.collection.CompositeCollection; +import com.fr.third.org.apache.commons.collections4.set.CompositeSet; +import com.fr.third.org.apache.commons.collections4.set.CompositeSet; +import com.fr.third.org.apache.commons.collections4.CollectionUtils; +import com.fr.third.org.apache.commons.collections4.collection.CompositeCollection; /** * Decorates a map of other maps to provide a single unified view. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/DefaultedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/DefaultedMap.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/DefaultedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/DefaultedMap.java index 7318b7317..41add7ccc 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/DefaultedMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/DefaultedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -23,10 +23,12 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import org.apache.commons.collections4.Factory; -import org.apache.commons.collections4.Transformer; -import org.apache.commons.collections4.functors.ConstantTransformer; -import org.apache.commons.collections4.functors.FactoryTransformer; +import com.fr.third.org.apache.commons.collections4.functors.ConstantTransformer; +import com.fr.third.org.apache.commons.collections4.functors.FactoryTransformer; +import com.fr.third.org.apache.commons.collections4.Factory; +import com.fr.third.org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.functors.ConstantTransformer; +import com.fr.third.org.apache.commons.collections4.functors.FactoryTransformer; /** * Decorates another Map returning a default value if the map diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java index 8623d1dfa..9ba09af08 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.apache.commons.collections4.MapIterator; -import org.apache.commons.collections4.ResettableIterator; +import com.fr.third.org.apache.commons.collections4.MapIterator; +import com.fr.third.org.apache.commons.collections4.ResettableIterator; /** * Adapts a Map entrySet to the MapIterator interface. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/FixedSizeMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/FixedSizeMap.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/FixedSizeMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/FixedSizeMap.java index aff54aef7..c030183d8 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/FixedSizeMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/FixedSizeMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -24,9 +24,10 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import org.apache.commons.collections4.BoundedMap; -import org.apache.commons.collections4.collection.UnmodifiableCollection; -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.BoundedMap; +import com.fr.third.org.apache.commons.collections4.collection.UnmodifiableCollection; +import com.fr.third.org.apache.commons.collections4.set.UnmodifiableSet; /** * Decorates another Map to fix the size, preventing add/remove. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/FixedSizeSortedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/FixedSizeSortedMap.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/FixedSizeSortedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/FixedSizeSortedMap.java index efdf104b7..f6ddeaa85 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/FixedSizeSortedMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/FixedSizeSortedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -25,10 +25,11 @@ import java.util.Map; import java.util.Set; import java.util.SortedMap; -import org.apache.commons.collections4.BoundedMap; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.collection.UnmodifiableCollection; -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.BoundedMap; +import com.fr.third.org.apache.commons.collections4.CollectionUtils; +import com.fr.third.org.apache.commons.collections4.collection.UnmodifiableCollection; +import com.fr.third.org.apache.commons.collections4.set.UnmodifiableSet; /** * Decorates another SortedMap to fix the size blocking add/remove. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/Flat3Map.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/Flat3Map.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/Flat3Map.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/Flat3Map.java index b6fa63e8f..b6e2b2b46 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/Flat3Map.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/Flat3Map.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -28,11 +28,12 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import org.apache.commons.collections4.IterableMap; -import org.apache.commons.collections4.MapIterator; -import org.apache.commons.collections4.ResettableIterator; -import org.apache.commons.collections4.iterators.EmptyIterator; -import org.apache.commons.collections4.iterators.EmptyMapIterator; +import com.fr.third.org.apache.commons.collections4.iterators.EmptyMapIterator; +import com.fr.third.org.apache.commons.collections4.IterableMap; +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.iterators.EmptyIterator; +import com.fr.third.org.apache.commons.collections4.iterators.EmptyMapIterator; /** * A Map implementation that stores data in simple fields until diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/HashedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/HashedMap.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/HashedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/HashedMap.java index 3e42287d8..e29f1b22a 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/HashedMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/HashedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/LRUMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/LRUMap.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/LRUMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/LRUMap.java index 6f384bb6f..16bdfdc4e 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/LRUMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/LRUMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -22,7 +22,7 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.Map; -import org.apache.commons.collections4.BoundedMap; +import com.fr.third.org.apache.commons.collections4.BoundedMap; /** * A Map implementation with a fixed maximum size which removes diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/LazyMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/LazyMap.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/LazyMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/LazyMap.java index 39ac2020e..b873d17da 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/LazyMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/LazyMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -22,9 +22,10 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.Map; -import org.apache.commons.collections4.Factory; -import org.apache.commons.collections4.Transformer; -import org.apache.commons.collections4.functors.FactoryTransformer; +import com.fr.third.org.apache.commons.collections4.functors.FactoryTransformer; +import com.fr.third.org.apache.commons.collections4.Factory; +import com.fr.third.org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.functors.FactoryTransformer; /** * Decorates another Map to create objects in the map on demand. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/LazySortedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/LazySortedMap.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/LazySortedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/LazySortedMap.java index 9d265e6b7..391c3dac4 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/LazySortedMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/LazySortedMap.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.util.Comparator; import java.util.SortedMap; -import org.apache.commons.collections4.Factory; -import org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.Factory; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Decorates another SortedMap to create objects in the map on demand. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/LinkedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/LinkedMap.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/LinkedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/LinkedMap.java index 924bb405c..70e781d15 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/LinkedMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/LinkedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -27,9 +27,10 @@ import java.util.List; import java.util.ListIterator; import java.util.Map; -import org.apache.commons.collections4.iterators.UnmodifiableIterator; -import org.apache.commons.collections4.iterators.UnmodifiableListIterator; -import org.apache.commons.collections4.list.UnmodifiableList; +import com.fr.third.org.apache.commons.collections4.list.UnmodifiableList; +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.list.UnmodifiableList; /** * A Map implementation that maintains the order of the entries. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/ListOrderedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/ListOrderedMap.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/ListOrderedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/ListOrderedMap.java index df4aefca1..8466f1fcd 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/ListOrderedMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/ListOrderedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -32,12 +32,15 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import org.apache.commons.collections4.OrderedMap; -import org.apache.commons.collections4.OrderedMapIterator; -import org.apache.commons.collections4.ResettableIterator; -import org.apache.commons.collections4.iterators.AbstractUntypedIteratorDecorator; -import org.apache.commons.collections4.keyvalue.AbstractMapEntry; -import org.apache.commons.collections4.list.UnmodifiableList; +import com.fr.third.org.apache.commons.collections4.iterators.AbstractUntypedIteratorDecorator; +import com.fr.third.org.apache.commons.collections4.keyvalue.AbstractMapEntry; +import com.fr.third.org.apache.commons.collections4.list.UnmodifiableList; +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.iterators.AbstractUntypedIteratorDecorator; +import com.fr.third.org.apache.commons.collections4.keyvalue.AbstractMapEntry; +import com.fr.third.org.apache.commons.collections4.list.UnmodifiableList; /** * Decorates a Map to ensure that the order of addition is retained diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/MultiKeyMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/MultiKeyMap.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/MultiKeyMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/MultiKeyMap.java index 849f293ff..1c209a529 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/MultiKeyMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/MultiKeyMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -22,8 +22,9 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.Map; -import org.apache.commons.collections4.MapIterator; -import org.apache.commons.collections4.keyvalue.MultiKey; +import com.fr.third.org.apache.commons.collections4.keyvalue.MultiKey; +import com.fr.third.org.apache.commons.collections4.MapIterator; +import com.fr.third.org.apache.commons.collections4.keyvalue.MultiKey; /** * A Map implementation that uses multiple keys to map the value. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/MultiValueMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/MultiValueMap.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/MultiValueMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/MultiValueMap.java index fbcedd64a..d9a56ca2e 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/MultiValueMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/MultiValueMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -28,15 +28,15 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.Factory; -import org.apache.commons.collections4.FunctorException; -import org.apache.commons.collections4.MultiMap; -import org.apache.commons.collections4.Transformer; -import org.apache.commons.collections4.iterators.EmptyIterator; -import org.apache.commons.collections4.iterators.IteratorChain; -import org.apache.commons.collections4.iterators.LazyIteratorChain; -import org.apache.commons.collections4.iterators.TransformIterator; +import com.fr.third.org.apache.commons.collections4.CollectionUtils; +import com.fr.third.org.apache.commons.collections4.Factory; +import com.fr.third.org.apache.commons.collections4.FunctorException; +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.iterators.EmptyIterator; +import com.fr.third.org.apache.commons.collections4.iterators.IteratorChain; +import com.fr.third.org.apache.commons.collections4.iterators.LazyIteratorChain; +import com.fr.third.org.apache.commons.collections4.iterators.TransformIterator; /** * A MultiValueMap decorates another map, allowing it to have diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/PassiveExpiringMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/PassiveExpiringMap.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/PassiveExpiringMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/PassiveExpiringMap.java index 647c8d089..b51dffebe 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/PassiveExpiringMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/PassiveExpiringMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/PredicatedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/PredicatedMap.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/PredicatedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/PredicatedMap.java index 1ec181814..b041280aa 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/PredicatedMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/PredicatedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -23,7 +23,7 @@ import java.io.Serializable; import java.util.Iterator; import java.util.Map; -import org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.Predicate; /** * Decorates another Map to validate that additions diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/PredicatedSortedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/PredicatedSortedMap.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/PredicatedSortedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/PredicatedSortedMap.java index 96b225758..71a413eaf 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/PredicatedSortedMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/PredicatedSortedMap.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.util.Comparator; import java.util.SortedMap; -import org.apache.commons.collections4.Predicate; +import com.fr.third.org.apache.commons.collections4.Predicate; /** * Decorates another SortedMap to validate that additions diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/ReferenceIdentityMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/ReferenceIdentityMap.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/ReferenceIdentityMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/ReferenceIdentityMap.java index 3b894a097..47aa68270 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/ReferenceIdentityMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/ReferenceIdentityMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -40,7 +40,7 @@ import java.lang.ref.Reference; * memory-sensitive cache. *

      * This map is similar to - * {@link org.apache.commons.collections4.map.ReferenceMap ReferenceMap}. + * {@link ReferenceMap ReferenceMap}. * It differs in that keys and values in this class are compared using ==. *

      * This map will violate the detail of various Map and map view contracts. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/ReferenceMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/ReferenceMap.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/ReferenceMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/ReferenceMap.java index 9b8de018a..170767153 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/ReferenceMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/ReferenceMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/SingletonMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/SingletonMap.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/SingletonMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/SingletonMap.java index 95775065c..396bb3f71 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/SingletonMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/SingletonMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.Serializable; import java.util.AbstractSet; @@ -25,13 +25,14 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import org.apache.commons.collections4.BoundedMap; -import org.apache.commons.collections4.KeyValue; -import org.apache.commons.collections4.OrderedMap; -import org.apache.commons.collections4.OrderedMapIterator; -import org.apache.commons.collections4.ResettableIterator; -import org.apache.commons.collections4.iterators.SingletonIterator; -import org.apache.commons.collections4.keyvalue.TiedMapEntry; +import com.fr.third.org.apache.commons.collections4.keyvalue.TiedMapEntry; +import com.fr.third.org.apache.commons.collections4.BoundedMap; +import com.fr.third.org.apache.commons.collections4.KeyValue; +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.iterators.SingletonIterator; +import com.fr.third.org.apache.commons.collections4.keyvalue.TiedMapEntry; /** * A Map implementation that holds a single item and is fixed size. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/StaticBucketMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/StaticBucketMap.java similarity index 99% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/StaticBucketMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/StaticBucketMap.java index 1a8433e97..775a67f81 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/StaticBucketMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/StaticBucketMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.util.AbstractCollection; import java.util.AbstractSet; @@ -25,7 +25,7 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import org.apache.commons.collections4.KeyValue; +import com.fr.third.org.apache.commons.collections4.KeyValue; /** * A StaticBucketMap is an efficient, thread-safe implementation of diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/TransformedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/TransformedMap.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/TransformedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/TransformedMap.java index b016f4cca..8a69e9f8e 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/TransformedMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/TransformedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -22,7 +22,8 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.Map; -import org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.splitmap.TransformedSplitMap; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Decorates another Map to transform objects that are added. @@ -40,7 +41,7 @@ import org.apache.commons.collections4.Transformer; *

      * This class is Serializable from Commons Collections 3.1. *

      - * @see org.apache.commons.collections4.splitmap.TransformedSplitMap + * @see TransformedSplitMap * * @since 3.0 * @version $Id: TransformedMap.java 1686855 2015-06-22 13:00:27Z tn $ diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/TransformedSortedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/TransformedSortedMap.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/TransformedSortedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/TransformedSortedMap.java index 727f57403..242ed3c13 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/TransformedSortedMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/TransformedSortedMap.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.util.Comparator; import java.util.Map; import java.util.SortedMap; -import org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Decorates another SortedMap to transform objects that are added. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/UnmodifiableEntrySet.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/UnmodifiableEntrySet.java similarity index 91% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/UnmodifiableEntrySet.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/UnmodifiableEntrySet.java index 62d2706bf..b43c421ec 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/UnmodifiableEntrySet.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/UnmodifiableEntrySet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.lang.reflect.Array; import java.util.Collection; @@ -22,10 +22,12 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.apache.commons.collections4.Unmodifiable; -import org.apache.commons.collections4.iterators.AbstractIteratorDecorator; -import org.apache.commons.collections4.keyvalue.AbstractMapEntryDecorator; -import org.apache.commons.collections4.set.AbstractSetDecorator; +import com.fr.third.org.apache.commons.collections4.keyvalue.AbstractMapEntryDecorator; +import com.fr.third.org.apache.commons.collections4.set.AbstractSetDecorator; +import com.fr.third.org.apache.commons.collections4.Unmodifiable; +import com.fr.third.org.apache.commons.collections4.iterators.AbstractIteratorDecorator; +import com.fr.third.org.apache.commons.collections4.keyvalue.AbstractMapEntryDecorator; +import com.fr.third.org.apache.commons.collections4.set.AbstractSetDecorator; /** * Decorates a map entry Set to ensure it can't be altered. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/UnmodifiableMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/UnmodifiableMap.java similarity index 88% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/UnmodifiableMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/UnmodifiableMap.java index 47c72f7d5..ea57479cb 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/UnmodifiableMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/UnmodifiableMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -24,13 +24,14 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import org.apache.commons.collections4.IterableMap; -import org.apache.commons.collections4.MapIterator; -import org.apache.commons.collections4.Unmodifiable; -import org.apache.commons.collections4.collection.UnmodifiableCollection; -import org.apache.commons.collections4.iterators.EntrySetMapIterator; -import org.apache.commons.collections4.iterators.UnmodifiableMapIterator; -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.IterableMap; +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.collection.UnmodifiableCollection; +import com.fr.third.org.apache.commons.collections4.iterators.EntrySetMapIterator; +import com.fr.third.org.apache.commons.collections4.iterators.UnmodifiableMapIterator; +import com.fr.third.org.apache.commons.collections4.set.UnmodifiableSet; /** * Decorates another Map to ensure it can't be altered. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java similarity index 89% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java index 2a29c135c..4b59d1921 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -24,12 +24,13 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import org.apache.commons.collections4.OrderedMap; -import org.apache.commons.collections4.OrderedMapIterator; -import org.apache.commons.collections4.Unmodifiable; -import org.apache.commons.collections4.collection.UnmodifiableCollection; -import org.apache.commons.collections4.iterators.UnmodifiableOrderedMapIterator; -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.OrderedMap; +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.collection.UnmodifiableCollection; +import com.fr.third.org.apache.commons.collections4.iterators.UnmodifiableOrderedMapIterator; +import com.fr.third.org.apache.commons.collections4.set.UnmodifiableSet; /** * Decorates another OrderedMap to ensure it can't be altered. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/UnmodifiableSortedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/UnmodifiableSortedMap.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/UnmodifiableSortedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/UnmodifiableSortedMap.java index 62cb270c1..60d318415 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/UnmodifiableSortedMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/UnmodifiableSortedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -26,9 +26,10 @@ import java.util.Map; import java.util.Set; import java.util.SortedMap; -import org.apache.commons.collections4.Unmodifiable; -import org.apache.commons.collections4.collection.UnmodifiableCollection; -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.Unmodifiable; +import com.fr.third.org.apache.commons.collections4.collection.UnmodifiableCollection; +import com.fr.third.org.apache.commons.collections4.set.UnmodifiableSet; /** * Decorates another SortedMap to ensure it can't be altered. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/map/package-info.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/package-info.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/map/package-info.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/package-info.java index f9670a026..2e5989ace 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/map/package-info.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/map/package-info.java @@ -51,5 +51,5 @@ * * @version $Id: package-info.java 1469004 2013-04-17 17:37:03Z tn $ */ -package org.apache.commons.collections4.map; +package com.fr.third.org.apache.commons.collections4.map; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/multimap/AbstractListValuedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/AbstractListValuedMap.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/multimap/AbstractListValuedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/AbstractListValuedMap.java index 9ac8bb824..161a649a9 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/multimap/AbstractListValuedMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/AbstractListValuedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.multimap; +package com.fr.third.org.apache.commons.collections4.multimap; import java.util.Collection; import java.util.Collections; @@ -22,8 +22,8 @@ import java.util.List; import java.util.ListIterator; import java.util.Map; -import org.apache.commons.collections4.ListUtils; -import org.apache.commons.collections4.ListValuedMap; +import com.fr.third.org.apache.commons.collections4.ListUtils; +import com.fr.third.org.apache.commons.collections4.ListValuedMap; /** * Abstract implementation of the {@link ListValuedMap} interface to simplify diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java index ac35c51cd..6d302d639 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.multimap; +package com.fr.third.org.apache.commons.collections4.multimap; import java.io.IOException; import java.io.ObjectInputStream; @@ -29,21 +29,23 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.IteratorUtils; -import org.apache.commons.collections4.MapIterator; -import org.apache.commons.collections4.MultiSet; -import org.apache.commons.collections4.MultiValuedMap; -import org.apache.commons.collections4.Transformer; -import org.apache.commons.collections4.iterators.AbstractIteratorDecorator; -import org.apache.commons.collections4.iterators.EmptyMapIterator; -import org.apache.commons.collections4.iterators.IteratorChain; -import org.apache.commons.collections4.iterators.LazyIteratorChain; -import org.apache.commons.collections4.iterators.TransformIterator; -import org.apache.commons.collections4.keyvalue.AbstractMapEntry; -import org.apache.commons.collections4.keyvalue.UnmodifiableMapEntry; -import org.apache.commons.collections4.multiset.AbstractMultiSet; -import org.apache.commons.collections4.multiset.UnmodifiableMultiSet; +import com.fr.third.org.apache.commons.collections4.multiset.AbstractMultiSet; +import com.fr.third.org.apache.commons.collections4.multiset.UnmodifiableMultiSet; +import com.fr.third.org.apache.commons.collections4.CollectionUtils; +import com.fr.third.org.apache.commons.collections4.IteratorUtils; +import com.fr.third.org.apache.commons.collections4.MapIterator; +import com.fr.third.org.apache.commons.collections4.MultiSet; +import com.fr.third.org.apache.commons.collections4.MultiValuedMap; +import com.fr.third.org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.iterators.AbstractIteratorDecorator; +import com.fr.third.org.apache.commons.collections4.iterators.EmptyMapIterator; +import com.fr.third.org.apache.commons.collections4.iterators.IteratorChain; +import com.fr.third.org.apache.commons.collections4.iterators.LazyIteratorChain; +import com.fr.third.org.apache.commons.collections4.iterators.TransformIterator; +import com.fr.third.org.apache.commons.collections4.keyvalue.AbstractMapEntry; +import com.fr.third.org.apache.commons.collections4.keyvalue.UnmodifiableMapEntry; +import com.fr.third.org.apache.commons.collections4.multiset.AbstractMultiSet; +import com.fr.third.org.apache.commons.collections4.multiset.UnmodifiableMultiSet; /** * Abstract implementation of the {@link MultiValuedMap} interface to simplify diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java index 8962ba10f..0fb4ef8af 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.multimap; +package com.fr.third.org.apache.commons.collections4.multimap; import java.io.Serializable; import java.util.Collection; @@ -22,9 +22,9 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.commons.collections4.MapIterator; -import org.apache.commons.collections4.MultiSet; -import org.apache.commons.collections4.MultiValuedMap; +import com.fr.third.org.apache.commons.collections4.MapIterator; +import com.fr.third.org.apache.commons.collections4.MultiSet; +import com.fr.third.org.apache.commons.collections4.MultiValuedMap; /** * Decorates another MultiValuedMap to provide additional behaviour. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java index c13579d31..b28a24c54 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.multimap; +package com.fr.third.org.apache.commons.collections4.multimap; import java.util.Collections; import java.util.Map; import java.util.Set; -import org.apache.commons.collections4.SetUtils; -import org.apache.commons.collections4.SetValuedMap; +import com.fr.third.org.apache.commons.collections4.SetUtils; +import com.fr.third.org.apache.commons.collections4.SetValuedMap; /** * Abstract implementation of the {@link SetValuedMap} interface to simplify the diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java index 4c645ccaa..c51ed847a 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.multimap; +package com.fr.third.org.apache.commons.collections4.multimap; import java.io.IOException; import java.io.ObjectInputStream; @@ -25,7 +25,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.apache.commons.collections4.MultiValuedMap; +import com.fr.third.org.apache.commons.collections4.MultiValuedMap; /** * Implements a {@code ListValuedMap}, using a {@link HashMap} to provide data diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java index 3a9396f5a..ca9cd1fd8 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.multimap; +package com.fr.third.org.apache.commons.collections4.multimap; import java.io.IOException; import java.io.ObjectInputStream; @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import org.apache.commons.collections4.MultiValuedMap; +import com.fr.third.org.apache.commons.collections4.MultiValuedMap; /** * Implements a {@code SetValuedMap}, using a {@link HashMap} to provide data diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java index f4131f051..fd18a673d 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.multimap; +package com.fr.third.org.apache.commons.collections4.multimap; import java.util.Iterator; import java.util.Map; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.FluentIterable; -import org.apache.commons.collections4.MultiValuedMap; -import org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.CollectionUtils; +import com.fr.third.org.apache.commons.collections4.FluentIterable; +import com.fr.third.org.apache.commons.collections4.MultiValuedMap; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Decorates another MultiValuedMap to transform objects that are added. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java similarity index 84% rename from fine-commons-collections4/src/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java index 1166c2af9..ccd003844 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java @@ -14,22 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.multimap; +package com.fr.third.org.apache.commons.collections4.multimap; import java.util.Collection; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.commons.collections4.MapIterator; -import org.apache.commons.collections4.MultiSet; -import org.apache.commons.collections4.MultiValuedMap; -import org.apache.commons.collections4.Unmodifiable; -import org.apache.commons.collections4.collection.UnmodifiableCollection; -import org.apache.commons.collections4.iterators.UnmodifiableMapIterator; -import org.apache.commons.collections4.map.UnmodifiableMap; -import org.apache.commons.collections4.multiset.UnmodifiableMultiSet; -import org.apache.commons.collections4.set.UnmodifiableSet; +import com.fr.third.org.apache.commons.collections4.multiset.UnmodifiableMultiSet; +import com.fr.third.org.apache.commons.collections4.MapIterator; +import com.fr.third.org.apache.commons.collections4.MultiSet; +import com.fr.third.org.apache.commons.collections4.MultiValuedMap; +import com.fr.third.org.apache.commons.collections4.Unmodifiable; +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.UnmodifiableMap; +import com.fr.third.org.apache.commons.collections4.multiset.UnmodifiableMultiSet; +import com.fr.third.org.apache.commons.collections4.set.UnmodifiableSet; /** * Decorates another {@link MultiValuedMap} to ensure it can't be altered. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/multimap/package-info.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/package-info.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/multimap/package-info.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/package-info.java index ee2a4fdcd..9e372bf84 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/multimap/package-info.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multimap/package-info.java @@ -32,4 +32,4 @@ * * @version $Id: package-info.java 1715302 2015-11-19 23:08:01Z tn $ */ -package org.apache.commons.collections4.multimap; +package com.fr.third.org.apache.commons.collections4.multimap; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java index 0b39f0672..bbfb13594 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.multiset; +package com.fr.third.org.apache.commons.collections4.multiset; import java.io.IOException; import java.io.ObjectInputStream; @@ -24,8 +24,8 @@ import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.Map; -import org.apache.commons.collections4.MultiSet; -import org.apache.commons.collections4.iterators.AbstractIteratorDecorator; +import com.fr.third.org.apache.commons.collections4.MultiSet; +import com.fr.third.org.apache.commons.collections4.iterators.AbstractIteratorDecorator; /** * Abstract implementation of the {@link MultiSet} interface to simplify the diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/multiset/AbstractMultiSet.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/AbstractMultiSet.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/multiset/AbstractMultiSet.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/AbstractMultiSet.java index ddfef0c80..fa4a73bb0 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/multiset/AbstractMultiSet.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/AbstractMultiSet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.multiset; +package com.fr.third.org.apache.commons.collections4.multiset; import java.io.IOException; import java.io.ObjectInputStream; @@ -25,9 +25,9 @@ import java.util.Collection; import java.util.Iterator; import java.util.Set; -import org.apache.commons.collections4.IteratorUtils; -import org.apache.commons.collections4.MultiSet; -import org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.IteratorUtils; +import com.fr.third.org.apache.commons.collections4.MultiSet; +import com.fr.third.org.apache.commons.collections4.Transformer; /** * Abstract implementation of the {@link MultiSet} interface to simplify the diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java index 8838d16ba..ec8e9bfcb 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.multiset; +package com.fr.third.org.apache.commons.collections4.multiset; import java.util.Set; -import org.apache.commons.collections4.MultiSet; -import org.apache.commons.collections4.collection.AbstractCollectionDecorator; +import com.fr.third.org.apache.commons.collections4.MultiSet; +import com.fr.third.org.apache.commons.collections4.collection.AbstractCollectionDecorator; /** * Decorates another MultSet to provide additional behaviour. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/multiset/HashMultiSet.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/HashMultiSet.java similarity index 97% rename from fine-commons-collections4/src/org/apache/commons/collections4/multiset/HashMultiSet.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/HashMultiSet.java index 047422313..14795038f 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/multiset/HashMultiSet.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/HashMultiSet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.multiset; +package com.fr.third.org.apache.commons.collections4.multiset; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/multiset/PredicatedMultiSet.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/PredicatedMultiSet.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/multiset/PredicatedMultiSet.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/PredicatedMultiSet.java index 2518bbbb6..3ac0497ea 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/multiset/PredicatedMultiSet.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/PredicatedMultiSet.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.multiset; +package com.fr.third.org.apache.commons.collections4.multiset; import java.util.Set; -import org.apache.commons.collections4.MultiSet; -import org.apache.commons.collections4.Predicate; -import org.apache.commons.collections4.collection.PredicatedCollection; +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.collection.PredicatedCollection; /** * Decorates another {@link MultiSet} to validate that additions diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java index 96d6a6765..685ec4d14 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.multiset; +package com.fr.third.org.apache.commons.collections4.multiset; import java.util.Set; -import org.apache.commons.collections4.MultiSet; -import org.apache.commons.collections4.collection.SynchronizedCollection; +import com.fr.third.org.apache.commons.collections4.MultiSet; +import com.fr.third.org.apache.commons.collections4.collection.SynchronizedCollection; /** * Decorates another {@link MultiSet} to synchronize its behaviour diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java similarity index 93% rename from fine-commons-collections4/src/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java index abb380e8d..b1a3a80de 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.multiset; +package com.fr.third.org.apache.commons.collections4.multiset; import java.io.IOException; import java.io.ObjectInputStream; @@ -23,10 +23,10 @@ import java.util.Collection; import java.util.Iterator; import java.util.Set; -import org.apache.commons.collections4.MultiSet; -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.MultiSet; +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 MultiSet} to ensure it can't be altered. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/multiset/package-info.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/package-info.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/multiset/package-info.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/package-info.java index 49c07f7b6..0edcb8645 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/multiset/package-info.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/multiset/package-info.java @@ -35,4 +35,4 @@ * * @version $Id: package-info.java 1688308 2015-06-29 21:28:54Z tn $ */ -package org.apache.commons.collections4.multiset; +package com.fr.third.org.apache.commons.collections4.multiset; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/overview.html b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/overview.html similarity index 100% rename from fine-commons-collections4/src/org/apache/commons/collections4/overview.html rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/overview.html diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/package-info.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/package-info.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/package-info.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/package-info.java index 7e44dc4c5..343aec7b8 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/package-info.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/package-info.java @@ -24,4 +24,4 @@ * * @version $Id: package-info.java 1469004 2013-04-17 17:37:03Z tn $ */ -package org.apache.commons.collections4; +package com.fr.third.org.apache.commons.collections4; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/queue/AbstractQueueDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/queue/AbstractQueueDecorator.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/queue/AbstractQueueDecorator.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/queue/AbstractQueueDecorator.java index 862383246..1caf96c35 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/queue/AbstractQueueDecorator.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/queue/AbstractQueueDecorator.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.queue; +package com.fr.third.org.apache.commons.collections4.queue; import java.util.Queue; -import org.apache.commons.collections4.collection.AbstractCollectionDecorator; +import com.fr.third.org.apache.commons.collections4.collection.AbstractCollectionDecorator; /** * Decorates another {@link Queue} to provide additional behaviour. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/queue/CircularFifoQueue.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/queue/CircularFifoQueue.java similarity index 98% rename from fine-commons-collections4/src/org/apache/commons/collections4/queue/CircularFifoQueue.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/queue/CircularFifoQueue.java index 5fd8ba957..2b242cd6d 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/queue/CircularFifoQueue.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/queue/CircularFifoQueue.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.queue; +package com.fr.third.org.apache.commons.collections4.queue; import java.io.IOException; import java.io.ObjectInputStream; @@ -27,7 +27,7 @@ import java.util.Iterator; import java.util.NoSuchElementException; import java.util.Queue; -import org.apache.commons.collections4.BoundedCollection; +import com.fr.third.org.apache.commons.collections4.BoundedCollection; /** * CircularFifoQueue is a first-in first-out queue with a fixed size that diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/queue/PredicatedQueue.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/queue/PredicatedQueue.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/queue/PredicatedQueue.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/queue/PredicatedQueue.java index ffbe128df..06d60184e 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/queue/PredicatedQueue.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/queue/PredicatedQueue.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.queue; +package com.fr.third.org.apache.commons.collections4.queue; import java.util.Queue; -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.collection.PredicatedCollection; /** * Decorates another {@link Queue} to validate that additions diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/queue/TransformedQueue.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/queue/TransformedQueue.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/queue/TransformedQueue.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/queue/TransformedQueue.java index c217ad565..bc9e65639 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/queue/TransformedQueue.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/queue/TransformedQueue.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.queue; +package com.fr.third.org.apache.commons.collections4.queue; import java.util.Queue; -import org.apache.commons.collections4.Transformer; -import org.apache.commons.collections4.collection.TransformedCollection; +import com.fr.third.org.apache.commons.collections4.Transformer; +import com.fr.third.org.apache.commons.collections4.collection.TransformedCollection; /** * Decorates another {@link Queue} to transform objects that are added. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/queue/UnmodifiableQueue.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/queue/UnmodifiableQueue.java similarity index 95% rename from fine-commons-collections4/src/org/apache/commons/collections4/queue/UnmodifiableQueue.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/queue/UnmodifiableQueue.java index 659099f5a..c2546905e 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/queue/UnmodifiableQueue.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/queue/UnmodifiableQueue.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.queue; +package com.fr.third.org.apache.commons.collections4.queue; import java.io.IOException; import java.io.ObjectInputStream; @@ -23,8 +23,8 @@ import java.util.Collection; import java.util.Iterator; import java.util.Queue; -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.iterators.UnmodifiableIterator; /** * Decorates another {@link Queue} to ensure it can't be altered. diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/queue/package-info.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/queue/package-info.java similarity index 96% rename from fine-commons-collections4/src/org/apache/commons/collections4/queue/package-info.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/queue/package-info.java index 817932611..2165649e9 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/queue/package-info.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/queue/package-info.java @@ -31,4 +31,4 @@ * * @version $Id: package-info.java 1477765 2013-04-30 18:37:37Z tn $ */ -package org.apache.commons.collections4.queue; +package com.fr.third.org.apache.commons.collections4.queue; diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/sequence/CommandVisitor.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/CommandVisitor.java similarity index 94% rename from fine-commons-collections4/src/org/apache/commons/collections4/sequence/CommandVisitor.java rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/CommandVisitor.java index 0b5e612d2..81478f52d 100644 --- a/fine-commons-collections4/src/org/apache/commons/collections4/sequence/CommandVisitor.java +++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/CommandVisitor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections4.sequence; +package com.fr.third.org.apache.commons.collections4.sequence; /** * This interface should be implemented by user object to walk @@ -35,7 +35,7 @@ package org.apache.commons.collections4.sequence; * The first example is a visitor that build the longest common * subsequence: * 

      - * import org.apache.commons.collections4.comparators.sequence.CommandVisitor;
+ * import com.fr.third.org.apache.commons.collections4.comparators.sequence.CommandVisitor;
  *
  * import java.util.ArrayList;
  *
@@ -67,7 +67,7 @@ package org.apache.commons.collections4.sequence;
  * The second example is a visitor that shows the commands and the way
  * they transform the first sequence into the second one:
  * 
      - * import org.apache.commons.collections4.comparators.sequence.CommandVisitor;
+ * import com.fr.third.org.apache.commons.collections4.comparators.sequence.CommandVisitor;
  *
  * import java.util.Arrays;
  * import java.util.ArrayList;
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/sequence/DeleteCommand.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/DeleteCommand.java
similarity index 97%
rename from fine-commons-collections4/src/org/apache/commons/collections4/sequence/DeleteCommand.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/DeleteCommand.java
index 1d0cc939f..1ea2c21d2 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/sequence/DeleteCommand.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/DeleteCommand.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.sequence;
+package com.fr.third.org.apache.commons.collections4.sequence;
 
 /**
  * Command representing the deletion of one object of the first sequence.
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/sequence/EditCommand.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/EditCommand.java
similarity index 98%
rename from fine-commons-collections4/src/org/apache/commons/collections4/sequence/EditCommand.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/EditCommand.java
index f8c7ec919..dacf04694 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/sequence/EditCommand.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/EditCommand.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.sequence;
+package com.fr.third.org.apache.commons.collections4.sequence;
 
 /**
  * Abstract base class for all commands used to transform an objects sequence
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/sequence/EditScript.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/EditScript.java
similarity index 98%
rename from fine-commons-collections4/src/org/apache/commons/collections4/sequence/EditScript.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/EditScript.java
index d2e9d5fec..523d72b3d 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/sequence/EditScript.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/EditScript.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.sequence;
+package com.fr.third.org.apache.commons.collections4.sequence;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/sequence/InsertCommand.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/InsertCommand.java
similarity index 97%
rename from fine-commons-collections4/src/org/apache/commons/collections4/sequence/InsertCommand.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/InsertCommand.java
index 47a913f0a..e451e1a79 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/sequence/InsertCommand.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/InsertCommand.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.sequence;
+package com.fr.third.org.apache.commons.collections4.sequence;
 
 /**
  * Command representing the insertion of one object of the second sequence.
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/sequence/KeepCommand.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/KeepCommand.java
similarity index 97%
rename from fine-commons-collections4/src/org/apache/commons/collections4/sequence/KeepCommand.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/KeepCommand.java
index a0a39a198..34b039ce3 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/sequence/KeepCommand.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/KeepCommand.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.sequence;
+package com.fr.third.org.apache.commons.collections4.sequence;
 
 /**
  * Command representing the keeping of one object present in both sequences.
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/sequence/ReplacementsFinder.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/ReplacementsFinder.java
similarity index 98%
rename from fine-commons-collections4/src/org/apache/commons/collections4/sequence/ReplacementsFinder.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/ReplacementsFinder.java
index 2f9949c76..7684ff7da 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/sequence/ReplacementsFinder.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/ReplacementsFinder.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.sequence;
+package com.fr.third.org.apache.commons.collections4.sequence;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/sequence/ReplacementsHandler.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/ReplacementsHandler.java
similarity index 97%
rename from fine-commons-collections4/src/org/apache/commons/collections4/sequence/ReplacementsHandler.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/ReplacementsHandler.java
index f584a6b42..468a493dc 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/sequence/ReplacementsHandler.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/ReplacementsHandler.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.sequence;
+package com.fr.third.org.apache.commons.collections4.sequence;
 
 import java.util.List;
 
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/sequence/SequencesComparator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/SequencesComparator.java
similarity index 98%
rename from fine-commons-collections4/src/org/apache/commons/collections4/sequence/SequencesComparator.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/SequencesComparator.java
index dd57c0ae6..d1d051284 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/sequence/SequencesComparator.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/SequencesComparator.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.sequence;
+package com.fr.third.org.apache.commons.collections4.sequence;
 
 import java.util.List;
 
-import org.apache.commons.collections4.Equator;
-import org.apache.commons.collections4.functors.DefaultEquator;
+import com.fr.third.org.apache.commons.collections4.Equator;
+import com.fr.third.org.apache.commons.collections4.functors.DefaultEquator;
 
 /**
  * This class allows to compare two objects sequences.
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/sequence/package-info.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/package-info.java
similarity index 91%
rename from fine-commons-collections4/src/org/apache/commons/collections4/sequence/package-info.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/package-info.java
index 42011eb3d..731f94782 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/sequence/package-info.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/sequence/package-info.java
@@ -46,7 +46,7 @@
  * Difference Algorithm and Its Variations. This algorithm produces
  * the shortest possible
  * {@link org.apache.commons.collections4.sequence.EditScript edit script} containing
- * all the {@link org.apache.commons.collections4.sequence.EditCommand commands}
+ * all the {@link com.fr.third.org.apache.commons.collections4.sequence.EditCommand commands}
  * needed to transform the first sequence into the second one.
  * The entry point for the user to this algorithm is the
  * {@link org.apache.commons.collections4.sequence.SequencesComparator} class.
@@ -64,14 +64,14 @@
  * prefers to see the differences between the two sequences as global
  * replacement operations acting on complete subsequences of
  * the original sequences, he will provide an object implementing the
- * simple {@link org.apache.commons.collections4.sequence.ReplacementsHandler} interface,
+ * simple {@link com.fr.third.org.apache.commons.collections4.sequence.ReplacementsHandler} interface,
  * using an instance of the {@link org.apache.commons.collections4.sequence.ReplacementsFinder}
  * class as a command converting layer between his object and the edit script. The number of
  * objects which are common to both initial arrays and hence are skipped between each call to the user
- * {@link org.apache.commons.collections4.sequence.ReplacementsHandler#handleReplacement handleReplacement}
+ * {@link com.fr.third.org.apache.commons.collections4.sequence.ReplacementsHandler#handleReplacement handleReplacement}
  * method is also provided. This allows the user to keep track of the current index in
  * both arrays if he needs so.
  *
  * @version $Id: package-info.java 1479338 2013-05-05 15:21:44Z tn $
  */
-package org.apache.commons.collections4.sequence;
+package com.fr.third.org.apache.commons.collections4.sequence;
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java
similarity index 98%
rename from fine-commons-collections4/src/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java
index 3b4aface8..59d67dcc2 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.set;
+package com.fr.third.org.apache.commons.collections4.set;
 
 import java.util.Iterator;
 import java.util.NavigableSet;
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java
similarity index 97%
rename from fine-commons-collections4/src/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java
index 312f9b416..f0b35d7f4 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.set;
+package com.fr.third.org.apache.commons.collections4.set;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/set/AbstractSetDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/AbstractSetDecorator.java
similarity index 93%
rename from fine-commons-collections4/src/org/apache/commons/collections4/set/AbstractSetDecorator.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/AbstractSetDecorator.java
index 8c6358ee8..3a93eb1d2 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/set/AbstractSetDecorator.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/AbstractSetDecorator.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.set;
+package com.fr.third.org.apache.commons.collections4.set;
 
 import java.util.Set;
 
-import org.apache.commons.collections4.collection.AbstractCollectionDecorator;
+import com.fr.third.org.apache.commons.collections4.collection.AbstractCollectionDecorator;
 
 /**
  * Decorates another Set to provide additional behaviour.
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java
similarity index 97%
rename from fine-commons-collections4/src/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java
index 3740e1285..d017363b1 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.set;
+package com.fr.third.org.apache.commons.collections4.set;
 
 import java.util.Comparator;
 import java.util.Set;
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/set/CompositeSet.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/CompositeSet.java
similarity index 97%
rename from fine-commons-collections4/src/org/apache/commons/collections4/set/CompositeSet.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/CompositeSet.java
index aa2782ec7..03e6db232 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/set/CompositeSet.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/CompositeSet.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.set;
+package com.fr.third.org.apache.commons.collections4.set;
 
 import java.io.Serializable;
 import java.lang.reflect.Array;
@@ -25,10 +25,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.collections4.CollectionUtils;
-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.CollectionUtils;
+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 set of other sets to provide a single unified view.
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/set/ListOrderedSet.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/ListOrderedSet.java
similarity index 96%
rename from fine-commons-collections4/src/org/apache/commons/collections4/set/ListOrderedSet.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/ListOrderedSet.java
index 6ec35c79e..d787de405 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/set/ListOrderedSet.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/ListOrderedSet.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.set;
+package com.fr.third.org.apache.commons.collections4.set;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,11 +24,12 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.Set;
 
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.collections4.OrderedIterator;
-import org.apache.commons.collections4.functors.UniquePredicate;
-import org.apache.commons.collections4.iterators.AbstractIteratorDecorator;
-import org.apache.commons.collections4.list.UnmodifiableList;
+import com.fr.third.org.apache.commons.collections4.functors.UniquePredicate;
+import com.fr.third.org.apache.commons.collections4.CollectionUtils;
+import com.fr.third.org.apache.commons.collections4.OrderedIterator;
+import com.fr.third.org.apache.commons.collections4.functors.UniquePredicate;
+import com.fr.third.org.apache.commons.collections4.iterators.AbstractIteratorDecorator;
+import com.fr.third.org.apache.commons.collections4.list.UnmodifiableList;
 
 /**
  * Decorates another Set to ensure that the order of addition is
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/set/MapBackedSet.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/MapBackedSet.java
similarity index 98%
rename from fine-commons-collections4/src/org/apache/commons/collections4/set/MapBackedSet.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/MapBackedSet.java
index 399d3a302..d3f809ccd 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/set/MapBackedSet.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/MapBackedSet.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.set;
+package com.fr.third.org.apache.commons.collections4.set;
 
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/set/PredicatedNavigableSet.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/PredicatedNavigableSet.java
similarity index 97%
rename from fine-commons-collections4/src/org/apache/commons/collections4/set/PredicatedNavigableSet.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/PredicatedNavigableSet.java
index 3425f4c45..3d15aaef1 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/set/PredicatedNavigableSet.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/PredicatedNavigableSet.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.set;
+package com.fr.third.org.apache.commons.collections4.set;
 
 import java.util.Iterator;
 import java.util.NavigableSet;
 
-import org.apache.commons.collections4.Predicate;
+import com.fr.third.org.apache.commons.collections4.Predicate;
 
 /**
  * Decorates another NavigableSet to validate that all additions
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/set/PredicatedSet.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/PredicatedSet.java
similarity index 94%
rename from fine-commons-collections4/src/org/apache/commons/collections4/set/PredicatedSet.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/PredicatedSet.java
index 2b62ac8e2..707e7ff6a 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/set/PredicatedSet.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/PredicatedSet.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.set;
+package com.fr.third.org.apache.commons.collections4.set;
 
 import java.util.Set;
 
-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.collection.PredicatedCollection;
 
 /**
  * Decorates another Set to validate that all additions
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/set/PredicatedSortedSet.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/PredicatedSortedSet.java
similarity index 97%
rename from fine-commons-collections4/src/org/apache/commons/collections4/set/PredicatedSortedSet.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/PredicatedSortedSet.java
index 502392023..907bd242f 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/set/PredicatedSortedSet.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/PredicatedSortedSet.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.set;
+package com.fr.third.org.apache.commons.collections4.set;
 
 import java.util.Comparator;
 import java.util.SortedSet;
 
-import org.apache.commons.collections4.Predicate;
+import com.fr.third.org.apache.commons.collections4.Predicate;
 
 /**
  * Decorates another SortedSet to validate that all additions
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/set/TransformedNavigableSet.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/TransformedNavigableSet.java
similarity index 98%
rename from fine-commons-collections4/src/org/apache/commons/collections4/set/TransformedNavigableSet.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/TransformedNavigableSet.java
index ddfe96eef..86067ac3e 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/set/TransformedNavigableSet.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/TransformedNavigableSet.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.set;
+package com.fr.third.org.apache.commons.collections4.set;
 
 import java.util.Iterator;
 import java.util.NavigableSet;
 
-import org.apache.commons.collections4.Transformer;
+import com.fr.third.org.apache.commons.collections4.Transformer;
 
 /**
  * Decorates another NavigableSet to transform objects that are added.
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/set/TransformedSet.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/TransformedSet.java
similarity index 95%
rename from fine-commons-collections4/src/org/apache/commons/collections4/set/TransformedSet.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/TransformedSet.java
index 7bf774f4b..5cf74001a 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/set/TransformedSet.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/TransformedSet.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.set;
+package com.fr.third.org.apache.commons.collections4.set;
 
 import java.util.Set;
 
-import org.apache.commons.collections4.Transformer;
-import org.apache.commons.collections4.collection.TransformedCollection;
+import com.fr.third.org.apache.commons.collections4.Transformer;
+import com.fr.third.org.apache.commons.collections4.collection.TransformedCollection;
 
 /**
  * Decorates another Set to transform objects that are added.
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/set/TransformedSortedSet.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/TransformedSortedSet.java
similarity index 97%
rename from fine-commons-collections4/src/org/apache/commons/collections4/set/TransformedSortedSet.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/TransformedSortedSet.java
index ac3834c6b..ee2091dcf 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/set/TransformedSortedSet.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/TransformedSortedSet.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.set;
+package com.fr.third.org.apache.commons.collections4.set;
 
 import java.util.Comparator;
 import java.util.SortedSet;
 
-import org.apache.commons.collections4.Transformer;
+import com.fr.third.org.apache.commons.collections4.Transformer;
 
 /**
  * Decorates another SortedSet to transform objects that are added.
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java
similarity index 96%
rename from fine-commons-collections4/src/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java
index 3be017aa3..bd0a01083 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.set;
+package com.fr.third.org.apache.commons.collections4.set;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -24,8 +24,8 @@ import java.util.Iterator;
 import java.util.NavigableSet;
 import java.util.SortedSet;
 
-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.iterators.UnmodifiableIterator;
 
 /**
  * Decorates another NavigableSet to ensure it can't be altered.
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/set/UnmodifiableSet.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/UnmodifiableSet.java
similarity index 94%
rename from fine-commons-collections4/src/org/apache/commons/collections4/set/UnmodifiableSet.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/UnmodifiableSet.java
index a81b3f2fc..ef0c32cff 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/set/UnmodifiableSet.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/UnmodifiableSet.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.set;
+package com.fr.third.org.apache.commons.collections4.set;
 
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Set;
 
-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.iterators.UnmodifiableIterator;
 
 /**
  * Decorates another Set to ensure it can't be altered.
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/set/UnmodifiableSortedSet.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/UnmodifiableSortedSet.java
similarity index 95%
rename from fine-commons-collections4/src/org/apache/commons/collections4/set/UnmodifiableSortedSet.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/UnmodifiableSortedSet.java
index 6e600c8cf..e5541854c 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/set/UnmodifiableSortedSet.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/UnmodifiableSortedSet.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.set;
+package com.fr.third.org.apache.commons.collections4.set;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -23,8 +23,8 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.SortedSet;
 
-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.iterators.UnmodifiableIterator;
 
 /**
  * Decorates another SortedSet to ensure it can't be altered.
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/set/package-info.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/package-info.java
similarity index 96%
rename from fine-commons-collections4/src/org/apache/commons/collections4/set/package-info.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/package-info.java
index de4d446ac..e389157ad 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/set/package-info.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/set/package-info.java
@@ -38,4 +38,4 @@
  *
  * @version $Id: package-info.java 1682768 2015-05-31 18:35:18Z tn $
  */
-package org.apache.commons.collections4.set;
+package com.fr.third.org.apache.commons.collections4.set;
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java
similarity index 92%
rename from fine-commons-collections4/src/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java
index 12d216efa..9cd746982 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.splitmap;
+package com.fr.third.org.apache.commons.collections4.splitmap;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections4.IterableGet;
-import org.apache.commons.collections4.MapIterator;
-import org.apache.commons.collections4.map.EntrySetToMapIteratorAdapter;
+import com.fr.third.org.apache.commons.collections4.IterableGet;
+import com.fr.third.org.apache.commons.collections4.MapIterator;
+import com.fr.third.org.apache.commons.collections4.map.EntrySetToMapIteratorAdapter;
 
 /**
  * {@link IterableGet} that uses a {@link Map} for the
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/splitmap/TransformedSplitMap.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/splitmap/TransformedSplitMap.java
similarity index 97%
rename from fine-commons-collections4/src/org/apache/commons/collections4/splitmap/TransformedSplitMap.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/splitmap/TransformedSplitMap.java
index a5a43683a..a5efbb0f7 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/splitmap/TransformedSplitMap.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/splitmap/TransformedSplitMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.splitmap;
+package com.fr.third.org.apache.commons.collections4.splitmap;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -22,9 +22,9 @@ import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.Map;
 
-import org.apache.commons.collections4.Put;
-import org.apache.commons.collections4.Transformer;
-import org.apache.commons.collections4.map.LinkedMap;
+import com.fr.third.org.apache.commons.collections4.Put;
+import com.fr.third.org.apache.commons.collections4.Transformer;
+import com.fr.third.org.apache.commons.collections4.map.LinkedMap;
 
 /**
  * Decorates another {@link Map} to transform objects that are added.
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/splitmap/package-info.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/splitmap/package-info.java
similarity index 96%
rename from fine-commons-collections4/src/org/apache/commons/collections4/splitmap/package-info.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/splitmap/package-info.java
index 405be61dc..c2af957bc 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/splitmap/package-info.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/splitmap/package-info.java
@@ -36,4 +36,4 @@
  *
  * @version $Id: package-info.java 1469004 2013-04-17 17:37:03Z tn $
  */
-package org.apache.commons.collections4.splitmap;
+package com.fr.third.org.apache.commons.collections4.splitmap;
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java
similarity index 98%
rename from fine-commons-collections4/src/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java
index 557590c52..5dac350f7 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.trie;
+package com.fr.third.org.apache.commons.collections4.trie;
 
 import java.io.Serializable;
 import java.util.AbstractMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.apache.commons.collections4.Trie;
+import com.fr.third.org.apache.commons.collections4.Trie;
 
 /**
  * This class provides some basic {@link Trie} functionality and
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
similarity index 99%
rename from fine-commons-collections4/src/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
index 56691faf4..e4aa08497 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.trie;
+package com.fr.third.org.apache.commons.collections4.trie;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -32,7 +32,7 @@ import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.SortedMap;
 
-import org.apache.commons.collections4.OrderedMapIterator;
+import com.fr.third.org.apache.commons.collections4.OrderedMapIterator;
 
 /**
  * This class implements the base PATRICIA algorithm and everything that
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/trie/KeyAnalyzer.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/KeyAnalyzer.java
similarity index 98%
rename from fine-commons-collections4/src/org/apache/commons/collections4/trie/KeyAnalyzer.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/KeyAnalyzer.java
index b009bc1fc..57ceeac9f 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/trie/KeyAnalyzer.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/KeyAnalyzer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.trie;
+package com.fr.third.org.apache.commons.collections4.trie;
 
 import java.io.Serializable;
 import java.util.Comparator;
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/trie/PatriciaTrie.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/PatriciaTrie.java
similarity index 93%
rename from fine-commons-collections4/src/org/apache/commons/collections4/trie/PatriciaTrie.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/PatriciaTrie.java
index 530fd81ad..f4cfabdce 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/trie/PatriciaTrie.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/PatriciaTrie.java
@@ -14,11 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.trie;
+package com.fr.third.org.apache.commons.collections4.trie;
 
 import java.util.Map;
 
-import org.apache.commons.collections4.trie.analyzer.StringKeyAnalyzer;
+import com.fr.third.org.apache.commons.collections4.trie.analyzer.StringKeyAnalyzer;
+import com.fr.third.org.apache.commons.collections4.trie.analyzer.StringKeyAnalyzer;
 
 /**
  * Implementation of a PATRICIA Trie (Practical Algorithm to Retrieve Information
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/trie/UnmodifiableTrie.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/UnmodifiableTrie.java
similarity index 93%
rename from fine-commons-collections4/src/org/apache/commons/collections4/trie/UnmodifiableTrie.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/UnmodifiableTrie.java
index 91a54fd5a..fbda4dbb3 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/trie/UnmodifiableTrie.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/UnmodifiableTrie.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.trie;
+package com.fr.third.org.apache.commons.collections4.trie;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -24,10 +24,10 @@ import java.util.Map;
 import java.util.Set;
 import java.util.SortedMap;
 
-import org.apache.commons.collections4.OrderedMapIterator;
-import org.apache.commons.collections4.Trie;
-import org.apache.commons.collections4.Unmodifiable;
-import org.apache.commons.collections4.iterators.UnmodifiableOrderedMapIterator;
+import com.fr.third.org.apache.commons.collections4.OrderedMapIterator;
+import com.fr.third.org.apache.commons.collections4.Trie;
+import com.fr.third.org.apache.commons.collections4.Unmodifiable;
+import com.fr.third.org.apache.commons.collections4.iterators.UnmodifiableOrderedMapIterator;
 
 /**
  * An unmodifiable {@link Trie}.
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/trie/analyzer/StringKeyAnalyzer.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/analyzer/StringKeyAnalyzer.java
similarity index 97%
rename from fine-commons-collections4/src/org/apache/commons/collections4/trie/analyzer/StringKeyAnalyzer.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/analyzer/StringKeyAnalyzer.java
index beeb515b8..7c85a1f1e 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/trie/analyzer/StringKeyAnalyzer.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/analyzer/StringKeyAnalyzer.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections4.trie.analyzer;
+package com.fr.third.org.apache.commons.collections4.trie.analyzer;
 
-import org.apache.commons.collections4.trie.KeyAnalyzer;
+import com.fr.third.org.apache.commons.collections4.trie.KeyAnalyzer;
 
 /**
  * An {@link KeyAnalyzer} for {@link String}s.
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/trie/analyzer/package-info.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/analyzer/package-info.java
similarity index 93%
rename from fine-commons-collections4/src/org/apache/commons/collections4/trie/analyzer/package-info.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/analyzer/package-info.java
index 5eeb5d31e..355a8ee26 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/trie/analyzer/package-info.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/analyzer/package-info.java
@@ -19,4 +19,4 @@
  *
  * @version $Id: package-info.java 1491615 2013-06-10 21:46:19Z tn $
  */
-package org.apache.commons.collections4.trie.analyzer;
+package com.fr.third.org.apache.commons.collections4.trie.analyzer;
diff --git a/fine-commons-collections4/src/org/apache/commons/collections4/trie/package-info.java b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/package-info.java
similarity index 96%
rename from fine-commons-collections4/src/org/apache/commons/collections4/trie/package-info.java
rename to fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/package-info.java
index cd0a29854..ef9111692 100644
--- a/fine-commons-collections4/src/org/apache/commons/collections4/trie/package-info.java
+++ b/fine-commons-collections4/src/com/fr/third/org/apache/commons/collections4/trie/package-info.java
@@ -34,4 +34,4 @@
  *
  * @version $Id: package-info.java 1493523 2013-06-16 15:56:35Z tn $
  */
-package org.apache.commons.collections4.trie;
+package com.fr.third.org.apache.commons.collections4.trie;