You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2017/04/05 09:26:15 UTC
svn commit: r1790195 [5/7] - in /sis/trunk: ./
application/sis-console/src/main/java/org/apache/sis/console/
application/sis-webapp/src/main/java/org/apache/sis/index/tree/
application/sis-webapp/src/main/java/org/apache/sis/services/
core/sis-feature/...
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProviderMock.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProviderMock.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProviderMock.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProviderMock.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -27,7 +27,7 @@ import org.apache.sis.referencing.operat
/**
* Base class of mock provider for coordinate operations not yet implemented in Apache SIS.
* This is used for operations needed for executing some Well Known Text (WKT) parsing tests
- * in the {@link org.apache.sis.io.wkt.WKTParserTest} class, without doing any real coordinate
+ * in the {@code org.apache.sis.io.wkt.WKTParserTest} class, without doing any real coordinate
* operations with the parsed objects.
*
* <p>Subclasses may be promoted to a real operation if we implement their formulas in a future Apache SIS version.</p>
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/SeismicBinGridMock.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/SeismicBinGridMock.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/SeismicBinGridMock.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/SeismicBinGridMock.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -26,7 +26,7 @@ import org.apache.sis.measure.Units;
* The provider for <cite>"P6 (I = J-90�) seismic bin grid transformation"</cite> transformation (EPSG:1049).
*
* This conversion is not yet implemented in Apache SIS, but we need to at least accept the parameters
- * for a Well Known Text (WKT) parsing test in the {@link org.apache.sis.io.wkt.WKTParserTest} class.
+ * for a Well Known Text (WKT) parsing test in the {@code org.apache.sis.io.wkt.WKTParserTest} class.
*
* <p>This class may be promoted to a real operation if we implement the formulas in a future Apache SIS version.</p>
*
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/TopocentricConversionMock.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/TopocentricConversionMock.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/TopocentricConversionMock.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/TopocentricConversionMock.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -26,7 +26,7 @@ import org.apache.sis.measure.Units;
* The provider for <cite>"Geographic/topocentric conversions"</cite> conversion (EPSG:9837).
*
* This conversion is not yet implemented in Apache SIS, but we need to at least accept the parameters
- * for a Well Known Text (WKT) parsing test in the {@link org.apache.sis.io.wkt.WKTParserTest} class.
+ * for a Well Known Text (WKT) parsing test in the {@code org.apache.sis.io.wkt.WKTParserTest} class.
*
* <p>This class may be promoted to a real operation if we implement the formulas in a future Apache SIS version.</p>
*
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/TransverseMercatorTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/TransverseMercatorTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/TransverseMercatorTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/TransverseMercatorTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -37,7 +37,7 @@ import static org.junit.Assert.*;
*/
public final strictfp class TransverseMercatorTest extends TestCase {
/**
- * Tests {@link TransverseMercator.Zoner#zone(double)},
+ * Tests {@link TransverseMercator.Zoner#zone(double, double)},
* including the special cases for Norway and Svalbard.
*/
@Test
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -129,11 +129,13 @@ public final strictfp class GeodeticObje
* Asserts that the name and (optionally) the EPSG identifier of the given object are equal to the given strings.
* As a special case if the given EPSG code is 0, then this method verifies that the given object has no identifier.
*
- * <p>This method is similar to {@link #assertEpsgNameAndIdentifierEqual(String, int, IdentifiedObject)} except
- * that the given name is not necessarily in the EPSG namespace and the EPSG code is allowed to be absent.</p>
+ * <p>This method is similar to {@code assertEpsgNameAndIdentifierEqual(name, epsg, object)} except that
+ * the given name is not necessarily in the EPSG namespace and the EPSG code is allowed to be absent.</p>
*
* @param name the expected name.
* @param epsg the expected EPSG identifier, or {@code 0} if the object shall have no identifier.
+ *
+ * @see org.apache.sis.test.ReferencingAssert#assertEpsgNameAndIdentifierEqual(String, int, IdentifiedObject)
*/
static void assertNameAndIdentifierEqual(final String name, final int epsg, final IdentifiedObject object) {
final String message = object.getClass().getSimpleName();
@@ -493,7 +495,7 @@ public final strictfp class GeodeticObje
}
/**
- * Implementation of {@link #testGeographicCRS()} and {@link #testWithAxisSwapping()}.
+ * Implementation of {@link #testGeographicCRS()} and related test methods.
* This test expects no {@code AUTHORITY} element on any component.
*
* @param swap 1 if axes are expected to be swapped, or 0 otherwise.
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -415,7 +415,7 @@ public final strictfp class DefaultParam
}
/**
- * Tests {@link #equals(Object, ComparisonMode)}.
+ * Tests {@link DefaultParameterValueGroup#equals(Object, ComparisonMode)}.
*
* @since 0.7
*/
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -59,7 +59,7 @@ public strictfp class TensorParametersTe
/**
* The expected parameter names according the WKT 1 convention for the matrix elements.
*
- * @see MatrixParametersTest#NAMES
+ * @see MatrixParametersTest#ALPHANUM_NAMES
*/
static final String[][] ELEMENT_NAMES = {
{"elt_0_0", "elt_0_1", "elt_0_2", "elt_0_3"},
@@ -87,7 +87,7 @@ public strictfp class TensorParametersTe
/**
* The expected parameter identifiers for all matrix elements, or {@code null}�for no identifier.
- * Example: {@link MatrixParametersAlphaNum#IDENTIFIERS}.
+ * Example: {@link MatrixParametersAlphaNumTest#IDENTIFIERS}.
*/
private final short[][] identifiers;
@@ -136,7 +136,7 @@ public strictfp class TensorParametersTe
/**
* Asserts that the given descriptor has the given name.
*
- * @param names the expected parameter name.
+ * @param name the expected parameter name.
* @param defaultValue the expected parameter default value.
* @param actual the actual parameter to verify.
*/
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java [UTF-8] Wed Apr 5 09:26:10 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 identifiers the value for the {@code "identifiers"} property.
*/
private static Map<String,Object> properties(final Set<ReferenceIdentifier> identifiers) {
final Map<String,Object> properties = new HashMap<>(8);
@@ -70,7 +70,7 @@ public final strictfp class AbstractIden
}
/**
- * Validates the given object created by {@link #testCreateFromMap()}.
+ * Validates the given object created by the test methods.
*
* @param object the object to validate.
* @param identifiers the expected value of {@link AbstractIdentifiedObject#getIdentifiers()}.
@@ -97,7 +97,7 @@ public final strictfp class AbstractIden
/**
* Tests the {@link AbstractIdentifiedObject#AbstractIdentifiedObject(Map)} constructor without name.
- * This is invalid and should thrown an exception.
+ * This is invalid and should throw an exception.
*/
@Test
@SuppressWarnings("ResultOfObjectAllocationIgnored")
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -186,7 +186,7 @@ public final strictfp class BuilderTest
}
/**
- * Convenience method creating a namespace for {@link #testScopedName()} purpose.
+ * Convenience method creating a namespace for {@link #testAddNameWithScope()} purpose.
*/
private static NameSpace scope(final NameFactory factory, final String codespace) {
return factory.createNameSpace(factory.createLocalName(null, codespace), null);
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -107,7 +107,7 @@ public final strictfp class NamedIdentif
}
/**
- * Tests the {@link NamedIdentifier#NamedIdentifier(Citation, InternationalString)} constructor.
+ * Tests the {@link NamedIdentifier#NamedIdentifier(Citation, CharSequence)} constructor.
*/
@Test
@DependsOnMethod("testCreateFromCode")
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -148,7 +148,7 @@ public final strictfp class DefaultCompo
}
/**
- * Tests {@link DefaultCompoundCRS#isStandardCompliant()}.
+ * Tests {@link DefaultCompoundCRS#isStandardCompliant(List)}.
*
* @since 0.6
*/
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -108,7 +108,7 @@ public final strictfp class DefaultProje
/**
* Creates the "NTF (Paris) / Lambert zone II" CRS. The prime meridian is always in grads,
* but the axes can be in degrees or in grads depending if the {@code baseCRS} argument is
- * {@link HardCodedCRS.NTF_NORMALIZED_AXES} or {@link HardCodedCRS.NTF} respectively.
+ * {@link HardCodedCRS#NTF_NORMALIZED_AXES} or {@link HardCodedCRS#NTF} respectively.
*
* @see HardCodedCRS#NTF
*/
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -428,7 +428,7 @@ public final strictfp class HardCodedAxe
AxisDirection.FUTURE, Units.DAY, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, null);
/**
- * Axis for column indices in a {@linkplain org.opengis.coverage.grid.GridCoverage grid coverage}.
+ * Axis for column indices in a grid coverage.
* Increasing values go toward {@linkplain AxisDirection#COLUMN_POSITIVE positive column number}.
* The abbreviation is lower case <cite>"i"</cite>.
*/
@@ -436,7 +436,7 @@ public final strictfp class HardCodedAxe
AxisDirection.COLUMN_POSITIVE, Units.UNITY, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, null);
/**
- * Axis for row indices in a {@linkplain org.opengis.coverage.grid.GridCoverage grid coverage}.
+ * Axis for row indices in a grid coverage.
* Increasing values go toward {@linkplain AxisDirection#ROW_POSITIVE positive row number}.
* The abbreviation is lower case <cite>"j"</cite>.
*/
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -45,7 +45,7 @@ import static org.apache.sis.test.Refere
})
public final strictfp class NormalizerTest extends TestCase {
/**
- * Tests {@link Normalizer#sort(CoordinateSystemAxis[])}.
+ * Tests {@link Normalizer#sort(CoordinateSystemAxis[], int)}.
*/
@Test
public void testSort() {
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/HardCodedDatum.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/HardCodedDatum.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/HardCodedDatum.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/HardCodedDatum.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -79,8 +79,7 @@ public final strictfp class HardCodedDat
/**
* WGS 1972 datum (EPSG:6322). Prime meridian is Greenwich.
* This datum is used, together with {@linkplain #WGS84}, in
- * {@linkplain org.apache.sis.referencing.operation.transform.EarthGravitationalModel
- * Earth Gravitational Model}.
+ * {@code org.apache.sis.referencing.operation.transform.EarthGravitationalModel}.
*/
public static final DefaultGeodeticDatum WGS72 = new DefaultGeodeticDatum(
properties("World Geodetic System 1972", "6322", WGS84.getScope()),
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/IdentifiedObjectFinderTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/IdentifiedObjectFinderTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/IdentifiedObjectFinderTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/IdentifiedObjectFinderTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -107,7 +107,7 @@ public final strictfp class IdentifiedOb
}
/**
- * An authority factory to be used by {@link IdentifiedObjectFinderTest#testFindOnCachedInstance()}.
+ * An authority factory to be used by {@link IdentifiedObjectFinderTest#testFindOnCachingInstance()}.
*/
private static final strictfp class Cached extends ConcurrentAuthorityFactory<GeodeticAuthorityFactory>
implements CRSAuthorityFactory
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGDataFormatter.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGDataFormatter.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGDataFormatter.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGDataFormatter.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -234,7 +234,6 @@ public final class EPSGDataFormatter ext
*
* @param inputFile the input file where to read the SQL statements to compact.
* @param outputFile the output file where to write the compacted SQL statements.
- * @param encoding the character encoding for both input and output files.
* @throws IOException if an I/O operation failed.
* @throws SQLException should never happen.
*/
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/AbstractSingleOperationTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/AbstractSingleOperationTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/AbstractSingleOperationTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/AbstractSingleOperationTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -55,7 +55,7 @@ public final strictfp class AbstractSing
}
/**
- * Tests {@link AbstractSingleOperation#checkDimensions(OperationMethod, MathTransform, Map)}
+ * Tests {@link AbstractSingleOperation#checkDimensions(OperationMethod, int, MathTransform, Map)}
* without interpolation dimension.
*/
@Test
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -166,7 +166,7 @@ public final strictfp class DefaultConve
/**
* Asserts that at least some of the properties of the given {@code op} instance have the expected values
- * for an instance created by {@link #createLongitudeRotation(GeographicCRS, GeographicCRS)}.
+ * for an instance created by {@link #createLongitudeRotation(GeographicCRS, GeographicCRS, TemporalCRS)}.
*/
@SuppressWarnings("SuspiciousToArrayCall")
private static void verifyProperties(final DefaultConversion op, final boolean swapSourceAxes) {
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -84,7 +84,8 @@ public final strictfp class DefaultOpera
}
/**
- * Tests the {@link DefaultOperationMethod#DefaultOperationMethod(Map)} constructor.
+ * Tests the {@link DefaultOperationMethod#DefaultOperationMethod(Map, Integer, Integer, ParameterDescriptorGroup)}
+ * constructor.
*/
@Test
public void testConstruction() {
@@ -116,7 +117,7 @@ public final strictfp class DefaultOpera
}
/**
- * Tests {@link DefaultOperationMethod#redimension(OperationMethod, Integer, Integer)}.
+ * Tests {@link DefaultOperationMethod#redimension(OperationMethod, int, int)}.
*/
@Test
@DependsOnMethod({"testConstruction", "testEquals"})
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/GeneralMatrixTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/GeneralMatrixTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/GeneralMatrixTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/GeneralMatrixTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -95,8 +95,8 @@ public final strictfp class GeneralMatri
}
/**
- * Tests {@link MatrixSIS#convertBefore(int, Number, Number)} using {@link AffineTranform}
- * as a reference implementation.
+ * Tests {@link MatrixSIS#convertBefore(int, Number, Number)}
+ * using {@link java.awt.geom.AffineTransform} as a reference implementation.
*
* @since 0.6
*/
@@ -107,8 +107,8 @@ public final strictfp class GeneralMatri
}
/**
- * Tests {@link MatrixSIS#convertAfter(int, Number, Number)} using {@link AffineTranform}
- * as a reference implementation.
+ * Tests {@link MatrixSIS#convertAfter(int, Number, Number)}
+ * using {@link java.awt.geom.AffineTransform} as a reference implementation.
*
* @since 0.6
*/
@@ -119,7 +119,8 @@ public final strictfp class GeneralMatri
}
/**
- * Tests {@link MatrixSIS#multiply(double[])} using {@link AffineTranform} as a reference implementation.
+ * Tests {@link MatrixSIS#multiply(double[])}
+ * using {@link java.awt.geom.AffineTransform} as a reference implementation.
*
* @since 0.8
*/
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix3Test.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix3Test.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix3Test.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix3Test.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -102,8 +102,8 @@ public final strictfp class Matrix3Test
}
/**
- * Tests {@link MatrixSIS#convertBefore(int, Number, Number)} using {@link AffineTranform}
- * as a reference implementation.
+ * Tests {@link MatrixSIS#convertBefore(int, Number, Number)}
+ * using {@link java.awt.geom.AffineTransform} as a reference implementation.
*
* @since 0.6
*/
@@ -113,8 +113,8 @@ public final strictfp class Matrix3Test
}
/**
- * Tests {@link MatrixSIS#convertAfter(int, Number, Number)} using {@link AffineTranform}
- * as a reference implementation.
+ * Tests {@link MatrixSIS#convertAfter(int, Number, Number)}
+ * using {@link java.awt.geom.AffineTransform} as a reference implementation.
*
* @since 0.6
*/
@@ -124,7 +124,8 @@ public final strictfp class Matrix3Test
}
/**
- * Tests {@link MatrixSIS#multiply(double[])} using {@link AffineTranform} as a reference implementation.
+ * Tests {@link MatrixSIS#multiply(double[])}
+ * using {@link java.awt.geom.AffineTransform} as a reference implementation.
*
* @since 0.8
*/
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -391,7 +391,7 @@ public abstract strictfp class MatrixTes
}
/**
- * Tests {@link MatrixSIS#convertBefore(int, Number, Number)} using {@link AffineTranform}
+ * Tests {@link MatrixSIS#convertBefore(int, Number, Number)} using {@link AffineTransform}
* as a reference implementation. This test can be run only with matrices of size 3�3.
* Consequently it is sub-classes responsibility to add a {@code testConvertBefore()} method
* which invoke this method.
@@ -461,7 +461,7 @@ public abstract strictfp class MatrixTes
}
/**
- * Tests {@link MatrixSIS#convertAfter(int, Number, Number)} using {@link AffineTranform}
+ * Tests {@link MatrixSIS#convertAfter(int, Number, Number)} using {@link AffineTransform}
* as a reference implementation. This test can be run only with matrices of size 3�3.
* Consequently it is sub-classes responsibility to add a {@code testConvertAfter()} method
* which invoke this method.
@@ -497,9 +497,10 @@ public abstract strictfp class MatrixTes
}
/**
- * Tests {@link MatrixSIS#multiply(double[])} using {@link AffineTranform} as a reference implementation.
- * This test can be run only with matrices of size 3�3. Consequently it is sub-classes responsibility to
- * add a {@code testMultiplyVector()} method which invoke this method.
+ * Tests {@link MatrixSIS#multiply(double[])} using {@link AffineTransform}
+ * as a reference implementation. This test can be run only with matrices of size 3�3.
+ * Consequently it is sub-classes responsibility to add a {@code testMultiplyVector()}
+ * method which invoke this method.
*
* @param matrix the matrix of size 3�3 to test.
*
@@ -532,7 +533,7 @@ public abstract strictfp class MatrixTes
}
/**
- * Tests {@link MatrixSIS#multiply(Matrix)}.
+ * Tests {@link MatrixSIS#multiply(org.opengis.referencing.operation.Matrix)}.
*/
@Test
@DependsOnMethod("testGetElements")
@@ -567,7 +568,7 @@ public abstract strictfp class MatrixTes
}
/**
- * Tests {@link MatrixSIS#solve(Matrix)}.
+ * Tests {@link MatrixSIS#solve(org.opengis.referencing.operation.Matrix)}.
*
* @throws NoninvertibleMatrixException if the matrix can not be inverted.
*/
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -44,7 +44,7 @@ import static org.apache.sis.test.Assert
@DependsOn(SolverTest.class)
public final strictfp class NonSquareMatrixTest extends MatrixTestCase {
/**
- * Number of rows and columns, initialized by {@link #initialize(String, boolean)}.
+ * Number of rows and columns, initialized by {@link #prepareNewMatrixSize(Random)}.
*/
private int numRow, numCol;
@@ -203,7 +203,7 @@ public final strictfp class NonSquareMat
/**
* Prints the statistics about the differences between JAMA and SIS matrix elements.
- * Those statistics will be visible only if {@link #verbose} is {@code true}.
+ * Those statistics will be visible only if {@link #VERBOSE} is {@code true}.
*/
@AfterClass
public static void printStatistics() {
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/SolverTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/SolverTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/SolverTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/SolverTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -120,7 +120,8 @@ public final strictfp class SolverTest e
}
/**
- * Tests {@link Solver#inverse(MatrixSIS, boolean)} with a square matrix that contains a {@link Double#NaN} value.
+ * Tests {@link Solver#inverse(org.opengis.referencing.operation.Matrix, boolean)}
+ * with a square matrix that contains a {@link Double#NaN} value.
*
* @throws NoninvertibleMatrixException if an unexpected error occurred while inverting the matrix.
*/
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -92,7 +92,7 @@ public final strictfp class ConformalPro
/**
* Implementation of {@link #testExpOfNorthing()}.
- * The {@link #projection} field must have been set before this method is called.
+ * The {@link #transform} field must have been set before this method is called.
*/
private void doTestExpOfNorthing() {
assertEquals("f(NaN) = NaN", NaN, expOfNorthing(NaN), tolerance);
@@ -158,7 +158,7 @@ public final strictfp class ConformalPro
}
/**
- * Tests the {@link NormalizedProjection#expOfNorthing(double, double)} function.
+ * Tests the {@link ConformalProjection#expOfNorthing(double, double)} function.
*
* {@preformat text
* Forward: y = -log(t(\u03c6))
@@ -176,7 +176,7 @@ public final strictfp class ConformalPro
}
/**
- * Tests the {@link NormalizedProjection#dy_d\u03c6(double, double)} method.
+ * Tests the {@link ConformalProjection#dy_d\u03c6(double, double)} method.
*
* @throws TransformException if an error occurred while projecting a point.
*/
@@ -190,7 +190,6 @@ public final strictfp class ConformalPro
/**
* Implementation of {@link #test_dy_d\u03c6()}.
- * The {@link #projection} field must have been set before this method is called.
*/
private void doTest_dy_d\u03c6(final NoOp projection) throws TransformException {
transform = new AbstractMathTransform1D() {
@@ -217,7 +216,7 @@ public final strictfp class ConformalPro
/**
* Tests the {@link ConformalProjection#\u03c6(double)} function. We expect it to be
- * the converse of the {@link NormalizedProjection#expOfNorthing(double, double)} function.
+ * the converse of the {@link ConformalProjection#expOfNorthing(double, double)} function.
* In theory only the [-90� \u2026 +90�] range needs to be tested. However the function is still
* consistent in the [-90� \u2026 +270�] range so we test that range for tracking this fact.
*
@@ -236,7 +235,7 @@ public final strictfp class ConformalPro
/**
* Implementation of {@link #test_\u03c6()}.
- * The {@link #projection} field must have been set before this method is called.
+ * The {@link #transform} field must have been set before this method is called.
*/
private void doTest_\u03c6() throws ProjectionException {
assertEquals("\u03c6(NaN) = NaN", NaN, \u03c6(NaN), tolerance);
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -26,7 +26,6 @@ import org.apache.sis.internal.referenci
import org.apache.sis.internal.referencing.provider.LambertConformal2SP;
import org.apache.sis.internal.referencing.provider.LambertConformalWest;
import org.apache.sis.internal.referencing.provider.LambertConformalBelgium;
-import org.apache.sis.internal.referencing.provider.LambertConformalMichigan;
import org.apache.sis.referencing.operation.transform.CoordinateDomain;
import org.apache.sis.parameter.Parameters;
import org.apache.sis.internal.util.DoubleDouble;
@@ -187,8 +186,6 @@ public final strictfp class LambertConic
*
* @throws FactoryException if an error occurred while creating the map projection.
* @throws TransformException if an error occurred while projecting a coordinate.
- *
- * @see org.opengis.test.referencing.ParameterizedTransformTest#testLambertConicConformal1SP()
*/
@Test
@DependsOnMethod({"testSpecialLatitudes", "testDerivative"})
@@ -202,8 +199,6 @@ public final strictfp class LambertConic
*
* @throws FactoryException if an error occurred while creating the map projection.
* @throws TransformException if an error occurred while projecting a coordinate.
- *
- * @see org.opengis.test.referencing.ParameterizedTransformTest#testLambertConicConformal1SP()
*/
@Test
@DependsOnMethod("testLambertConicConformal1SP")
@@ -217,8 +212,6 @@ public final strictfp class LambertConic
*
* @throws FactoryException if an error occurred while creating the map projection.
* @throws TransformException if an error occurred while projecting a coordinate.
- *
- * @see org.opengis.test.referencing.ParameterizedTransformTest#testLambertConicConformal1SP()
*/
@Test
@DependsOnMethod({"testLambertConicConformal2SP", "verifyBelgeConstant"})
@@ -232,8 +225,6 @@ public final strictfp class LambertConic
*
* @throws FactoryException if an error occurred while creating the map projection.
* @throws TransformException if an error occurred while projecting a coordinate.
- *
- * @see org.opengis.test.referencing.ParameterizedTransformTest#testLambertConicConformalMichigan()
*/
@Test
@DependsOnMethod("testLambertConicConformal2SP")
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -267,7 +267,7 @@ public final class MercatorMethodCompari
*
* @param min the first eccentricity value to test.
* @param max the maximal eccentricity value to test.
- * @throws ProjectionException if an error occurred in {@link #\u03c6(double)}.
+ * @throws ProjectionException if an error occurred in {@link ConformalProjection#\u03c6(double)}.
*/
public static void printErrorForExcentricities(final double min, final double max) throws ProjectionException {
final TableAppender table = new TableAppender(out);
@@ -300,7 +300,7 @@ public final class MercatorMethodCompari
/**
* Compares the performance of the 3 methods.
*
- * @throws ProjectionException if an error occurred in {@link #\u03c6(double)}.
+ * @throws ProjectionException if an error occurred in {@link ConformalProjection#\u03c6(double)}.
*/
private void benchmark() throws ProjectionException {
final Random random = new Random();
@@ -335,7 +335,7 @@ public final class MercatorMethodCompari
* The result is printed to the standard output stream.
*
* @param args ignored.
- * @throws ProjectionException if an error occurred in {@link #\u03c6(double)}.
+ * @throws ProjectionException if an error occurred in {@link ConformalProjection#\u03c6(double)}.
* @throws InterruptedException if the thread has been interrupted between two benchmarks.
*/
public static void main(String[] args) throws ProjectionException, InterruptedException {
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -181,8 +181,6 @@ public final strictfp class MercatorTest
*
* @throws FactoryException if an error occurred while creating the map projection.
* @throws TransformException if an error occurred while projecting a coordinate.
- *
- * @see org.opengis.test.referencing.ParameterizedTransformTest#testMercator1SP()
*/
@Test
@DependsOnMethod({"testSpecialLatitudes", "testDerivative"})
@@ -196,8 +194,6 @@ public final strictfp class MercatorTest
*
* @throws FactoryException if an error occurred while creating the map projection.
* @throws TransformException if an error occurred while projecting a coordinate.
- *
- * @see org.opengis.test.referencing.ParameterizedTransformTest#testMercator2SP()
*/
@Test
@DependsOnMethod("testMercator1SP")
@@ -211,8 +207,6 @@ public final strictfp class MercatorTest
*
* @throws FactoryException if an error occurred while creating the map projection.
* @throws TransformException if an error occurred while projecting a coordinate.
- *
- * @see org.opengis.test.referencing.ParameterizedTransformTest#testMercatorVariantC()
*/
@Test
@DependsOnMethod("testMercator2SP")
@@ -226,8 +220,6 @@ public final strictfp class MercatorTest
*
* @throws FactoryException if an error occurred while creating the map projection.
* @throws TransformException if an error occurred while projecting a coordinate.
- *
- * @see org.opengis.test.referencing.ParameterizedTransformTest#testMercatorSpherical()
*/
@Test
@DependsOnMethod("testMercator1SP")
@@ -241,8 +233,6 @@ public final strictfp class MercatorTest
*
* @throws FactoryException if an error occurred while creating the map projection.
* @throws TransformException if an error occurred while projecting a coordinate.
- *
- * @see org.opengis.test.referencing.ParameterizedTransformTest#testPseudoMercator()
*/
@Test
@DependsOnMethod("testMercatorSpherical")
@@ -256,8 +246,6 @@ public final strictfp class MercatorTest
*
* @throws FactoryException if an error occurred while creating the map projection.
* @throws TransformException if an error occurred while projecting a coordinate.
- *
- * @see org.opengis.test.referencing.ParameterizedTransformTest#testMiller()
*/
@Test
@DependsOnMethod("testMercator1SP")
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -48,9 +48,6 @@ import static java.lang.StrictMath.*;
public final strictfp class PolarStereographicTest extends MapProjectionTestCase {
/**
* 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.
*/
private void createNormalizedProjection(final MapProjection method) {
final Parameters parameters = parameters(method, false);
@@ -123,8 +120,6 @@ public final strictfp class PolarStereog
*
* @throws FactoryException if an error occurred while creating the map projection.
* @throws TransformException if an error occurred while projecting a coordinate.
- *
- * @see org.opengis.test.referencing.ParameterizedTransformTest#testPolarStereographicA()
*/
@Test
public void testPolarStereographicA() throws FactoryException, TransformException {
@@ -137,8 +132,6 @@ public final strictfp class PolarStereog
*
* @throws FactoryException if an error occurred while creating the map projection.
* @throws TransformException if an error occurred while projecting a coordinate.
- *
- * @see org.opengis.test.referencing.ParameterizedTransformTest#testPolarStereographicB()
*/
@Test
public void testPolarStereographicB() throws FactoryException, TransformException {
@@ -151,8 +144,6 @@ public final strictfp class PolarStereog
*
* @throws FactoryException if an error occurred while creating the map projection.
* @throws TransformException if an error occurred while projecting a coordinate.
- *
- * @see org.opengis.test.referencing.ParameterizedTransformTest#testPolarStereographicC()
*/
@Test
public void testPolarStereographicC() throws FactoryException, TransformException {
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -63,8 +63,6 @@ public final strictfp class TransverseMe
*
* @throws FactoryException if an error occurred while creating the map projection.
* @throws TransformException if an error occurred while projecting a coordinate.
- *
- * @see org.opengis.test.referencing.ParameterizedTransformTest#testTransverseMercator()
*/
@Test
public void testTransverseMercator() throws FactoryException, TransformException {
@@ -77,8 +75,6 @@ public final strictfp class TransverseMe
*
* @throws FactoryException if an error occurred while creating the map projection.
* @throws TransformException if an error occurred while projecting a coordinate.
- *
- * @see org.opengis.test.referencing.ParameterizedTransformTest#testTransverseMercatorSouthOrientated()
*/
@Test
@DependsOnMethod("testTransverseMercator")
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -110,8 +110,8 @@ public final strictfp class Concatenated
/**
* Tests the concatenation of a 3D affine transform with a pass-through transform.
- * The {@link ConcatenatedTransform#create(MathTransform, MathTransform)} method
- * should optimize this case.
+ * The {@link ConcatenatedTransform#create(MathTransform, MathTransform, MathTransformFactory)}
+ * method should optimize this case.
*
* @throws FactoryException if an error occurred while creating the math transform to test.
*/
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -33,8 +33,8 @@ import org.junit.Test;
* instead than the real geocentric translation is verified by the following tests:
*
* <ul>
- * <li>{@link GeocentricTranslationTest#testFranceGeocentricInterpolationPoint()}</li>
- * <li>{@link MolodenskyTransformTest#testFranceGeocentricInterpolationPoint()}</li>
+ * <li>{@code GeocentricTranslationTest.testFranceGeocentricInterpolationPoint()}</li>
+ * <li>{@code MolodenskyTransformTest.testFranceGeocentricInterpolationPoint()}</li>
* </ul>
*
* @author Martin Desruisseaux (Geomatys)
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -48,7 +48,6 @@ import static org.opengis.test.Assert.*;
* <p>Various assertion methods:</p>
* <ul>
* <li>{@link #assertCoordinateEquals assertCoordinateEquals(\u2026)} \u2014 from GeoAPI</li>
- * <li>{@link #assertMatrixEquals assertMatrixEquals(\u2026)} \u2014 from GeoAPI</li>
* <li>{@link #assertParameterEquals assertParameterEquals(\u2026)} \u2014 from Apache SIS</li>
* <li>{@link #assertWktEquals assertWktEquals(\u2026)} \u2014 from Apache SIS</li>
* </ul>
@@ -345,8 +344,6 @@ public abstract strictfp class MathTrans
/**
* Prints the current {@linkplain #transform transform} as normal and internal WKT.
* This method is for debugging purpose only.
- *
- * @see #verifyWKT(String)
*/
@Debug
protected final void printInternalWKT() {
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -39,7 +39,7 @@ import static org.apache.sis.test.Assert
/**
- * Tests {@link MolodenskyTransform}. The {@link #compareWithGeocentricTranslation()}
+ * Tests {@link MolodenskyTransform}. The {@code compareWithGeocentricTranslation()}
* method uses {@link EllipsoidToCentricTransform} as a reference implementation.
* The errors compared to geocentric translations should not be greater than
* approximatively 1 centimetre.
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -44,7 +44,7 @@ import org.opengis.test.referencing.Tran
/**
* Tests the {@link ProjectiveTransform} class by inheriting the tests defined in GeoAPI conformance module.
- * We use the {@link AffineTransform2D} class as a reference, so we need to avoid NaN values.
+ * We use the {@link java.awt.geom.AffineTransform} class as a reference, so we need to avoid NaN values.
* Note that {@link CopyTransformTest} will use {@code ProjectiveTransform} as a reference,
* this time with NaN values.
*
Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/HTMLGenerator.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/HTMLGenerator.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/HTMLGenerator.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/HTMLGenerator.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -86,7 +86,7 @@ abstract strictfp class HTMLGenerator im
*
* @param filename the name of the file where to write.
* @param title the document title.
- * @param path path to the CSS file.
+ * @param css path to the CSS file.
* @throws IOException if the file can not be created (e.g. because it already exists).
*/
HTMLGenerator(final String filename, final String title, final String css) throws IOException {
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -49,7 +49,7 @@ import org.apache.sis.util.resources.Err
* from multiple threads.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 0.3
+ * @version 0.8
* @since 0.3
* @module
*/
@@ -473,8 +473,37 @@ public class ConverterRegistry {
}
}
/*
+ * If the source type is a class (not an interface), verify if a converter has been
+ * explicitely registered for that interface. We do not perform this check if the given
+ * sourceClass is already an interface because this case was handled by previous block.
+ * If we find more than one converter for different interface, select the most specific.
+ */
+ if (!sourceClass.isInterface()) {
+ for (final Class<? super S> source : Classes.getAllInterfaces(sourceClass)) {
+ final ObjectConverter<? super S, ? extends T> c = get(new ClassPair<>(source, targetClass));
+ if (c != null) {
+ if (converter != null) {
+ final Class<? super S> previous = converter.getSourceClass();
+ if (source.isAssignableFrom(previous)) {
+ continue; // Previous type was more specific \u2013 keep it.
+ } else if (!previous.isAssignableFrom(source)) {
+ converter = null;
+ break; // No relationship between the two types \u2013 abort.
+ }
+ // This type is more specific \u2013 take it instead than the previous type.
+ }
+ converter = c;
+ }
+ }
+ if (converter != null) {
+ put(key, converter);
+ return converter;
+ }
+ }
+ /*
* No converter found. Gives a chance to subclasses to provide dynamically-generated
- * converter.
+ * converter. The SystemRegistry subclass provides special cases, including from any
+ * object to String.
*/
converter = createConverter(sourceClass, targetClass);
if (converter != null) {
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -89,7 +89,7 @@ final class FallbackConverter<S,T> exten
* @param primary a first converter.
* @param fallback a second converter.
*
- * @see #create(ObjectConverter, ObjectConverter)
+ * @see #merge(ObjectConverter, ObjectConverter)
*/
private FallbackConverter(final Class<S> sourceClass, final Class<T> targetClass,
final ObjectConverter<S, ? extends T> primary,
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/PathConverter.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/PathConverter.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/PathConverter.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/PathConverter.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -65,7 +65,7 @@ abstract class PathConverter<S,T> extend
/**
* Converts the given path to the target type of this converter.
* This method verifies that the given path is non-null,
- * then delegates to {@link #doConvert(S)}.
+ * then delegates to {@link #doConvert(Object)}.
*
* @param source the path to convert, or {@code null}.
* @return the converted value, or {@code null} if the given path was null.
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -84,7 +84,6 @@ abstract class StringConverter<T> extend
* Creates a new converter for the given target class.
*
* @param targetClass the {@linkplain #getTargetClass() target class}.
- * @param inverse the inverse converter from the target to the source class.
*/
@SuppressWarnings("OverridableMethodCallDuringObjectConstruction")
StringConverter(final Class<T> targetClass) {
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -126,7 +126,7 @@ public final class SystemRegistry extend
}
/**
- * Create dynamically the converters for a few special cases.
+ * Creates dynamically the converters for a few special cases.
* This method is invoked only the first time that a new pair of source and target classes is
* requested. Then, the value returned by this method will be cached for future invocations.
*
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/package-info.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/package-info.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -25,8 +25,8 @@
* <div class="section">Adding system-wide converters</div>
* Applications can add system-wide custom converters either by explicit calls to the
* {@code SystemRegistry.INSTANCE.register(ObjectConverter)} method, or by listing the
- * fully qualified classnames of their {@link ObjectConverter} instances in a file having
- * exactly the following name:
+ * fully qualified classnames of their {@link org.apache.sis.util.ObjectConverter} instances
+ * in a file having exactly the following name:
*
* {@preformat text
* META-INF/services/org.apache.sis.util.ObjectConverter
@@ -42,7 +42,7 @@
* classpath changes.</p>
*
* @author Martin Desruisseaux (Geomatys)
- * @version 0.7
+ * @version 0.8
* @since 0.3
* @module
*/
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -382,9 +382,9 @@ public class IdentifierMapAdapter extend
}
/**
- * The iterator over the (<var>citation</var>, <var>code</var>) entries. This iterator is created by
- * the {@link IdentifierMapAdapter.Entries} collection. It extends {@link HashMap} as an opportunist
- * implementation strategy, but users does not need to know this detail.
+ * The iterator over the (<var>citation</var>, <var>code</var>) entries. This iterator is created by the
+ * {@link #entrySet()} collection. It extends {@link HashMap} as an opportunist implementation strategy,
+ * but users do not need to know this detail.
*
* <p>This iterator supports the {@link #remove()} operation if the underlying collection supports it.</p>
*
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -22,11 +22,9 @@ import org.opengis.metadata.citation.Cit
/**
- * An entry in the {@link IdentifierMap}. This class implements both the
- * {@link Map.Entry} interface (for inclusion in the set to be returned
- * by {@link IdentifierMapAdapter#entrySet()}) and the {@link Identifier}
- * interface (for inclusion in the {@link IdentifierMapAdapter#identifiers}
- * collection).
+ * An entry in {@link org.apache.sis.xml.IdentifierMap}. This class implements both the {@link AbstractMap.Entry}
+ * interface (for inclusion in the set to be returned by {@link IdentifierMapAdapter#entrySet()}) and the
+ * {@link Identifier} interface (for inclusion in the {@link IdentifierMapAdapter#identifiers} collection).
*
* @author Martin Desruisseaux (Geomatys)
* @version 0.5
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -170,7 +170,7 @@ public abstract class TypeRegistration {
}
/**
- * Returns the shared {@code JAXBContext} for the set of {@link #load()}.
+ * Returns the shared {@code JAXBContext} for the set of classes returned by {@link #load(boolean)}.
* Note that the {@code JAXBContext} class is thread safe, but the {@code Marshaller},
* {@code Unmarshaller}, and {@code Validator} classes are not thread safe.
*
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_LocalName.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_LocalName.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_LocalName.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_LocalName.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -52,7 +52,7 @@ public final class GO_LocalName extends
}
/**
- * Does the link between an {@link AbstractName} and the adapter associated.
+ * Does the link between an {@link org.apache.sis.util.iso.AbstractName} and the adapter associated.
* JAXB calls automatically this method at marshalling-time.
*
* @param value the implementing class for this metadata value.
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -136,7 +136,7 @@ public abstract class CodeListAdapter<Va
*
* @return {@code true} if this code list is actually an enum.
*
- * @todo Remove this method after we refactored enum wrappers as {@link EnumAdapter} subclasses
+ * @todo Remove this method after we refactored enum wrappers as {@code EnumAdapter} subclasses
* instead of {@code CodeListAdapter}. This requires the resolution of GEO-199 first.
*
* @see <a href="http://jira.codehaus.org/browse/GEO-199">GEO-199</a>
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListUID.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListUID.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListUID.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListUID.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -23,8 +23,7 @@ import org.apache.sis.util.iso.Types;
/**
- * JAXB adapter for {@link GMLCodeList}, in order to integrate the value in an element
- * complying with OGC/ISO standard.
+ * An element of the XML documented created for GML {@link CodeList}.
*
* @author Guilhem Legal (Geomatys)
* @version 0.7
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -37,7 +37,7 @@ import org.apache.sis.measure.Units;
* A measurement value together with its unit of measure.
* This is used for marshalling an element defined by ISO-19103.
*
- * <p>This class duplicates {@link org.apache.sis.measure.Measure}, but we have to do that way
+ * <p>This class duplicates {@code org.apache.sis.measure.Measure}, but we have to do that way
* because that {@code Measure} extends {@link Number} and we are not allowed to use the
* {@code @XmlValue} annotation on a class that extends an other class.</p>
*
@@ -65,7 +65,6 @@ import org.apache.sis.measure.Units;
* @author Martin Desruisseaux (Geomatys)
* @version 0.8
*
- * @see org.apache.sis.measure.Measure
* @see org.apache.sis.internal.jaxb.gml.MeasureList
* @see org.apache.sis.internal.jaxb.gco.UnitAdapter
*
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleAttributeType.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleAttributeType.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleAttributeType.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleAttributeType.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -26,7 +26,7 @@ import org.opengis.util.TypeName;
/**
* A simple attribute type containing only a name and a class of values.
* Such simple type are suitable for use in ISO 19103 {@link org.opengis.util.RecordType}
- * in addition to ISO 19109 {@link org.opengis.feature.FeatureType}.
+ * in addition to ISO 19109 {@code FeatureType}.
*
* @author Martin Desruisseaux (Geomatys)
* @version 0.5
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleMetadata.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleMetadata.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleMetadata.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleMetadata.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -55,8 +55,8 @@ import org.opengis.util.InternationalStr
* <p>Unless specified otherwise, all methods in this class returns {@code null} or an empty collection by default.
* The exceptions to this rules are the following methods:</p>
* <ul>
- * <li>{@link #getMetadataScopes()} returns {@code this}</li>
- * <li>{@link #getResourceScope()} returns {@link ScopeCode#DATASET}</li>
+ * <li>{@code getMetadataScopes()} returns {@code this}</li>
+ * <li>{@code getResourceScope()} returns {@link ScopeCode#DATASET}</li>
* <li>{@link #getIdentificationInfo()} returns {@code this}</li>
* <li>{@link #getCitation()} returns {@code this}</li>
* <li>{@link #getSpatialRepresentationTypes()} returns {@link SpatialRepresentationType#VECTOR}</li>
@@ -189,7 +189,7 @@ public class SimpleMetadata implements M
}
/**
- * As of ISO 19115:2014, replaced by {@link #getMetadataStandards()}
+ * As of ISO 19115:2014, replaced by {@code getMetadataStandards()}
* followed by {@link Citation#getEdition()}.
*/
@Override
@@ -239,7 +239,6 @@ public class SimpleMetadata implements M
* @see #getPointOfContacts()
* @see #getSpatialRepresentationTypes()
* @see #getSpatialResolutions()
- * @see #getTemporalResolutions()
* @see #getTopicCategories()
* @see #getExtents()
* @see #getResourceFormats()
@@ -470,7 +469,7 @@ public class SimpleMetadata implements M
}
/**
- * @deprecated As of ISO 19115:2014, replaced by {@link #getAssociatedResources()}.
+ * @deprecated As of ISO 19115:2014, replaced by {@code getAssociatedResources()}.
*/
@Override
@Deprecated
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -30,7 +30,7 @@ import org.apache.sis.util.logging.Loggi
*
* <p>The methods for use in this class are:</p>
* <ul>
- * <li>{@link #schedule(Runnable, long)}</li>
+ * <li>{@link #schedule(DelayedRunnable)}</li>
* </ul>
*
* <div class="section">Comparison with {@code java.util.concurrent}</div>
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Semaphores.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Semaphores.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Semaphores.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Semaphores.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -21,8 +21,8 @@ import org.apache.sis.util.Workaround;
/**
* Thread-local booleans that need to be shared across different packages. Each thread has its own set of booleans.
- * The {@link #clear(int)} method <strong>must</strong> be invoked after the {@link #queryAndSet(int)} method in a
- * {@code try ... finally} block.
+ * The {@link #clear(byte)} method <strong>must</strong> be invoked after the {@link #queryAndSet(byte)} method in
+ * a {@code try ... finally} block.
*
* @author Martin Desruisseaux (Geomatys)
* @version 0.7
@@ -31,9 +31,8 @@ import org.apache.sis.util.Workaround;
*/
public final class Semaphores {
/**
- * A lock for avoiding never-ending recursivity in the {@code equals} method of
- * {@link org.apache.sis.referencing.crs.AbstractDerivedCRS} and
- * {@link org.apache.sis.referencing.operation.AbstractCoordinateOperation}.
+ * A lock for avoiding never-ending recursivity in the {@code equals} method of {@code AbstractDerivedCRS}
+ * and {@link org.apache.sis.referencing.operation.AbstractCoordinateOperation}.
* It is set to {@code true} when a comparison is in progress. This lock is necessary because
* {@code AbstractDerivedCRS} objects contain a {@code conversionFromBase} field, which contains a
* {@code DefaultConversion.targetCRS} field referencing back the {@code AbstractDerivedCRS} object.
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -458,7 +458,7 @@ public final class Citations extends Sta
* for the public documentation of this method.
*
* <div class="section">When to use</div>
- * Use this method when assigning values to be returned by methods like {@link Identifier#getCodeSpace()},
+ * Use this method when assigning values to be returned by methods like {@code Identifier.getCodeSpace()},
* since those values are likely to be compared without special care about ignorable identifier characters.
* But if the intend is to format a more complex string like WKT or {@code toString()}, then we suggest to
* use {@code getIdentifier(citation, true)} instead, which will produce the same result but preserving the
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -725,7 +725,7 @@ public final class CollectionsExt extend
/**
* Returns the elements of the given collection as an array. This method can be used when the {@code valueClass}
* argument is not known at compile-time. If the {@code valueClass} is known at compile-time, then callers should
- * use {@link Collection#toArray(T[])} instead.
+ * use {@link Collection#toArray(Object[])} instead.
*
* @param <T> the compile-time value of {@code valueClass}.
* @param collection the collection from which to get the elements.
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -175,8 +175,6 @@ public final class DefinitionURI {
*
* <div class="note"><b>Example:</b>
* In the {@code "urn:ogc:def:crs:EPSG:8.2:4326"} URN, this is {@code "EPSG"}.</div>
- *
- * @see org.apache.sis.internal.metadata.NameMeaning#authority(String)
*/
public String authority;
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -82,7 +82,7 @@ public final class DoubleDouble extends
* omitted by the compiler from the class files in normal operations.</p>
*
* <p>Setting this flag to {@code true} causes some JUnit tests to fail. This is normal. The main
- * purpose of this flag is to allow {@link org.apache.sis.referencing.operation.matrix.MatrixTestCase}
+ * purpose of this flag is to allow {@code org.apache.sis.referencing.operation.matrix.MatrixTestCase}
* to perform strict comparisons of matrix operation results with JAMA, which is taken as the reference
* implementation. Since JAMA uses {@code double} arithmetic, SIS needs to disable {@code double-double}
* arithmetic if the results are to be compared for strict equality.</p>
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/EmptyQueue.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/EmptyQueue.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/EmptyQueue.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/EmptyQueue.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -42,7 +42,7 @@ final class EmptyQueue<E> extends Abstra
private static final long serialVersionUID = 2798927118201392605L;
/**
- * The singleton instance to be returned by {@link Collections#emptyQueue()}.
+ * The singleton instance to be returned by {@link CollectionsExt#emptyQueue()}.
* This is not parameterized on intend.
*/
@SuppressWarnings("rawtypes")
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/LazySet.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/LazySet.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/LazySet.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/LazySet.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -59,8 +59,6 @@ public class LazySet<E> extends SetOfUnk
/**
* The iterator to use for filling this set, or {@code null} if the iteration did not started yet or is finished.
* Those two cases can be distinguished by looking whether the {@link #cachedElements} array is null or not.
- *
- * @see #sourceIterator()
*/
private Iterator<? extends E> sourceIterator;
@@ -130,7 +128,7 @@ public class LazySet<E> extends SetOfUnk
/**
* Creates the {@link #cachedElements} array. This array will contains the elements
- * given by {@link #initialContent()} if that method returned a non-null and non-empty array.
+ * given by {@link #initialValues()} if that method returned a non-null and non-empty array.
*
* @return {@code true} if {@link #initialValues()} initialized the set with at least one value.
*/
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/MetadataServices.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/MetadataServices.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/MetadataServices.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/MetadataServices.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -42,8 +42,9 @@ public class MetadataServices extends Op
private static volatile MetadataServices instance;
/**
- * For subclass only. This constructor registers this instance as a {@link SystemListener}
- * in order to force a new {@code MetadataServices} lookup if the classpath changes.
+ * For subclass only. This constructor registers this instance as a
+ * {@link org.apache.sis.internal.system.SystemListener} in order to
+ * force a new {@code MetadataServices} lookup if the classpath changes.
*/
protected MetadataServices() {
super(Modules.UTILITIES, "sis-metadata");
@@ -129,7 +130,7 @@ public class MetadataServices extends Op
* @param locale language to use if possible.
* @return the information, or {@code null} if none.
*
- * @see org.apache.sis.internal.metadata.ReferencingServices#getInformation(String)
+ * @see org.apache.sis.internal.metadata.ReferencingServices#getInformation(String, Locale)
*/
public String getInformation(String key, Locale locale) {
return null;