sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1779709 [15/15] - in /sis/trunk: ./ core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/ core/sis-referencing/src/main/java/org/apache/sis/geometry/ core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/refere...
Date Sat, 21 Jan 2017 09:15:01 GMT
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomain.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomain.java?rev=1779709&r1=1779708&r2=1779709&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomain.java
[UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomain.java
[UTF-8] Sat Jan 21 09:14:56 2017
@@ -231,10 +231,10 @@ public strictfp class CoordinateDomain {
     /**
      * Generates random input coordinates.
      *
-     * @param  random    The random number generator to use.
-     * @param  dimension The number of dimension of the points to generate.
-     * @param  numPts    The number of points to generate.
-     * @return An array of length {@code numPts*dimension} filled with random input ordinate
values.
+     * @param  random     the random number generator to use.
+     * @param  dimension  the number of dimension of the points to generate.
+     * @param  numPts     the number of points to generate.
+     * @return an array of length {@code numPts*dimension} filled with random input ordinate
values.
      */
     public double[] generateRandomInput(final Random random, final int dimension, final int
numPts) {
         final double[] ordinates = new double[numPts * dimension];

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
[UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
[UTF-8] Sat Jan 21 09:14:56 2017
@@ -164,9 +164,9 @@ public final strictfp class EllipsoidToC
     /**
      * Executes the derivative test using the given ellipsoid.
      *
-     * @param  ellipsoid The ellipsoid to use for the test.
-     * @param  hasHeight {@code true} if geographic coordinates include an ellipsoidal height
(i.e. are 3-D),
-     *         or {@code false} if they are only 2-D.
+     * @param  ellipsoid  the ellipsoid to use for the test.
+     * @param  hasHeight  {@code true} if geographic coordinates include an ellipsoidal height
(i.e. are 3-D),
+     *                    or {@code false} if they are only 2-D.
      * @throws FactoryException if an error occurred while creating a transform.
      * @throws TransformException should never happen.
      */
@@ -177,7 +177,7 @@ public final strictfp class EllipsoidToC
          * Derivative of the direct transform.
          */
         tolerance = 1E-2;
-        derivativeDeltas = new double[] {toRadians(1.0 / 60) / 1852}; // Approximatively
one metre.
+        derivativeDeltas = new double[] {toRadians(1.0 / 60) / 1852};           // Approximatively
one metre.
         verifyDerivative(point.getCoordinate());
         /*
          * Derivative of the inverse transform.
@@ -185,7 +185,7 @@ public final strictfp class EllipsoidToC
         point = transform.transform(point, null);
         transform = transform.inverse();
         tolerance = 1E-8;
-        derivativeDeltas = new double[] {1}; // Approximatively one metre.
+        derivativeDeltas = new double[] {1};                                    // Approximatively
one metre.
         verifyDerivative(point.getCoordinate());
     }
 

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java
[UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java
[UTF-8] Sat Jan 21 09:14:56 2017
@@ -70,11 +70,11 @@ public final strictfp class ExponentialT
      *
      * The {@link #transform} field must be set before to invoke this method.
      *
-     * @param expectedType The expected base type of the math transform.
-     * @param base         The exponent base given to the {@link ExponentialTransform1D}
constructor.
-     * @param scale        The scale factor given to the {@link ExponentialTransform1D} constructor.
-     * @param preAffine    {@code true} for applying an additional affine transform before
the transform.
-     * @param postAffine   {@code true} for applying an additional affine transform after
the transform.
+     * @param  expectedType  the expected base type of the math transform.
+     * @param  base          the exponent base given to the {@link ExponentialTransform1D}
constructor.
+     * @param  scale         the scale factor given to the {@link ExponentialTransform1D}
constructor.
+     * @param  preAffine     {@code true} for applying an additional affine transform before
the transform.
+     * @param  postAffine    {@code true} for applying an additional affine transform after
the transform.
      */
     private void run(final Class<? extends MathTransform1D> expectedType, final double
base, final double scale,
             final boolean preAffine, final boolean postAffine) throws TransformException

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java
[UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java
[UTF-8] Sat Jan 21 09:14:56 2017
@@ -62,11 +62,11 @@ public final strictfp class LogarithmicT
      *
      * The {@link #transform} field must be set before to invoke this method.
      *
-     * @param expectedType The expected base type of the math transform.
-     * @param base         The exponent base given to the {@link LogarithmicTransform1D}
constructor.
-     * @param offset       The offset given to the {@link LogarithmicTransform1D} constructor.
-     * @param preAffine    {@code true} for applying an additional affine transform before
the transform.
-     * @param postAffine   {@code true} for applying an additional affine transform after
the transform.
+     * @param  expectedType  the expected base type of the math transform.
+     * @param  base          the exponent base given to the {@link LogarithmicTransform1D}
constructor.
+     * @param  offset        the offset given to the {@link LogarithmicTransform1D} constructor.
+     * @param  preAffine     {@code true} for applying an additional affine transform before
the transform.
+     * @param  postAffine    {@code true} for applying an additional affine transform after
the transform.
      */
     private void run(final Class<? extends MathTransform1D> expectedType, final double
base, final double offset,
             final boolean preAffine, final boolean postAffine) throws TransformException
@@ -79,7 +79,7 @@ public final strictfp class LogarithmicT
         final double[] expected = new double[values.length];
         final double lnBase = log(base);
         for (int i=0; i<values.length; i++) {
-            double value = abs(values[i]) + 0.001; // Makes the values valid for logarithms.
+            double value = abs(values[i]) + 0.001;                      // Makes the values
valid for logarithms.
             values[i] = value;
             if (preAffine) {
                 value = C0 + C1*value;
@@ -214,7 +214,7 @@ public final strictfp class LogarithmicT
         final double[] values = generateRandomCoordinates(CoordinateDomain.RANGE_10, 0);
         final double[] expected = new double[values.length];
         for (int i=0; i<values.length; i++) {
-            final double value = abs(values[i]) + 0.001; // Makes the values valid for logarithms.
+            final double value = abs(values[i]) + 0.001;        // Makes the values valid
for logarithms.
             values[i] = value;
             expected[i] = ExponentialTransform1DTest.SCALE * pow(10, log(value) / lnBase
+ C0);
         }

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformFactoryMock.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformFactoryMock.java?rev=1779709&r1=1779708&r2=1779709&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformFactoryMock.java
[UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformFactoryMock.java
[UTF-8] Sat Jan 21 09:14:56 2017
@@ -59,8 +59,8 @@ public final strictfp class MathTransfor
     /**
      * Returns the singleton method, if assignable to the given type.
      *
-     * @param  type The type of operation methods to get.
-     * @return The singleton method, or an empty set.
+     * @param  type  the type of operation methods to get.
+     * @return the singleton method, or an empty set.
      */
     @Override
     public Set<OperationMethod> getAvailableMethods(Class<? extends SingleOperation>
type) {
@@ -70,7 +70,7 @@ public final strictfp class MathTransfor
     /**
      * Returns the last method used, which can only be null or the method given at construction
time.
      *
-     * @return The method given at construction time.
+     * @return the method given at construction time.
      */
     @Override
     public OperationMethod getLastMethodUsed() {
@@ -80,8 +80,8 @@ public final strictfp class MathTransfor
     /**
      * Returns the parameters for the operation method.
      *
-     * @param name Shall be the operation method name.
-     * @return The parameters.
+     * @param  name  shall be the operation method name.
+     * @return the parameters.
      * @throws NoSuchIdentifierException if the given name is not the name
      *         of the operation method known to this factory.
      */
@@ -96,8 +96,8 @@ public final strictfp class MathTransfor
     /**
      * Delegates to the method given at construction time.
      *
-     * @param  parameters The parameters to give to the math transform provider.
-     * @return The transform created by the provider.
+     * @param  parameters  the parameters to give to the math transform provider.
+     * @return the transform created by the provider.
      * @throws FactoryException if the provider can not create the transform.
      */
     @Override
@@ -108,8 +108,8 @@ public final strictfp class MathTransfor
     /**
      * Delegates to {@link MathTransforms}.
      *
-     * @param  matrix Matrix representing the affine transform.
-     * @return Affine transform for the given matrix.
+     * @param  matrix  matrix representing the affine transform.
+     * @return affine transform for the given matrix.
      */
     @Override
     public MathTransform createAffineTransform(final Matrix matrix) {
@@ -119,9 +119,9 @@ public final strictfp class MathTransfor
     /**
      * Delegates to {@link MathTransforms}.
      *
-     * @param  transform1 First transform to concatenate.
-     * @param  transform2 Second transform to concatenate.
-     * @return Result of concatenation.
+     * @param  transform1  first transform to concatenate.
+     * @param  transform2  second transform to concatenate.
+     * @return result of concatenation.
      */
     @Override
     public MathTransform createConcatenatedTransform(MathTransform transform1, MathTransform
transform2) {
@@ -131,10 +131,10 @@ public final strictfp class MathTransfor
     /**
      * Unimplemented method.
      *
-     * @param  firstAffectedOrdinate Ignored.
-     * @param  subTransform          Ignored.
-     * @param  numTrailingOrdinates  Ignored.
-     * @return Never returned.
+     * @param  firstAffectedOrdinate  ignored.
+     * @param  subTransform           ignored.
+     * @param  numTrailingOrdinates   ignored.
+     * @return never returned.
      */
     @Override
     public MathTransform createPassThroughTransform(int firstAffectedOrdinate, MathTransform
subTransform, int numTrailingOrdinates) {
@@ -144,10 +144,10 @@ public final strictfp class MathTransfor
     /**
      * Unimplemented method.
      *
-     * @param  baseCRS    Ignored.
-     * @param  parameters Ignored.
-     * @param  derivedCS  Ignored.
-     * @return Never returned.
+     * @param  baseCRS     ignored.
+     * @param  parameters  ignored.
+     * @param  derivedCS   ignored.
+     * @return never returned.
      */
     @Override
     public MathTransform createBaseToDerived(CoordinateReferenceSystem baseCRS,
@@ -159,8 +159,8 @@ public final strictfp class MathTransfor
     /**
      * Unimplemented method.
      *
-     * @param xml Ignored.
-     * @return Never returned.
+     * @param  xml  ignored.
+     * @return never returned.
      */
     @Override
     public MathTransform createFromXML(String xml) {
@@ -170,8 +170,8 @@ public final strictfp class MathTransfor
     /**
      * Unimplemented method.
      *
-     * @param wkt Ignored.
-     * @return Never returned.
+     * @param  wkt  ignored.
+     * @return never returned.
      */
     @Override
     public MathTransform createFromWKT(String wkt) {
@@ -181,7 +181,7 @@ public final strictfp class MathTransfor
     /**
      * Unimplemented method.
      *
-     * @return null.
+     * @return {@code null}.
      */
     @Override
     public Citation getVendor() {

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformWrapper.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformWrapper.java?rev=1779709&r1=1779708&r2=1779709&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformWrapper.java
[UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformWrapper.java
[UTF-8] Sat Jan 21 09:14:56 2017
@@ -16,6 +16,7 @@
  */
 package org.apache.sis.referencing.operation.transform;
 
+import java.util.Objects;
 import java.io.Serializable;
 import org.opengis.referencing.operation.Matrix;
 import org.opengis.referencing.operation.MathTransform;
@@ -28,9 +29,6 @@ import org.apache.sis.io.wkt.Formatter;
 import org.apache.sis.io.wkt.FormattableObject;
 import org.apache.sis.io.wkt.UnformattableObjectException;
 
-// Branch-dependent imports
-import java.util.Objects;
-
 
 /**
  * The base class of math transform wrappers. Despite being a concrete class, there is no
point
@@ -192,7 +190,7 @@ public strictfp class MathTransformWrapp
     /**
      * Returns a <cite>Well Known Text</cite> (WKT) for this transform.
      *
-     * @throws UnsupportedOperationException If this object can't be formatted as WKT.
+     * @throws UnsupportedOperationException if this object can't be formatted as WKT.
      */
     @Override
     public final String toWKT() throws UnsupportedOperationException {

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformsTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformsTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformsTest.java
[UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformsTest.java
[UTF-8] Sat Jan 21 09:14:56 2017
@@ -48,7 +48,7 @@ public final strictfp class MathTransfor
      *   <li>The transform in the middle (at dimension 1) is non-linear.</li>
      * </ul>
      *
-     * @return The dummy math transform.
+     * @return the dummy math transform.
      */
     public static MathTransform createConcatenateAndPassThrough() {
         return createConcatenateAndPassThrough(new Matrix4(), new Matrix4());
@@ -62,8 +62,8 @@ public final strictfp class MathTransfor
      * <p><b>Implementation note:</b> we do not use {@code MathTransforms.concatenate(…)}
for
      * preventing the optimization performed for the {@link PassThroughTransform} special
case.</p>
      *
-     * @param scale The matrix applying a scale along at least one axis.
-     * @param swap  The matrix swapping two matrices.
+     * @param  scale  the matrix applying a scale along at least one axis.
+     * @param  swap   the matrix swapping two matrices.
      */
     private static MathTransform createConcatenateAndPassThrough(final Matrix4 scale, final
Matrix4 swap) {
         scale.m11 = 3;
@@ -71,7 +71,7 @@ public final strictfp class MathTransfor
         swap.m10 = 1; swap.m11 = 0;
         MathTransform tr = ExponentialTransform1D.create(10, 1);
         tr = PassThroughTransform.create(1, tr, 1);
-        tr = new ConcatenatedTransformDirect(MathTransforms.linear(scale), tr); // See "implementation
note" above.
+        tr = new ConcatenatedTransformDirect(MathTransforms.linear(scale), tr);     // See
"implementation note" above.
         tr = new ConcatenatedTransformDirect(tr, MathTransforms.linear(swap));
         return tr;
     }
@@ -81,8 +81,8 @@ public final strictfp class MathTransfor
      */
     @Test
     public void testGetSteps() {
-        final Matrix4 scale = new Matrix4(); // Scales a value.
-        final Matrix4 swap  = new Matrix4(); // Swaps two dimensions.
+        final Matrix4 scale = new Matrix4();                    // Scales a value.
+        final Matrix4 swap  = new Matrix4();                    // Swaps two dimensions.
         final List<MathTransform> steps = MathTransforms.getSteps(createConcatenateAndPassThrough(scale,
swap));
         assertEquals(3, steps.size());
         assertMatrixEquals("Step 1", scale, MathTransforms.getMatrix(steps.get(0)), STRICT);
@@ -98,7 +98,7 @@ public final strictfp class MathTransfor
     @Test
     public void testCompound() {
         final MathTransform t1 = MathTransforms.linear(new Matrix2(
-            3, -1,   // Random numbers (no real meaning)
+            3, -1,                                                          // Random numbers
(no real meaning)
             0,  1));
         final MathTransform t2 = MathTransforms.linear(new Matrix4(
             0,  8,  0,  9,

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java
[UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java
[UTF-8] Sat Jan 21 09:14:56 2017
@@ -52,9 +52,9 @@ public final strictfp class OperationMet
     /**
      * Creates a new two-dimensional operation method for an operation of the given name.
      *
-     * @param  type The value to be returned by {@link DefaultOperationMethod#getOperationType()}.
-     * @param  method The operation name (example: "Mercator (variant A)").
-     * @return The operation method.
+     * @param  type    the value to be returned by {@link DefaultOperationMethod#getOperationType()}.
+     * @param  method  the operation name (example: "Mercator (variant A)").
+     * @return the operation method.
      */
     @SuppressWarnings("serial")
     private static DefaultOperationMethod createMethod(final Class<? extends Projection>
type, final String method) {
@@ -76,8 +76,8 @@ public final strictfp class OperationMet
      * Creates an {@code OperationMethodSet} from the given methods, using an iterable
      * which will guarantee that the iteration is performed at most once.
      *
-     * @param type The type of coordinate operation for which to retain methods.
-     * @param methods The {@link DefaultMathTransformFactory#methods} used for fetching the
initial methods.
+     * @param  type     the type of coordinate operation for which to retain methods.
+     * @param  methods  the {@link DefaultMathTransformFactory#methods} used for fetching
the initial methods.
      */
     private static OperationMethodSet create(final Class<? extends Projection> type,
final DefaultOperationMethod... methods) {
         @SuppressWarnings("serial")
@@ -91,7 +91,7 @@ public final strictfp class OperationMet
                 return super.iterator();
             }
         };
-        synchronized (asList) { // Needed for avoiding assertion error in OperationMethodSet.
+        synchronized (asList) {                           // Needed for avoiding assertion
error in OperationMethodSet.
             return new OperationMethodSet(type, asList);
         }
     }

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
[UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
[UTF-8] Sat Jan 21 09:14:56 2017
@@ -81,7 +81,7 @@ public final strictfp class PassThroughT
      * Tests the pass through transform using an identity transform.
      * The "pass-through" of such transform shall be itself the identity transform.
      *
-     * @throws TransformException Should never happen.
+     * @throws TransformException should never happen.
      */
     @Test
     public void testIdentity() throws TransformException {
@@ -93,7 +93,7 @@ public final strictfp class PassThroughT
      * Tests the pass-through transform using an affine transform.
      * The "pass-through" of such transforms are optimized using matrix arithmetic.
      *
-     * @throws TransformException Should never happen.
+     * @throws TransformException should never happen.
      */
     @Test
     public void testLinear() throws TransformException {
@@ -108,7 +108,7 @@ public final strictfp class PassThroughT
      * Tests the general pass-through transform.
      * This test uses a non-linear sub-transform for preventing the factory method to optimize.
      *
-     * @throws TransformException Should never happen.
+     * @throws TransformException should never happen.
      */
     @Test
     public void testPassthrough() throws TransformException {
@@ -118,9 +118,9 @@ public final strictfp class PassThroughT
     /**
      * Tests a pass-through transform built using the given sub-transform.
      *
-     * @param  subTransform  The sub-transform to use for building pass-through transform.
-     * @param  expectedClass The expected implementation class of pass-through transforms.
-     * @throws TransformException If a transform failed.
+     * @param  subTransform   the sub-transform to use for building pass-through transform.
+     * @param  expectedClass  the expected implementation class of pass-through transforms.
+     * @throws TransformException if a transform failed.
      */
     private void runTest(final MathTransform subTransform, final Class<? extends MathTransform>
expectedClass)
             throws TransformException
@@ -153,9 +153,9 @@ public final strictfp class PassThroughT
      * Tests the current {@linkplain #transform transform} using an array of random coordinate
values,
      * and compares the result against the expected ones. This method computes itself the
expected results.
      *
-     * @param  subTransform The sub transform used by the current pass-through transform.
-     * @param  firstAffectedOrdinate First input/output dimension used by {@code subTransform}.
-     * @throws TransformException If a transform failed.
+     * @param  subTransform           the sub transform used by the current pass-through
transform.
+     * @param  firstAffectedOrdinate  first input/output dimension used by {@code subTransform}.
+     * @throws TransformException if a transform failed.
      */
     private void verifyTransform(final MathTransform subTransform, final int firstAffectedOrdinate)
             throws TransformException
@@ -191,7 +191,7 @@ public final strictfp class PassThroughT
         /*
          * Now process to the transform and compares the results with the expected ones.
          */
-        tolerance = 0; // Results should be strictly identical because we used the same inputs.
+        tolerance         = 0;          // Results should be strictly identical because we
used the same inputs.
         final double[] transformedData = new double[expectedData.length];
         transform.transform(passthroughData, 0, transformedData, 0, numPts);
         assertCoordinatesEqual("Direct transform.", passthroughDim,

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PseudoTransform.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PseudoTransform.java?rev=1779709&r1=1779708&r2=1779709&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PseudoTransform.java
[UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PseudoTransform.java
[UTF-8] Sat Jan 21 09:14:56 2017
@@ -59,8 +59,8 @@ strictfp class PseudoTransform extends A
     /**
      * Creates a transform for the given dimensions.
      *
-     * @param sourceDimension The source dimension.
-     * @param targetDimension The target dimension.
+     * @param  sourceDimension  the source dimension.
+     * @param  targetDimension  the target dimension.
      */
     public PseudoTransform(final int sourceDimension, final int targetDimension) {
         this.sourceDimension = sourceDimension;
@@ -88,7 +88,7 @@ strictfp class PseudoTransform extends A
      * Pseudo-transform a point in the given array.
      *
      * @throws TransformException should never occurs in this class,
-     *         but can occur in method overridden in subclasses.
+     *         but can occur in method overridden by subclasses.
      */
     @Override
     public Matrix transform(final double[] srcPts, final int srcOff,

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/RandomFailureTransform.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/RandomFailureTransform.java?rev=1779709&r1=1779708&r2=1779709&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/RandomFailureTransform.java
[UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/RandomFailureTransform.java
[UTF-8] Sat Jan 21 09:14:56 2017
@@ -77,7 +77,7 @@ final strictfp class RandomFailureTransf
     /**
      * Fills the given array with random number.
      *
-     * @param array The array to fill.
+     * @param  array  the array to fill.
      */
     public void fill(final double[] array) {
         for (int i=0; i<array.length; i++) {
@@ -88,7 +88,7 @@ final strictfp class RandomFailureTransf
     /**
      * Fills the given array with random number.
      *
-     * @param array The array to fill.
+     * @param  array  the array to fill.
      */
     public void fill(final float[] array) {
         for (int i=0; i<array.length; i++) {
@@ -99,7 +99,7 @@ final strictfp class RandomFailureTransf
     /**
      * Pseudo-transform a point in the given array, with intentional random failures.
      *
-     * @throws TransformException Throws randomly at the frequency given at construction
time.
+     * @throws TransformException thrown randomly at the frequency given at construction
time.
      */
     @Override
     public Matrix transform(final double[] srcPts, final int srcOff,

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
[UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
[UTF-8] Sat Jan 21 09:14:56 2017
@@ -44,9 +44,9 @@ public final strictfp class ScaleTransfo
     /**
      * Sets the {@link #transform} field to the {@link ScaleTransform} instance to test.
      *
-     * @param sourceDimensions  expected number of source dimensions.
-     * @param targetDimensions  expected number of source dimensions.
-     * @param matrix            the data to use for creating the transform.
+     * @param  sourceDimensions  expected number of source dimensions.
+     * @param  targetDimensions  expected number of source dimensions.
+     * @param  matrix            the data to use for creating the transform.
      */
     private void create(final int sourceDimensions, final int targetDimensions, final MatrixSIS
matrix) {
         final double[] elements = matrix.getElements();
@@ -86,7 +86,7 @@ public final strictfp class ScaleTransfo
     @Test
     @DependsOnMethod("testConstantDimension")
     public void testDimensionReduction() throws TransformException {
-        isInverseTransformSupported = false;    // Because matrix is not square.
+        isInverseTransformSupported = false;                            // Because matrix
is not square.
         create(3, 2, Matrices.create(3, 4, new double[] {
                 2, 0, 0, 0,
                 0, 3, 0, 0,

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
[UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
[UTF-8] Sat Jan 21 09:14:56 2017
@@ -110,7 +110,7 @@ public final strictfp class TransformSep
     @Test
     public void testLinearTransform() throws FactoryException {
         Matrix matrix = Matrices.create(4, 4, new double[] {
-            2, 0, 0, 7,     // Some random values.
+            2, 0, 0, 7,                                         // Some random values.
             0, 5, 0, 6,
             1, 0, 3, 8,
             0, 0, 0, 1

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java?rev=1779709&r1=1779708&r2=1779709&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
[UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
[UTF-8] Sat Jan 21 09:14:56 2017
@@ -72,8 +72,8 @@ public strictfp class CoordinateOperatio
     /**
      * Generates the HTML report.
      *
-     * @param  args No argument expected.
-     * @throws IOException If an error occurred while writing the HTML file.
+     * @param  args  no argument expected.
+     * @throws IOException if an error occurred while writing the HTML file.
      */
     public static void main(final String[] args) throws IOException {
         final MathTransformFactory factory = DefaultFactories.forBuildin(MathTransformFactory.class);
@@ -182,7 +182,7 @@ public strictfp class CoordinateOperatio
     /**
      * Writes a table of content.
      *
-     * @param  methods The methods to write to the HTML file.
+     * @param  methods  the methods to write to the HTML file.
      * @throws IOException if an error occurred while writing to the file.
      */
     public void writeIndex(final Iterable<? extends OperationMethod> methods) throws
IOException {
@@ -214,7 +214,7 @@ public strictfp class CoordinateOperatio
     /**
      * Writes identification info and parameters for the given method.
      *
-     * @param  method The method to write to the HTML file.
+     * @param  method  the method to write to the HTML file.
      * @throws IOException if an error occurred while writing to the file.
      */
     public void write(final OperationMethod method) throws IOException {
@@ -328,7 +328,7 @@ public strictfp class CoordinateOperatio
         final Map<String, Integer> footnotes = new LinkedHashMap<>();
         for (final GeneralParameterDescriptor gp : group.descriptors()) {
             if (isDeprecated(gp)) {
-                continue;   // Hide deprecated parameters.
+                continue;                                                       // Hide deprecated
parameters.
             }
             final ParameterDescriptor<?> param = (ParameterDescriptor<?>) gp;
             reopenTag("tr");
@@ -408,9 +408,9 @@ public strictfp class CoordinateOperatio
      *
      * @todo This method is not yet used. This is pending the implementation of {@code CRSAuthorityFactory}
is SIS.
      *
-     * @param  factory The factory to use for getting CRS.
-     * @return The union of domain of validity of all map projections using a method of the
given name.
-     * @throws FactoryException If an error occurred while fetching the list of CRS.
+     * @param  factory  the factory to use for getting CRS.
+     * @return the union of domain of validity of all map projections using a method of the
given name.
+     * @throws FactoryException if an error occurred while fetching the list of CRS.
      */
     public static Map<String, DefaultGeographicBoundingBox> computeUnionOfAllDomainOfValidity(
             final CRSAuthorityFactory factory) throws FactoryException
@@ -421,7 +421,7 @@ public strictfp class CoordinateOperatio
             try {
                 crs = factory.createCoordinateReferenceSystem(code);
             } catch (FactoryException e) {
-                continue; // Ignore and inspect the next element.
+                continue;                                                   // Ignore and
inspect the next element.
             }
             if (crs instanceof GeneralDerivedCRS) {
                 final GeographicBoundingBox candidate = CRS.getGeographicBoundingBox(crs);

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/integration/DatumShiftTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/integration/DatumShiftTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/integration/DatumShiftTest.java
[UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/integration/DatumShiftTest.java
[UTF-8] Sat Jan 21 09:14:56 2017
@@ -16,6 +16,7 @@
  */
 package org.apache.sis.test.integration;
 
+import java.nio.file.Path;
 import java.io.IOException;
 import org.opengis.util.FactoryException;
 import org.opengis.referencing.operation.TransformException;
@@ -29,9 +30,6 @@ import org.junit.Test;
 
 import static org.apache.sis.test.Assume.*;
 
-// Branch-specific imports
-import java.nio.file.Path;
-
 
 /**
  * Tests datum shifts using the official grid files rather than the small extracts distributed
in the SIS

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
[UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
[UTF-8] Sat Jan 21 09:14:56 2017
@@ -21,6 +21,7 @@ import java.net.URL;
 import java.util.Arrays;
 import java.util.Locale;
 import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.bind.JAXBException;
@@ -86,11 +87,8 @@ import org.junit.Test;
 import static org.apache.sis.test.Assert.*;
 import static org.apache.sis.test.TestUtilities.getSingleton;
 
-// Branch-dependent imports
-import java.nio.charset.StandardCharsets;
 import org.apache.sis.internal.geoapi.evolution.UnsupportedCodeList;
 
-
 /**
  * Tests XML (un)marshalling of a metadata object containing various elements
  * in addition to Coordinate Reference System (CRS) elements.



Mime
View raw message