You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2016/01/14 12:58:57 UTC
svn commit: r1724594 - in /sis/trunk: ./
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/
core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/
core/sis-referencing/src/test/java/org/apache/sis/referencing/operati...
Author: desruisseaux
Date: Thu Jan 14 11:58:57 2016
New Revision: 1724594
URL: http://svn.apache.org/viewvc?rev=1724594&view=rev
Log:
Merge from the JDK6 branch.
Modified:
sis/trunk/ (props changed)
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NTv2.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
Propchange: sis/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 14 11:58:57 2016
@@ -1,4 +1,4 @@
/sis/branches/Android:1430670-1480699
-/sis/branches/JDK6:1394364-1724528
-/sis/branches/JDK7:1394913-1724479
-/sis/branches/JDK8:1584960-1724474
+/sis/branches/JDK6:1394364-1724593
+/sis/branches/JDK7:1394913-1724592
+/sis/branches/JDK8:1584960-1724583
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java?rev=1724594&r1=1724593&r2=1724594&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java [UTF-8] Thu Jan 14 11:58:57 2016
@@ -338,10 +338,10 @@ public class ImmutableIdentifier extends
* risk of false code space.
*/
value = properties.get(CODESPACE_KEY);
- if (value == null && !properties.containsKey(CODESPACE_KEY)) {
+ if (value == null) {
codeSpace = org.apache.sis.internal.util.Citations.getCodeSpace(authority);
- } else if (value instanceof String) {
- codeSpace = trimWhitespaces((String) value);
+ } else if (value instanceof CharSequence) {
+ codeSpace = trimWhitespaces((CharSequence) value).toString();
} else {
throw illegalPropertyType(properties, CODESPACE_KEY, value);
}
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java?rev=1724594&r1=1724593&r2=1724594&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java [UTF-8] Thu Jan 14 11:58:57 2016
@@ -159,7 +159,7 @@ public class FranceGeocentricInterpolati
FILE = builder
.addIdentifier("8727")
.addName("Geocentric translations file")
- .create(File.class, Paths.get(DEFAULT));
+ .setRemarks(NTv2.WARNING).create(File.class, Paths.get(DEFAULT));
PARAMETERS = builder
.addIdentifier("9655")
.addName("France geocentric interpolation")
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java?rev=1724594&r1=1724593&r2=1724594&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java [UTF-8] Thu Jan 14 11:58:57 2016
@@ -93,11 +93,11 @@ public final class NADCON extends Abstra
LATITUDE = builder
.addIdentifier("8657")
.addName("Latitude difference file")
- .create(File.class, Paths.get("conus.las"));
+ .setRemarks(NTv2.WARNING).create(File.class, Paths.get("conus.las"));
LONGITUDE = builder
.addIdentifier("8658")
.addName("Longitude difference file")
- .create(File.class, Paths.get("conus.los"));
+ .setRemarks(NTv2.WARNING).create(File.class, Paths.get("conus.los"));
PARAMETERS = builder
.addIdentifier("9613")
.addName("NADCON")
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NTv2.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NTv2.java?rev=1724594&r1=1724593&r2=1724594&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NTv2.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NTv2.java [UTF-8] Thu Jan 14 11:58:57 2016
@@ -52,6 +52,8 @@ import org.apache.sis.util.resources.Mes
// Branch-dependent imports
import java.io.File;
+import org.opengis.util.InternationalString;
+import org.apache.sis.util.iso.SimpleInternationalString;
import org.apache.sis.internal.jdk7.Files;
import org.apache.sis.internal.jdk7.Path;
import org.apache.sis.internal.jdk7.StandardCharsets;
@@ -76,6 +78,14 @@ public final class NTv2 extends Abstract
private static final long serialVersionUID = -4027618007780159180L;
/**
+ * Warns the user that the parameter type will be changed from {@link File}
+ * to {@link java.nio.file.Path} when Apache SIS will upgrade to Java 7.
+ */
+ static final InternationalString WARNING = new SimpleInternationalString(
+ "The parameter type will be changed from ‘java.io.File’ to ‘java.nio.file.Path’ " +
+ "when Apache SIS will upgrade to Java 7.");
+
+ /**
* The operation parameter descriptor for the <cite>"Latitude and longitude difference file"</cite> parameter value.
* The file extension is typically {@code ".gsb"}. There is no default value.
*/
@@ -90,7 +100,7 @@ public final class NTv2 extends Abstract
FILE = builder
.addIdentifier("8656")
.addName("Latitude and longitude difference file")
- .create(File.class, null);
+ .setRemarks(WARNING).create(File.class, null);
PARAMETERS = builder
.addIdentifier("9615")
.addName("NTv2")
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java?rev=1724594&r1=1724593&r2=1724594&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java [UTF-8] Thu Jan 14 11:58:57 2016
@@ -209,7 +209,8 @@ public strictfp class InterpolatedGeocen
" Parameter[“tgt_semi_major”, 6378137.0],\n" +
" Parameter[“tgt_semi_minor”, 6356752.314140356],\n" +
" ParameterFile[“Geocentric translations file”, “\\E.*\\W\\Q" +
- FranceGeocentricInterpolationTest.TEST_FILE + "”, Id[“EPSG”, 8727]]],\n" +
+ FranceGeocentricInterpolationTest.TEST_FILE + "”, Id[“EPSG”, 8727],\n" +
+ " Remark[“\\E.*\\Q”]]],\n" +
" Param_MT[“Affine parametric transformation”,\n" +
" Parameter[“A0”, 57.29577951308232, Id[“EPSG”, 8623]],\n" + // Radians to degrees conversion
" Parameter[“B1”, 57.29577951308232, Id[“EPSG”, 8640]]]]\\E");
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java?rev=1724594&r1=1724593&r2=1724594&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java [UTF-8] Thu Jan 14 11:58:57 2016
@@ -118,7 +118,8 @@ public final strictfp class Interpolated
" Parameter[“Semi-major axis length difference”, -112.2],\n" +
" Parameter[“Flattening difference”, -5.4738838833299144E-5],\n" +
" ParameterFile[“Geocentric translations file”, “\\E.*\\W\\Q" +
- FranceGeocentricInterpolationTest.TEST_FILE + "”, Id[“EPSG”, 8727]],\n" +
+ FranceGeocentricInterpolationTest.TEST_FILE + "”, Id[“EPSG”, 8727],\n" +
+ " Remark[“\\E.*\\Q”]],\n" +
" Parameter[“dim”, 2]],\n" +
" Param_MT[“Affine parametric transformation”,\n" +
" Parameter[“A0”, 57.29577951308232, Id[“EPSG”, 8623]],\n" + // Radians to degrees conversion