Author: ggregory
Date: Tue Apr 12 18:29:49 2011
New Revision: 1091531
URL: http://svn.apache.org/viewvc?rev=1091531&view=rev
Log:
Refactor all 3 three Pair classes from o.a.c.l to o.a.c.l.tuple.
Added:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java
- copied, changed from r1091241,
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ImmutablePair.java
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java
- copied, changed from r1091241,
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/MutablePair.java
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/Pair.java
- copied, changed from r1091471,
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/Pair.java
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/package.html
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/tuple/
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java
- copied, changed from r1091241,
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/ImmutablePairTest.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/tuple/MutablePairTest.java
- copied, changed from r1091241,
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/MutablePairTest.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/tuple/PairTest.java
- copied, changed from r1091156,
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/PairTest.java
Removed:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ImmutablePair.java
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/MutablePair.java
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/Pair.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/ImmutablePairTest.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/MutablePairTest.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/PairTest.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java?rev=1091531&r1=1091530&r2=1091531&view=diff
==============================================================================
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
Tue Apr 12 18:29:49 2011
@@ -24,7 +24,7 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.Pair;
+import org.apache.commons.lang3.tuple.Pair;
/**
* <p>Assists in implementing {@link Object#equals(Object)} methods.</p>
Copied:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java
(from r1091241,
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ImmutablePair.java)
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java?p2=commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java&p1=commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ImmutablePair.java&r1=1091241&r2=1091531&rev=1091531&view=diff
==============================================================================
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ImmutablePair.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java
Tue Apr 12 18:29:49 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.lang3;
+package org.apache.commons.lang3.tuple;
/**
* <p>An immutable pair consisting of two {@code Object} elements.</p>
Copied:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java
(from r1091241,
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/MutablePair.java)
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java?p2=commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java&p1=commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/MutablePair.java&r1=1091241&r2=1091531&rev=1091531&view=diff
==============================================================================
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/MutablePair.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java
Tue Apr 12 18:29:49 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.lang3;
+package org.apache.commons.lang3.tuple;
/**
* <p>A mutable pair consisting of two {@code Object} elements.</p>
Copied:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/Pair.java
(from r1091471,
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/Pair.java)
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/Pair.java?p2=commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/Pair.java&p1=commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/Pair.java&r1=1091471&r2=1091531&rev=1091531&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/Pair.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/Pair.java
Tue Apr 12 18:29:49 2011
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.lang3;
+package org.apache.commons.lang3.tuple;
import java.io.Serializable;
import java.util.Formatter;
import java.util.Map;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.builder.CompareToBuilder;
/**
Added:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/package.html
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/package.html?rev=1091531&view=auto
==============================================================================
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/package.html
(added)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/package.html
Tue Apr 12 18:29:49 2011
@@ -0,0 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" 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.
+-->
+<html>
+<body>
+Tuple classes, starting with a Pair class in version 3.0.
+@since 3.0
+</body>
+</html>
Copied:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java
(from r1091241,
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/ImmutablePairTest.java)
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java?p2=commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java&p1=commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/ImmutablePairTest.java&r1=1091241&r2=1091531&rev=1091531&view=diff
==============================================================================
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/ImmutablePairTest.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java
Tue Apr 12 18:29:49 2011
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.lang3;
+package org.apache.commons.lang3.tuple;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Copied:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/tuple/MutablePairTest.java
(from r1091241,
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/MutablePairTest.java)
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/tuple/MutablePairTest.java?p2=commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/tuple/MutablePairTest.java&p1=commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/MutablePairTest.java&r1=1091241&r2=1091531&rev=1091531&view=diff
==============================================================================
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/MutablePairTest.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/tuple/MutablePairTest.java
Tue Apr 12 18:29:49 2011
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.lang3;
+package org.apache.commons.lang3.tuple;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Copied:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/tuple/PairTest.java
(from r1091156,
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/PairTest.java)
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/tuple/PairTest.java?p2=commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/tuple/PairTest.java&p1=commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/PairTest.java&r1=1091156&r2=1091531&rev=1091531&view=diff
==============================================================================
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/PairTest.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/tuple/PairTest.java
Tue Apr 12 18:29:49 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.lang3;
+package org.apache.commons.lang3.tuple;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
