sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1555319 - in /sis: branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/ ip-review/ ip-review/rev/07848/ ip-review/rev/10796/ ip-review/rev/20874/
Date Sat, 04 Jan 2014 04:35:14 GMT
Author: desruisseaux
Date: Sat Jan  4 04:35:13 2014
New Revision: 1555319

URL: http://svn.apache.org/r1555319
Log:
Ported AbstractSingleCRS.

Added:
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractSingleCRS.java
  (with props)
    sis/ip-review/AbstractSingleCRS.xhtml   (with props)
    sis/ip-review/rev/07848/AbstractSingleCRS.xhtml   (with props)
    sis/ip-review/rev/10796/AbstractSingleCRS.xhtml   (with props)
    sis/ip-review/rev/20874/AbstractSingleCRS.xhtml   (with props)

Added: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractSingleCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractSingleCRS.java?rev=1555319&view=auto
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractSingleCRS.java
(added)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractSingleCRS.java
Sat Jan  4 04:35:13 2014
@@ -0,0 +1,238 @@
+/*
+ * 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.crs;
+
+import java.util.Map;
+import javax.xml.bind.annotation.XmlTransient;
+import org.opengis.referencing.datum.Datum;
+import org.opengis.referencing.crs.SingleCRS;
+import org.opengis.referencing.cs.CoordinateSystem;
+import org.apache.sis.referencing.AbstractReferenceSystem;
+import org.apache.sis.util.ComparisonMode;
+import org.apache.sis.io.wkt.Formatter;
+
+import static org.apache.sis.util.Utilities.deepEquals;
+import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
+import static org.apache.sis.internal.referencing.ReferencingUtilities.canSetProperty;
+
+// Related to JDK7
+import java.util.Objects;
+
+
+/**
+ * A CRS consisting of a single coordinate system and a single datum (as opposed to compound
CRS).
+ *
+ * {@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.
+ * An exception to this rule may occur when it is not possible to identify the exact type,
for example when
+ * parsing some definitions written in version 1 of WKT format.
+ *
+ * {@section Immutability and thread safety}
+ * This base class is immutable and thus thread-safe if the property <em>values</em>
(not necessarily the map itself)
+ * given to the constructor are also immutable. Most SIS subclasses and related classes are
immutable under similar
+ * conditions. This means that unless otherwise noted in the javadoc, {@code SingleCRS} instances
created using only
+ * SIS factories and static constants can be shared by many objects and passed between threads
without synchronization.
+ *
+ * @author  Martin Desruisseaux (IRD, Geomatys)
+ * @since   0.4 (derived from geotk-1.2)
+ * @version 0.4
+ * @module
+ *
+ * @see org.apache.sis.referencing.cs.AbstractCS
+ * @see org.apache.sis.referencing.datum.AbstractDatum
+ */
+@XmlTransient
+public class AbstractSingleCRS extends AbstractCRS implements SingleCRS {
+    /**
+     * Serial number for inter-operability with different versions.
+     */
+    private static final long serialVersionUID = 1815712797774273L;
+
+    /**
+     * The datum.
+     *
+     * <p><b>Consider this field as final!</b>
+     * This field is modified only at unmarshalling time by {@link #setDatum(Datum)}</p>
+     */
+    private Datum datum;
+
+    /**
+     * Constructs a new object in which every attributes are set to a null value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly
+     * reserved to JAXB, which will assign values to the fields using reflexion.
+     */
+    AbstractSingleCRS() {
+    }
+
+    /**
+     * Constructs a coordinate reference system from a set of properties.
+     * The properties given in argument follow the same rules than for the
+     * {@linkplain AbstractReferenceSystem#AbstractReferenceSystem(Map) 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>
+     *   <tr>
+     *     <td>{@value org.opengis.referencing.datum.Datum#DOMAIN_OF_VALIDITY_KEY}</td>
+     *     <td>{@link org.opengis.metadata.extent.Extent}</td>
+     *     <td>{@link #getDomainOfValidity()}</td>
+     *   </tr>
+     *   <tr>
+     *     <td>{@value org.opengis.referencing.datum.Datum#SCOPE_KEY}</td>
+     *     <td>{@link org.opengis.util.InternationalString} or {@link String}</td>
+     *     <td>{@link #getScope()}</td>
+     *   </tr>
+     * </table>
+     *
+     * @param properties The properties to be given to the coordinate reference system.
+     * @param datum The datum.
+     * @param cs The coordinate system.
+     */
+    public AbstractSingleCRS(final Map<String,?> properties,
+                             final Datum datum,
+                             final CoordinateSystem cs)
+    {
+        super(properties, cs);
+        this.datum = datum;
+        ensureNonNull("datum", datum);
+    }
+
+    /**
+     * Constructs a new coordinate reference 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 crs The coordinate reference system to copy.
+     */
+    protected AbstractSingleCRS(final SingleCRS crs) {
+        super(crs);
+        datum = crs.getDatum();
+    }
+
+    /**
+     * Returns the GeoAPI interface implemented by this class.
+     * The default implementation returns {@code SingleCRS.class}.
+     * Subclasses implementing a more specific GeoAPI interface shall override this method.
+     *
+     * @return The coordinate reference system interface implemented by this class.
+     */
+    @Override
+    public Class<? extends SingleCRS> getInterface() {
+        return SingleCRS.class;
+    }
+
+    /**
+     * Returns the datum.
+     *
+     * @return The datum.
+     */
+    @Override
+    public Datum getDatum() {
+        return datum;
+    }
+
+    /**
+     * Sets the datum. This method is invoked only by JAXB at unmarshalling time
+     * and can be invoked only if the datum has never been set.
+     *
+     * @param  name The property name, used only in case of error message to format.
+     * @throws IllegalStateException If the datum has already been set.
+     */
+    final void setDatum(final String name, final Datum datum) {
+        if (datum != null && canSetProperty(name, this.datum != null)) {
+            this.datum = datum;
+        }
+    }
+
+    /**
+     * Compares this coordinate reference system with the specified object for equality.
+     * If the {@code mode} argument value is {@link ComparisonMode#STRICT STRICT} or
+     * {@link ComparisonMode#BY_CONTRACT BY_CONTRACT}, then all available properties are
+     * compared including the {@linkplain #getDomainOfValidity() domain of validity} and
+     * the {@linkplain #getScope() scope}.
+     *
+     * @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 (super.equals(object, mode)) {
+            switch (mode) {
+                case STRICT: {
+                    final AbstractSingleCRS that = (AbstractSingleCRS) object;
+                    return Objects.equals(datum, that.datum);
+                }
+                default: {
+                    final SingleCRS that = (SingleCRS) object;
+                    return deepEquals(getDatum(), that.getDatum(), mode);
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Invoked by {@code #hashCode()} for computing the hash code when first needed.
+     * See {@link org.apache.sis.referencing.AbstractIdentifiedObject#computeHashCode()}
+     * for more information.
+     *
+     * @return The hash code value. This value may change in any future Apache SIS version.
+     */
+    @Override
+    protected long computeHashCode() {
+        return super.computeHashCode() + 31*Objects.hashCode(datum);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    final void formatDefaultWKT(final Formatter formatter) {
+        formatter.append(datum);
+        super.formatDefaultWKT(formatter);
+    }
+}

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

Propchange: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractSingleCRS.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: sis/ip-review/AbstractSingleCRS.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/AbstractSingleCRS.xhtml?rev=1555319&view=auto
==============================================================================
--- sis/ip-review/AbstractSingleCRS.xhtml (added)
+++ sis/ip-review/AbstractSingleCRS.xhtml Sat Jan  4 04:35:13 2014
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>AbstractSingleCRS history</title>
+    <style type="text/css" media="all">
+      @import url("./reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>AbstractSingleCRS 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/crs/AbstractSingleCRS.java</code></blockquote>
+<table>
+  <tr>
+    <th>Rev.</th>
+    <th>Date</th>
+    <th>Author</th>
+    <th class="last">Message</th>
+  </tr>
+<tr><td class="rev">31000</td><td>2008-07-10</td><td>desruisseaux</td><td>Avoid
usage of 2 deprecated constructors from CRSFactory. Their replacement were tricky and required
more sophesticated code in ReferencingFactoryContainer.toGeodetic3D.</td></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">30497</td><td>2008-06-03</td><td>desruisseaux</td><td>Renamed
Position.getPosition() as getDirectPosition() in GeoAPI interface for avoiding ambiguity (GEO-87).
Javadoc fixes.</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">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">28030</td><td>2007-11-23</td><td>desruisseaux</td><td>More
Java 5 generics. Added implementation for three new GeoAPI methods for alignment with RFC
07-073r1.</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">24609</td><td>2007-02-26</td><td>desruisseaux</td><td>Removed
the package-private 'getTypeWKT()' method; it was not needed after all.</td></tr>
+<tr><td class="rev">24607</td><td>2007-02-26</td><td>desruisseaux</td><td>Avoid
UnformattableObjectException for 'LOCAL_CS' and 'VERT_CS' WKT elements. Try to provides some
hints about the cause for the other cases of unformattable WKT.</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/AbstractSingleCRS.xhtml">ip review</a></td></tr>
+<tr><td class="rev">19962</td><td>2006-06-14</td><td>desruisseaux</td><td>Minor
javadoc fixes.</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">15150</td><td>2005-08-05</td><td>desruisseaux</td><td>Added
more localizations / Bug fix in image sample values table widget</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">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">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/AbstractSingleCRS.xhtml">imports cleaned</a></td></tr>
+<tr><td class="rev">8596</td><td>2004-10-12</td><td>desruisseaux</td><td>Redirected
javadoc links toward org.opengis.* instead org.geotools.* when the discussion is general enough</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">7848</td><td>2004-09-08</td><td class="unav">jgarnett</td><td><a
href="rev/07848/AbstractSingleCRS.xhtml">round 2 of sync with geoapi</a></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">6536</td><td>2004-06-25</td><td>desruisseaux</td><td>Added
SingleCRS class / Renamed ObliqueCartesianCS as AffineCS / Moved Position as super-interface
for DirectPosition and Point</td></tr>
+</table>
+    </div>
+  </body>
+</html>

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

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

Added: sis/ip-review/rev/07848/AbstractSingleCRS.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/07848/AbstractSingleCRS.xhtml?rev=1555319&view=auto
==============================================================================
--- sis/ip-review/rev/07848/AbstractSingleCRS.xhtml (added)
+++ sis/ip-review/rev/07848/AbstractSingleCRS.xhtml Sat Jan  4 04:35:13 2014
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>AbstractSingleCRS changes for revisions 7847:7848</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>AbstractSingleCRS changes for revisions 7847:7848</h1>
+<p>The line modified by this commit has been deleted.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change --ignore-all-space
--ignore-eol-style" -r7847:7848 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/crs/AbstractSingleCRS.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 7847</th><th>Revision 7848</th></tr>
+<tr><td><pre>// J2SE dependencies
+import java.util.Map;
+<span class="del">import javax.units.Unit;</span>
+
+// OpenGIS direct dependencies
+import org.opengis.referencing.datum.Datum;</pre></td>
+<td><pre>// J2SE dependencies
+import java.util.Map;
+<span class="add">//import javax.units.Unit;</span>
+
+// OpenGIS direct dependencies
+import org.opengis.referencing.datum.Datum;</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/07848/AbstractSingleCRS.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

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

Added: sis/ip-review/rev/10796/AbstractSingleCRS.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/10796/AbstractSingleCRS.xhtml?rev=1555319&view=auto
==============================================================================
--- sis/ip-review/rev/10796/AbstractSingleCRS.xhtml (added)
+++ sis/ip-review/rev/10796/AbstractSingleCRS.xhtml Sat Jan  4 04:35:13 2014
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>AbstractSingleCRS changes for revisions 10795:10796</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>AbstractSingleCRS changes for revisions 10795:10796</h1>
+<p>Changes in this commit seem to be the result of some "<cite>auto reformat</cite>"
tool execution.
+The <cite>Java</cite> - <cite>GeoAPI</cite> - <cite>GeoTools</cite>
import ordering is altered,
+imports used only in Javadoc are lost and the encoding of non-ASCII characters is broken.
+This commit has been reverted, except for the removal of really unused imports which are
keep removed.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change --ignore-all-space
--ignore-eol-style" -r10795:10796 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/crs/AbstractSingleCRS.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 10795</th><th>Revision 10796</th></tr>
+<tr><td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+<span class="del"> * (C) 2001, Institut de Recherche pour le Développement</span>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public</pre></td>
+<td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+<span class="add"> * (C) 2001, Institut de Recherche pour le D�veloppement</span>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public</pre></td></tr>
+<tr><td><pre>// J2SE dependencies
+import java.util.Map;
+
+<span class="del">// OpenGIS direct dependencies</span>
+<span class="del">import org.opengis.referencing.datum.Datum;</span>
+import org.opengis.referencing.cs.CoordinateSystem;
+import org.opengis.referencing.cs.CoordinateSystemAxis;
+
+<span class="del">// Geotools dependencies</span>
+<span class="del">import org.geotools.referencing.IdentifiedObject;</span>
+<span class="del">import org.geotools.referencing.wkt.Formatter;</span>
+
+<span class="del"></span>
+/**
+ * Abstract coordinate reference system, consisting of a single
+ * {@linkplain CoordinateSystem Coordinate System} and a single</pre></td>
+<td><pre>// J2SE dependencies
+import java.util.Map;
+
+<span class="add">import org.geotools.referencing.IdentifiedObject;</span>
+<span class="add">import org.geotools.referencing.wkt.Formatter;</span>
+import org.opengis.referencing.cs.CoordinateSystem;
+import org.opengis.referencing.cs.CoordinateSystemAxis;
+<span class="add">import org.opengis.referencing.datum.Datum;</span>
+
+
+/**
+ * Abstract coordinate reference system, consisting of a single
+ * {@linkplain CoordinateSystem Coordinate System} and a single</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/10796/AbstractSingleCRS.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

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

Added: sis/ip-review/rev/20874/AbstractSingleCRS.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/20874/AbstractSingleCRS.xhtml?rev=1555319&view=auto
==============================================================================
--- sis/ip-review/rev/20874/AbstractSingleCRS.xhtml (added)
+++ sis/ip-review/rev/20874/AbstractSingleCRS.xhtml Sat Jan  4 04:35:13 2014
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>AbstractSingleCRS changes for revisions 20873:20874</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>AbstractSingleCRS changes for revisions 20873:20874</h1>
+<p>Changes in GeoTools header only. The removal of the "<cite>or (at your option)
any later version</cite>" clause
+must be keep in Geotk for every classes having contribution from a developer other than those
who accepted re-licensing.
+This header does not apply to Apache SIS, since the above-cited contributions are omitted.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change --ignore-all-space
--ignore-eol-style" -r20873:20874 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/crs/AbstractSingleCRS.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 20873</th><th>Revision 20874</th></tr>
+<tr><td><pre>/*
+<span class="del"> * Geotools 2 - OpenSource mapping toolkit</span>
+<span class="del"> * (C) 2003, Geotools Project Managment Committee (PMC)</span>
+ * (C) 2001, Institut de Recherche pour le Développement
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+<span class="del"> *    License as published by the Free Software Foundation; either</span>
+<span class="del"> *    version 2.1 of the License, or (at your option) any later version.</span>
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of</pre></td>
+<td><pre>/*
+<span class="add"> *    GeoTools - OpenSource mapping toolkit</span>
+<span class="add"> *    http://geotools.org</span>
+<span class="add"> *    (C) 2003-2006, GeoTools Project Managment Committee (PMC)</span>
+ * (C) 2001, Institut de Recherche pour le Développement
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+<span class="add"> *    License as published by the Free Software Foundation;</span>
+<span class="add"> *    version 2.1 of the License.</span>
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of</pre></td></tr>
+<tr><td><pre>*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 See the GNU
+*    Lesser General Public License for more details.
+*
+<span class="del">*    You should have received a copy of the GNU Lesser General Public</span>
+<span class="del">*    License along with this library; if not, write to the Free Software</span>
+<span class="del">*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
 USA</span>
+<span class="del">*</span>
+*    This package contains documentation from OpenGIS specifications.
+*    OpenGIS consortium's work is fully acknowledged here.
+*/</pre></td>
+<td><pre>*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+*    Lesser General Public License for more details.
+*
+*    This package contains documentation from OpenGIS specifications.
+*    OpenGIS consortium's work is fully acknowledged here.
+*/</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/20874/AbstractSingleCRS.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

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



Mime
View raw message