Return-Path: X-Original-To: apmail-sis-commits-archive@www.apache.org Delivered-To: apmail-sis-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C350917BBF for ; Wed, 7 Jan 2015 15:10:41 +0000 (UTC) Received: (qmail 2403 invoked by uid 500); 7 Jan 2015 15:10:43 -0000 Delivered-To: apmail-sis-commits-archive@sis.apache.org Received: (qmail 2371 invoked by uid 500); 7 Jan 2015 15:10:42 -0000 Mailing-List: contact commits-help@sis.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sis-dev@sis.apache.org Delivered-To: mailing list commits@sis.apache.org Received: (qmail 2345 invoked by uid 99); 7 Jan 2015 15:10:42 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jan 2015 15:10:42 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 43A97AC0043; Wed, 7 Jan 2015 15:10:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1650078 - in /sis/branches/JDK8/core: sis-feature/src/main/java/org/apache/sis/feature/ sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/ sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/ sis-metadata/src/mai... Date: Wed, 07 Jan 2015 15:10:34 -0000 To: commits@sis.apache.org From: desruisseaux@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150107151039.43A97AC0043@hades.apache.org> Author: desruisseaux Date: Wed Jan 7 15:10:33 2015 New Revision: 1650078 URL: http://svn.apache.org/r1650078 Log: Fixed some javac and javadoc warnings. Modified: sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelopes.java sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/integration/DefaultMetadataTest.java sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java Modified: sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java?rev=1650078&r1=1650077&r2=1650078&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java [UTF-8] Wed Jan 7 15:10:33 2015 @@ -239,11 +239,11 @@ public abstract class AbstractFeature im * * * - * - * - * - * - * + * + * + * + * + * *
Class of returned value
Property type max. occurs Method invoked Return type
{@link AttributeType} 0 or 1 {@link Attribute#getValue()} {@link Object}
{@code AttributeType} 2 or more {@link Attribute#getValues()} {@code Collection}
{@link AssociationRole} 0 or 1 {@link FeatureAssociation#getValue()} {@link Feature}
{@code AssociationRole} 2 or more {@link FeatureAssociation#getValues()} {@code Collection}
Property type max. occurs Method invoked Return type
{@link AttributeType} 0 or 1 {@link Attribute#getValue()} {@link Object}
{@code AttributeType} 2 or more {@link Attribute#getValues()} {@code Collection}
{@link FeatureAssociationRole} 0 or 1 {@link FeatureAssociation#getValue()} {@link Feature}
{@code FeatureAssociationRole} 2 or more {@link FeatureAssociation#getValues()} {@code Collection}
* *
Note: “max. occurs” is the {@linkplain DefaultAttributeType#getMaximumOccurs() maximum Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java?rev=1650078&r1=1650077&r2=1650078&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java [UTF-8] Wed Jan 7 15:10:33 2015 @@ -84,7 +84,7 @@ public class DefaultReleasability extend * * @param object The metadata to copy values from, or {@code null} if none. * - * @see #castOrCopy(SecurityConstraints) + * @see #castOrCopy(Releasability) */ public DefaultReleasability(final Releasability object) { super(object); Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java?rev=1650078&r1=1650077&r2=1650078&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java [UTF-8] Wed Jan 7 15:10:33 2015 @@ -175,7 +175,7 @@ public class DefaultBand extends Default /** * Returns the shortest wavelength that the sensor is capable of collecting within a designated band. - * The units of measurement is given by {@link #getBoundUnit()}. + * The units of measurement is given by {@link #getBoundUnits()}. * * @return Shortest wavelength that the sensor is capable of collecting within a designated band, * or {@code null} if unspecified. Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java?rev=1650078&r1=1650077&r2=1650078&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java [UTF-8] Wed Jan 7 15:10:33 2015 @@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlSeeA import javax.xml.bind.annotation.XmlType; import org.opengis.metadata.content.Band; import org.opengis.metadata.content.SampleDimension; +import org.opengis.metadata.content.CoverageContentType; import org.opengis.metadata.content.TransferFunctionType; import org.opengis.util.Record; import org.opengis.util.RecordType; Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java?rev=1650078&r1=1650077&r2=1650078&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java [UTF-8] Wed Jan 7 15:10:33 2015 @@ -63,15 +63,6 @@ * {@code  └─} {@linkplain org.opengis.metadata.content.ImagingCondition Imaging condition} «code list»
* * - * {@section Bands in gridded data} - * ISO 19115 defines a {@link org.opengis.metadata.content.Band} interface - * which expresses the range of wavelengths in the electromagnetic spectrum. - * For the needs of Image I/O, an additional interface has been defined with a subset - * of the {@code Band} API and the restriction to electromagnetic spectrum removed. - * That interface is named {@link org.apache.sis.image.io.metadata.SampleDimension}. - * Both {@code Band} and {@code SampleDimension} interfaces extend the same parent, - * {@link org.opengis.metadata.content.RangeDimension}. - * * {@section Null values, nil objects and collections} * All constructors and setter methods accept {@code null} arguments. * A null argument value means that the metadata element can not be provided, and the reason for that is unspecified. Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java?rev=1650078&r1=1650077&r2=1650078&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java [UTF-8] Wed Jan 7 15:10:33 2015 @@ -82,7 +82,7 @@ public class DefaultAggregateInformation * * @param object The metadata to copy values from, or {@code null} if none. * - * @see #castOrCopy(AggregateInformation) + * @see #castOrCopy(AssociatedResource) */ public DefaultAggregateInformation(final AssociatedResource object) { super(object); Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java?rev=1650078&r1=1650077&r2=1650078&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java [UTF-8] Wed Jan 7 15:10:33 2015 @@ -256,7 +256,7 @@ public class DefaultSource extends ISOMe /** * Sets the denominator of the representative fraction on a source map. * This method stores the value in the - * {@linkplain #setSourceSpatialResolution(RepresentativeFraction) source spatial resolution}. + * {@linkplain #setSourceSpatialResolution(Resolution) source spatial resolution}. * * @param newValue The new scale denominator. * Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelopes.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelopes.java?rev=1650078&r1=1650077&r2=1650078&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelopes.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelopes.java [UTF-8] Wed Jan 7 15:10:33 2015 @@ -58,7 +58,7 @@ import static org.apache.sis.util.String * For example in order to get an envelope that fully encompass the shape shown below on the right side, * projecting the four corners is not sufficient: * - *
+ *
* * * Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/integration/DefaultMetadataTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/integration/DefaultMetadataTest.java?rev=1650078&r1=1650077&r2=1650078&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/integration/DefaultMetadataTest.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/integration/DefaultMetadataTest.java [UTF-8] Wed Jan 7 15:10:33 2015 @@ -220,7 +220,7 @@ public strictfp class DefaultMetadataTes name.setDates(singleton(new DefaultCitationDate(TestUtilities.date("1990-06-04 22:00:00"), DateType.REVISION))); aggregateInfo.setName(name); aggregateInfo.setInitiativeType(InitiativeType.CAMPAIGN); - aggregateInfo.setAssociationType(AssociationType.LARGER_WORD_CITATION); + aggregateInfo.setAssociationType(AssociationType.LARGER_WORK_CITATION); identification.setAssociatedResources(singleton(aggregateInfo)); } /* Modified: sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java?rev=1650078&r1=1650077&r2=1650078&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java [UTF-8] Wed Jan 7 15:10:33 2015 @@ -335,10 +335,10 @@ public strictfp class Assert extends org } /** - * Serializes the given object in memory, deserialize it and ensures that the deserialized - * object is equals to the original one. This method doesn't write anything to the disk. + * Serializes the given object in memory, deserializes it and ensures that the deserialized + * object is equals to the original one. This method does not write anything to the disk. * - *

If the serialization fails, then this method thrown an {@link AssertionError} + *

If the serialization fails, then this method throws an {@link AssertionError} * as do the other JUnit assertion methods.

* * @param The type of the object to serialize.
Example of curvature induced by a map projection
Envelope before map projection