Author: desruisseaux
Date: Tue Nov 26 21:32:11 2013
New Revision: 1545848
URL: http://svn.apache.org/r1545848
Log:
Ported DefaultCylindricalCS, and opportunist javadoc fixes.
Added:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
(with props)
Modified:
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/AbstractReferenceSystem.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
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=1545848&r1=1545847&r2=1545848&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] Tue Nov 26 21:32:11 2013
@@ -485,21 +485,20 @@ public class AbstractIdentifiedObject ex
*
* <ul>
* <li>The {@linkplain #getName() primary name}'s {@linkplain NamedIdentifier#getCode()
code}
- * (ignoring {@linkplain NamedIdentifier#getCodeSpace() codespace}).</li>
+ * (without {@linkplain NamedIdentifier#getCodeSpace() codespace}).</li>
* <li>Any {@linkplain #getAlias() alias}'s {@linkplain NamedIdentifier#tip()
tip}
- * (ignoring {@linkplain NamedIdentifier#scope() scope} and namespace).</li>
+ * (without {@linkplain NamedIdentifier#scope() scope} and namespace).</li>
* </ul>
*
- * {@note Namespaces or scopes are ignored because this method is typically invoked with
either the value of an
- * other <code>IdentifiedObject.getName().getCode()</code>, or with
the <cite>Well Known Text</cite> (WKT)
- * projection or parameter name.}
- *
* The comparison ignores the following aspects:
* <ul>
* <li>Lower/upper cases.</li>
* <li>Some Latin diacritical signs (e.g. {@code "Réunion"} and {@code "Reunion"}
are considered equal).</li>
* <li>All characters that are not {@linkplain Character#isLetterOrDigit(int)
letters or digits}
* (e.g. {@code "Mercator (1SP)"} and {@code "Mercator_1SP"} are considered equal).</li>
+ * <li>Namespaces or scopes, because this method is typically invoked with either
the value of an other
+ * <code>IdentifiedObject.getName().getCode()</code> or with the <cite>Well
Known Text</cite> (WKT)
+ * projection or parameter name.</li>
* </ul>
*
* {@section Usage}
@@ -523,7 +522,7 @@ public class AbstractIdentifiedObject ex
* Comparisons of coordinate system axis names} consider {@code "Lat"}, {@code
"Latitude"} and
* {@code "Geodetic latitude"} as synonymous, and likewise for longitude.</li>
* <li>{@linkplain org.apache.sis.referencing.datum.DefaultGeodeticDatum#isHeuristicMatchForName(String)
- * Comparisons of geodetic datum} ignore the {@code "D_"} prefix, if any.
+ * Comparisons of geodetic datum names} ignore the {@code "D_"} prefix, if any.
* This prefix appears in ESRI datum name (e.g. {@code "D_WGS_1984"}).</li>
* </ul>
*
@@ -570,7 +569,7 @@ public class AbstractIdentifiedObject ex
* @param object The object to compare to {@code this}.
* @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison,
or
* {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only
properties
- * relevant to transformations.
+ * relevant to coordinate transformations.
* @return {@code true} if both objects are equal.
*
* @see #hashCode(ComparisonMode)
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java?rev=1545848&r1=1545847&r2=1545848&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java
[UTF-8] Tue Nov 26 21:32:11 2013
@@ -181,7 +181,7 @@ public class AbstractReferenceSystem ext
* @param object The object to compare to {@code this}.
* @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison,
or
* {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only
properties
- * relevant to transformations.
+ * relevant to coordinate transformations.
* @return {@code true} if both objects are equal.
*/
@Override
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java?rev=1545848&r1=1545847&r2=1545848&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
[UTF-8] Tue Nov 26 21:32:11 2013
@@ -298,9 +298,9 @@ public final class IdentifiedObjects ext
*
* <ul>
* <li>The {@linkplain AbstractIdentifiedObject#getName() primary name}'s {@linkplain
NamedIdentifier#getCode() code}
- * (ignoring {@linkplain NamedIdentifier#getCodeSpace() codespace}).</li>
+ * (without {@linkplain NamedIdentifier#getCodeSpace() codespace}).</li>
* <li>Any {@linkplain AbstractIdentifiedObject#getAlias() alias}'s {@linkplain
NamedIdentifier#tip() tip}
- * (ignoring {@linkplain NamedIdentifier#scope() scope} and namespace).</li>
+ * (without {@linkplain NamedIdentifier#scope() scope} and namespace).</li>
* </ul>
*
* The comparison ignores the following aspects:
@@ -309,6 +309,9 @@ public final class IdentifiedObjects ext
* <li>Some Latin diacritical signs (e.g. {@code "Réunion"} and {@code "Reunion"}
are considered equal).</li>
* <li>All characters that are not {@linkplain Character#isLetterOrDigit(int)
letters or digits}
* (e.g. {@code "Mercator (1SP)"} and {@code "Mercator_1SP"} are considered equal).</li>
+ * <li>Namespaces or scopes, because this method is typically invoked with either
the value of an other
+ * <code>IdentifiedObject.getName().getCode()</code> or with the <cite>Well
Known Text</cite> (WKT)
+ * projection or parameter name.</li>
* </ul>
*
* @param object The object for which to check the name or alias.
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java?rev=1545848&r1=1545847&r2=1545848&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
[UTF-8] Tue Nov 26 21:32:11 2013
@@ -237,7 +237,7 @@ public class AbstractCS extends Abstract
* @param object The object to compare to {@code this}.
* @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison,
or
* {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only
properties
- * relevant to transformations.
+ * relevant to coordinate transformations.
* @return {@code true} if both objects are equal.
*/
@Override
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java?rev=1545848&r1=1545847&r2=1545848&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
[UTF-8] Tue Nov 26 21:32:11 2013
@@ -141,11 +141,10 @@ public class DefaultAffineCS extends Abs
}
/**
- * Returns a SIS coordinate system implementation with the same values than the given
arbitrary
- * implementation. If the given object is {@code null}, then this method returns {@code
null}.
- * Otherwise if the given object is already a SIS implementation, then the given object
is
- * returned unchanged. Otherwise a new SIS implementation is created and initialized
to the
- * attribute values of the given object.
+ * Returns a SIS coordinate system implementation with the same values than the given
arbitrary implementation.
+ * If the given object is {@code null}, then this method returns {@code null}.
+ * Otherwise if the given object is already a SIS implementation, then the given object
is returned unchanged.
+ * Otherwise a new SIS implementation is created and initialized to the attribute values
of the given object.
*
* <p>This method checks for the {@link CartesianCS} sub-interface. If that interface
is found,
* then this method delegates to the corresponding {@code castOrCopy} static method.</p>
@@ -189,7 +188,7 @@ public class DefaultAffineCS extends Abs
* @param object The object to compare to {@code this}.
* @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison,
or
* {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only
properties
- * relevant to transformations.
+ * relevant to coordinate transformations.
* @return {@code true} if both objects are equal.
*/
@Override
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java?rev=1545848&r1=1545847&r2=1545848&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
[UTF-8] Tue Nov 26 21:32:11 2013
@@ -159,11 +159,10 @@ public class DefaultCartesianCS extends
}
/**
- * Returns a SIS coordinate system implementation with the same values than the given
arbitrary
- * implementation. If the given object is {@code null}, then this method returns {@code
null}.
- * Otherwise if the given object is already a SIS implementation, then the given object
is
- * returned unchanged. Otherwise a new SIS implementation is created and initialized
to the
- * attribute values of the given object.
+ * Returns a SIS coordinate system implementation with the same values than the given
arbitrary implementation.
+ * If the given object is {@code null}, then this method returns {@code null}.
+ * Otherwise if the given object is already a SIS implementation, then the given object
is returned unchanged.
+ * Otherwise a new SIS implementation is created and initialized to the attribute values
of the given object.
*
* @param object The object to get as a SIS implementation, or {@code null} if none.
* @return A SIS implementation containing the values of the given object (may be the
@@ -198,7 +197,7 @@ public class DefaultCartesianCS extends
* @param object The object to compare to {@code this}.
* @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison,
or
* {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only
properties
- * relevant to transformations.
+ * relevant to coordinate transformations.
* @return {@code true} if both objects are equal.
*/
@Override
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java?rev=1545848&r1=1545847&r2=1545848&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java
[UTF-8] Tue Nov 26 21:32:11 2013
@@ -177,7 +177,7 @@ public class DefaultCompoundCS extends A
* @param object The object to compare to {@code this}.
* @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison,
or
* {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only
properties
- * relevant to transformations.
+ * relevant to coordinate transformations.
* @return {@code true} if both objects are equal.
*/
@Override
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java?rev=1545848&r1=1545847&r2=1545848&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
[UTF-8] Tue Nov 26 21:32:11 2013
@@ -450,7 +450,7 @@ public class DefaultCoordinateSystemAxis
* @param object The object to compare to {@code this}.
* @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison,
or
* {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only
properties
- * relevant to transformations.
+ * relevant to coordinate transformations.
* @return {@code true} if both objects are equal.
*/
@Override
Added: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java?rev=1545848&view=auto
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
(added)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
[UTF-8] Tue Nov 26 21:32:11 2013
@@ -0,0 +1,156 @@
+/*
+ * 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.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.referencing.cs;
+
+import java.util.Map;
+import org.opengis.referencing.cs.CylindricalCS;
+import org.opengis.referencing.cs.AxisDirection;
+import org.opengis.referencing.cs.CoordinateSystemAxis;
+import org.apache.sis.internal.referencing.AxisDirections;
+import org.apache.sis.util.ComparisonMode;
+import org.apache.sis.util.Immutable;
+
+
+/**
+ * A 3-dimensional coordinate system consisting of a
+ * {@linkplain DefaultPolarCS polar coordinate system} extended by a straight perpendicular
axis.
+ *
+ * <table class="sis"><tr>
+ * <th>Used with</th>
+ * <th>Permitted axis names</th>
+ * </tr><tr>
+ * <td>{@linkplain org.geotoolkit.referencing.crs.DefaultEngineeringCRS Engineering
CRS}</td>
+ * <td>unspecified</td>
+ * </tr></table>
+ *
+ * @author Martin Desruisseaux (IRD, Geomatys)
+ * @since 0.4 (derived from geotk-2.0)
+ * @version 0.4
+ * @module
+ *
+ * @see DefaultPolarCS
+ */
+@Immutable
+public class DefaultCylindricalCS extends AbstractCS implements CylindricalCS {
+ /**
+ * Serial number for inter-operability with different versions.
+ */
+ private static final long serialVersionUID = -8290402732390917907L;
+
+ /**
+ * Constructs a three-dimensional coordinate system from a set of properties.
+ * The properties map is given unchanged to the
+ * {@linkplain AbstractCS#AbstractCS(Map,CoordinateSystemAxis[]) super-class constructor}.
+ * The following table is a reminder of main (not all) properties:
+ *
+ * <table class="sis">
+ * <tr>
+ * <th>Property name</th>
+ * <th>Value type</th>
+ * <th>Returned by</th>
+ * </tr>
+ * <tr>
+ * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td>
+ * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td>
+ * <td>{@link #getName()}</td>
+ * </tr>
+ * <tr>
+ * <td>{@value org.opengis.referencing.IdentifiedObject#ALIAS_KEY}</td>
+ * <td>{@link org.opengis.util.GenericName} or {@link CharSequence} (optionally
as array)</td>
+ * <td>{@link #getAlias()}</td>
+ * </tr>
+ * <tr>
+ * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td>
+ * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td>
+ * <td>{@link #getIdentifiers()}</td>
+ * </tr>
+ * <tr>
+ * <td>{@value org.opengis.referencing.IdentifiedObject#REMARKS_KEY}</td>
+ * <td>{@link org.opengis.util.InternationalString} or {@link String}</td>
+ * <td>{@link #getRemarks()}</td>
+ * </tr>
+ * </table>
+ *
+ * @param properties Set of properties. Should contains at least {@code "name"}.
+ * @param axis0 The first axis.
+ * @param axis1 The second axis.
+ * @param axis2 The third axis.
+ */
+ public DefaultCylindricalCS(final Map<String,?> properties,
+ final CoordinateSystemAxis axis0,
+ final CoordinateSystemAxis axis1,
+ final CoordinateSystemAxis axis2)
+ {
+ super(properties, axis0, axis1, axis2);
+ }
+
+ /**
+ * Creates a new coordinate system with the same values than the specified one.
+ * This copy constructor provides a way to convert an arbitrary implementation into a
SIS one
+ * or a user-defined one (as a subclass), usually in order to leverage some implementation-specific
API.
+ *
+ * <p>This constructor performs a shallow copy, i.e. the properties are not cloned.</p>
+ *
+ * @param cs The coordinate system to copy.
+ *
+ * @see #castOrCopy(CylindricalCS)
+ */
+ protected DefaultCylindricalCS(final CylindricalCS cs) {
+ super(cs);
+ }
+
+ /**
+ * Returns a SIS coordinate system implementation with the same values than the given
arbitrary implementation.
+ * If the given object is {@code null}, then this method returns {@code null}.
+ * Otherwise if the given object is already a SIS implementation, then the given object
is returned unchanged.
+ * Otherwise a new SIS implementation is created and initialized to the attribute values
of the given object.
+ *
+ * @param object The object to get as a SIS implementation, or {@code null} if none.
+ * @return A SIS implementation containing the values of the given object (may be the
+ * given object itself), or {@code null} if the argument was null.
+ */
+ public static DefaultCylindricalCS castOrCopy(final CylindricalCS object) {
+ return (object == null) || (object instanceof DefaultCylindricalCS)
+ ? (DefaultCylindricalCS) object : new DefaultCylindricalCS(object);
+ }
+
+ /**
+ * Returns {@code true} if the specified axis direction is allowed for this coordinate
system.
+ * Current implementation accepts all directions except temporal ones.
+ */
+ @Override
+ final boolean isCompatibleDirection(final AxisDirection direction) {
+ return !AxisDirection.FUTURE.equals(AxisDirections.absolute(direction));
+ }
+
+ /**
+ * Compares this coordinate system with the specified object for equality.
+ *
+ * @param object The object to compare to {@code this}.
+ * @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison,
or
+ * {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only
properties
+ * relevant to coordinate transformations.
+ * @return {@code true} if both objects are equal.
+ */
+ @Override
+ public boolean equals(final Object object, final ComparisonMode mode) {
+ if (object == this) {
+ return true; // Slight optimization.
+ }
+ return (object instanceof CylindricalCS) && super.equals(object, mode);
+ }
+}
Propchange: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
------------------------------------------------------------------------------
svn:mime-type = text/plain;charset=UTF-8
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java?rev=1545848&r1=1545847&r2=1545848&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
[UTF-8] Tue Nov 26 21:32:11 2013
@@ -336,7 +336,7 @@ public class AbstractDatum extends Abstr
* @param object The object to compare to {@code this}.
* @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison,
or
* {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only
properties
- * relevant to transformations.
+ * relevant to coordinate transformations.
* @return {@code true} if both objects are equal.
*/
@Override
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=1545848&r1=1545847&r2=1545848&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] Tue Nov 26 21:32:11 2013
@@ -645,7 +645,7 @@ public class DefaultEllipsoid extends Ab
* @param object The object to compare to {@code this}.
* @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison,
or
* {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only
properties
- * relevant to transformations.
+ * relevant to coordinate transformations.
* @return {@code true} if both objects are equal.
*/
@Override
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java?rev=1545848&r1=1545847&r2=1545848&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
[UTF-8] Tue Nov 26 21:32:11 2013
@@ -143,7 +143,7 @@ public class DefaultEngineeringDatum ext
* @param object The object to compare to {@code this}.
* @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison,
or
* {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only
properties
- * relevant to transformations.
+ * relevant to coordinate transformations.
* @return {@code true} if both objects are equal.
*/
@Override
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java?rev=1545848&r1=1545847&r2=1545848&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
[UTF-8] Tue Nov 26 21:32:11 2013
@@ -418,7 +418,7 @@ public class DefaultGeodeticDatum extend
* @param object The object to compare to {@code this}.
* @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison,
or
* {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only
properties
- * relevant to transformations.
+ * relevant to coordinate transformations.
* @return {@code true} if both objects are equal.
*/
@Override
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java?rev=1545848&r1=1545847&r2=1545848&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
[UTF-8] Tue Nov 26 21:32:11 2013
@@ -167,7 +167,7 @@ public class DefaultImageDatum extends A
* @param object The object to compare to {@code this}.
* @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison,
or
* {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only
properties
- * relevant to transformations.
+ * relevant to coordinate transformations.
* @return {@code true} if both objects are equal.
*/
@Override
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java?rev=1545848&r1=1545847&r2=1545848&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
[UTF-8] Tue Nov 26 21:32:11 2013
@@ -219,7 +219,7 @@ public class DefaultPrimeMeridian extend
* @param object The object to compare to {@code this}.
* @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison,
or
* {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only
properties
- * relevant to transformations.
+ * relevant to coordinate transformations.
* @return {@code true} if both objects are equal.
*/
@Override
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java?rev=1545848&r1=1545847&r2=1545848&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
(original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
Tue Nov 26 21:32:11 2013
@@ -190,7 +190,7 @@ public class DefaultTemporalDatum extend
* @param object The object to compare to {@code this}.
* @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison,
or
* {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only
properties
- * relevant to transformations.
+ * relevant to coordinate transformations.
* @return {@code true} if both objects are equal.
*/
@Override
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java?rev=1545848&r1=1545847&r2=1545848&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
[UTF-8] Tue Nov 26 21:32:11 2013
@@ -246,7 +246,7 @@ public class DefaultVerticalDatum extend
* @param object The object to compare to {@code this}.
* @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison,
or
* {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only
properties
- * relevant to transformations.
+ * relevant to coordinate transformations.
* @return {@code true} if both objects are equal.
*/
@Override
|