sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1727366 - in /sis/branches/JDK7: ./ core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ core/sis-referencing/src/test/java/org/...
Date Thu, 28 Jan 2016 14:27:19 GMT
Author: desruisseaux
Date: Thu Jan 28 14:27:19 2016
New Revision: 1727366

URL: http://svn.apache.org/viewvc?rev=1727366&view=rev
Log:
Merge parameter name fix from the JDK8 branch.

Modified:
    sis/branches/JDK7/   (props changed)
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyFormula.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java

Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 28 14:27:19 2016
@@ -1,4 +1,4 @@
 /sis/branches/Android:1430670-1480699
 /sis/branches/JDK6:1394913-1508480
-/sis/branches/JDK8:1584960-1727313
+/sis/branches/JDK8:1584960-1727364
 /sis/trunk:1394364-1508466,1519089-1519674

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java?rev=1727366&r1=1727365&r2=1727366&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java
[UTF-8] Thu Jan 28 14:27:19 2016
@@ -143,7 +143,7 @@ public class FranceGeocentricInterpolati
     private static final String DEFAULT = "gr3df97a.txt";
 
     /**
-     * The operation parameter descriptor for the <cite>Geocentric translations file</cite>
parameter value.
+     * The operation parameter descriptor for the <cite>Geocentric translation file</cite>
parameter value.
      */
     public static final ParameterDescriptor<Path> FILE;
 
@@ -157,7 +157,7 @@ public class FranceGeocentricInterpolati
         final ParameterBuilder builder = builder();
         FILE = builder
                 .addIdentifier("8727")
-                .addName("Geocentric translations file")
+                .addName("Geocentric translation file")
                 .create(Path.class, Paths.get(DEFAULT));
         PARAMETERS = builder
                 .addIdentifier("9655")

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyFormula.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyFormula.java?rev=1727366&r1=1727365&r2=1727366&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyFormula.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyFormula.java
[UTF-8] Thu Jan 28 14:27:19 2016
@@ -255,7 +255,7 @@ abstract class MolodenskyFormula extends
      *   <li><cite>"X-axis translation"</cite> (Molodensky only)</li>
      *   <li><cite>"Y-axis translation"</cite> (Molodensky only)</li>
      *   <li><cite>"Z-axis translation"</cite> (Molodensky only)</li>
-     *   <li><cite>"Geocentric translations file"</cite> (Geocentric interpolations
only)</li>
+     *   <li><cite>"Geocentric translation file"</cite> (Geocentric interpolations
only)</li>
      *   <li><cite>"Semi-major axis length difference"</cite> (Always for
Molodensky, internal WKT only for geocentric interpolations)</li>
      *   <li><cite>"Flattening difference"</cite> (Always for Molodensky,
internal WKT only for geocentric interpolations)</li>
      * </ul>

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java?rev=1727366&r1=1727365&r2=1727366&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java
[UTF-8] Thu Jan 28 14:27:19 2016
@@ -73,7 +73,7 @@ public strictfp class InterpolatedGeocen
         values.parameter("src_semi_minor").setValue(source.getSemiMinorAxis());
         values.parameter("tgt_semi_major").setValue(target.getSemiMajorAxis());
         values.parameter("tgt_semi_minor").setValue(target.getSemiMinorAxis());
-        values.parameter("Geocentric translations file").setValue(file);    // Automatic
conversion from URL to Path.
+        values.parameter("Geocentric translation file").setValue(file);    // Automatic conversion
from URL to Path.
         transform = provider.createMathTransform(DefaultFactories.forBuildin(MathTransformFactory.class),
values);
         tolerance = FranceGeocentricInterpolationTest.ANGULAR_TOLERANCE;
     }
@@ -171,7 +171,7 @@ public strictfp class InterpolatedGeocen
                 "  PARAMETER[“src_semi_minor”, 6356752.314140356],\n" +
                 "  PARAMETER[“tgt_semi_major”, 6378249.2],\n" +
                 "  PARAMETER[“tgt_semi_minor”, 6356515.0],\n" +
