Author: desruisseaux
Date: Mon Dec 17 10:11:26 2012
New Revision: 1422825
URL: http://svn.apache.org/viewvc?rev=1422825&view=rev
Log:
SVN merge info, with adjustments in import statements.
Modified:
sis/branches/JDK7/ (props changed)
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java
Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
Merged /sis/trunk:r1420669-1422813
Merged /sis/branches/JDK6:r1420698-1422815
Modified:
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java?rev=1422825&r1=1422824&r2=1422825&view=diff
==============================================================================
---
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java
(original)
+++
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java
Mon Dec 17 10:11:26 2012
@@ -22,7 +22,6 @@ package org.apache.sis.geometry;
* to force installation of the Java2D module (e.g. JavaFX/SWT).
*/
import java.util.Arrays;
-import java.util.Objects;
import org.opengis.geometry.DirectPosition;
import org.opengis.geometry.MismatchedDimensionException;
import org.opengis.geometry.MismatchedReferenceSystemException;
@@ -36,6 +35,9 @@ import static java.lang.Double.doubleToL
import static org.apache.sis.util.Arrays.resize;
import static org.apache.sis.util.StringBuilders.trimFractionalPart;
+// Related to JDK7
+import java.util.Objects;
+
/**
* Base class for {@link DirectPosition} implementations.
Modified:
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java?rev=1422825&r1=1422824&r2=1422825&view=diff
==============================================================================
---
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java
(original)
+++
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java
Mon Dec 17 10:11:26 2012
@@ -22,7 +22,6 @@ package org.apache.sis.geometry;
* force installation of the Java2D module (e.g. JavaFX/SWT).
*/
import java.util.Arrays;
-import java.util.Objects;
import java.io.Serializable;
import org.opengis.geometry.Envelope;
import org.opengis.geometry.DirectPosition;
@@ -41,6 +40,9 @@ import static org.apache.sis.util.Argume
import static org.apache.sis.math.MathFunctions.isNegative;
import static org.apache.sis.internal.referencing.Utilities.isPoleToPole;
+// Related to JDK7
+import java.util.Objects;
+
/**
* Base class of envelopes backed by an array.
Modified:
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java?rev=1422825&r1=1422824&r2=1422825&view=diff
==============================================================================
---
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java
(original)
+++
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java
Mon Dec 17 10:11:26 2012
@@ -16,7 +16,6 @@
*/
package org.apache.sis.geometry;
-import java.util.Objects;
import java.awt.geom.Point2D;
import org.opengis.geometry.DirectPosition;
import org.opengis.geometry.MismatchedDimensionException;
@@ -33,6 +32,9 @@ import static org.apache.sis.util.String
import static
org.apache.sis.geometry.AbstractDirectPosition.ensureDimensionMatch;
import static org.apache.sis.geometry.AbstractDirectPosition.parse;
+// Related to JDK7
+import java.util.Objects;
+
/**
* Holds the coordinates for a two-dimensional position on top of {@link
Point2D}.
Modified:
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java?rev=1422825&r1=1422824&r2=1422825&view=diff
==============================================================================
---
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java
(original)
+++
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java
Mon Dec 17 10:11:26 2012
@@ -16,7 +16,6 @@
*/
package org.apache.sis.geometry;
-import java.util.Objects;
import java.awt.geom.Rectangle2D;
import org.opengis.geometry.Envelope;
import org.opengis.geometry.DirectPosition;
@@ -49,6 +48,9 @@ import static org.apache.sis.geometry.Ab
import static org.apache.sis.geometry.AbstractEnvelope.isWrapAround;
import static org.apache.sis.geometry.AbstractEnvelope.isNegativeUnsafe;
+// Related to JDK7
+import java.util.Objects;
+
/**
* A two-dimensional envelope on top of {@link Rectangle2D}.
