From commits-return-3460-apmail-sis-commits-archive=sis.apache.org@sis.apache.org Fri Jan 17 18:40:29 2014 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 50C6E10FE7 for ; Fri, 17 Jan 2014 18:40:29 +0000 (UTC) Received: (qmail 58612 invoked by uid 500); 17 Jan 2014 18:40:22 -0000 Delivered-To: apmail-sis-commits-archive@sis.apache.org Received: (qmail 58512 invoked by uid 500); 17 Jan 2014 18:40:21 -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 58428 invoked by uid 99); 17 Jan 2014 18:40:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jan 2014 18:40:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jan 2014 18:40:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 17B8923888E2; Fri, 17 Jan 2014 18:39:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1559213 - in /sis/branches/JDK7/core: sis-referencing/src/main/java/org/apache/sis/geometry/ sis-referencing/src/main/java/org/apache/sis/io/wkt/ sis-referencing/src/main/java/org/apache/sis/referencing/ sis-referencing/src/main/java/org/a... Date: Fri, 17 Jan 2014 18:39:51 -0000 To: commits@sis.apache.org From: desruisseaux@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140117183952.17B8923888E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: desruisseaux Date: Fri Jan 17 18:39:50 2014 New Revision: 1559213 URL: http://svn.apache.org/r1559213 Log: Javadoc fixes. Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelopes.java sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Convention.java sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/GeodeticObjects.java sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRS.java sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Locales.java sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/StringBuilders.java sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java?rev=1559213&r1=1559212&r2=1559213&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java [UTF-8] Fri Jan 17 18:39:50 2014 @@ -176,7 +176,9 @@ class ArrayEnvelope extends AbstractEnve /** * Constructs a new envelope with the same data than the specified geographic bounding box. - * The coordinate reference system is set to {@code "CRS:84"}. + * The coordinate reference system is set to the + * {@linkplain org.apache.sis.referencing.GeodeticObjects#defaultGeographic() default geographic CRS}. + * Axis order is (longitude, latitude). * * @param box The bounding box to copy. */ @@ -194,7 +196,7 @@ class ArrayEnvelope extends AbstractEnve ArraysExt.swap(ordinates, 1, (ordinates.length >>> 1) + 1); } } - crs = GeodeticObjects.WGS84.normalizedGeographic(); + crs = GeodeticObjects.defaultGeographic(); } /** Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java?rev=1559213&r1=1559212&r2=1559213&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java [UTF-8] Fri Jan 17 18:39:50 2014 @@ -199,7 +199,9 @@ public class Envelope2D extends Rectangl /** * Constructs a new envelope with the same data than the specified geographic bounding box. - * The coordinate reference system is set to {@code "CRS:84"}. + * The coordinate reference system is set to the + * {@linkplain org.apache.sis.referencing.GeodeticObjects#defaultGeographic() default geographic CRS}. + * Axis order is (longitude, latitude). * * @param box The bounding box to copy (can not be {@code null}). */ @@ -208,7 +210,7 @@ public class Envelope2D extends Rectangl box.getSouthBoundLatitude(), box.getEastBoundLongitude(), box.getNorthBoundLatitude()); - crs = GeodeticObjects.WGS84.normalizedGeographic(); + crs = GeodeticObjects.defaultGeographic(); if (Boolean.FALSE.equals(box.getInclusion())) { x += width; width = -width; Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelopes.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelopes.java?rev=1559213&r1=1559212&r2=1559213&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelopes.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelopes.java [UTF-8] Fri Jan 17 18:39:50 2014 @@ -25,6 +25,7 @@ import org.opengis.geometry.Envelope; import org.opengis.util.FactoryException; import org.apache.sis.util.Static; import org.apache.sis.util.resources.Errors; +import org.apache.sis.referencing.CRS; import static org.apache.sis.util.ArgumentChecks.ensureNonNull; import static org.apache.sis.util.StringBuilders.trimFractionalPart; Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java?rev=1559213&r1=1559212&r2=1559213&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java [UTF-8] Fri Jan 17 18:39:50 2014 @@ -184,7 +184,9 @@ public class GeneralEnvelope extends Arr /** * Constructs a new envelope with the same data than the specified geographic bounding box. - * The coordinate reference system is set to {@code "CRS:84"}. + * The coordinate reference system is set to the + * {@linkplain org.apache.sis.referencing.GeodeticObjects#defaultGeographic() default geographic CRS}. + * Axis order is (longitude, latitude). * * @param box The bounding box to copy. */ Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java?rev=1559213&r1=1559212&r2=1559213&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java [UTF-8] Fri Jan 17 18:39:50 2014 @@ -87,7 +87,9 @@ public final class ImmutableEnvelope ext /** * Constructs a new envelope with the same data than the specified geographic bounding box. - * The coordinate reference system is set to {@code "CRS:84"}. + * The coordinate reference system is set to the + * {@linkplain org.apache.sis.referencing.GeodeticObjects#defaultGeographic() default geographic CRS}. + * Axis order is (longitude, latitude). * * @param box The bounding box to copy. */ Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Convention.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Convention.java?rev=1559213&r1=1559212&r2=1559213&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Convention.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Convention.java [UTF-8] Fri Jan 17 18:39:50 2014 @@ -27,7 +27,6 @@ import org.opengis.referencing.operation import org.opengis.referencing.operation.CoordinateOperation; import org.apache.sis.util.Debug; import org.apache.sis.metadata.iso.citation.Citations; -import org.apache.sis.referencing.cs.DefaultCoordinateSystemAxis; import static javax.measure.unit.NonSI.DEGREE_ANGLE; @@ -65,9 +64,7 @@ public enum Convention { * *
    *
  • For {@link GeocentricCRS}, this convention uses the legacy set of Cartesian axes. - * Those axes were defined in OGC 01-009 as Other, - * {@linkplain DefaultCoordinateSystemAxis#EASTING Easting} and - * {@linkplain DefaultCoordinateSystemAxis#NORTHING Northing} + * Those axes were defined in OGC 01-009 as Other, Easting and Northing * in metres, where the "Other" axis is toward prime meridian.
    • *
* @@ -83,10 +80,8 @@ public enum Convention { * *
    *
  • For {@link GeocentricCRS}, this convention uses the new set of Cartesian axes. - * Those axes are defined in ISO 19111 as - * {@linkplain DefaultCoordinateSystemAxis#GEOCENTRIC_X Geocentric X}, - * {@linkplain DefaultCoordinateSystemAxis#GEOCENTRIC_Y Geocentric Y} and - * {@linkplain DefaultCoordinateSystemAxis#GEOCENTRIC_Z Geocentric Z} in metres.
    • + * Those axes are defined in ISO 19111 as Geocentric X, Geocentric Y + * and Geocentric Z in metres. *
* * @see Citations#EPSG @@ -304,19 +299,11 @@ public enum Convention { * and the new (ISO 19111) directions. Those directions are: * * - * - * - * - * - * - * - * - * - * - * - * - * - *
ISO 19111OGC 01-009
{@linkplain DefaultCoordinateSystemAxis#GEOCENTRIC_X Geocentric X}Other
{@linkplain DefaultCoordinateSystemAxis#GEOCENTRIC_Y Geocentric Y}{@linkplain DefaultCoordinateSystemAxis#EASTING Easting}
{@linkplain DefaultCoordinateSystemAxis#GEOCENTRIC_Z Geocentric Z}{@linkplain DefaultCoordinateSystemAxis#NORTHING Northing}
+ * ISO 19111 OGC 01-009 + * Geocentric X Other + * Geocentric Y Easting + * Geocentric Z Northing + * * * @param cs The coordinate system. * @return A coordinate system equivalent to the given one but with conform axis names, Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java?rev=1559213&r1=1559212&r2=1559213&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] Fri Jan 17 18:39:50 2014 @@ -828,8 +828,8 @@ public class Formatter { /** * Returns {@code true} if the WKT written by this formatter is not strictly compliant to the * WKT - * specification. This method returns {@code true} if {@link #setInvalidWKT(String)} has - * been invoked at least once. The action to take regarding invalid WKT is caller-dependent. + * specification. This method returns {@code true} if {@link #setInvalidWKT(IdentifiedObject)} + * has been invoked at least once. The action to take regarding invalid WKT is caller-dependent. * For example {@link FormattableObject#toString()} will accepts loose WKT formatting and ignore * this flag, while {@link FormattableObject#toWKT()} requires strict WKT formatting and will * thrown an exception if this flag is set. Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java?rev=1559213&r1=1559212&r2=1559213&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java [UTF-8] Fri Jan 17 18:39:50 2014 @@ -16,6 +16,8 @@ */ package org.apache.sis.io.wkt; +import org.opengis.referencing.IdentifiedObject; + /** * Thrown by {@link FormattableObject#toWKT()} when an object can not be formatted as WKT. @@ -33,7 +35,7 @@ package org.apache.sis.io.wkt; * @version 0.4 * @module * - * @see Formatter#setInvalidWKT(String) + * @see Formatter#setInvalidWKT(IdentifiedObject) */ public class UnformattableObjectException extends UnsupportedOperationException { /** Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java?rev=1559213&r1=1559212&r2=1559213&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java [UTF-8] Fri Jan 17 18:39:50 2014 @@ -138,7 +138,7 @@ public class AbstractIdentifiedObject ex * The name for this object or code. Shall never be {@code null}. * *

Consider this field as final! - * This field is modified only at unmarshalling time by {@link Names#add(ReferenceIdentifier)}.

+ * This field is modified only at unmarshalling time by {@link #addName(ReferenceIdentifier)}.

* * @see #getName() * @see #getNames() @@ -151,7 +151,7 @@ public class AbstractIdentifiedObject ex * we may get both on unmarshalling. * *

Consider this field as final! - * This field is modified only at unmarshalling time by {@link Names#add(ReferenceIdentifier)}.

+ * This field is modified only at unmarshalling time by {@link #addName(ReferenceIdentifier)}.

*/ private Collection alias; Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/GeodeticObjects.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/GeodeticObjects.java?rev=1559213&r1=1559212&r2=1559213&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/GeodeticObjects.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/GeodeticObjects.java [UTF-8] Fri Jan 17 18:39:50 2014 @@ -300,6 +300,32 @@ public enum GeodeticObjects { } /** + * Returns the default two-dimensional normalized geographic CRS. + * The CRS returned by this method has the following properties: + * + *
    + *
  • Axis order is (longitude, latitude).
    • + *
  • Axis directions are ({@linkplain AxisDirection#EAST East}, {@linkplain AxisDirection#NORTH North}).
    • + *
  • Angular unit is {@link NonSI#DEGREE_ANGLE}.
    • + *
  • Prime meridian in Greenwich.
    • + *
+ * + * {@note This method makes no guarantees about the datum. The current default datum is WGS 84, + * but this may change in future SIS versions if a WGS 84 replacement become in wide use.} + * + *

This default CRS is assigned to + * {@linkplain org.apache.sis.geometry.GeneralEnvelope#GeneralEnvelope(org.opengis.metadata.extent.GeographicBoundingBox) + * envelopes created from a geographic bounding box}. + * Since ISO 19115 {@link org.opengis.metadata.extent.GeographicBoundingBox} is approximative by definition, + * their datum can be arbitrary.

+ * + * @return The default two-dimensional geographic CRS with (longitude, latitude) axis order. + */ + public static GeographicCRS defaultGeographic() { + return WGS84.normalizedGeographic(); + } + + /** * Returns a two-dimensional geographic CRS with axes in the non-standard but computationally convenient * (longitude, latitude) order. The coordinate system axes will be oriented toward * {@linkplain AxisDirection#EAST East} and {@linkplain AxisDirection#NORTH North} respectively, with units Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java?rev=1559213&r1=1559212&r2=1559213&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java [UTF-8] Fri Jan 17 18:39:50 2014 @@ -423,7 +423,7 @@ public class DefaultEllipsoid extends Ab * and we can not convert from one to the other. * * @see #setSecondDefiningParameter(SecondDefiningParameter) - * @see #afterUnmarshal(Object, Object) + * @see #afterUnmarshal() */ private void setSemiMajorAxisMeasure(final Measure measure) throws ConversionException { if (semiMajorAxis != 0) { @@ -526,7 +526,7 @@ public class DefaultEllipsoid extends Ab * and we can not convert from one to the other. * * @see #setSemiMajorAxisMeasure(Measure) - * @see #afterUnmarshal(Object, Object) + * @see #afterUnmarshal() */ private void setSecondDefiningParameter(SecondDefiningParameter second) throws ConversionException { while (second.secondDefiningParameter != null) { Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java?rev=1559213&r1=1559212&r2=1559213&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java [UTF-8] Fri Jan 17 18:39:50 2014 @@ -130,8 +130,8 @@ public final strictfp class AbstractIden /** * Tests the {@link AbstractIdentifiedObject#AbstractIdentifiedObject(Map)} constructor - * with more than one identifier. This method tries a different identifier implementation - * than the {@link #testCreateWithSingleIdentifier()} one. + * with more than one identifier. This method also tries a different identifier implementation + * than the one used by {@link #testWithSingleIdentifier()}. */ @Test @DependsOnMethod("testWithSingleIdentifier") Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRS.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRS.java?rev=1559213&r1=1559212&r2=1559213&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRS.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRS.java [UTF-8] Fri Jan 17 18:39:50 2014 @@ -130,7 +130,7 @@ public final strictfp class HardCodedCRS * By default, this CRS has no transformation path to any other CRS (i.e. a map using * this CS can't be reprojected to a geographic coordinate reference system for example). * - *

The {@code PixelInCell} attribute of the associated {@link ImageDatum} + *

The {@code PixelInCell} attribute of the associated {@code ImageDatum} * is set to {@link PixelInCell#CELL_CENTER}.

*/ public static final DefaultImageCRS IMAGE = new DefaultImageCRS( Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java?rev=1559213&r1=1559212&r2=1559213&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java [UTF-8] Fri Jan 17 18:39:50 2014 @@ -294,8 +294,7 @@ public final class Units extends Static * * The above is exact for {@linkplain javax.measure.converter.LinearConverter linear converters}, * which is the case of the vast majority of unit converters in use. It may not be exact for a - * few unusual converter like the one from {@link #SEXAGESIMAL_DMS} to decimal degrees for - * example. + * few unusual converter like the one from sexagesimal degrees to decimal degrees for example. * * @param converter The converter for which we want the derivative at a given point. * @param value The point at which to compute the derivative. Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Locales.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Locales.java?rev=1559213&r1=1559212&r2=1559213&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Locales.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Locales.java [UTF-8] Fri Jan 17 18:39:50 2014 @@ -141,8 +141,7 @@ public final class Locales extends Stati public static final Locales ALL = new Locales(); /** - * Only locales available in the Apache SIS library. They are the locales for which localized - * resources are provided in the {@link org.apache.sis.util.resources} package. + * Only locales available in the Apache SIS library. */ public static final Locales SIS = new Locales(); @@ -156,7 +155,7 @@ public final class Locales extends Stati /** * Returns the languages known to the JavaVM ({@link #ALL}) or to the Apache SIS library * ({@link #SIS}). In the later case, this method returns only the languages for which - * localized resources are provided in the {@link org.apache.sis.util.resources} package. + * localized resources are provided in the {@code org.apache.sis.util.resources} package. * * @return The list of supported languages. */ @@ -173,7 +172,7 @@ public final class Locales extends Stati /** * Returns the locales known to the JavaVM ({@link #ALL}) or to the Apache SIS library * ({@link #SIS}). In the later case, this method returns only the locales for which - * localized resources are provided in the {@link org.apache.sis.util.resources} package. + * localized resources are provided in the {@code org.apache.sis.util.resources} package. * * @return The list of supported locales. */ Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/StringBuilders.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/StringBuilders.java?rev=1559213&r1=1559212&r2=1559213&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/StringBuilders.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/StringBuilders.java [UTF-8] Fri Jan 17 18:39:50 2014 @@ -86,7 +86,7 @@ public final class StringBuilders extend * @throws IllegalArgumentException If the {@code toSearch} argument is empty. * * @see String#replace(char, char) - * @see CharSequences#replace(CharSequence, String, String) + * @see CharSequences#replace(CharSequence, CharSequence, CharSequence) * @see StringBuilder#replace(int, int, String) */ public static void replace(final StringBuilder buffer, final String toSearch, final String replaceBy) { Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java?rev=1559213&r1=1559212&r2=1559213&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java [UTF-8] Fri Jan 17 18:39:50 2014 @@ -69,7 +69,7 @@ import static org.apache.sis.util.Argume * with the addition of type safety and optional arguments to be formatted in the localized string. * Those resource bundles provide {@code formatInternational(int, …)} static methods for creating * international strings with the same functionality than this {@code ResourceInternationalString}. - * See {@link org.apache.sis.util.resources} for more information. + * See {@code org.apache.sis.util.resources} for more information. * * {@section Immutability and thread safety} * This class is immutable and thus inherently thread-safe if the bundles created by {@link #getBundle(Locale)}