-                "  PARAMETER[“Geocentric translations file”, “\\E.*\\W\\Q" +
+                "  PARAMETER[“Geocentric translation file”, “\\E.*\\W\\Q" +
                              FranceGeocentricInterpolationTest.TEST_FILE + "”]]\\E");
 
         transform = transform.inverse();
@@ -182,7 +182,7 @@ public strictfp class InterpolatedGeocen
                 "  PARAMETER[“src_semi_minor”, 6356515.0],\n" +
                 "  PARAMETER[“tgt_semi_major”, 6378137.0],\n" +
                 "  PARAMETER[“tgt_semi_minor”, 6356752.314140356],\n" +
-                "  PARAMETER[“Geocentric translations file”, “\\E.*\\W\\Q" +
+                "  PARAMETER[“Geocentric translation file”, “\\E.*\\W\\Q" +
                              FranceGeocentricInterpolationTest.TEST_FILE + "”]]\\E");
     }
 
@@ -208,7 +208,7 @@ public strictfp class InterpolatedGeocen
                 "    Parameter[“src_semi_minor”, 6356515.0],\n" +
                 "    Parameter[“tgt_semi_major”, 6378137.0],\n" +
                 "    Parameter[“tgt_semi_minor”, 6356752.314140356],\n" +
-                "    ParameterFile[“Geocentric translations file”, “\\E.*\\W\\Q" +
+                "    ParameterFile[“Geocentric translation file”, “\\E.*\\W\\Q" +
                                    FranceGeocentricInterpolationTest.TEST_FILE + "”, Id[“EPSG”,
8727]]],\n" +
                 "  Param_MT[“Affine parametric transformation”,\n" +
                 "    Parameter[“A0”, 57.29577951308232, Id[“EPSG”, 8623]],\n" + 
    // Radians to degrees conversion

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java?rev=1727366&r1=1727365&r2=1727366&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
[UTF-8] Thu Jan 28 14:27:19 2016
@@ -80,7 +80,7 @@ public final strictfp class Interpolated
                 "  PARAMETER[“src_semi_minor”, 6356752.314140356],\n" +
                 "  PARAMETER[“tgt_semi_major”, 6378249.2],\n" +
                 "  PARAMETER[“tgt_semi_minor”, 6356515.0],\n" +
-                "  PARAMETER[“Geocentric translations file”, “\\E.*\\W\\Q" +
+                "  PARAMETER[“Geocentric translation file”, “\\E.*\\W\\Q" +
                              FranceGeocentricInterpolationTest.TEST_FILE + "”]]\\E");
 
         transform = transform.inverse();
@@ -91,7 +91,7 @@ public final strictfp class Interpolated
                 "  PARAMETER[“src_semi_minor”, 6356515.0],\n" +
                 "  PARAMETER[“tgt_semi_major”, 6378137.0],\n" +
                 "  PARAMETER[“tgt_semi_minor”, 6356752.314140356],\n" +
-                "  PARAMETER[“Geocentric translations file”, “\\E.*\\W\\Q" +
+                "  PARAMETER[“Geocentric translation file”, “\\E.*\\W\\Q" +
                              FranceGeocentricInterpolationTest.TEST_FILE + "”]]\\E");
     }
 
@@ -117,7 +117,7 @@ public final strictfp class Interpolated
                 "    Parameter[“src_semi_minor”, 6356515.0],\n" +
                 "    Parameter[“Semi-major axis length difference”, -112.2],\n" +
                 "    Parameter[“Flattening difference”, -5.4738838833299144E-5],\n" +
-                "    ParameterFile[“Geocentric translations file”, “\\E.*\\W\\Q" +
+                "    ParameterFile[“Geocentric translation file”, “\\E.*\\W\\Q" +
                                    FranceGeocentricInterpolationTest.TEST_FILE + "”, Id[“EPSG”,
8727]],\n" +
                 "    Parameter[“dim”, 2]],\n" +
                 "  Param_MT[“Affine parametric transformation”,\n" +



Mime
View raw message