sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1519430 - in /sis: branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/ branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/ ip-review/ ip-review/rev/28106/
Date Mon, 02 Sep 2013 13:16:34 GMT
Author: desruisseaux
Date: Mon Sep  2 13:16:34 2013
New Revision: 1519430

URL: http://svn.apache.org/r1519430
Log:
Ported AbstractDatum.

Added:
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
  (with props)
    sis/ip-review/AbstractDatum.xhtml   (with props)
    sis/ip-review/rev/28106/AbstractDatum.xhtml   (with props)
Modified:
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java?rev=1519430&r1=1519429&r2=1519430&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
[UTF-8] Mon Sep  2 13:16:34 2013
@@ -57,6 +57,7 @@ import org.apache.sis.internal.metadata.
  *
  * @see Extents#getGeographicBoundingBox(Extent)
  * @see org.apache.sis.referencing.AbstractReferenceSystem#getDomainOfValidity()
+ * @see org.apache.sis.referencing.datum.AbstractDatum#getDomainOfValidity()
  */
 @XmlType(name = "EX_Extent_Type", propOrder = {
     "description",

Added: 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=1519430&view=auto
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
(added)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
[UTF-8] Mon Sep  2 13:16:34 2013
@@ -0,0 +1,317 @@
+/*
+ * 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.datum;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Locale;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.opengis.util.InternationalString;
+import org.opengis.metadata.extent.Extent;
+import org.opengis.referencing.datum.Datum;
+import org.opengis.referencing.IdentifiedObject;
+import org.apache.sis.referencing.AbstractIdentifiedObject;
+import org.apache.sis.referencing.IdentifiedObjects;
+import org.apache.sis.io.wkt.Formatter;
+import org.apache.sis.util.iso.Types;
+import org.apache.sis.util.Classes;
+import org.apache.sis.util.Immutable;
+import org.apache.sis.util.ComparisonMode;
+import org.apache.sis.util.resources.Vocabulary;
+import org.apache.sis.internal.metadata.MetadataUtilities;
+import org.apache.sis.internal.jaxb.gco.DateAsLongAdapter;
+
+import static org.apache.sis.util.Utilities.deepEquals;
+import static org.apache.sis.util.collection.Containers.property;
+
+// Related to JDK7
+import java.util.Objects;
+
+
+/**
+ * Specifies the relationship of a coordinate system to the earth.
+ * A datum can be defined as a set of real points on the earth that have coordinates.
+ * Each datum subtype can be associated with only specific types of
+ * {@linkplain org.apache.sis.referencing.cs.AbstractCS coordinate systems}, thus creating
specific types of
+ * {@linkplain org.apache.sis.referencing.crs.AbstractCRS coordinate reference system}.
+ *
+ * {@section Instantiation}
+ * This class is conceptually <cite>abstract</cite>, even if it is technically
possible to instantiate it.
+ * Typical applications should create instances of the most specific subclass prefixed by
{@code Default} instead.
+ *
+ * @author  Martin Desruisseaux (IRD, Geomatys)
+ * @since   0.3 (derived from geotk-1.2)
+ * @version 0.3
+ * @module
+ *
+ * @see org.apache.sis.referencing.cs.AbstractCS
+ * @see org.apache.sis.referencing.crs.AbstractCRS
+ */
+@Immutable
+@XmlType(name="AbstractDatumType")
+public class AbstractDatum extends AbstractIdentifiedObject implements Datum {
+    /**
+     * Serial number for inter-operability with different versions.
+     */
+    private static final long serialVersionUID = -4894180465652474930L;
+
+    /**
+     * Description, possibly including coordinates, of the point or points used to anchor
the datum
+     * to the Earth. Also known as the "origin", especially for Engineering and Image Datums.
+     */
+    @XmlElement
+    private final InternationalString anchorPoint;
+
+    /**
+     * The time after which this datum definition is valid. This time may be precise
+     * (e.g. 1997 for IRTF97) or merely a year (e.g. 1983 for NAD83). If the time is
+     * not defined, then the value is {@link Long#MIN_VALUE}.
+     */
+    @XmlElement
+    @XmlJavaTypeAdapter(value=DateAsLongAdapter.class, type=long.class)
+    private final long realizationEpoch;
+
+    /**
+     * Area or region in which this datum object is valid.
+     */
+    @XmlElement(name = "validArea")
+    private final Extent domainOfValidity;
+
+    /**
+     * Description of domain of usage, or limitations of usage, for which this datum object
is valid.
+     */
+    @XmlElement
+    private final InternationalString scope;
+
+    /**
+     * Constructs a new datum 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 datum The datum to copy.
+     */
+    public AbstractDatum(final Datum datum) {
+        super(datum);
+        realizationEpoch = MetadataUtilities.toMilliseconds(datum.getRealizationEpoch());
+        domainOfValidity = datum.getDomainOfValidity();
+        scope            = datum.getScope();
+        anchorPoint      = datum.getAnchorPoint();
+    }
+
+    /**
+     * Constructs a datum from a set of properties.
+     * The properties given in argument follow the same rules than for the
+     * {@linkplain AbstractIdentifiedObject#AbstractIdentifiedObject(Map) super-class constructor}.
+     * Additionally, the following properties are understood by this constructor:
+     *
+     * <table class="sis">
+     *   <tr>
+     *     <th>Property name</th>
+     *     <th>Value type</th>
+     *     <th>Returned by</th>
+     *   </tr>
+     *   <tr>
+     *     <td>{@value org.opengis.referencing.datum.Datum#ANCHOR_POINT_KEY}</td>
+     *     <td>{@link InternationalString} or {@link String}</td>
+     *     <td>{@link #getAnchorPoint()}</td>
+     *   </tr>
+     *   <tr>
+     *     <td>{@value org.opengis.referencing.datum.Datum#REALIZATION_EPOCH_KEY}</td>
+     *     <td>{@link Date}</td>
+     *     <td>{@link #getRealizationEpoch()}</td>
+     *   </tr>
+     *   <tr>
+     *     <td>{@value org.opengis.referencing.datum.Datum#DOMAIN_OF_VALIDITY_KEY}</td>
+     *     <td>{@link Extent}</td>
+     *     <td>{@link #getDomainOfValidity()}</td>
+     *   </tr>
+     *   <tr>
+     *     <td>{@value org.opengis.referencing.datum.Datum#SCOPE_KEY}</td>
+     *     <td>{@link InternationalString} or {@link String}</td>
+     *     <td>{@link #getScope()}</td>
+     *   </tr>
+     * </table>
+     *
+     * @param properties The properties to be given to the identified object.
+     */
+    public AbstractDatum(final Map<String,?> properties) {
+        super(properties);
+        realizationEpoch = MetadataUtilities.toMilliseconds(property(properties, REALIZATION_EPOCH_KEY,
Date.class));
+        domainOfValidity = property(properties, DOMAIN_OF_VALIDITY_KEY, Extent.class);
+        anchorPoint      = Types.toInternationalString(properties, ANCHOR_POINT_KEY);
+        scope            = Types.toInternationalString(properties, SCOPE_KEY);
+    }
+
+    /**
+     * Same convenience method than {@link org.apache.sis.cs.AbstractCS#name(int)} except
that we get the
+     * unlocalized name (usually in English locale), because the name is part of the elements
compared by
+     * the {@link #equals(Object, ComparisonMode)} method.
+     */
+    static Map<String,Object> name(final int key) {
+        final Map<String,Object> properties = new HashMap<>(4);
+        final InternationalString name = Vocabulary.formatInternational(key);
+        properties.put(NAME_KEY,  name.toString(Locale.ROOT));
+        properties.put(ALIAS_KEY, name);
+        return properties;
+    }
+
+    /**
+     * Returns a description of the point(s) used to anchor the datum to the Earth.
+     * Also known as the "origin", especially for Engineering and Image Datums.
+     *
+     * <ul>
+     *   <li>For a {@linkplain DefaultGeodeticDatum geodetic datum}, the anchor may
be the point(s) where the
+     *       relationship between geoid and ellipsoid is defined.</li>
+     *
+     *   <li>For an {@linkplain DefaultEngineeringDatum engineering datum}, the anchor
may be an identified
+     *       physical point with the orientation defined relative to the object.</li>
+     *
+     *   <li>For an {@linkplain DefaultImageDatum image datum}, the anchor point may
be the centre or the corner
+     *       of the image.</li>
+     *
+     *   <li>For a {@linkplain DefaultTemporalDatum temporal datum}, see their
+     *       {@linkplain DefaultTemporalDatum#getOrigin() origin} instead.</li>
+     * </ul>
+     *
+     * @return Description, possibly including coordinates, of the point or points used to
anchor the datum
+     *         to the Earth.
+     */
+    @Override
+    public InternationalString getAnchorPoint() {
+        return anchorPoint;
+    }
+
+    /**
+     * The time after which this datum definition is valid.
+     * This time may be precise or merely a year.
+     *
+     * <p>If an old datum is superseded by a new datum, then the realization epoch
for the new datum
+     * defines the upper limit for the validity of the old datum.</p>
+     *
+     * @return The time after which this datum definition is valid, or {@code null} if none.
+     */
+    @Override
+    public Date getRealizationEpoch() {
+        return MetadataUtilities.toDate(realizationEpoch);
+    }
+
+    /**
+     * Returns the region or timeframe in which this reference system is valid,
+     * or {@code null} if unspecified.
+     *
+     * @return Area or region or timeframe in which this (coordinate) reference system is
valid, or {@code null}.
+     *
+     * @see org.apache.sis.metadata.iso.extent.DefaultExtent
+     */
+    @Override
+    public Extent getDomainOfValidity() {
+        return domainOfValidity;
+    }
+
+    /**
+     * Returns the domain or limitations of usage, or {@code null} if unspecified.
+     *
+     * @return Description of domain of usage, or limitations of usage, for which this datum
object is valid.
+     */
+    @Override
+    public InternationalString getScope() {
+        return scope;
+    }
+
+    /**
+     * Gets the type of the datum as an enumerated code. Datum type was provided for all
kind of datum
+     * in the legacy OGC 01-009 specification. In the new OGC 03-73 (ISO 19111) specification,
+     * datum type is provided only for vertical datum. Nevertheless, we keep this method
around
+     * since it is needed for WKT formatting. Note that we return the datum type ordinal
value,
+     * not the code list object.
+     */
+    int getLegacyDatumType() {
+        return 0;
+    }
+
+    /**
+     * Compares the specified object with this datum 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 transformations.
+     * @return {@code true} if both objects are equal.
+     */
+    @Override
+    public boolean equals(final Object object, final ComparisonMode mode) {
+        if (super.equals(object, mode)) {
+            switch (mode) {
+                case STRICT: {
+                    final AbstractDatum that = (AbstractDatum) object;
+                    return this.realizationEpoch == that.realizationEpoch &&
+                           Objects.equals(this.domainOfValidity, that.domainOfValidity) &&
+                           Objects.equals(this.anchorPoint,      that.anchorPoint) &&
+                           Objects.equals(this.scope,            that.scope);
+                }
+                case BY_CONTRACT: {
+                    if (object instanceof Datum) {
+                        final Datum that = (Datum) object;
+                        return deepEquals(getRealizationEpoch(), that.getRealizationEpoch(),
mode) &&
+                               deepEquals(getDomainOfValidity(), that.getDomainOfValidity(),
mode) &&
+                               deepEquals(getAnchorPoint(),      that.getAnchorPoint(), 
    mode) &&
+                               deepEquals(getScope(),            that.getScope(),       
    mode);
+                    }
+                    break;
+                }
+                default: {
+                    /*
+                     * Tests for name, since datum with different name have completely
+                     * different meaning. We don't perform this comparison if the user
+                     * asked for metadata comparison, because in such case the names
+                     * have already been compared by the subclass.
+                     */
+                    if (object instanceof Datum) {
+                        final IdentifiedObject that = (IdentifiedObject) object;
+                        return nameMatches(that. getName().getCode()) ||
+                               IdentifiedObjects.nameMatches(that, getName().getCode());
+                    }
+                    break;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Formats the inner part of a
+     * <a href="http://www.geoapi.org/3.0/javadoc/org/opengis/referencing/doc-files/WKT.html"><cite>Well
+     * Known Text</cite> (WKT)</a> element.
+     *
+     * {@note All subclasses will override this method, but only <code>DefaultGeodeticDatum</code>
+     *        will <strong>not</strong> invoke this parent method, because horizontal
datum do not
+     *        write the datum type.}
+     *
+     * @param  formatter The formatter to use.
+     * @return The WKT element name.
+     */
+    @Override
+    public String formatTo(final Formatter formatter) {
+        formatter.append(getLegacyDatumType());
+        return Classes.getShortClassName(this);
+    }
+}

Propchange: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Added: sis/ip-review/AbstractDatum.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/AbstractDatum.xhtml?rev=1519430&view=auto
==============================================================================
--- sis/ip-review/AbstractDatum.xhtml (added)
+++ sis/ip-review/AbstractDatum.xhtml Mon Sep  2 13:16:34 2013
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>AbstractDatum history</title>
+    <style type="text/css" media="all">
+      @import url("./reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>AbstractDatum history</h1>
+  <p>Click on the commit message for inspecting the <code>diff</code> and
how the code has been rewritten.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn log -r31996:1 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/datum/AbstractDatum.java</code></blockquote>
+<table>
+  <tr>
+    <th>Rev.</th>
+    <th>Date</th>
+    <th>Author</th>
+    <th class="last">Message</th>
+  </tr>
+<tr><td class="rev">30641</td><td>2008-06-12</td><td>acuster</td><td>Copyright
headers: lib/referencing, this time with feeling (and the el in Toolkit)</td></tr>
+<tr><td class="rev">30521</td><td>2008-06-05</td><td>acuster</td><td>Copyright:
Update referencing headers</td></tr>
+<tr><td class="rev">30313</td><td>2008-05-16</td><td>desruisseaux</td><td>Changed
my mind about Utilities.shallowEquals(Object,Object) and renamed it as equals, since a few
tests show that the compiler always select the best overloaded flavor working on primitive
types (except if an argument is a boolean and the other a different primitive type). Updated
a few references. Fixed a few javadoc warnings by explicit declaration of parameter and return
values.</td></tr>
+<tr><td class="rev">30258</td><td>2008-05-08</td><td>acuster</td><td>Reshuffle
the top level repo: drop uDig, move up trunk, tags, and branches.</td></tr>
+<tr><td class="rev">30257</td><td>2008-05-08</td><td>acuster</td><td>Move
trunk/gt/ directory contents up to trunk/ and drop gt</td></tr>
+<tr><td class="rev">29776</td><td>2008-04-03</td><td>desruisseaux</td><td>More
predefined CRS constants, especially for TemporalCRS.</td></tr>
+<tr><td class="rev">28922</td><td>2008-01-24</td><td>acuster</td><td>Bump
the (at)since version to 2.5 since WKTParser was cut from 2.4</td></tr>
+<tr><td class="rev">28540</td><td>2007-12-29</td><td>acuster</td><td>Hide
buttons which are not yet used</td></tr>
+<tr><td class="rev">28393</td><td>2007-12-17</td><td>desruisseaux</td><td>WKT
formatting now includes the semi-major and semi-minor axis length if they differ from the
datum. Applied Java 5 features. Uses WarpAffine when applicable during Raster reprojection.</td></tr>
+<tr><td class="rev">28252</td><td>2007-12-04</td><td>desruisseaux</td><td>More
MosaicImageReader work. As a side effect, moved Utilities.getShort[Class]Name in a separated
utilities class named 'Classes'. Also added a couple of @Override annotations.</td></tr>
+<tr><td class="rev">28107</td><td>2007-11-28</td><td>desruisseaux</td><td>Updated
for recent changes in GeoAPI interfaces.</td></tr>
+<tr><td class="rev">28106</td><td>2007-11-28</td><td class="unav">jgarnett</td><td><a
href="rev/28106/AbstractDatum.xhtml">Line up with GeoAPI crs change to getDomainOfValidity,
remove DuplicatorFilterVistior</a></td></tr>
+<tr><td class="rev">27575</td><td>2007-10-22</td><td>desruisseaux</td><td>Converted
Java source files from ISO-LATIN-1 encoding to UTF-8 (GEOT-1516).</td></tr>
+<tr><td class="rev">24384</td><td>2007-02-14</td><td>desruisseaux</td><td>GEOT-1160:
First working implementation of AbstractAuthorityFactory.find(IdentifiedObject). This includes
a package-privated AuthorityFactoryProxy class, together with many fix in the code base in
order to get CRS.equalsIgnoreCase to work in the ProjectedCRS case.</td></tr>
+<tr><td class="rev">22327</td><td>2006-10-23</td><td>desruisseaux</td><td>GEOT-982:
regroup 'module', 'plugin', 'ext' and 'unsupported' in a common directory.</td></tr>
+<tr><td class="rev">22315</td><td>2006-10-22</td><td>desruisseaux</td><td>Reorganisation
of directory tree structure (GEOT-982) phase 1: moved 'src' to 'src/main/java'.</td></tr>
+<tr><td class="rev">20874</td><td>2006-08-07</td><td class="unav">jgarnett</td><td><a
href="rev/20874/AbstractDatum.xhtml">ip review</a></td></tr>
+<tr><td class="rev">17672</td><td>2006-01-19</td><td>desruisseaux</td><td>Added
@source tag.</td></tr>
+<tr><td class="rev">17660</td><td>2006-01-18</td><td>desruisseaux</td><td>Fixed
SVN attributes, including the addition of URL attribute.</td></tr>
+<tr><td class="rev">15350</td><td>2005-08-16</td><td>desruisseaux</td><td>Merged
the 'split-main' branch to trunk (GEOT-662)</td></tr>
+<tr><td class="rev">15256</td><td>2005-08-09</td><td>desruisseaux</td><td>Extraction
of referencing module from main</td></tr>
+<tr><td class="rev">15255</td><td>2005-08-09</td><td>desruisseaux</td><td>Prepare
branch for splitting main</td></tr>
+<tr><td class="rev">14657</td><td>2005-07-01</td><td>desruisseaux</td><td>Ongoing
work for the port of grid coverage operations from 'legacy' to 'main' (GEOT-413): ported SampleDimensionSelect</td></tr>
+<tr><td class="rev">14550</td><td>2005-06-16</td><td>desruisseaux</td><td>Removed
deprecated fields and methods</td></tr>
+<tr><td class="rev">14545</td><td>2005-06-15</td><td>desruisseaux</td><td>Initial
port of coverage I/O helper classes (work in progress)</td></tr>
+<tr><td class="rev">14235</td><td>2005-06-10</td><td>desruisseaux</td><td>Replaced
_PROPERTY suffix by _KEY as of GEOT-577</td></tr>
+<tr><td class="rev">13925</td><td>2005-05-30</td><td>desruisseaux</td><td>Added
@since javadoc tag</td></tr>
+<tr><td class="rev">13907</td><td>2005-05-28</td><td>desruisseaux</td><td>More
additions of 'Default' prefix in CRS package</td></tr>
+<tr><td class="rev">13906</td><td>2005-05-28</td><td>desruisseaux</td><td>Renamed
some 'Default' prefix as 'Abstract'</td></tr>
+<tr><td class="rev">13869</td><td>2005-05-27</td><td>desruisseaux</td><td>Added
'Default' or 'Abstract' prefix in CRS's 'datum' and 'cs' packages</td></tr>
+<tr><td class="rev">13836</td><td>2005-05-26</td><td>desruisseaux</td><td>Added
'Default' suffix to some CRS implementations: partial work</td></tr>
+<tr><td class="rev">11140</td><td>2005-02-06</td><td>desruisseaux</td><td>Work
in progres for GEOT-400 (CoordinateOperationFactory should create appropriate subclass of
CoordinateOperation)</td></tr>
+<tr><td class="rev">11001</td><td>2005-02-02</td><td>desruisseaux</td><td>Fixed
wrong encoding in main/src</td></tr>
+<tr><td class="rev">10796</td><td>2005-01-28</td><td class="unav">dzwiers</td><td><a
href="rev/10796/AbstractDatum.xhtml">imports cleaned</a></td></tr>
+<tr><td class="rev">9346</td><td>2004-11-30</td><td>desruisseaux</td><td>First
working version of CoordinateOperationFactory</td></tr>
+<tr><td class="rev">8518</td><td>2004-10-11</td><td>desruisseaux</td><td>Apply
changes voted in OGC meeting at Southampton: use of Identifier and GenericName</td></tr>
+<tr><td class="rev">6888</td><td>2004-07-14</td><td>desruisseaux</td><td>Update
for GeoAPI changes (Info -->  IdentifiedObject)</td></tr>
+<tr><td class="rev">6343</td><td>2004-06-07</td><td>desruisseaux</td><td>More
ports of legacy CTS to new CRS</td></tr>
+<tr><td class="rev">6098</td><td>2004-05-23</td><td>desruisseaux</td><td>Partial
implementation of GeoAPI referencing package</td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/AbstractDatum.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/AbstractDatum.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/28106/AbstractDatum.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/28106/AbstractDatum.xhtml?rev=1519430&view=auto
==============================================================================
--- sis/ip-review/rev/28106/AbstractDatum.xhtml (added)
+++ sis/ip-review/rev/28106/AbstractDatum.xhtml Mon Sep  2 13:16:34 2013
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>AbstractDatum changes for revisions 28105:28106</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>AbstractDatum changes for revisions 28105:28106</h1>
+<p>Method has been renamed as a result of a change in GeoAPI interface.
+Reverting this change causes a compilation error, which can be fixed only by re-applying
exactly the same renaming.</p>
+
+<p>The deprecated method has been removed from Geotk/SIS.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change --ignore-all-space
--ignore-eol-style" -r28105:28106 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/datum/AbstractDatum.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 28105</th><th>Revision 28106</th></tr>
+<tr><td><pre>}
+
+/**
+ * Area or region in which this datum object is valid.
+ */
+public Extent getValidArea() {
+<span class="del">    return validArea;</span>
+}
+
+/**</pre></td>
+<td><pre>}
+
+/**
+<span class="add"> * Area or region or timeframe in which this datum is valid.</span>
+<span class="add"> *</span>
+<span class="add"> * @return The datum valid domain, or {@code null} if not available.</span>
+<span class="add"> *</span>
+<span class="add"> * @since GeoAPI 2.1</span>
+<span class="add"> */</span>
+<span class="add">public Extent getDomainOfValidity() {</span>
+<span class="add">    return validArea;</span>
+<span class="add">}</span>
+<span class="add">/**</span>
+ * Area or region in which this datum object is valid.
+<span class="add"> * @deprecated Use getDomainOfValidity</span>
+ */
+public Extent getValidArea() {
+<span class="add">    return getDomainOfValidity();</span>
+}
+
+/**</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/28106/AbstractDatum.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/28106/AbstractDatum.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html



Mime
View raw message