Author: desruisseaux
Date: Mon Feb 23 09:17:33 2015
New Revision: 1661624
URL: http://svn.apache.org/r1661624
Log:
Renamed "Affine general parametric transformation" as "Affine parametric
transformation".
A verification in http://epsg-registry.org/ show us that the "general" word has
been dropped.
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AffineTest.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorValuesTest.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java?rev=1661624&r1=1661623&r2=1661624&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java
[UTF-8] Mon Feb 23 09:17:33 2015
@@ -36,7 +36,7 @@ import org.apache.sis.referencing.operat
/**
- * The provider for "<cite>Affine general parametric transformation</cite>"
(EPSG:9624).
+ * The provider for "<cite>Affine parametric transformation</cite>"
(EPSG:9624).
* The set of available parameters depends on the matrix size, which is 3×3 by
default.
*
* <table class="sis">
@@ -74,7 +74,7 @@ public final class Affine extends Abstra
*
* @see org.apache.sis.internal.util.Constants#AFFINE
*/
- public static final String NAME = "Affine general parametric
transformation";
+ public static final String NAME = "Affine parametric transformation";
/**
* The EPSG:9624 compliant instance, created when first needed.
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java?rev=1661624&r1=1661623&r2=1661624&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java
[UTF-8] Mon Feb 23 09:17:33 2015
@@ -30,7 +30,6 @@ import org.opengis.parameter.ParameterVa
import org.opengis.parameter.ParameterDescriptor;
import org.opengis.parameter.ParameterDescriptorGroup;
import org.opengis.parameter.GeneralParameterValue;
-import org.opengis.parameter.GeneralParameterDescriptor;
import org.opengis.parameter.ParameterNotFoundException;
import org.opengis.parameter.InvalidParameterNameException;
import org.opengis.metadata.Identifier;
@@ -186,7 +185,7 @@ public class TensorParameters<E> impleme
*
* {@section Relationship with EPSG}
* The above-cited group of parameters are close, but not identical, to
the definitions provided
- * by the <cite>"Affine general parametric transformation"</cite>
(EPSG:9624) operation method.
+ * by the <cite>"Affine parametric transformation"</cite> (EPSG:9624)
operation method.
* The differences are:
*
* <ul>
@@ -377,7 +376,7 @@ public class TensorParameters<E> impleme
* <tr><th>Rank</th> <th>Type</th> <th>Used with</th></tr>
* <tr><td>0</td> <td>scalar</td> <td></td></tr>
* <tr><td>1</td> <td>vector</td> <td></td></tr>
- * <tr><td>2</td> <td>matrix</td> <td>Affine general parametric
transformation</td></tr>
+ * <tr><td>2</td> <td>matrix</td> <td>Affine parametric
transformation</td></tr>
* <tr><td><var>k</var></td><td>rank <var>k</var> tensor</td></tr>
* </table>
*
Modified:
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AffineTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AffineTest.java?rev=1661624&r1=1661623&r2=1661624&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AffineTest.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AffineTest.java
[UTF-8] Mon Feb 23 09:17:33 2015
@@ -82,7 +82,7 @@ public final strictfp class AffineTest e
public void testWKT() {
final Matrix matrix = Matrices.createDiagonal(3, 3);
assertWktEquals(
- "ParameterGroup[“Affine general parametric transformation”," +
+ "ParameterGroup[“Affine parametric transformation”," +
" Id[“EPSG”, 9624, Citation[“OGP”]]]",
Affine.parameters(matrix));
/*
* Try arbitrary values.
@@ -91,7 +91,7 @@ public final strictfp class AffineTest e
matrix.setElement(1, 1, 0); // B1
matrix.setElement(1, 2, -1); // B2
assertWktEquals(
- "ParameterGroup[“Affine general parametric transformation”,\n"
+
+ "ParameterGroup[“Affine parametric transformation”,\n" +
" Parameter[“A1”, 2.0, Id[“EPSG”, 8624]],\n" +
" Parameter[“B1”, 0.0, Id[“EPSG”, 8640]],\n" +
" Parameter[“B2”, -1.0, Id[“EPSG”, 8641]],\n" +
Modified:
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorValuesTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorValuesTest.java?rev=1661624&r1=1661623&r2=1661624&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorValuesTest.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorValuesTest.java
[UTF-8] Mon Feb 23 09:17:33 2015
@@ -332,7 +332,7 @@ public final strictfp class TensorValues
/**
* Tests {@link TensorParameters#ALPHANUM} formatting.
* <ul>
- * <li>Group name shall be {@code "Affine general parametric
transformation"}.</li>
+ * <li>Group name shall be {@code "Affine parametric
transformation"}.</li>
* <li>No {@code "num_row"} or {@code "num_col"} parameters if their
value is equals to 3.</li>
* <li>Parameter names shall be of the form {@code "A0"}.</li>
* <li>Identifiers present, but only for A0-A2 and B0-B2.</li>
@@ -348,7 +348,7 @@ public final strictfp class TensorValues
singletonMap(TensorValues.NAME_KEY, Affine.NAME), matrix);
validate(group);
assertWktEquals(
- "ParameterGroup[“Affine general parametric transformation”,\n"
+
+ "ParameterGroup[“Affine parametric transformation”,\n" +
" Parameter[“A2”, 4.0, Id[“EPSG”, 8625]],\n" +
" Parameter[“B0”, -2.0, Id[“EPSG”, 8639]],\n" +
" Parameter[“C2”, 7.0]]", group);
Modified:
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java?rev=1661624&r1=1661623&r2=1661624&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java
[UTF-8] Mon Feb 23 09:17:33 2015
@@ -82,7 +82,7 @@ public final class Constants extends Sta
public static final String NUM_ROW = "num_row", NUM_COL = "num_col";
/**
- * The OGC name for <cite>Affine general parametric transformation"</cite>.
+ * The OGC name for <cite>"Affine parametric transformation"</cite>.
*
* @see org.apache.sis.internal.referencing.provider.Affine#NAME
*/
