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 2013/05/06 12:48:14 UTC
svn commit: r1479515 - in /sis/branches/JDK7:
sis-metadata/src/main/java/org/apache/sis/metadata/
sis-metadata/src/test/java/org/apache/sis/metadata/
sis-referencing/src/test/java/org/apache/sis/geometry/
sis-utility/src/main/java/org/apache/sis/util/ ...
Author: desruisseaux
Date: Mon May 6 10:48:13 2013
New Revision: 1479515
URL: http://svn.apache.org/r1479515
Log:
Minor javadoc fixes.
Modified:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/InformationMapTest.java
sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java
sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
sis/branches/JDK7/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/Classes.java
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/Containers.java
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java
Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java?rev=1479515&r1=1479514&r2=1479515&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java [UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java [UTF-8] Mon May 6 10:48:13 2013
@@ -209,9 +209,9 @@ public abstract class AbstractMetadata i
* {@code "alternateTitle"} collection contains two elements, then there is a node with index 0
* for the first element and an other node with index 1 for the second element.</p>
*
- * <p>The {@code (IDENTIFIER, INDEX)} pair can be used as a primary key for uniquely identifying
- * a node in a list of children. Note that the uniqueness is guaranteed only for the children of
- * a given node; the same keys may appear in the children of any other nodes.</p></li>
+ * {@note The <code>(IDENTIFIER, INDEX)</code> pair can be used as a primary key for uniquely identifying
+ * a node in a list of children. That uniqueness is guaranteed only for the children of a given
+ * node; the same keys may appear in the children of any other nodes.}</li>
*
* <li><p>{@link org.apache.sis.util.collection.TableColumn#NAME}<br>
* A human-readable name for the node, derived from the identifier and the index.
Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java?rev=1479515&r1=1479514&r2=1479515&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] Mon May 6 10:48:13 2013
@@ -641,9 +641,9 @@ public class MetadataStandard implements
* {@code "alternateTitle"} collection contains two elements, then there is a node with index 0
* for the first element and an other node with index 1 for the second element.</p>
*
- * <p>The {@code (IDENTIFIER, INDEX)} pair can be used as a primary key for uniquely identifying
- * a node in a list of children. Note that the uniqueness is guaranteed only for the children of
- * a given node; the same keys may appear in the children of any other nodes.</p></li>
+ * {@note The <code>(IDENTIFIER, INDEX)</code> pair can be used as a primary key for uniquely identifying
+ * a node in a list of children. That uniqueness is guaranteed only for the children of a given
+ * node; the same keys may appear in the children of any other nodes.}</li>
*
* <li><p>{@link org.apache.sis.util.collection.TableColumn#NAME}<br>
* A human-readable name for the node, derived from the identifier and the index.
Modified: sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/InformationMapTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/InformationMapTest.java?rev=1479515&r1=1479514&r2=1479515&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/InformationMapTest.java [UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/InformationMapTest.java [UTF-8] Mon May 6 10:48:13 2013
@@ -24,6 +24,7 @@ import java.util.Locale;
import org.opengis.metadata.ExtendedElementInformation;
import org.opengis.metadata.acquisition.EnvironmentalRecord;
import org.opengis.metadata.citation.Citation;
+import org.opengis.metadata.content.CoverageDescription;
import org.opengis.metadata.content.ImageDescription;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
Modified: sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java?rev=1479515&r1=1479514&r2=1479515&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java [UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java [UTF-8] Mon May 6 10:48:13 2013
@@ -161,7 +161,7 @@ public abstract strictfp class MetadataT
/**
* Validates the given newly constructed metadata. The default implementation ensures that
- * {@link AbstractMetadata.isEmpty()} returns {@code true}.
+ * {@link AbstractMetadata#isEmpty()} returns {@code true}.
*
* @param metadata The metadata to validate.
*/
Modified: sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java?rev=1479515&r1=1479514&r2=1479515&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java [UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java [UTF-8] Mon May 6 10:48:13 2013
@@ -197,7 +197,7 @@ public final strictfp class PropertyAcce
}
/**
- * Tests the {@link PropertyAccessor#descriptor(int)} method.
+ * Tests the {@link PropertyAccessor#information(int)} method.
* This method delegates to some {@link PropertyInformationTest} methods.
*/
@Test
Modified: sis/branches/JDK7/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java?rev=1479515&r1=1479514&r2=1479515&view=diff
==============================================================================
--- sis/branches/JDK7/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java [UTF-8] (original)
+++ sis/branches/JDK7/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java [UTF-8] Mon May 6 10:48:13 2013
@@ -37,7 +37,7 @@ import static org.opengis.test.Validator
@DependsOn(GeneralEnvelopeTest.class)
public final strictfp class EnvelopesTest extends TestCase {
/**
- * Tests {@link Envelopes#fromWKT(String)}. This test is provided as a matter of principle,
+ * Tests {@link Envelopes#fromWKT(CharSequence)}. This test is provided as a matter of principle,
* but the real test is done by {@link GeneralEnvelopeTest#testWktParsing()}.
*
* @throws FactoryException Should never happen.
Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/Classes.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/Classes.java?rev=1479515&r1=1479514&r2=1479515&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/Classes.java [UTF-8] (original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/Classes.java [UTF-8] Mon May 6 10:48:13 2013
@@ -584,7 +584,7 @@ cmp: for (final Class<?> c : c1) {
* <td>{@code "String"}</td>
* </tr>
* <tr>
- * <td>{@link double[]}</td>
+ * <td>{@code double[]}</td>
* <td>{@code "[D"}</td>
* <td>{@code "double[]"}</td>
* <td>{@code "double[]"}</td>
Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/Containers.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/Containers.java?rev=1479515&r1=1479514&r2=1479515&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/Containers.java [UTF-8] (original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/Containers.java [UTF-8] Mon May 6 10:48:13 2013
@@ -91,7 +91,7 @@ public final class Containers extends St
* @return The given array wrapped in an unmodifiable list, or {@code null} if the given
* array was null.
*
- * @see java.util.Arrays#asList(T[])
+ * @see java.util.Arrays#asList(Object[])
*/
@SafeVarargs
public static <E> List<? extends E> unmodifiableList(final E... array) {
Modified: sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java?rev=1479515&r1=1479514&r2=1479515&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java [UTF-8] (original)
+++ sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java [UTF-8] Mon May 6 10:48:13 2013
@@ -128,7 +128,7 @@ public abstract strictfp class Annotatio
* </CI_ResponsibleParty>
* }
*
- * To reflect that fact, this method shall return the {@link org.apache.sis.internal.jaxb.metadata.CI_Contact}
+ * To reflect that fact, this method shall return the internal {@code CI_Contact}
* wrapper class for the {@link org.apache.sis.metadata.iso.citation.DefaultCitation} argument.
* If no wrapper is expected for the given class, then this method shall return {@code null}.
*