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 [3/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-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -271,7 +271,7 @@ public class DefaultProcessStep extends
* organization(s) associated with the process step.
*
* <div class="warning"><b>Upcoming API change \u2014 generalization</b><br>
- * As of ISO 19115:2014, {@code ResponsibleParty} is replaced by the {@link Responsibility} parent interface.
+ * As of ISO 19115:2014, {@code ResponsibleParty} is replaced by the {@code Responsibility} parent interface.
* This change may be applied in GeoAPI 4.0.
* </div>
*
@@ -288,7 +288,7 @@ public class DefaultProcessStep extends
* organization(s) associated with the process step.
*
* <div class="warning"><b>Upcoming API change \u2014 generalization</b><br>
- * As of ISO 19115:2014, {@code ResponsibleParty} is replaced by the {@link Responsibility} parent interface.
+ * As of ISO 19115:2014, {@code ResponsibleParty} is replaced by the {@code Responsibility} parent interface.
* This change may be applied in GeoAPI 4.0.
* </div>
*
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -467,7 +467,7 @@ public class DefaultMaintenanceInformati
* person(s) and organization(s) with responsibility for maintaining the resource.
*
* <div class="warning"><b>Upcoming API change \u2014 generalization</b><br>
- * As of ISO 19115:2014, {@code ResponsibleParty} is replaced by the {@link Responsibility} parent interface.
+ * As of ISO 19115:2014, {@code ResponsibleParty} is replaced by the {@code Responsibility} parent interface.
* This change may be applied in GeoAPI 4.0.
* </div>
*
@@ -485,7 +485,7 @@ public class DefaultMaintenanceInformati
* person(s) and organization(s) with responsibility for maintaining the resource.
*
* <div class="warning"><b>Upcoming API change \u2014 generalization</b><br>
- * As of ISO 19115:2014, {@code ResponsibleParty} is replaced by the {@link Responsibility} parent interface.
+ * As of ISO 19115:2014, {@code ResponsibleParty} is replaced by the {@code Responsibility} parent interface.
* This change may be applied in GeoAPI 4.0.
* </div>
*
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -244,8 +244,8 @@ public class DefaultScopeDescription ext
* Sets the properties identified by the {@code code} argument, if non-null and non-empty.
* This discards any other properties.
*
- * @param caller the caller method, for logging purpose.
- * @param code the property which is going to be set.
+ * @param newValue the value to set.
+ * @param code the property which is going to be set.
*/
private <E> void setProperty(final Set<? extends E> newValue, final Class<E> type, final byte code) {
Set<E> c = null;
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/package-info.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/package-info.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -30,7 +30,7 @@
* defined in the {@link org.opengis.metadata} package and sub-packages. That standard is identified in SIS by the
* {@link org.apache.sis.metadata.MetadataStandard#ISO_19115} constant. Other standards are defined as well,
* for example the {@link org.apache.sis.metadata.MetadataStandard#ISO_19123} constant stands for the standards
- * defined by the interfaces in the {@link org.opengis.coverage} package and sub-packages.
+ * defined by the interfaces in the {@code org.opengis.coverage} package and sub-packages.
*
* <p>For each interface, the collection of declared getter methods defines its <cite>properties</cite>
* (or <cite>attributes</cite>). If a {@link org.opengis.annotation.UML} annotation is attached to the getter method,
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/CachedStatement.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/CachedStatement.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/CachedStatement.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/CachedStatement.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -41,7 +41,7 @@ import org.apache.sis.internal.system.Lo
* <div class="section"><b>Closing</b>:
* While this class implements {@link java.lang.AutoCloseable}, it should not be used in a try-finally block.
* This is because {@code CachedStatement} is typically closed by a different thread than the one that created
- * the {@code CachedStatement} instance. This object is closed by a background thread of {@link Tables}.</div>
+ * the {@code CachedStatement} instance. This object is closed by a background thread of {@link MetadataSource}.</div>
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @version 0.8
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataSource.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataSource.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataSource.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataSource.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -882,8 +882,8 @@ public class MetadataSource implements A
/**
* Converts the specified non-metadata value into an object of the expected type.
- * The expected value is an instance of a class outside the metadata package, for
- * example {@link String}, {@link InternationalString}, {@link URI}, <i>etc.</i>
+ * The expected value is an instance of a class outside the metadata package, for example
+ * {@link String}, {@link org.opengis.util.InternationalString}, {@link java.net.URI}, <i>etc.</i>
*
* @throws UnconvertibleObjectException if the value can not be converter.
*/
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/VerticalDatumTypesTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/VerticalDatumTypesTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/VerticalDatumTypesTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/VerticalDatumTypesTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -45,7 +45,7 @@ public final strictfp class VerticalDatu
}
/**
- * Tests the {@link VerticalDatumTypes#toLegacy(int)} method.
+ * Tests the {@link VerticalDatumTypes#toLegacy(VerticalDatumType)} method.
*/
@Test
public void testToLegacy() {
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/ScriptRunnerTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/ScriptRunnerTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/ScriptRunnerTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/ScriptRunnerTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -69,7 +69,7 @@ public final strictfp class ScriptRunner
/**
* Verifies the regular expressions used by the script runner.
- * This method tests the values returned by {@link ScriptRunner#isSupported(StringBuilder)}
+ * This method tests the values returned by {@link ScriptRunner#isSupported(CharSequence)}
*
* @param sr the script runner to use for testing regular expressions.
*/
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ElementTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ElementTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ElementTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ElementTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -227,7 +227,7 @@ public final strictfp class ElementTest
}
/**
- * Tests {@link Element#pullElement(String)}. This implies testing {@code Element} nesting.
+ * Tests {@link Element#pullElement(int, String...)}. This implies testing {@code Element} nesting.
*
* @throws ParseException if an error occurred during the parsing.
*/
@@ -245,7 +245,7 @@ public final strictfp class ElementTest
}
/**
- * Tests {@link Element#close()}.
+ * Tests {@link Element#close(Map)}.
*
* @throws ParseException if an error occurred during the parsing.
*/
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/FormatterTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/FormatterTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/FormatterTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/FormatterTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -16,7 +16,6 @@
*/
package org.apache.sis.io.wkt;
-import org.opengis.util.CodeList;
import org.opengis.referencing.cs.AxisDirection;
import org.opengis.metadata.extent.GeographicBoundingBox;
import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
@@ -53,7 +52,7 @@ public final strictfp class FormatterTes
}
/**
- * Tests (indirectly) {@link Formatter#quote(String)}.
+ * Tests (indirectly) {@link Formatter#quote(String, ElementKind)}.
*/
@Test
public void testQuote() {
@@ -111,7 +110,7 @@ public final strictfp class FormatterTes
}
/**
- * Tests (indirectly) {@link Formatter#append(CodeList)}.
+ * Tests (indirectly) {@code Formatter.append(ControlledVocabulary)}.
*/
@Test
public void testAppendCodeList() {
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -153,7 +153,7 @@ public final strictfp class MetadataStan
}
/**
- * Tests {@link MetadataStandard#getAccessor(Class, boolean)}.
+ * Tests {@link MetadataStandard#getAccessor(CacheKey, boolean)}.
*/
@Test
@DependsOnMethod("testGetInterface")
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -263,7 +263,7 @@ public final strictfp class PropertyAcce
}
/**
- * Tests the {@link PropertyAccessor#get(int, Object)} method on the {@link HardCodedCitations#ISO} constant.
+ * Tests the {@link PropertyAccessor#get(int, Object)} method on the {@link HardCodedCitations#ISO_19111} constant.
* The metadata object read by this test is:
*
* {@preformat text
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/SpecialCasesTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/SpecialCasesTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/SpecialCasesTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/SpecialCasesTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -69,14 +69,15 @@ public final strictfp class SpecialCases
}
/**
- * Invokes {@link SpecialCases#type(int)} and ensure that the result is equals to the expected value.
+ * Invokes {@link SpecialCases#type(int, TypeValuePolicy)}
+ * and ensures that the result is equals to the expected value.
*/
private void assertTypeEquals(final String name, final Class<?> expected) {
assertEquals(name, expected, accessor.type(accessor.indexOf(name, true), TypeValuePolicy.ELEMENT_TYPE));
}
/**
- * Invokes {@link SpecialCases#get(int, Object)} and ensure that the result is equals to the expected value.
+ * Invokes {@link SpecialCases#get(int, Object)} and ensures that the result is equals to the expected value.
*/
private void assertPropertyEquals(final String name, final Object expected) {
assertEquals(name, expected, accessor.get(accessor.indexOf(name, true), box));
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -259,7 +259,7 @@ public final strictfp class TreeNodeTest
}
/**
- * Tests {@link TreeNode#getElementType()} on a metadata with a hierarchy.
+ * Tests getting the value of {@link TableColumn#TYPE} on a metadata with a hierarchy.
*/
@Test
@DependsOnMethod("testGetIdentifier") // Because if identifiers are wrong, we are looking at wrong properties.
@@ -357,7 +357,7 @@ public final strictfp class TreeNodeTest
/**
* Compares the result of the given getter method invoked on the given node, then invoked
- * on all children of that given. In the particular case of the {@link #NAME} method,
+ * on all children of that given. In the particular case of the {@link TableColumn#NAME},
* international strings are replaced by unlocalized strings before comparisons.
*
* @param node the node for which to test the children.
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -40,7 +40,7 @@ import static org.junit.Assert.*;
/**
* Verifies the API changes caused by the ISO 19115:2003 to ISO 19115:2014 upgrade.
* This class compares the presence of {@link Deprecated} and {@link UML} annotations against the content of an
- * {@linkplain #listAPIChanges(File, File, Appendable) automatically generated} {@code api-changes.properties} file.
+ * {@linkplain #listAPIChanges(File, File, File, Appendable) automatically generated} {@code api-changes.properties} file.
* The intend is to ensure that we did not forgot an annotation or put the wrong one.
*
* <p>The content of the {@code api-changes.properties} files is typically empty on Apache SIS
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -219,7 +219,7 @@ public final strictfp class DefaultMetad
/**
* Tests {@link DefaultMetadata#getHierarchyLevels()}, {@link DefaultMetadata#getHierarchyLevelNames()},
- * {@link DefaultMetadata#setHierarchyLevel(Collection)} and {@link DefaultMetadata#setHierarchyLevelNames(Collection)}
+ * {@link DefaultMetadata#setHierarchyLevels(Collection)} and {@link DefaultMetadata#setHierarchyLevelNames(Collection)}
* methods.
*/
@Test
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -103,14 +103,8 @@ public final strictfp class DefaultResol
}
/**
- * Tests XML (un)marshalling of a resolution element. The main purpose of this method is to test our
- * workaround for a strange JAXB behavior (bug?). For an unknown reason, we are unable to annotate the
- * {@link DefaultResolution#getDistance()} method directly. Doing so cause JAXB to randomly ignores the
- * {@code <gmd:distance>} property. Annotating a separated method which in turn invokes the real method
- * seems to work.
- *
- * <p>This test creates a {@link DefaultResolution} instance which is expected to be marshalled as below
- * (ignoring namespace declarations):</p>
+ * Tests XML (un)marshalling of a resolution element. This test creates a {@link DefaultResolution}
+ * instance which is expected to be marshalled as below (ignoring namespace declarations):
*
* {@preformat xml
* <gmd:MD_Resolution>
@@ -120,23 +114,7 @@ public final strictfp class DefaultResol
* </gmd:MD_Resolution>
* }
*
- * If we annotate the public {@code getDistance()} directly, JAXB will sometime marshals the resolution as
- * expected, or sometime marshals an empty element as below:
- *
- * {@preformat xml
- * <gmd:MD_Resolution/>
- * }
- *
- * In the later case, debugging shows that the {@code getDistance()} method is simply never invoked.
- * Whether the distance is marshaled or not seems totally random: just executing this test many time
- * make both cases to occur (however failures occur more often the successes).
- *
- * <p>Annotating an other method as a workaround seems to always work. See the {@link DefaultResolution#getValue()}
- * javadoc for instructions about how to check if this workaround is still needed with more recent JAXB versions.</p>
- *
* @throws JAXBException if an error occurred while marshalling the element.
- *
- * @see DefaultResolution#getValue()
*/
@Test
public void testXML() throws JAXBException {
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -40,7 +40,7 @@ import org.apache.sis.metadata.iso.citat
*/
public strictfp class MetadataAssert extends Assert {
/**
- * The formatter to be used by {@link #assertWktEquals(Object, String)}.
+ * The formatter to be used by {@link #assertWktEquals(String, Object)}.
* This formatter uses the {@code \u201c\u2026\u201d} quotation marks instead of {@code "\u2026"}
* for easier readability of {@link String} constants in Java code.
*/
Modified: sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocation.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocation.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocation.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -125,7 +125,7 @@ public abstract class AbstractLocation {
* by the {@linkplain ModifiableLocationType#getIdentifications() location type identifications}.
*
* <div class="note"><b>Examples:</b>
- * if {@link LocationType#getIdentifications()} contain \u201cname\u201d, then geographic identifiers may be country
+ * if {@code LocationType.getIdentifications()} contain \u201cname\u201d, then geographic identifiers may be country
* names like \u201cJapan\u201d or \u201cFrance\u201d, or places like \u201cEiffel Tower\u201d. If location type identifications contain
* \u201ccode\u201d, then geographic identifiers may be \u201cSW1P 3AD\u201d postcode.
* </div>
Modified: sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocationType.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocationType.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocationType.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocationType.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -79,7 +79,7 @@ abstract class AbstractLocationType impl
}
/**
- * Implementation of {@link #verifyCycle()} to be invoked recursively for each children.
+ * Implementation of {@link #checkForCycles()} to be invoked recursively for each children.
*
* @throws IllegalArgumentException if an infinite recursivity is detected.
*/
Modified: sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/FinalLocationType.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/FinalLocationType.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/FinalLocationType.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/FinalLocationType.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -33,7 +33,7 @@ import org.apache.sis.metadata.iso.citat
/**
- * Unmodifiable description of a location created as a snapshot of another {@link LocationType} instance
+ * Unmodifiable description of a location created as a snapshot of another {@code LocationType} instance
* at {@link ReferencingByIdentifiers} construction time. This instance will be set a different reference
* system than the original location type.
*
@@ -228,7 +228,7 @@ final class FinalLocationType extends Ab
*
* @return property used as the defining characteristic of the location type.
*
- * @see ReferenceSystemUsingIdentifiers#getTheme()
+ * @see ReferencingByIdentifiers#getTheme()
*/
@Override
public InternationalString getTheme() {
Modified: sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -57,7 +57,7 @@ public class GeohashReferenceSystem exte
private static final long serialVersionUID = 9162259764027168776L;
/**
- * The encoding format used by {@link GeoHashCoder}.
+ * The encoding format used by {@link GeohashReferenceSystem.Coder}.
*/
public enum Format {
/**
@@ -125,7 +125,7 @@ public class GeohashReferenceSystem exte
final Format format;
/**
- * The {@link #crs}�with (<var>longitude</var>, <var>latitude</var>) axis order in degrees.
+ * The user-supplied CRS�with (<var>longitude</var>, <var>latitude</var>) axis order in degrees.
*/
final DefaultGeographicCRS normalizedCRS;
@@ -367,8 +367,6 @@ public class GeohashReferenceSystem exte
private final class Decoder extends SimpleLocation {
/**
* Decodes the given geohash.
- *
- * @param owner the {@code Coder} which is creating this {@code Decoder}.
*/
Decoder(final CharSequence geohash, final double[] coordinates) throws TransformException {
super(rootType(), geohash);
Modified: sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/LocationFormat.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/LocationFormat.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/LocationFormat.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/LocationFormat.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -65,7 +65,7 @@ import org.apache.sis.metadata.iso.citat
/**
- * Formats {@link Location} instances in a tabular format.
+ * Formats {@code Location} instances in a tabular format.
* This format assumes a monospaced font and an encoding supporting drawing box characters (e.g. UTF-8).
*
* <div class="note"><b>Example:</b>
@@ -433,7 +433,7 @@ public class LocationFormat extends Tabu
/**
* Creates the format to use for formatting a latitude, longitude or projected coordinate.
- * This method is invoked by {@link #format(Location, Appendable)} when first needed.
+ * This method is invoked by {@code format(Location, Appendable)} when first needed.
*
* @param valueType {@code Angle.class}. {@code Number.class} or {@code Unit.class}.
* @return a new {@link AngleFormat}, {@link NumberFormat} or {@link UnitFormat} instance
Modified: sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -1429,10 +1429,10 @@ public class MilitaryGridReferenceSystem
}
/**
- * Returns the band letter for the given latitude. It is caller responsibility to ensure that the
- * given latitude is between {@value #UTM_SOUTH_BOUNDS} and {@value #UTM_NORTH_BOUNDS} inclusive.
- * The returned letter will be one of {@code "CDEFGHJKLMNPQRSTUVWX"} (note that I and O letters
- * are excluded). All bands are 8� height except the X band which is 12� height.
+ * Returns the band letter for the given latitude. It is caller responsibility to ensure that the given latitude
+ * is between {@value TransverseMercator.Zoner#SOUTH_BOUNDS} and {@value TransverseMercator.Zoner#NORTH_BOUNDS}
+ * inclusive. The returned letter will be one of {@code "CDEFGHJKLMNPQRSTUVWX"} (note that I and O letters are
+ * excluded). All bands are 8� height except the X band which is 12� height.
*
* @param \u03c6 the latitude in degrees for which to get the band letter.
* @return the band letter for the given latitude.
Modified: sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -119,13 +119,13 @@ public class ReferencingByIdentifiers ex
* <th>Returned by</th>
* </tr>
* <tr>
- * <td>{@value org.opengis.referencing.gazetteer.ReferenceSystemUsingIdentifiers#THEME_KEY}</td>
+ * <td>"theme"</td>
* <td>{@link String} or {@link InternationalString}</td>
* <td>{@link #getTheme()}</td>
* </tr>
* <tr>
- * <td>{@value org.opengis.referencing.gazetteer.ReferenceSystemUsingIdentifiers#OVERALL_OWNER_KEY}</td>
- * <td>{@link Party}</td>
+ * <td>"overallOwner"</td>
+ * <td>{@code Party}</td>
* <td>{@link #getOverallOwner()}</td>
* </tr>
* <tr>
@@ -163,8 +163,8 @@ public class ReferencingByIdentifiers ex
* </tr>
* </table>
*
- * This constructor copies the given {@link LocationType} instances as per
- * {@link ModifiableLocationType#snapshot(ReferenceSystemUsingIdentifiers, LocationType...)}.
+ * This constructor copies the given {@code LocationType} instances as per
+ * {@code ModifiableLocationType.snapshot(ReferenceSystemUsingIdentifiers, LocationType...)}.
* Changes in the given location types after construction will not affect this {@code ReferencingByIdentifiers}.
*
* <div class="warning"><b>Upcoming API change \u2014 generalization</b><br>
Modified: sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/SimpleLocation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/SimpleLocation.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/SimpleLocation.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/SimpleLocation.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -298,8 +298,8 @@ class SimpleLocation extends AbstractLoc
/**
* A {@code SimpleLocation} for non-geographic CRS.
- * Subclasses should invoke {@link #computeGeographicBoundingBox(MathTransform, DirectPosition2D)}
- * after the {@link #minX}, {@link #minY}, {@link #maxX} and {@link #maxY} fields have been set.
+ * Subclasses should invoke {@link #computeGeographicBoundingBox(MathTransform)} after the
+ * {@link #minX}, {@link #minY}, {@link #maxX} and {@link #maxY} fields have been set.
*
* @author Martin Desruisseaux (Geomatys)
* @version 0.8
Modified: sis/trunk/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationViewer.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationViewer.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationViewer.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationViewer.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -46,7 +46,7 @@ import org.apache.sis.internal.jdk8.JDK8
/**
- * A Swing panel drawing {@link Location} instances.
+ * A Swing panel drawing {@code Location} instances.
* This is used for debugging purpose only.
*
* @author Martin Desruisseaux (Geomatys)
Modified: sis/trunk/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -102,8 +102,8 @@ public final strictfp class MilitaryGrid
}
/**
- * Verifies that {@link Zoner#isNorway(double)} and {@link Zoner#isSvalbard(double)}
- * are consistent with the latitude bands.
+ * Verifies that {@link TransverseMercator.Zoner#isNorway(double)} and
+ * {@link TransverseMercator.Zoner#isSvalbard(double)} are consistent with the latitude bands.
*/
@Test
@DependsOnMethod("testLatitudeBand")
@@ -761,7 +761,7 @@ public final strictfp class MilitaryGrid
}
/**
- * Implementation of {@link #testIteratorUTM()}.
+ * Implementation of {@code testIteratorXXX()} methods.
*/
private static void testIterator(final Envelope areaOfInterest, final List<String> expected) throws TransformException {
final MilitaryGridReferenceSystem.Coder coder = coder();
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/distance/DistanceUtils.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/distance/DistanceUtils.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/distance/DistanceUtils.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/distance/DistanceUtils.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.sis.distance;
// SIS imports
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -966,8 +966,7 @@ public abstract class AbstractEnvelope i
* Compares to the specified envelope for equality up to the specified tolerance value.
* The tolerance value {@code eps} can be either relative to the {@linkplain #getSpan(int)
* envelope span} along each dimension or can be an absolute value (as for example some
- * ground resolution of a {@linkplain org.opengis.coverage.grid.GridCoverage.GridCoverage
- * grid coverage}).
+ * ground resolution of a grid coverage).
*
* <ul>
* <li>If {@code epsIsRelative} is set to {@code true}, the actual tolerance value for a
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/CurveExtremum.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/CurveExtremum.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/CurveExtremum.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/CurveExtremum.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -69,7 +69,6 @@ final class CurveExtremum {
* @param x2 the <var>x</var> ordinate of the second point.
* @param y2 the <var>y</var> ordinate of the second point.
* @param dy2 the \u2202<var>x</var>/\u2202<var>y</var> value at the second point.
- * @return the two points located on the extremum of the fitted cubic curve.
*/
void resolve(double x1, double y1, final double dy1,
double x2, double y2, final double dy2)
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/UnmodifiableGeometryException.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/UnmodifiableGeometryException.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/UnmodifiableGeometryException.java (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/UnmodifiableGeometryException.java Wed Apr 5 09:26:10 2017
@@ -18,7 +18,7 @@ package org.apache.sis.geometry;
/**
- * Indicates that an operation is not allowed on a {@linkplain Geometry geometry} object
+ * Indicates that an operation is not allowed on a geometry object
* because it is unmodifiable. Note that unmodifiable geometries are not necessarily immutable;
* they are just not allowed to be modified through the {@code setFoo(...)} method that
* raised this exception. Whatever an unmodifiable geometry is immutable or not is
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_Conversion.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_Conversion.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_Conversion.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_Conversion.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -35,7 +35,7 @@ import org.apache.sis.referencing.operat
*/
public final class CC_Conversion extends PropertyType<CC_Conversion, Conversion> {
/**
- * Temporary storage for the {@code baseCRS} during {@link org.apache.sis.referencing.crs.AbstractDerivedCRS}
+ * Temporary storage for the {@code baseCRS} during {@code org.apache.sis.referencing.crs.AbstractDerivedCRS}
* unmarshalling. A temporary location is needed because {@code AbstractDerivedCRS} does not have any explicit
* field for {@code baseCRS}.
*
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -98,7 +98,7 @@ public final class ReferencingUtilities
* @param cs the coordinate system for which to get the unit, or {@code null}.
* @return the unit for all axis in the given coordinate system, or {@code null}.
*
- * @see org.apache.sis.internal.metadata.AxisDirections#getAngularUnit(CoordinateSystem)
+ * @see org.apache.sis.internal.metadata.AxisDirections#getAngularUnit(CoordinateSystem, Unit)
*/
public static Unit<?> getUnit(final CoordinateSystem cs) {
Unit<?> unit = null;
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -228,7 +228,7 @@ public final class ServicesForMetadata e
* @param envelope the source envelope.
* @param target the target temporal extent.
* @param crs the envelope CRS (mandatory, can not be {@code null}).
- * @param verticalCRS the temporal component of the given CRS (mandatory).
+ * @param temporalCRS the temporal component of the given CRS (mandatory).
* @throws UnsupportedOperationException if no implementation of {@code TemporalFactory} has been found
* on the classpath.
*/
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/AffineTransform2D.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/AffineTransform2D.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/AffineTransform2D.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/AffineTransform2D.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -49,10 +49,7 @@ import static org.apache.sis.util.Argume
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @version 0.7
- *
- * @see ProjectiveTransform
- *
- * @since 0.5
+ * @since 0.5
* @module
*/
public class AffineTransform2D extends ImmutableAffineTransform
@@ -322,10 +319,10 @@ public class AffineTransform2D extends I
/**
* Compares this affine transform with the given object for equality. This method behaves as documented
- * in the {@link LinearTransform#equals(Object, ComparisonMode) LinearTransform} interface, except for
- * the following case: if the given mode is {@link ComparisonMode#STRICT}, then this method delegates
- * to {@link #equals(Object)}. The later method has different rules than the ones documented in the
- * {@code LinearTransform} interface, because of the {@code AffineTransform} inheritance.
+ * in the {@link LenientComparable#equals(Object, ComparisonMode) LenientComparable.equals(\u2026)} method,
+ * except for the following case: if the given mode is {@link ComparisonMode#STRICT}, then this method
+ * delegates to {@link #equals(Object)}. The later method has different rules than the ones documented
+ * in the {@code LenientComparable} interface, because of the {@code AffineTransform} inheritance.
*
* @param object the object to compare to {@code this}.
* @param mode the strictness level of the comparison.
@@ -378,7 +375,7 @@ public class AffineTransform2D extends I
* <p>This special case exists in order to allow developers to attach additional information to their own subclass
* of {@code AffineTransform2D}, and still distinguish their specialized subclass from ordinary affine transforms
* in a pool of {@code MathTransform} instances. The main application is the
- * {@linkplain org.apache.sis.referencing.operation.projection.Equirectangular} map projection,
+ * {@linkplain org.apache.sis.internal.referencing.provider.Equirectangular Equirectangular} map projection,
* which can be simplified to an affine transform but still needs to remember the projection parameters.</p>
*
* @param object the object to compare with this affine transform for equality.
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/IntervalRectangle.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/IntervalRectangle.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/IntervalRectangle.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/IntervalRectangle.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -505,7 +505,7 @@ public class IntervalRectangle extends R
/**
* Returns the {@code String} representation of this {@code Rectangle2D}. The ordinate order is
* (<var>x</var><sub>min</sub>, <var>y</var><sub>min</sub>, <var>x</var><sub>max</sub>, <var>y</var><sub>max</sub>),
- * which is consistent with the {@link #RectangleExt(double, double, double, double)} constructor
+ * which is consistent with the {@link #IntervalRectangle(double, double, double, double)} constructor
* and with the {@code BBOX} <cite>Well Known Text</cite> (WKT) syntax.
*
* @return a {@code String} representing this {@code Rectangle2D}.
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ParameterizedAffine.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ParameterizedAffine.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ParameterizedAffine.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ParameterizedAffine.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -28,7 +28,7 @@ import org.apache.sis.internal.system.Se
* An affine transform that remember the parameters used for its construction.
* Those parameters may be very different than the usual affine transform parameters.
*
- * For example an {@link org.apache.sis.referencing.operation.projection.Equirectangular} projection
+ * For example an {@link org.apache.sis.internal.referencing.provider.Equirectangular} projection
* can be expressed as an affine transform. In such case, the same affine transform can be described
* by two equivalent set of parameters:
*
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbridgedMolodensky.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbridgedMolodensky.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbridgedMolodensky.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbridgedMolodensky.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -86,8 +86,8 @@ public final class AbridgedMolodensky ex
* @param targetDimensions number of dimensions in the target CRS of this operation method.
* @param redimensioned providers for all combinations between 2D and 3D cases, or {@code null}.
*/
- private AbridgedMolodensky(int sourceDimension, int targetDimension, GeodeticOperation[] redimensioned) {
- super(sourceDimension, targetDimension, PARAMETERS, redimensioned);
+ private AbridgedMolodensky(int sourceDimensions, int targetDimensions, GeodeticOperation[] redimensioned) {
+ super(sourceDimensions, targetDimensions, PARAMETERS, redimensioned);
}
/**
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -137,9 +137,9 @@ public final class Affine extends Abstra
/**
* Creates a provider for affine transform with the specified dimensions.
- * This is created when first needed by {@link #getProvider(int, int)}.
+ * This is created when first needed by {@link #getProvider(int, int, boolean)}.
*
- * @see #getProvider(int, int)
+ * @see #getProvider(int, int, boolean)
*/
private Affine(final int sourceDimensions, final int targetDimensions) {
super(IDENTIFICATION_OGC, sourceDimensions, targetDimensions, new Descriptor(IDENTIFICATION_OGC,
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -415,7 +415,7 @@ public abstract class DatumShiftGridFile
*
* @param dim the dimension for which to get an average value.
* @param gridX the grid index along the <var>x</var> axis, from 0 inclusive to {@link #nx} exclusive.
- * @param gridY the grid index along the <var>y</var> axis, from 0 inclusive to {@link #ny} exclusive.
+ * @param gridY the grid index along the <var>y</var> axis, from 0 inclusive to {@code ny} exclusive.
* @return the offset at the given dimension in the grid cell at the given index.
*/
@Override
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -99,21 +99,21 @@ public abstract class GeocentricAffine e
/**
* The operation parameter descriptor for the <cite>X-axis rotation</cite>
* ({@linkplain BursaWolfParameters#rX rX}) parameter value.
- * Units are {@linkplain Units#SECOND_ANGLE arc-seconds}.
+ * Units are {@linkplain Units#ARC_SECOND arc-seconds}.
*/
static final ParameterDescriptor<Double> RX;
/**
* The operation parameter descriptor for the <cite>Y-axis rotation</cite>
* ({@linkplain BursaWolfParameters#rY rY}) parameter value.
- * Units are {@linkplain Units#SECOND_ANGLE arc-seconds}.
+ * Units are {@linkplain Units#ARC_SECOND arc-seconds}.
*/
static final ParameterDescriptor<Double> RY;
/**
* The operation parameter descriptor for the <cite>Z-axis rotation</cite>
* ({@linkplain BursaWolfParameters#rZ rZ}) parameter value.
- * Units are {@linkplain Units#SECOND_ANGLE arc-seconds}.
+ * Units are {@linkplain Units#ARC_SECOND arc-seconds}.
*/
static final ParameterDescriptor<Double> RZ;
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -256,7 +256,7 @@ public final class NADCON extends Abstra
private final StringBuilder ascii;
/**
- * The grid created by {@link #readGrid(Loader)}.
+ * The grid created by {@link #readGrid(FloatBuffer, Loader, Path)}.
*/
DatumShiftGridFile.Float<Angle,Angle> grid;
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -227,7 +227,7 @@ public final class TransverseMercator ex
* Width of a zone, in degrees of longitude.
* Positive if zone numbers are increasing eastward, or negative if increasing westwards.
*
- * @see #zone(double)
+ * @see #zone(double, double)
* @see #centralMeridian(int)
*/
public final double width;
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/AbstractParameterDescriptor.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/AbstractParameterDescriptor.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/AbstractParameterDescriptor.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/AbstractParameterDescriptor.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -66,7 +66,7 @@ import static org.apache.sis.internal.ja
* <td class="sep">Also known as \u201cdefinition\u201d.</td>
* </tr>
* <tr>
- * <td>{@link #getDirection()}</td>
+ * <td>{@code getDirection()}</td>
* <td class="sep"></td>
* <td class="sep"></td>
* <td class="sep">{@code direction}</td>
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -148,7 +148,7 @@ public class DefaultParameterDescriptor<
* <td>{@link #getIdentifiers()}</td>
* </tr>
* <tr>
- * <td>{@value org.opengis.metadata.Identifier#DESCRIPTION_KEY}</td>
+ * <td>"description"</td>
* <td>{@link org.opengis.util.InternationalString} or {@link String}</td>
* <td>{@link #getDescription()}</td>
* </tr>
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -138,7 +138,7 @@ public class DefaultParameterDescriptorG
* <td>{@link #getIdentifiers()}</td>
* </tr>
* <tr>
- * <td>{@value org.opengis.metadata.Identifier#DESCRIPTION_KEY}</td>
+ * <td>"description"</td>
* <td>{@link org.opengis.util.InternationalString} or {@link String}</td>
* <td>{@link #getDescription()}</td>
* </tr>
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionDescriptor.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionDescriptor.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionDescriptor.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionDescriptor.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -61,7 +61,7 @@ final class MapProjectionDescriptor exte
private static final long serialVersionUID = -9142116135803309453L;
/**
- * {@code true} if the {@link #STANDARD_PARALLEL} parameter can be added.
+ * {@code true} if the {@value Constants#STANDARD_PARALLEL} parameter can be added.
*/
final boolean hasStandardParallels;
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionParameters.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionParameters.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionParameters.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionParameters.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -433,8 +433,8 @@ final class MapProjectionParameters exte
/**
* All names known to Apache SIS for the standard parallels parameter, as an array of 1 or 2 elements.
- * This is used in some NetCDF files instead of {@link #STANDARD_PARALLEL_1} and
- * {@link #STANDARD_PARALLEL_2}. This is not a standard parameter.
+ * This is used in some NetCDF files instead of {@value Constants#STANDARD_PARALLEL_1} and
+ * {@value Constants#STANDARD_PARALLEL_2}. This is not a standard parameter.
*/
static final ParameterDescriptor<double[]> DESCRIPTOR = new DefaultParameterDescriptor<>(
InverseFlattening.toMap(Constants.STANDARD_PARALLEL),
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -444,9 +444,9 @@ public class ParameterFormat extends Tab
/**
* Implementation of public {@code format(\u2026)} methods for all content levels except {@code NAME_SUMMARY}.
*
- * @param name the group name, usually {@code descriptor.getName().getCode()}.
- * @param descriptor the parameter descriptor, usually {@code values.getDescriptor()}.
- * @param values the parameter values, or {@code null} if none.
+ * @param name the group name, usually {@code descriptor.getName().getCode()}.
+ * @param group the parameter descriptor, usually {@code values.getDescriptor()}.
+ * @param values the parameter values, or {@code null} if none.
* @throws IOException if an error occurred while writing to the given appendable.
*/
private void format(final String name, final ParameterDescriptorGroup group,
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -529,7 +529,7 @@ public abstract class Parameters impleme
/**
* Returns the default value of the given descriptor, or throws an exception if the
* descriptor does not define a default value. This check should be kept consistent
- * with the {@link DefaultParameterValue#incompatibleValue(Object)} check.
+ * with the {@link DefaultParameterValue#missingOrIncompatibleValue(Object)} check.
*/
private static <T> T defaultValue(final ParameterDescriptor<T> parameter) throws IllegalStateException {
final T value = parameter.getDefaultValue();
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -283,7 +283,7 @@ public class TensorParameters<E> impleme
/**
* The cached descriptors for each elements in a tensor. Descriptors do not depend on tensor element values.
- * Consequently, the same descriptors can be reused for all {@link MatrixParameterValues} instances.
+ * Consequently, the same descriptors can be reused for all {@link TensorValues} instances.
*/
private final transient ParameterDescriptor<E>[] parameters;
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorValues.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorValues.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorValues.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorValues.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -373,7 +373,7 @@ final class TensorValues<E> extends Abst
/**
* Creates a matrix from this group of parameters.
- * This operation is allowed only for tensors of {@linkplain #rank() rank} 2.
+ * This operation is allowed only for tensors of {@linkplain TensorParameters#rank() rank} 2.
*
* @return a matrix created from this group of parameters.
*/
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -77,7 +77,7 @@ import org.apache.sis.metadata.iso.Immut
* Base class for objects identified by a name or a code. Those objects are typically
* {@linkplain org.apache.sis.referencing.datum.DefaultGeodeticDatum geodetic datum} (e.g. <cite>"World Geodetic System 1984"</cite>),
* {@linkplain org.apache.sis.referencing.crs.AbstractCRS Coordinate Reference System} (e.g. <cite>"WGS 84 / World Mercator"</cite>) or
- * {@linkplain org.apache.sis.referencing.operation.DefaultProjection map projection} (e.g. <cite>"Mercator (variant A)"</cite>).
+ * {@linkplain org.apache.sis.referencing.operation.DefaultConversion map projection} (e.g. <cite>"Mercator (variant A)"</cite>).
* Those names, or a code (e.g. {@code "EPSG:3395"}), can be used for fetching an object from a database.
* However it is not sufficient to know the object name. We also need to know who define that name
* (the {@linkplain NamedIdentifier#getAuthority() authority}) since the same objects are often named differently
@@ -174,7 +174,7 @@ public class AbstractIdentifiedObject ex
* The name for this object or code. Shall never be {@code null}.
*
* <p><b>Consider this field as final!</b>
- * This field is modified only at unmarshalling time by {@link Names#add(Identifier)}.</p>
+ * This field is modified only at unmarshalling time by {@code Names.add(Identifier)}.</p>
*
* @see #getName()
* @see #getNames()
@@ -187,7 +187,7 @@ public class AbstractIdentifiedObject ex
* we may get both on unmarshalling.
*
* <p><b>Consider this field as final!</b>
- * This field is modified only at unmarshalling time by {@link Names#add(Identifier)}.</p>
+ * This field is modified only at unmarshalling time by {@code Names.add(Identifier)}.</p>
*/
private Collection<GenericName> alias;
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -97,7 +97,7 @@ import org.opengis.referencing.Reference
* The result is a {@linkplain org.apache.sis.util.iso.DefaultScopedName scoped name} or identifier,
* in which the code space information is shown by the {@code toString()} method.</li>
*
- * <li>The {@link #addIdentifier(Identifier)}, {@link #addName(Identifier)} and {@link #addName(GenericName)}
+ * <li>The {@code addIdentifier(Identifier)}, {@code addName(Identifier)} and {@link #addName(GenericName)}
* methods take the given object <cite>as-is</cite>. Any authority, code space, version or description
* information given to the {@code Builder} are ignored.</li>
* </ul>
@@ -210,7 +210,7 @@ public abstract class Builder<B extends
/**
* The codespace as a {@code NameSpace} object, or {@code null} if not yet created.
- * This object is built from the {@value org.opengis.metadata.Identifier#CODESPACE_KEY} value when first needed.
+ * This object is built from the "codespace" value when first needed.
*/
private transient NameSpace namespace;
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -170,7 +170,7 @@ public class NamedIdentifier extends Imm
* <td>{@link #getCode()}</td>
* </tr>
* <tr>
- * <td>{@value org.opengis.metadata.Identifier#CODESPACE_KEY}</td>
+ * <td>"codespace"</td>
* <td>{@link String}</td>
* <td>{@link #getCodeSpace()}</td>
* </tr>
@@ -180,12 +180,12 @@ public class NamedIdentifier extends Imm
* <td>{@link #getAuthority()}</td>
* </tr>
* <tr>
- * <td>{@value org.opengis.metadata.Identifier#VERSION_KEY}</td>
+ * <td>"version"</td>
* <td>{@link String}</td>
* <td>{@link #getVersion()}</td>
* </tr>
* <tr>
- * <td>{@value org.opengis.metadata.Identifier#DESCRIPTION_KEY}</td>
+ * <td>"description"</td>
* <td>{@link String} or {@link InternationalString}</td>
* <td>{@link #getDescription()}</td>
* </tr>
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/Properties.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/Properties.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/Properties.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/Properties.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -52,9 +52,8 @@ final class Properties extends AbstractM
private static final long serialVersionUID = 6391635771714311314L;
/**
- * The keys to search for. The index of each element in this array must matches the index searched
- * by {@link #getAt(IdentifiedObject, int)}. In other words, this array performs the reverse mapping
- * of {@link #INDICES}.
+ * The keys to search for. The index of each element in this array must matches the index searched by
+ * {@link #getAt(int)}. In other words, this array performs the reverse mapping of {@link #INDICES}.
*/
private static final String[] KEYS = {
/*[0]*/ IdentifiedObject .NAME_KEY,
@@ -76,7 +75,7 @@ final class Properties extends AbstractM
};
/**
- * The mapping from key names to the index expected by the {@link #getAt(IdentifiedObject, int)} method.
+ * The mapping from key names to the index expected by the {@link #getAt(int)} method.
* This map shall not be modified after construction (for multi-thread safety without synchronization).
*/
private static final Map<String,Integer> INDICES = new HashMap<>(16);
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultParametricCRS.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultParametricCRS.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultParametricCRS.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultParametricCRS.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -75,7 +75,7 @@ public class DefaultParametricCRS extend
* The datum.
*
* <p><b>Consider this field as final!</b>
- * This field is modified only at unmarshalling time by {@link #setDatum(ParametricDatum)}</p>
+ * This field is modified only at unmarshalling time by {@code setDatum(ParametricDatum)}</p>
*
* @see #getDatum()
*/
@@ -84,8 +84,8 @@ public class DefaultParametricCRS extend
/**
* Creates a coordinate reference system from the given properties, datum and coordinate system.
* The properties given in argument follow the same rules than for the
- * {@linkplain AbstractReferenceSystem#AbstractReferenceSystem(Map) super-class constructor}.
- * The following table is a reminder of main (not all) properties:
+ * {@linkplain org.apache.sis.referencing.AbstractReferenceSystem#AbstractReferenceSystem(Map)
+ * super-class constructor}. The following table is a reminder of main (not all) properties:
*
* <table class="sis">
* <caption>Recognized properties (non exhaustive list)</caption>
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -131,7 +131,7 @@ public class AbstractCS extends Abstract
* </tr>
* <tr>
* <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td>
- * <td>{@link ReferenceIdentifier} or {@link String}</td>
+ * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td>
* <td>{@link #getName()}</td>
* </tr>
* <tr>
@@ -141,7 +141,7 @@ public class AbstractCS extends Abstract
* </tr>
* <tr>
* <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td>
- * <td>{@link ReferenceIdentifier} (optionally as array)</td>
+ * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td>
* <td>{@link #getIdentifiers()}</td>
* </tr>
* <tr>
@@ -270,7 +270,8 @@ public class AbstractCS extends Abstract
* or an {@code INVALID_*} error code otherwise. This method is invoked at construction time for checking
* argument validity. The default implementation returns {@code VALID} in all cases. Subclasses override
* this method in order to put more restrictions on allowed axis directions and check for compatibility
- * with {@linkplain Units#METRE metre} or {@linkplain Units#DEGREE degree} units.
+ * with {@linkplain org.apache.sis.measure.Units#METRE metre} or
+ * {@linkplain org.apache.sis.measure.Units#DEGREE degree} units.
*
* <p><b>Note for implementors:</b> since this method is invoked at construction time, it shall not depend
* on this object's state. This method is not in public API for that reason.</p>
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -122,9 +122,9 @@ public enum AxesConvention implements Ax
* <li>Axes are oriented and ordered as defined for {@link #CONVENTIONALLY_ORIENTED} coordinate systems.</li>
* <li>Known units are normalized (this list may be expanded in future SIS versions):
* <ul>
- * <li>Angular units are set to {@link javax.measure.Units#DEGREE}.</li>
- * <li>Linear units are set to {@link javax.measure.unit.Units#METRE}.</li>
- * <li>Temporal units are set to {@link javax.measure.unit.Units#DAY}.</li>
+ * <li>Angular units are set to {@link Units#DEGREE}.</li>
+ * <li>Linear units are set to {@link Units#METRE}.</li>
+ * <li>Temporal units are set to {@link Units#DAY}.</li>
* </ul>
* </li>
* </ul>
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Codes.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Codes.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Codes.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Codes.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -29,7 +29,8 @@ import static org.apache.sis.internal.ut
/**
- * Map units of measurement and axis directions to {@link CoordinateSystem} objects defined in the EPSG database.
+ * Map units of measurement and axis directions to {@link org.opengis.referencing.cs.CoordinateSystem}
+ * objects defined in the EPSG database.
* Current version uses hard-coded mapping.
*
* @author R�mi Marechal (Geomatys)
@@ -106,7 +107,7 @@ final class Codes {
/**
* Returns the hash code value for this {@code Codes} instance.
- * Note that {@link #lookup(AxisDirection[], Unit)} needs that the hash code excludes the EPSG code.
+ * Note that {@link #lookup(Unit, AxisDirection[])} needs that the hash code excludes the EPSG code.
*/
@Override
public int hashCode() {
@@ -115,7 +116,7 @@ final class Codes {
/**
* Compares this {@code Codes} instance with the given object for equality.
- * Note that {@link #lookup(AxisDirection[], Unit)} needs that the comparison excludes the EPSG code.
+ * Note that {@link #lookup(Unit, AxisDirection[])} needs that the comparison excludes the EPSG code.
*/
@Override
public boolean equals(final Object obj) {
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -259,7 +259,7 @@ public class DefaultCoordinateSystemAxis
* </tr>
* <tr>
* <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td>
- * <td>{@link ReferenceIdentifier} or {@link String}</td>
+ * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td>
* <td>{@link #getName()}</td>
* </tr>
* <tr>
@@ -269,7 +269,7 @@ public class DefaultCoordinateSystemAxis
* </tr>
* <tr>
* <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td>
- * <td>{@link ReferenceIdentifier} (optionally as array)</td>
+ * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td>
* <td>{@link #getIdentifiers()}</td>
* </tr>
* <tr>
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -142,7 +142,7 @@ final class Normalizer implements Compar
private final int unitOrder;
/**
- * For internal usage by {@link #sort(CoordinateSystemAxis[])} only.
+ * For internal usage by {@link #sort(CoordinateSystemAxis[], int)} only.
*/
private Normalizer(final CoordinateSystemAxis axis, final int angularUnitOrder) {
this.axis = axis;
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -110,7 +110,7 @@ import java.util.Objects;
* <div class="section">When Bursa-Wolf parameters are used</div>
* {@code BursaWolfParameters} are used in three contexts:
* <ol>
- * <li>Created as a step while creating a {@linkplain org.apache.sis.referencing.operation.DefaultCoordinateOperation
+ * <li>Created as a step while creating a {@linkplain org.apache.sis.referencing.operation.AbstractCoordinateOperation
* coordinate operation} from the EPSG database.</li>
* <li>Associated to a {@link DefaultGeodeticDatum} with the WGS 84 {@linkplain #getTargetDatum() target datum} for
* providing the parameter values to display in the {@code TOWGS84[\u2026]} element of <cite>Well Known Text</cite>