sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1697535 - in /sis/branches/JDK7: ./ core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/ core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/ core/sis-referencing/src/test/java/org/apache/sis/referencing/d...
Date Tue, 25 Aug 2015 02:40:33 GMT
Author: desruisseaux
Date: Tue Aug 25 02:40:32 2015
New Revision: 1697535

URL: http://svn.apache.org/r1697535
Log:
Merge from the JDK8 branch.

Added:
    sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/crs/GeographicCRS.xml
      - copied unchanged from r1697533, sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/crs/GeographicCRS.xml
    sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/crs/ProjectedCRS.xml
      - copied unchanged from r1697533, sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/crs/ProjectedCRS.xml
    sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Ellipsoid.xml
      - copied unchanged from r1697533, sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Ellipsoid.xml
    sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/GeodeticDatum.xml
      - copied unchanged from r1697533, sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/GeodeticDatum.xml
    sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/PrimeMeridian.xml
      - copied unchanged from r1697533, sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/PrimeMeridian.xml
    sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/TemporalDatum.xml
      - copied unchanged from r1697533, sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/TemporalDatum.xml
    sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/VerticalDatum
(GML 3.1).xml
      - copied unchanged from r1697533, sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/VerticalDatum
(GML 3.1).xml
    sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/VerticalDatum.xml
      - copied unchanged from r1697533, sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/VerticalDatum.xml
Removed:
    sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/crs/NTF.xml
    sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/crs/WGS
84.xml
    sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Clarke
1880.xml
    sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Mean
Sea Level (GML 3.1).xml
    sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Mean
Sea Level.xml
    sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Modified
Julian.xml
    sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Paris.xml
    sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/WGS
84.xml
Modified:
    sis/branches/JDK7/   (props changed)
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java

Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 25 02:40:32 2015
@@ -1,4 +1,4 @@
 /sis/branches/Android:1430670-1480699
 /sis/branches/JDK6:1394913-1508480
-/sis/branches/JDK8:1584960-1697417
+/sis/branches/JDK8:1584960-1697533
 /sis/trunk:1394364-1508466,1519089-1519674

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java?rev=1697535&r1=1697534&r2=1697535&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java
[UTF-8] Tue Aug 25 02:40:32 2015
@@ -26,7 +26,6 @@ import java.util.LinkedHashSet;
 import org.opengis.util.FactoryException;
 import org.opengis.metadata.quality.PositionalAccuracy;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.SingleOperation;
 import org.opengis.referencing.operation.CoordinateOperation;
 import org.opengis.referencing.operation.ConcatenatedOperation;
 import org.opengis.referencing.operation.Transformation;
@@ -104,7 +103,7 @@ final class DefaultConcatenatedOperation
                                         final MathTransformFactory factory)
             throws FactoryException
     {
-        this(properties, new ArrayList<SingleOperation>(operations.length), operations,
factory);
+        this(properties, new ArrayList<CoordinateOperation>(operations.length), operations,
factory);
     }
 
     /**
@@ -112,7 +111,7 @@ final class DefaultConcatenatedOperation
      * ("Relax constraint on placement of this()/super() call in constructors").
      */
     private DefaultConcatenatedOperation(final Map<String,?> properties,
-                                         final ArrayList<SingleOperation> list,
+                                         final ArrayList<CoordinateOperation> list,
                                          final CoordinateOperation[] operations,
                                          final MathTransformFactory factory)
             throws FactoryException
@@ -126,14 +125,14 @@ final class DefaultConcatenatedOperation
      */
     private DefaultConcatenatedOperation(final Map<String,?> properties,
                                          final MathTransform transform,
-                                         final List<SingleOperation> operations)
+                                         final List<CoordinateOperation> operations)
     {
         super(mergeAccuracy(properties, operations),
               operations.get(0).getSourceCRS(),
               operations.get(operations.size() - 1).getTargetCRS(),
               null, transform);
 
-        this.operations = UnmodifiableArrayList.wrap(operations.toArray(new SingleOperation[operations.size()]));
+        this.operations = UnmodifiableArrayList.wrap(operations.toArray(new CoordinateOperation[operations.size()]));
     }
 
     /**
@@ -150,7 +149,7 @@ final class DefaultConcatenatedOperation
      */
     private static MathTransform expand(final Map<String,?> properties,
             final CoordinateOperation[] operations,
-            final List<SingleOperation> target,
+            final List<CoordinateOperation> target,
             final MathTransformFactory  factory,
             final boolean wantTransform)
             throws FactoryException
