Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -18,6 +18,7 @@ package org.apache.sis.parameter;
import java.util.Collections;
import java.util.Iterator;
+import java.util.Objects;
import java.net.URI;
import java.net.URISyntaxException;
import javax.xml.bind.JAXBException;
@@ -40,9 +41,6 @@ import org.junit.Test;
import static org.apache.sis.test.ReferencingAssert.*;
-// Branch-dependent imports
-import java.util.Objects;
-
/**
* Tests XML (un)marshalling of {@link DefaultParameterValue}.
@@ -70,8 +68,8 @@ public final strictfp class ParameterMar
/**
* Marshals the given object, then unmarshals it and compare with the original value.
*
- * @param parameter The parameter to marshal.
- * @param expected The expected XML (ignoring {@code xmlns}).
+ * @param parameter the parameter to marshal.
+ * @param expected the expected XML (ignoring {@code xmlns}).
*/
private static void testMarshallAndUnmarshall(final DefaultParameterValue<?> parameter, final String expected)
throws JAXBException
@@ -127,7 +125,7 @@ public final strictfp class ParameterMar
* change in any future Apache SIS version.
*/
assertNull("valueDomain", r.getValueDomain());
- assertNull("valueClass", r.getValueClass()); // May change in any future SIS release.
+ assertNull("valueClass", r.getValueClass()); // May change in any future SIS release.
}
/**
@@ -318,11 +316,11 @@ public final strictfp class ParameterMar
/**
* Verifies that the given parameter descriptor has the expected EPSG code, name and OGC alias.
*
- * @param code The expected EPSG code.
- * @param name The expected EPSG name.
- * @param alias The expected OGC alias.
- * @param required {@code true} if the parameter should be mandatory, or {@code false} if optional.
- * @param descriptor The parameter descriptor to verify.
+ * @param code the expected EPSG code.
+ * @param name the expected EPSG name.
+ * @param alias the expected OGC alias.
+ * @param required {@code true} if the parameter should be mandatory, or {@code false} if optional.
+ * @param descriptor the parameter descriptor to verify.
*/
private static void verifyDescriptor(final int code, final String name, final String alias,
final boolean required, final GeneralParameterDescriptor descriptor)
@@ -336,13 +334,13 @@ public final strictfp class ParameterMar
/**
* Verifies that the given parameter value has the expected value and descriptor properties.
*
- * @param code The expected EPSG code.
- * @param name The expected EPSG name.
- * @param alias The expected OGC alias.
- * @param value The expected value.
- * @param unit The expected unit of measurement for both the value and the descriptor.
- * @param descriptor The expected parameter descriptor associated to the parameter value.
- * @param parameter The parameter value to verify.
+ * @param code the expected EPSG code.
+ * @param name the expected EPSG name.
+ * @param alias the expected OGC alias.
+ * @param value the expected value.
+ * @param unit the expected unit of measurement for both the value and the descriptor.
+ * @param descriptor the expected parameter descriptor associated to the parameter value.
+ * @param parameter the parameter value to verify.
*/
private static void verifyParameter(final int code, final String name, final String alias,
final double value, final Unit<?> unit, final GeneralParameterDescriptor descriptor,
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -111,10 +111,10 @@ public strictfp class TensorParametersTe
/**
* Creates a new test case for a {@link MatrixParameters} defined by the subclass.
*
- * @param param The instance tested by this class.
- * @param names The expected parameter names for all matrix elements.
- * @param aliases The expected parameter aliases for all matrix elements, or {@code null} for no alias.
- * @param identifiers The expected parameter identifiers for all matrix elements, or {@code null} for no identifier.
+ * @param param the instance tested by this class.
+ * @param names the expected parameter names for all matrix elements.
+ * @param aliases the expected parameter aliases for all matrix elements, or {@code null} for no alias.
+ * @param identifiers the expected parameter identifiers for all matrix elements, or {@code null} for no identifier.
*/
TensorParametersTest(final TensorParameters<Double> param, final String[][] names, final String[][] aliases,
final short[][] identifiers)
@@ -137,9 +137,9 @@ public strictfp class TensorParametersTe
/**
* Asserts that the given descriptor has the given name.
*
- * @param names The expected parameter name.
- * @param defaultValue The expected parameter default value.
- * @param actual The actual parameter to verify.
+ * @param names the expected parameter name.
+ * @param defaultValue the expected parameter default value.
+ * @param actual the actual parameter to verify.
*/
private static void verifyDescriptor(final String name, final Number defaultValue,
final ParameterDescriptor<?> actual)
@@ -151,10 +151,10 @@ public strictfp class TensorParametersTe
/**
* Asserts that the given descriptor has the given name, alias, identifier and default value.
*
- * @param defaultValue The expected parameter default value.
- * @param actual The actual parameter to verify.
- * @param row Row index of the matrix element to test.
- * @param column Column index of the matrix element to test.
+ * @param defaultValue the expected parameter default value.
+ * @param actual the actual parameter to verify.
+ * @param row row index of the matrix element to test.
+ * @param column column index of the matrix element to test.
*/
private void verifyDescriptor(final Number defaultValue, final ParameterDescriptor<?> actual,
final int row, final int column)
@@ -198,7 +198,7 @@ public strictfp class TensorParametersTe
verifyDescriptor(N0, e01, 0, 1);
verifyDescriptor(N0, e10, 1, 0);
verifyDescriptor(N1, e11, 1, 1);
- assertSame(e00, param.getElementDescriptor(0, 0)); // Test caching.
+ assertSame(e00, param.getElementDescriptor(0, 0)); // Test caching.
assertSame(e01, param.getElementDescriptor(0, 1));
assertSame(e10, param.getElementDescriptor(1, 0));
assertSame(e11, param.getElementDescriptor(1, 1));
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=1779702&r1=1779701&r2=1779702&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] Sat Jan 21 08:49:49 2017
@@ -73,9 +73,9 @@ public final strictfp class TensorValues
* Asserts that the given descriptor has the given name and default value.
* Aliases and identifiers are ignored - testing them is the purpose of {@link MatrixParametersTest}.
*
- * @param name The expected parameter name.
- * @param defaultValue The expected parameter default value.
- * @param actual The actual parameter to verify.
+ * @param name the expected parameter name.
+ * @param defaultValue the expected parameter default value.
+ * @param actual the actual parameter to verify.
*/
private static void assertDescriptorEquals(final String name, final Number defaultValue,
final GeneralParameterDescriptor actual)
@@ -87,9 +87,9 @@ public final strictfp class TensorValues
/**
* Asserts that the given parameter has the given name and value.
*
- * @param name The expected parameter name.
- * @param value The expected parameter value.
- * @param actual The actual parameter to verify.
+ * @param name the expected parameter name.
+ * @param value the expected parameter value.
+ * @param actual the actual parameter to verify.
*/
private static void assertValueEquals(final String name, final Number value, final GeneralParameterValue actual) {
assertEquals(name, actual.getDescriptor().getName().getCode());
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -55,7 +55,7 @@ public final strictfp class AbstractIden
* Creates a map of properties to be given to the {@link AbstractIdentifiedObject} constructor.
* The values in the map are consistent with the values expected by the {@link #validate} method.
*
- * @param identifier The value for the {@code "identifiers"} property.
+ * @param identifier the value for the {@code "identifiers"} property.
*/
private static Map<String,Object> properties(final Set<Identifier> identifiers) {
final Map<String,Object> properties = new HashMap<>(8);
@@ -72,10 +72,10 @@ public final strictfp class AbstractIden
/**
* Validates the given object created by {@link #testCreateFromMap()}.
*
- * @param object The object to validate.
- * @param identifiers The expected value of {@link AbstractIdentifiedObject#getIdentifiers()}.
- * @param gmlID The expected value of {@link AbstractIdentifiedObject#getID()}.
- * @return The value of {@link AbstractIdentifiedObject#getIdentifier()}.
+ * @param object the object to validate.
+ * @param identifiers the expected value of {@link AbstractIdentifiedObject#getIdentifiers()}.
+ * @param gmlID the expected value of {@link AbstractIdentifiedObject#getID()}.
+ * @return the value of {@link AbstractIdentifiedObject#getIdentifier()}.
*/
private static Identifier validate(final AbstractIdentifiedObject object,
final Set<Identifier> identifiers, final String gmlID)
@@ -108,8 +108,10 @@ public final strictfp class AbstractIden
new AbstractIdentifiedObject(properties);
fail("Should not allow unnamed object.");
} catch (IllegalArgumentException e) {
- // The message may be in any language, but shall
- // contain at least the missing property name.
+ /*
+ * The message may be in any language, but shall
+ * contain at least the missing property name.
+ */
final String message = e.getMessage();
assertTrue(message, message.contains("name"));
}
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderMock.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderMock.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderMock.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderMock.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -68,7 +68,7 @@ final strictfp class BuilderMock extends
/**
* Convenience accessor for aliases or identifiers as strings.
*
- * @param kind 0 for identifiers, or 1 for names.
+ * @param kind 0 for identifiers, or 1 for names.
*/
String[] getAsStrings(final int kind) {
final Object[] values = (kind == 0) ? getIdentifiers() : getAliases();
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -138,14 +138,14 @@ public final strictfp class BuilderTest
*
* @param withNames {@code true} for adding the names in the builder.
* @param withIdentifiers {@code true} for adding the identifiers in the builder.
- * @return The builder with Mercator names and/or identifiers.
+ * @return the builder with Mercator names and/or identifiers.
*/
private static BuilderMock createMercator(final boolean withNames, final boolean withIdentifiers) {
final BuilderMock builder = new BuilderMock();
assertSame(builder, builder.setCodeSpace(Citations.EPSG, "EPSG"));
if (withNames) {
- assertSame(builder, builder.addName( "Mercator (variant A)")); // EPSG version 7.6 and later.
- assertSame(builder, builder.addName( "Mercator (1SP)")); // EPSG before version 7.6.
+ assertSame(builder, builder.addName( "Mercator (variant A)")); // EPSG version 7.6 and later.
+ assertSame(builder, builder.addName( "Mercator (1SP)")); // EPSG before version 7.6.
assertSame(builder, builder.addName(Citations.OGC, "Mercator_1SP"));
assertSame(builder, builder.addName(Citations.GEOTIFF, "CT_Mercator"));
}
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -73,7 +73,7 @@ public final strictfp class CRSTest exte
/**
* Tests {@link CRS#forCode(String)} with EPSG codes.
*
- * @throws FactoryException If a CRS can not be constructed.
+ * @throws FactoryException if a CRS can not be constructed.
*
* @see CommonCRSTest#testForCode()
*/
@@ -102,7 +102,7 @@ public final strictfp class CRSTest exte
/**
* Tests {@link CRS#forCode(String)} with CRS codes.
*
- * @throws FactoryException If a CRS can not be constructed.
+ * @throws FactoryException if a CRS can not be constructed.
*
* @see CommonCRSTest#testForCode()
*/
@@ -177,7 +177,7 @@ public final strictfp class CRSTest exte
null, new DefaultGeographicBoundingBox(-1, +1, ymin, ymax), null, null));
crs[i] = new DefaultProjectedCRS(properties, baseCRS.geographic(), HardCodedConversions.MERCATOR, cs);
}
- final ProjectedCRS[] overlappingCRS = Arrays.copyOf(crs, 3); // Exclude the last CRS only.
+ final ProjectedCRS[] overlappingCRS = Arrays.copyOf(crs, 3); // Exclude the last CRS only.
/*
* Test between the 3 overlapping CRS without region of interest. We expect the CRS having a domain
* of validity large enough for all CRS; this is the second CRS created in above 'switch' statement.
@@ -285,20 +285,20 @@ public final strictfp class CRSTest exte
@Test
public void testGetComponentAt() {
testGetComponentAt(
- null, // Null because our CRS has no component for the 'x' axis alone.
- null, // Null because our CRS has no component for the 'y' axis alone.
+ null, // Null because our CRS has no component for the 'x' axis alone.
+ null, // Null because our CRS has no component for the 'y' axis alone.
HardCodedCRS.GRAVITY_RELATED_HEIGHT,
HardCodedCRS.TIME,
HardCodedCRS.WGS84,
- null, // Null because our CRS has no (x,y,z) component.
+ null, // Null because our CRS has no (x,y,z) component.
HardCodedCRS.GEOID_4D);
/*
* The above tests was for the standard (x,y,z,t) flat view.
* Now test again, but with a more hierarchical structure: ((x,y,z),t)
*/
testGetComponentAt(
- null, // Null because our CRS has no component for the 'x' axis alone.
- null, // Null because our CRS has no component for the 'y' axis alone.
+ null, // Null because our CRS has no component for the 'x' axis alone.
+ null, // Null because our CRS has no component for the 'y' axis alone.
HardCodedCRS.GRAVITY_RELATED_HEIGHT,
HardCodedCRS.TIME,
HardCodedCRS.WGS84,
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -268,8 +268,8 @@ public final strictfp class CommonCRSTes
final TemporalCRS crs = e.crs();
final Date origin = datum.getOrigin();
Validators.validate(crs);
- assertSame (name, datum, e.datum()); // Datum before CRS creation.
- assertSame (name, crs.getDatum(), e.datum()); // Datum after CRS creation.
+ assertSame (name, datum, e.datum()); // Datum before CRS creation.
+ assertSame (name, crs.getDatum(), e.datum()); // Datum after CRS creation.
assertEquals(name, epoch, format(origin));
assertEquals(name, days, origin.getTime() / DAY_LENGTH - julianEpoch, 0);
}
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -67,8 +67,8 @@ public final strictfp class GeodeticObje
* <p><b>Note:</b> a future version of this method may accept other kinds of extent,
* for example a polygon encompassing the world.</p>
*
- * @param extent The extent to verify, or {@code null} if none.
- * @param isMandatory {@code true} if an absence of world extent is a failure.
+ * @param extent the extent to verify, or {@code null} if none.
+ * @param isMandatory {@code true} if an absence of world extent is a failure.
*/
private static void assertIsWorld(final Extent extent, boolean isMandatory) {
if (extent != null) {
@@ -98,7 +98,7 @@ public final strictfp class GeodeticObje
* <tr><td>{@linkplain GeographicBoundingBox#getNorthBoundLatitude() North bound latitude}</td><td> +90</td></tr>
* </table>
*
- * @param box The geographic bounding box to verify.
+ * @param box the geographic bounding box to verify.
*/
public static void assertIsWorld(final GeographicBoundingBox box) {
final Boolean inclusion = box.getInclusion();
@@ -126,7 +126,7 @@ public final strictfp class GeodeticObje
* <td>{@link Units#DEGREE}</td></tr>
* </table>
*
- * @param meridian The prime meridian to verify.
+ * @param meridian the prime meridian to verify.
*/
public static void assertIsGreenwich(final PrimeMeridian meridian) {
assertEquals("name", "Greenwich", meridian.getName().getCode());
@@ -149,7 +149,7 @@ public final strictfp class GeodeticObje
* <td>{@link Units#GRAD}</td></tr>
* </table>
*
- * @param meridian The prime meridian to verify.
+ * @param meridian the prime meridian to verify.
*/
public static void assertIsParis(final PrimeMeridian meridian) {
assertEquals("name", "Paris", meridian.getName().getCode());
@@ -178,7 +178,7 @@ public final strictfp class GeodeticObje
* <td>{@code true}</td></tr>
* </table>
*
- * @param ellipsoid The ellipsoid to verify.
+ * @param ellipsoid the ellipsoid to verify.
*/
public static void assertIsWGS84(final Ellipsoid ellipsoid) {
assertEquals("name", "WGS 84", ellipsoid.getName().getCode());
@@ -206,9 +206,9 @@ public final strictfp class GeodeticObje
* <td>{@linkplain #assertIsWGS84(Ellipsoid) Is WGS84}</td></tr>
* </table>
*
- * @param datum The datum to verify.
- * @param isExtentMandatory {@code true} if the domain of validity is required to contain an {@code Extent} element
- * for the world, or {@code false} if optional.
+ * @param datum the datum to verify.
+ * @param isExtentMandatory {@code true} if the domain of validity is required to contain an
+ * {@code Extent} element for the world, or {@code false} if optional.
*/
public static void assertIsWGS84(final GeodeticDatum datum, final boolean isExtentMandatory) {
assertEquals("name", "World Geodetic System 1984", datum.getName().getCode());
@@ -234,11 +234,11 @@ public final strictfp class GeodeticObje
* <td>{@linkplain #assertIsGeodetic2D(EllipsoidalCS, boolean) Is for a 2D geodetic CRS}</td></tr>
* </table>
*
- * @param crs The coordinate reference system to verify.
- * @param isExtentMandatory {@code true} if the CRS and datum domains of validity are required to contain an
- * {@code Extent} element for the world, or {@code false} if optional.
- * @param isRangeMandatory {@code true} if the coordinate system axes range and range meaning properties
- * shall be defined, or {@code false} if they are optional.
+ * @param crs the coordinate reference system to verify.
+ * @param isExtentMandatory {@code true} if the CRS and datum domains of validity are required to contain an
+ * {@code Extent} element for the world, or {@code false} if optional.
+ * @param isRangeMandatory {@code true} if the coordinate system axes range and range meaning properties
+ * shall be defined, or {@code false} if they are optional.
*/
public static void assertIsWGS84(final GeodeticCRS crs, final boolean isExtentMandatory, final boolean isRangeMandatory) {
assertEquals("name", "WGS 84", crs.getName().getCode());
@@ -262,9 +262,9 @@ public final strictfp class GeodeticObje
* <td>{@linkplain #assertIsWorld(GeographicBoundingBox) Is world} or absent</td></tr>
* </table>
*
- * @param datum The datum to verify.
- * @param isExtentMandatory {@code true} if the domain of validity is required to contain an {@code Extent} element
- * for the world, or {@code false} if optional.
+ * @param datum the datum to verify.
+ * @param isExtentMandatory {@code true} if the domain of validity is required to contain an
+ * {@code Extent} element for the world, or {@code false} if optional.
*/
public static void assertIsMeanSeaLevel(final VerticalDatum datum, final boolean isExtentMandatory) {
assertEquals("name", "Mean Sea Level", datum.getName().getCode());
@@ -300,7 +300,7 @@ public final strictfp class GeodeticObje
* <td>{@code null}</td>
* </table>
*
- * @param cs The coordinate system to verify.
+ * @param cs the coordinate system to verify.
*/
public static void assertIsProjected2D(final CartesianCS cs) {
assertEquals("dimension", 2, cs.getDimension());
@@ -353,9 +353,9 @@ public final strictfp class GeodeticObje
* because the classical symbols (φ,λ) are often replaced by (lat,long).</li>
* </ul>
*
- * @param cs The coordinate system to verify.
- * @param isRangeMandatory {@code true} if the axes range and range meaning properties shall be defined,
- * or {@code false} if they are optional.
+ * @param cs the coordinate system to verify.
+ * @param isRangeMandatory {@code true} if the axes range and range meaning properties shall be defined,
+ * or {@code false} if they are optional.
*/
public static void assertIsGeodetic2D(final EllipsoidalCS cs, final boolean isRangeMandatory) {
assertEquals("dimension", 2, cs.getDimension());
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -96,9 +96,9 @@ public final strictfp class DefaultCompo
/**
* Verifies the components of the CRS created by {@link #testConstructionAndSerialization()}.
*
- * @param crs2 The expected two-dimensional component (for the 2 first axes).
- * @param crs3 The expected three-dimensional component.
- * @param crs4 The four-dimensional compound CRS to test.
+ * @param crs2 the expected two-dimensional component (for the 2 first axes).
+ * @param crs3 the expected three-dimensional component.
+ * @param crs4 the four-dimensional compound CRS to test.
*/
private static void verifyComponents(final DefaultGeographicCRS crs2,
final DefaultCompoundCRS crs3,
@@ -262,7 +262,7 @@ public final strictfp class DefaultCompo
/**
* Tests (un)marshalling of a derived coordinate reference system.
*
- * @throws JAXBException If an error occurred during (un)marshalling.
+ * @throws JAXBException if an error occurred during (un)marshalling.
*
* @since 0.7
*/
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -49,7 +49,7 @@ import static org.apache.sis.test.Refere
* @module
*/
@DependsOn({
- DefaultProjectedCRSTest.class, // Has many similarities with DerivedCRS, but is simpler.
+ DefaultProjectedCRSTest.class, // Has many similarities with DerivedCRS, but is simpler.
DefaultConversionTest.class
})
public final strictfp class DefaultDerivedCRSTest extends XMLTestCase {
@@ -217,7 +217,7 @@ public final strictfp class DefaultDeriv
/**
* Tests (un)marshalling of a derived coordinate reference system.
*
- * @throws JAXBException If an error occurred during (un)marshalling.
+ * @throws JAXBException if an error occurred during (un)marshalling.
*
* @since 0.7
*/
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -50,7 +50,7 @@ public final strictfp class DefaultGeode
/**
* Tests (un)marshalling of a geodetic coordinate reference system.
*
- * @throws JAXBException If an error occurred during unmarshalling.
+ * @throws JAXBException if an error occurred during unmarshalling.
*/
@Test
public void testXML() throws JAXBException {
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -465,7 +465,7 @@ public final strictfp class DefaultProje
* Tests (un)marshalling of a projected coordinate reference system.
*
* @throws FactoryException if the CRS creation failed.
- * @throws JAXBException If an error occurred during (un)marshalling.
+ * @throws JAXBException if an error occurred during (un)marshalling.
*/
@Test
public void testXML() throws FactoryException, JAXBException {
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/AbstractCSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/AbstractCSTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/AbstractCSTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/AbstractCSTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -47,9 +47,9 @@ public final strictfp class AbstractCSTe
/**
* Gets a coordinate system for the given axes convention and compare against the expected values.
*
- * @param convention The convention to use.
- * @param cs The coordinate system to test.
- * @param expected The expected axes, in order.
+ * @param convention the convention to use.
+ * @param cs the coordinate system to test.
+ * @param expected the expected axes, in order.
*/
private static void verifyAxesConvention(final AxesConvention convention, final AbstractCS cs,
final CoordinateSystemAxis... expected)
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -201,7 +201,7 @@ public final strictfp class DefaultCarte
/**
* Tests (un)marshalling of a Cartesian coordinate system.
*
- * @throws JAXBException If an error occurred during unmarshalling.
+ * @throws JAXBException if an error occurred during unmarshalling.
*/
@Test
public void testXML() throws JAXBException {
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -116,7 +116,7 @@ public final strictfp class DefaultEllip
/**
* Tests (un)marshalling of an ellipsoidal coordinate system.
*
- * @throws JAXBException If an error occurred during unmarshalling.
+ * @throws JAXBException if an error occurred during unmarshalling.
*/
@Test
public void testXML() throws JAXBException {
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -204,7 +204,7 @@ public final strictfp class DefaultGeode
/**
* Tests marshalling.
*
- * @throws JAXBException If an error occurred during marshalling.
+ * @throws JAXBException if an error occurred during marshalling.
*/
@Test
public void testMarshalling() throws JAXBException {
@@ -238,8 +238,8 @@ public final strictfp class DefaultGeode
* <p>This method is part of a chain.
* The next method is {@link #testUnmarshalledWKT()}.</p>
*
- * @return The unmarshalled datum.
- * @throws JAXBException If an error occurred during unmarshalling.
+ * @return the unmarshalled datum.
+ * @throws JAXBException if an error occurred during unmarshalling.
*/
@TestStep
public DefaultGeodeticDatum testUnmarshalling() throws JAXBException {
@@ -265,7 +265,7 @@ public final strictfp class DefaultGeode
/**
* Tests the WKT formatting of the datum created by {@link #testUnmarshalling()}.
*
- * @throws JAXBException If an error occurred during unmarshalling.
+ * @throws JAXBException if an error occurred during unmarshalling.
*/
@Test
@DependsOnMethod("testToWKT")
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -117,7 +117,7 @@ public final strictfp class DefaultPrime
/**
* Tests marshalling in the default namespace.
*
- * @throws JAXBException If an error occurred during marshalling.
+ * @throws JAXBException if an error occurred during marshalling.
*/
@Test
public void testMarshall() throws JAXBException {
@@ -128,7 +128,7 @@ public final strictfp class DefaultPrime
/**
* Tests marshalling in the GML 3.1 namespace.
*
- * @throws JAXBException If an error occurred during marshalling.
+ * @throws JAXBException if an error occurred during marshalling.
*/
@Test
@DependsOnMethod("testMarshall")
@@ -145,7 +145,7 @@ public final strictfp class DefaultPrime
/**
* Tests unmarshalling.
*
- * @throws JAXBException If an error occurred during unmarshalling.
+ * @throws JAXBException if an error occurred during unmarshalling.
*
* @see <a href="http://epsg-registry.org/export.htm?gml=urn:ogc:def:meridian:EPSG::8901">GML export of EPSG:8901</a>
*/
@@ -158,7 +158,7 @@ public final strictfp class DefaultPrime
/**
* Tests marshalling in the GML 3.1 namespace.
*
- * @throws JAXBException If an error occurred during unmarshalling.
+ * @throws JAXBException if an error occurred during unmarshalling.
*/
@Test
@DependsOnMethod("testUnmarshall")
@@ -175,7 +175,7 @@ public final strictfp class DefaultPrime
/**
* Tests unmarshalling of Paris prime meridian.
*
- * @throws JAXBException If an error occurred during unmarshalling.
+ * @throws JAXBException if an error occurred during unmarshalling.
*/
@Test
@DependsOnMethod({"testUnmarshall", "testMarshall", "testWKT_inGrads"})
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -95,7 +95,7 @@ public final strictfp class DefaultTempo
/**
* Tests XML marshalling.
*
- * @throws JAXBException If an error occurred during marshalling.
+ * @throws JAXBException if an error occurred during marshalling.
*/
@Test
public void testMarshalling() throws JAXBException {
@@ -106,7 +106,7 @@ public final strictfp class DefaultTempo
/**
* Tests XML unmarshalling.
*
- * @throws JAXBException If an error occurred during unmarshalling.
+ * @throws JAXBException if an error occurred during unmarshalling.
*/
@Test
public void testUnmarshalling() throws JAXBException {
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -101,7 +101,7 @@ public final strictfp class DefaultVerti
/**
* Tests XML (un)marshalling.
*
- * @throws JAXBException If an error occurred during (un)marshalling.
+ * @throws JAXBException if an error occurred during (un)marshalling.
*/
@Test
public void testXML() throws JAXBException {
@@ -128,7 +128,7 @@ public final strictfp class DefaultVerti
/**
* Tests (un)marshalling of an older version, GML 3.1.
*
- * @throws JAXBException If an error occurred during unmarshalling.
+ * @throws JAXBException if an error occurred during unmarshalling.
*
* @see <a href="http://issues.apache.org/jira/browse/SIS-160">SIS-160: Need XSLT between GML 3.1 and 3.2</a>
*/
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/PrimeMeridianMock.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/PrimeMeridianMock.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/PrimeMeridianMock.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/PrimeMeridianMock.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -48,7 +48,7 @@ final strictfp class PrimeMeridianMock e
/**
* Returns the longitude of this prime meridian relative to Greenwich.
*
- * @return The prime meridian longitude.
+ * @return the prime meridian longitude.
*/
@Override
public double getGreenwichLongitude() {
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/TimeDependentBWPTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/TimeDependentBWPTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/TimeDependentBWPTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/TimeDependentBWPTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -126,8 +126,8 @@ public final strictfp class TimeDependen
* EPSG documentation truncates the numerical values given in their example, so it is normal that we have a
* slight difference.
*
- * @param actual The coordinates calculated by the matrix, or {@code null} for comparing against
- * the EPSG expected values.
+ * @param actual the coordinates calculated by the matrix, or {@code null} for comparing against
+ * the EPSG expected values.
*/
private void compareWithExplicitCalculation(final Matrix actual) {
/*
@@ -166,7 +166,7 @@ public final strictfp class TimeDependen
assertEquals("Y", Yt, actual.getElement(1, 0), 0.0005);
assertEquals("Z", Zt, actual.getElement(2, 0), 0.0005);
} else {
- assertEquals("X", -3789470.008, Xt, 0.013); // Smallest tolerance value such as the test do not fail.
+ assertEquals("X", -3789470.008, Xt, 0.013); // Smallest tolerance value such as the test do not fail.
assertEquals("Y", 4841770.685, Yt, 0.009);
assertEquals("Z", -1690895.103, Zt, 0.003);
}
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryMock.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryMock.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryMock.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryMock.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -154,7 +154,7 @@ public final strictfp class AuthorityFac
/**
* Returns the unit of measurement for the given code.
*
- * @return The unit of measurement.
+ * @return the unit of measurement.
* @throws NoSuchAuthorityCodeException if the given code is unknown.
*/
@Override
@@ -176,7 +176,7 @@ public final strictfp class AuthorityFac
/**
* Returns the spatial extent for the given code.
*
- * @return The spatial extent.
+ * @return the spatial extent.
* @throws NoSuchAuthorityCodeException if the given code is unknown.
*/
@Override
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2004.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2004.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2004.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2004.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -94,8 +94,8 @@ public final strictfp class GIGS2004 ext
/**
* Removes the accented characters from the object name, so it can be compared against the expected name.
*
- * @param object The object from which to get a name than can be verified against the expected name.
- * @return The name of the given object, eventually modified in order to match the expected name.
+ * @param object the object from which to get a name than can be verified against the expected name.
+ * @return the name of the given object, eventually modified in order to match the expected name.
*/
@Override
protected String getVerifiableName(final IdentifiedObject object) {
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGDataFormatter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGDataFormatter.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGDataFormatter.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGDataFormatter.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -27,6 +27,7 @@ import java.io.Writer;
import java.io.BufferedWriter;
import java.io.OutputStreamWriter;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.sql.Connection;
import java.sql.SQLException;
import javax.sql.DataSource;
@@ -37,9 +38,6 @@ import org.apache.sis.util.CharSequences
import org.apache.sis.internal.metadata.sql.ScriptRunner;
import org.apache.sis.internal.metadata.sql.TestDatabase;
-// Branch-dependent imports
-import java.nio.charset.StandardCharsets;
-
/**
* Rewrites the {@code INSERT TO ...} statements in a SQL script in a more compact form.
@@ -131,7 +129,7 @@ public final class EPSGDataFormatter ext
* <li>{@code core/sis-referencing/src/main/resources/org/apache/sis/referencing/factory/sql/Data.sql}</li>
* </ol>
*
- * @param arguments The source files and the destination file.
+ * @param arguments the source files and the destination file.
* @throws Exception if an error occurred while reading of writing the file.
*/
@SuppressWarnings("UseOfSystemOutOrSystemErr")
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -258,8 +258,8 @@ public final strictfp class CoordinateOp
* Implementation of {@link #testGeocentricTranslationInGeographic2D()}
* and {@link #testGeocentricTranslationInGeographic3D()}.
*
- * @param sourceCRS The NAD27 geographic CRS.
- * @param targetCRS Either the two-dimensional or the three-dimensional geographic CRS using WGS84 datum.
+ * @param sourceCRS the NAD27 geographic CRS.
+ * @param targetCRS either the two-dimensional or the three-dimensional geographic CRS using WGS84 datum.
*/
private void testGeocentricTranslationInGeographicDomain(final String method,
final GeographicCRS sourceCRS, final GeographicCRS targetCRS)
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -310,8 +310,8 @@ public final strictfp class CoordinateOp
/**
* Verifies a coordinate operation which is expected to be <cite>"NTF (Paris) to WGS 84 (1)"</cite> (EPSG:8094).
*
- * @param domain either {@code "geog2D domain"} or either {@code "geog3D domain"}.
- * @param isEPSG {@code true} if the coordinate operation is expected to contain EPSG identifiers.
+ * @param domain either {@code "geog2D domain"} or either {@code "geog3D domain"}.
+ * @param isEPSG {@code true} if the coordinate operation is expected to contain EPSG identifiers.
*/
private static void verifyNTF(final CoordinateOperation operation, final String domain, final boolean isEPSG) {
assertInstanceOf("Operation should have two steps.", ConcatenatedOperation.class, operation);
@@ -351,8 +351,8 @@ public final strictfp class CoordinateOp
* or the addition of height. In such case the modified object is not allowed to have the EPSG identifier of the
* original object.
*
- * @param name The expected EPSG name.
- * @param object The object to verify.
+ * @param name the expected EPSG name.
+ * @param object the object to verify.
*/
private static void assertEpsgNameWithoutIdentifierEqual(final String name, final IdentifiedObject object) {
assertNotNull(name, object);
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -76,9 +76,9 @@ public final strictfp class DefaultConve
* but with the prime meridian optionally set to Greenwich. Such CRS is not in real usage, but this is convenient
* for testing a conversion consisting of only a longitude rotation, which is a very simple operation easy to test.
*
- * @param isSource {@code true} if creating the source CRS, or {@code false} if creating the target CRS.
- * @param cs {@link HardCodedCS#GEODETIC_2D}, {@link HardCodedCS#GEODETIC_φλ} or other compatible coordinate system.
- * @param useGreenwich {@code true} for using Greenwich prime meridian, or {@code false} for staying on the Paris one.
+ * @param isSource {@code true} if creating the source CRS, or {@code false} if creating the target CRS.
+ * @param cs {@link HardCodedCS#GEODETIC_2D}, {@link HardCodedCS#GEODETIC_φλ} or other compatible coordinate system.
+ * @param useGreenwich {@code true} for using Greenwich prime meridian, or {@code false} for staying on the Paris one.
*
* @see HardCodedCRS#NTF
*/
@@ -110,8 +110,8 @@ public final strictfp class DefaultConve
* change the prime meridian). However we handle them as conversions for testing purpose only, because the
* longitude rotation is a very simple operation easy to test.</p>
*
- * @param useGreenwich {@code true} for using Greenwich prime meridian in the {@code targetCRS},
- * or {@code false} for staying on the Paris one.
+ * @param useGreenwich {@code true} for using Greenwich prime meridian in the {@code targetCRS},
+ * or {@code false} for staying on the Paris one.
* @return a pseudo-conversion performing a longitude rotation.
*/
public static DefaultConversion createLongitudeRotation(final boolean useGreenwich) {
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -53,12 +53,12 @@ public final strictfp class DefaultOpera
/**
* Creates a new two-dimensional operation method for an operation of the given name and identifier.
*
- * @param method The operation name (example: "Mercator (variant A)").
- * @param identifier The EPSG numeric identifier (example: "9804").
- * @param formula Formula citation (example: "EPSG guidance note #7-2").
- * @param dimension The number of input and output dimension, or {@code null}.
- * @param parameters The parameters (can be empty).
- * @return The operation method.
+ * @param method the operation name (example: "Mercator (variant A)").
+ * @param identifier the EPSG numeric identifier (example: "9804").
+ * @param formula formula citation (example: "EPSG guidance note #7-2").
+ * @param dimension the number of input and output dimension, or {@code null}.
+ * @param parameters the parameters (can be empty).
+ * @return the operation method.
*/
static DefaultOperationMethod create(final String method, final String identifier, final String formula,
final Integer dimension, final ParameterDescriptor<?>... parameters)
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -52,7 +52,7 @@ public final strictfp class DefaultPassT
/**
* Tests (un)marshalling of a concatenated operation.
*
- * @throws JAXBException If an error occurred during (un)marshalling.
+ * @throws JAXBException if an error occurred during (un)marshalling.
*/
@Test
public void testXML() throws JAXBException {
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -176,10 +176,10 @@ public final strictfp class SingleOperat
* Verify a parameter value. The descriptor is expected to be the same instance than the descriptors
* defined in the {@link ParameterValueGroup} and in the {@link OperationMethod}.
*
- * @param method The method of the enclosing operation.
- * @param group The group which contain the given parameter.
- * @param expectedValue The expected parameter value.
- * @param parameter The parameter to verify.
+ * @param method the method of the enclosing operation.
+ * @param group the group which contain the given parameter.
+ * @param expectedValue the expected parameter value.
+ * @param parameter the parameter to verify.
*/
private static void verifyParameter(final OperationMethod method, final ParameterValueGroup group,
final double expectedValue, final ParameterValue<?> parameter)
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -149,10 +149,10 @@ public final strictfp class LinearTransf
/**
* Implementation of {@link #testExact1D()} and {@link #testNonExact1D()}.
*
- * @param rd The random number generator to use.
- * @param numPts The number of points to generate.
- * @param addErrors {@code true} for adding a random error in the target points.
- * @param scaleTolerance Tolerance threshold for floating point comparisons.
+ * @param rd the random number generator to use.
+ * @param numPts the number of points to generate.
+ * @param addErrors {@code true} for adding a random error in the target points.
+ * @param scaleTolerance tolerance threshold for floating point comparisons.
*/
private static void test1D(final Random rd, final int numPts, final boolean addErrors,
final double scaleTolerance, final double translationTolerance)
@@ -185,10 +185,10 @@ public final strictfp class LinearTransf
/**
* Implementation of {@link #testExact2D()} and {@link #testNonExact2D()}.
*
- * @param rd The random number generator to use.
- * @param numPts The number of points to generate.
- * @param addErrors {@code true} for adding a random error in the target points.
- * @param scaleTolerance Tolerance threshold for floating point comparisons.
+ * @param rd the random number generator to use.
+ * @param numPts the number of points to generate.
+ * @param addErrors {@code true} for adding a random error in the target points.
+ * @param scaleTolerance tolerance threshold for floating point comparisons.
*/
private static void test2D(final Random rd, final int numPts, final boolean addErrors,
final double scaleTolerance, final double translationTolerance)
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix3Test.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix3Test.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix3Test.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix3Test.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -76,7 +76,7 @@ public final strictfp class Matrix3Test
* Verifies our claim that {@code A.solve(B)} is equivalent to {@code A.inverse().multiply(B)}.
* This claim is documented in {@link MatrixSIS#solve(Matrix)} javadoc.
*
- * @throws NoninvertibleMatrixException Should not happen.
+ * @throws NoninvertibleMatrixException should not happen.
*/
@Test
public void testSolveEquivalence() throws NoninvertibleMatrixException {
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix4Test.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix4Test.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix4Test.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix4Test.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -82,11 +82,11 @@ public final strictfp class Matrix4Test
/**
* Tests the accuracy of a chain of matrix operations.
*
- * @throws NoninvertibleMatrixException Should never happen.
+ * @throws NoninvertibleMatrixException should never happen.
*/
@Test
public void testAccuracy() throws NoninvertibleMatrixException {
- final double parisMeridian = 2 + (20 + 13.82/60)/60; // Paris meridian: 2°20'13.82"
+ final double parisMeridian = 2 + (20 + 13.82/60)/60; // Paris meridian: 2°20'13.82"
final double toRadians = StrictMath.PI / 180;
/*
* Gradians to degrees with a Prime Meridian shift
@@ -95,7 +95,7 @@ public final strictfp class Matrix4Test
final Matrix4 step1 = new Matrix4(
0.9, 0, 0, parisMeridian,
0, 0.9, 0, 0,
- 0, 0, 0.8, 0, // Random conversion factor for z values.
+ 0, 0, 0.8, 0, // Random conversion factor for z values.
0, 0, 0, 1);
/*
* Degrees to radians with swapping of (longitude, latitude) axes
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -335,7 +335,7 @@ public abstract strictfp class MatrixTes
for (int j=0; j<numRow; j++) {
for (int i=0; i<numCol; i++) {
final double element = clone.getElement(j,i);
- clone.setElement(j, i, random.nextDouble() - 2); // Negative value is guaranteed to be different.
+ clone.setElement(j, i, random.nextDouble() - 2); // Negative value is guaranteed to be different.
assertFalse(matrix.equals(clone));
assertFalse(clone.equals(matrix));
clone.setElement(j, i, element);
@@ -398,7 +398,7 @@ public abstract strictfp class MatrixTes
*
* @param matrix the matrix of size 3×3 to test.
* @param withShear {@code true} for including shear in the matrix to test.
- * This value can be set to {@code false} if the subclass want to test a simpler case.
+ * This value can be set to {@code false} if the subclass want to test a simpler case.
*
* @since 0.6
*/
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/Benchmark.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/Benchmark.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/Benchmark.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/Benchmark.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -174,8 +174,8 @@ public final class Benchmark {
/**
* Creates a decomposition of the given map projection.
*
- * @param label a label for display purpose.
- * @param projection the map projection to benchmark.
+ * @param label a label for display purpose.
+ * @param projection the map projection to benchmark.
*/
private Transforms(final String label, final MathTransform projection) {
this.projection = projection;
@@ -245,8 +245,8 @@ public final class Benchmark {
/**
* Runs the benchmark.
*
- * @param kernelOnly {@code true} for measuring the performance of only the non-linear part,
- * or {@code false} for measuring the performance of the whole projection.
+ * @param kernelOnly {@code true} for measuring the performance of only the non-linear part,
+ * or {@code false} for measuring the performance of the whole projection.
*/
private void run(final boolean kernelOnly) throws TransformException {
if (kernelOnly) {
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -136,7 +136,7 @@ public final strictfp class ConformalPro
/**
* Computes {@link ConformalProjection#expOfNorthing(double, double)} for the given latitude.
*
- * @param φ The latitude in radians.
+ * @param φ the latitude in radians.
* @return {@code Math.exp} of the Mercator projection of the given latitude.
*/
private double expOfNorthing(final double φ) {
@@ -146,8 +146,8 @@ public final strictfp class ConformalPro
/**
* Computes {@link ConformalProjection#expOfNorthing(double, double)} for the given latitude.
*
- * @param projection The projection on which to invoke {@code expOfNorthing(…)}.
- * @param φ The latitude in radians.
+ * @param projection the projection on which to invoke {@code expOfNorthing(…)}.
+ * @param φ the latitude in radians.
* @return {@code Math.exp} of the Mercator projection of the given latitude.
*/
private static double expOfNorthing(final ConformalProjection projection, final double φ) {
@@ -165,10 +165,10 @@ public final strictfp class ConformalPro
@Test
@DependsOnMethod("testMath")
public void testExpOfNorthing() {
- transform = new NoOp(false); // Spherical case
+ transform = new NoOp(false); // Spherical case
tolerance = TOLERANCE;
doTestExpOfNorthing();
- transform = new NoOp(true); // Ellipsoidal case
+ transform = new NoOp(true); // Ellipsoidal case
doTestExpOfNorthing();
}
@@ -181,8 +181,8 @@ public final strictfp class ConformalPro
@DependsOnMethod("testExpOfNorthing")
public void test_dy_dφ() throws TransformException {
tolerance = 1E-7;
- doTest_dy_dφ(new NoOp(false)); // Spherical case
- doTest_dy_dφ(new NoOp(true)); // Ellipsoidal case
+ doTest_dy_dφ(new NoOp(false)); // Spherical case
+ doTest_dy_dφ(new NoOp(true)); // Ellipsoidal case
}
/**
@@ -199,7 +199,7 @@ public final strictfp class ConformalPro
return projection.dy_dφ(sinφ, cos(φ)) * expOfNorthing(projection, φ);
}
};
- verifyInDomain(-89 * (PI/180), 89 * (PI/180)); // Verify from 85°S to 85°N.
+ verifyInDomain(-89 * (PI/180), 89 * (PI/180)); // Verify from 85°S to 85°N.
}
/**
@@ -209,17 +209,17 @@ public final strictfp class ConformalPro
derivativeDeltas = new double[] {2E-8};
isInverseTransformSupported = false;
verifyInDomain(
- new double[] {min}, // Minimal value to test.
- new double[] {max}, // Maximal value to test.
- new int[] {100}, // Number of points to test.
+ new double[] {min}, // Minimal value to test.
+ new double[] {max}, // Maximal value to test.
+ new int[] {100}, // Number of points to test.
TestUtilities.createRandomNumberGenerator());
}
/**
* Computes {@link ConformalProjection#φ(double)}.
*
- * @param expOfSouthing The reciprocal of the value returned by {@link #expOfNorthing(double)}.
- * @return The latitude in radians.
+ * @param expOfSouthing the reciprocal of the value returned by {@link #expOfNorthing(double)}.
+ * @return the latitude in radians.
* @throws ProjectionException if the iteration does not converge.
*/
private double φ(final double expOfSouthing) throws ProjectionException {
@@ -237,10 +237,10 @@ public final strictfp class ConformalPro
@Test
@DependsOnMethod("testExpOfNorthing")
public void test_φ() throws ProjectionException {
- transform = new NoOp(false); // Spherical case
+ transform = new NoOp(false); // Spherical case
tolerance = TOLERANCE;
doTest_φ();
- transform = new NoOp(true); // Ellipsoidal case
+ transform = new NoOp(true); // Ellipsoidal case
tolerance = NormalizedProjection.ITERATION_TOLERANCE;
doTest_φ();
}
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -74,8 +74,8 @@ public final strictfp class LambertConic
* Creates a new instance of {@link LambertConicConformal}. See the class javadoc for an explanation
* about why we ask only for the latitude of origin and not the standard parallels.
*
- * @param ellipse {@code false} for a sphere, or {@code true} for WGS84 ellipsoid.
- * @param latitudeOfOrigin The latitude of origin, in decimal degrees.
+ * @param ellipse {@code false} for a sphere, or {@code true} for WGS84 ellipsoid.
+ * @param latitudeOfOrigin the latitude of origin, in decimal degrees.
*/
private void createNormalizedProjection(final boolean ellipse, final double latitudeOfOrigin) {
final LambertConformal1SP method = new LambertConformal1SP();
@@ -313,7 +313,7 @@ public final strictfp class LambertConic
@Test
@DependsOnMethod({"testSpecialLatitudes", "testDerivative"})
public void testSphericalCase() throws FactoryException, TransformException {
- createNormalizedProjection(false, 40); // Spherical case
+ createNormalizedProjection(false, 40); // Spherical case
testSpecialLatitudes();
testDerivative();
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -203,7 +203,7 @@ abstract strictfp class MapProjectionTes
{
transform = ProjectionResultComparator.sphericalAndEllipsoidal(transform);
if (derivativeDeltas == null) {
- final double delta = toRadians(100.0 / 60) / 1852; // Approximatively 100 metres.
+ final double delta = toRadians(100.0 / 60) / 1852; // Approximatively 100 metres.
derivativeDeltas = new double[] {delta, delta};
}
verifyInDomain(domain, randomSeed);
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -79,7 +79,7 @@ public final class MercatorMethodCompari
* Reminder: the eccentricity of a sphere is 0.
*/
public MercatorMethodComparison() {
- this(0.00669437999014133); // Squared eccentricity.
+ this(0.00669437999014133); // Squared eccentricity.
}
/**
@@ -94,7 +94,7 @@ public final class MercatorMethodCompari
/**
* Creates a new instance for the given squared eccentricity.
*
- * @param e2 the square of the eccentricity.
+ * @param e2 the square of the eccentricity.
*/
public MercatorMethodComparison(final double e2) {
eccentricity = sqrt(e2);
@@ -120,7 +120,7 @@ public final class MercatorMethodCompari
*/
public double bySeriesExpansion(final double t) {
final double χ = PI/2 - 2*atan(t);
- return c8χ * sin(8*χ) + // Add the smallest values first for reducing rounding errors.
+ return c8χ * sin(8*χ) + // Add the smallest values first for reducing rounding errors.
c6χ * sin(6*χ) +
c4χ * sin(4*χ) +
c2χ * sin(2*χ) + χ;
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -53,7 +53,7 @@ public final strictfp class MercatorTest
* Creates a new instance of {@link Mercator} for a sphere or an ellipsoid.
* The new instance is stored in the inherited {@link #transform} field.
*
- * @param ellipse {@code false} for a sphere, or {@code true} for WGS84 ellipsoid.
+ * @param ellipse {@code false} for a sphere, or {@code true} for WGS84 ellipsoid.
*/
private void createNormalizedProjection(final boolean ellipse) {
final Mercator2SP method = new Mercator2SP();
@@ -132,7 +132,7 @@ public final strictfp class MercatorTest
*/
@Test
public void testSpecialLatitudes() throws ProjectionException {
- if (transform == null) { // May have been initialized by 'testSphericalCase'.
+ if (transform == null) { // May have been initialized by 'testSphericalCase'.
createNormalizedProjection(true); // Elliptical case
}
assertEquals ("Not a number", NaN, transform(NaN), tolerance);
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NoOp.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NoOp.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NoOp.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NoOp.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -42,7 +42,7 @@ final strictfp class NoOp extends Confor
/**
* Creates a new "no-operation".
*
- * @param ellipsoidal {@code true} for an ellipsoidal case, or {@code false} for a spherical case.
+ * @param ellipsoidal {@code true} for an ellipsoidal case, or {@code false} for a spherical case.
*/
NoOp(final boolean ellipsoidal) {
this(ellipsoidal, ellipsoidal);
@@ -51,8 +51,8 @@ final strictfp class NoOp extends Confor
/**
* Creates a new "no-operation".
*
- * @param ellipsoidal {@code true} for an ellipsoidal case, or {@code false} for a spherical case.
- * @param declareIvf {@code true} for declaring the inverse flattening factor.
+ * @param ellipsoidal {@code true} for an ellipsoidal case, or {@code false} for a spherical case.
+ * @param declareIvf {@code true} for declaring the inverse flattening factor.
*/
NoOp(final boolean ellipsoidal, final boolean declareIvf) {
this(parameters((ellipsoidal ? GeodeticDatumMock.WGS84 : GeodeticDatumMock.SPHERE).getEllipsoid(), declareIvf));
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -111,7 +111,7 @@ public final strictfp class ObliqueStere
* Creates a new instance of {@link ObliqueStereographic} for a sphere or an ellipsoid.
* The new instance is stored in the inherited {@link #transform} field.
*
- * @param ellipse {@code false} for the spherical case, or {@code true} for the ellipsoidal case.
+ * @param ellipse {@code false} for the spherical case, or {@code true} for the ellipsoidal case.
*/
private void createNormalizedProjection(final boolean ellipse) {
final OperationMethod op = new org.apache.sis.internal.referencing.provider.ObliqueStereographic();
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -49,8 +49,8 @@ public final strictfp class PolarStereog
/**
* Creates a new instance of {@link PolarStereographic}.
*
- * @param ellipse {@code false} for a sphere, or {@code true} for WGS84 ellipsoid.
- * @param latitudeOfOrigin The latitude of origin, in decimal degrees.
+ * @param ellipse {@code false} for a sphere, or {@code true} for WGS84 ellipsoid.
+ * @param latitudeOfOrigin the latitude of origin, in decimal degrees.
*/
private void createNormalizedProjection(final MapProjection method) {
final Parameters parameters = parameters(method, false);
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -45,7 +45,7 @@ public final strictfp class TransverseMe
/**
* Creates a new instance of {@link TransverseMercator}.
*
- * @param ellipse {@code false} for a sphere, or {@code true} for WGS84 ellipsoid.
+ * @param ellipse {@code false} for a sphere, or {@code true} for WGS84 ellipsoid.
*/
private void createNormalizedProjection(final boolean ellipse, final double latitudeOfOrigin) {
final org.apache.sis.internal.referencing.provider.TransverseMercator method =
|