@@ -160,15 +159,12 @@ final class DefaultConcatenatedOperation
         for (int i=0; i<operations.length; i++) {
             ArgumentChecks.ensureNonNullElement("operations", i, operations);
             final CoordinateOperation op = operations[i];
-            if (op instanceof SingleOperation) {
-                target.add((SingleOperation) op);
-            } else if (op instanceof ConcatenatedOperation) {
+            if (op instanceof ConcatenatedOperation) {
                 final ConcatenatedOperation cop = (ConcatenatedOperation) op;
                 final List<? extends CoordinateOperation> cops = cop.getOperations();
                 expand(properties, cops.toArray(new CoordinateOperation[cops.size()]), target,
factory, false);
             } else {
-                throw new IllegalArgumentException(Errors.getResources(properties).getString(
-                        Errors.Keys.IllegalArgumentClass_2, "operations[" + i + ']', op.getClass()));
+                target.add(op);
             }
             /*
              * Checks the CRS dimensions.

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java?rev=1697535&r1=1697534&r2=1697535&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
[UTF-8] Tue Aug 25 02:40:32 2015
@@ -45,7 +45,7 @@ public final strictfp class DefaultGeode
     /**
      * An XML file in this package containing a geodetic CRS definition.
      */
-    private static final String XML_FILE = "WGS 84.xml";
+    private static final String XML_FILE = "GeographicCRS.xml";
 
     /**
      * Tests (un)marshalling of a geodetic coordinate reference system.

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java?rev=1697535&r1=1697534&r2=1697535&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
[UTF-8] Tue Aug 25 02:40:32 2015
@@ -73,7 +73,7 @@ public final strictfp class DefaultProje
     /**
      * An XML file in this package containing a projected CRS definition.
      */
-    private static final String XML_FILE = "NTF.xml";
+    private static final String XML_FILE = "ProjectedCRS.xml";
 
     /**
      * Creates the "NTF (Paris) / Lambert zone II" CRS. The prime meridian is always in grades,

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java?rev=1697535&r1=1697534&r2=1697535&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
[UTF-8] Tue Aug 25 02:40:32 2015
@@ -49,7 +49,7 @@ public final strictfp class DefaultEllip
     /**
      * An XML file in this package containing an ellipsoid definition.
      */
-    private static final String XML_FILE = "Clarke 1880.xml";
+    private static final String XML_FILE = "Ellipsoid.xml";
 
     /**
      * Half of a minute of angle, in degrees.

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java?rev=1697535&r1=1697534&r2=1697535&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
[UTF-8] Tue Aug 25 02:40:32 2015
@@ -58,7 +58,7 @@ public final strictfp class DefaultGeode
     /**
      * An XML file in this package containing a geodetic datum definition.
      */
-    private static final String XML_FILE = "WGS 84.xml";
+    private static final String XML_FILE = "GeodeticDatum.xml";
 
     /**
      * Tests the creation and serialization of a {@link DefaultGeodeticDatum}.

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java?rev=1697535&r1=1697534&r2=1697535&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
[UTF-8] Tue Aug 25 02:40:32 2015
@@ -180,7 +180,7 @@ public final strictfp class DefaultPrime
     @Test
     @DependsOnMethod({"testUnmarshall", "testMarshall", "testWKT_inGrads"})
     public void testParisMeridian() throws JAXBException {
-        final DefaultPrimeMeridian pm = unmarshalFile(DefaultPrimeMeridian.class, "Paris.xml");
+        final DefaultPrimeMeridian pm = unmarshalFile(DefaultPrimeMeridian.class, "PrimeMeridian.xml");
         assertIsParis(pm);
         assertEquals("greenwichLongitude", 2.33722917, pm.getGreenwichLongitude(NonSI.DEGREE_ANGLE),
1E-12);
         assertEquals("Equivalent to 2°20′14.025″.", pm.getRemarks().toString());

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java?rev=1697535&r1=1697534&r2=1697535&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
[UTF-8] Tue Aug 25 02:40:32 2015
@@ -42,7 +42,7 @@ public final strictfp class DefaultTempo
     /**
      * An XML file in this package containing a vertical datum definition.
      */
-    private static final String XML_FILE = "Modified Julian.xml";
+    private static final String XML_FILE = "TemporalDatum.xml";
 
     /**
      * November 17, 1858 at 00:00 UTC as a Java timestamp.

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java?rev=1697535&r1=1697534&r2=1697535&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
[UTF-8] Tue Aug 25 02:40:32 2015
@@ -47,12 +47,12 @@ public final strictfp class DefaultVerti
     /**
      * An XML file in this package containing a vertical datum definition.
      */
-    private static final String XML_FILE = "Mean Sea Level.xml";
+    private static final String XML_FILE = "VerticalDatum.xml";
 
     /**
      * An XML file with the same content than {@link #XML_FILE}, but written in an older
GML format.
      */
-    private static final String GML31_FILE = "Mean Sea Level (GML 3.1).xml";
+    private static final String GML31_FILE = "VerticalDatum (GML 3.1).xml";
 
     /**
      * Tests the {@link DefaultVerticalDatum#getVerticalDatumType()} method in a state



Mime
View raw message