sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1518542 - in /sis/ip-review: ./ rev/07857/ rev/10796/ rev/20874/ rev/24973/
Date Thu, 29 Aug 2013 09:06:48 GMT
Author: desruisseaux
Date: Thu Aug 29 09:06:48 2013
New Revision: 1518542

URL: http://svn.apache.org/r1518542
Log:
Added IP review for AbstractIdentifiedObject.

Added:
    sis/ip-review/AbstractIdentifiedObject.xhtml   (with props)
    sis/ip-review/rev/07857/
    sis/ip-review/rev/07857/AbstractIdentifiedObject.xhtml   (with props)
    sis/ip-review/rev/07857/HEADER.html   (with props)
    sis/ip-review/rev/10796/AbstractIdentifiedObject.xhtml   (with props)
    sis/ip-review/rev/20874/AbstractIdentifiedObject.xhtml   (with props)
    sis/ip-review/rev/24973/AbstractIdentifiedObject.xhtml   (with props)

Added: sis/ip-review/AbstractIdentifiedObject.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/AbstractIdentifiedObject.xhtml?rev=1518542&view=auto
==============================================================================
--- sis/ip-review/AbstractIdentifiedObject.xhtml (added)
+++ sis/ip-review/AbstractIdentifiedObject.xhtml Thu Aug 29 09:06:48 2013
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>AbstractIdentifiedObject history</title>
+    <style type="text/css" media="all">
+      @import url("./reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>AbstractIdentifiedObject 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/AbstractIdentifiedObject.java</code></blockquote>
+<table>
+  <tr>
+    <th>Rev.</th>
+    <th>Date</th>
+    <th>Author</th>
+    <th class="last">Message</th>
+  </tr>
+<tr><td class="rev">31445</td><td>2008-09-07</td><td>desruisseaux</td><td>GEOT-1667: Need to invoke LogRecord.setLoggerName(String) before Logger.log(LogRecord).</td></tr>
+<tr><td class="rev">31148</td><td>2008-08-07</td><td>desruisseaux</td><td>Renamed GenericName.name() as tip(). The old method still around as a deprecated one.</td></tr>
+<tr><td class="rev">31139</td><td>2008-08-06</td><td>desruisseaux</td><td>Avoid usage of deprecated methods from the org.opengis.util.GenericName interface.</td></tr>
+<tr><td class="rev">31132</td><td>2008-08-05</td><td>desruisseaux</td><td>As a side effect of "geotidy" work, ported a few bug fixes in metadata. Avoid usage of deprecated GeneralName.getScope() method, replaced by scope().</td></tr>
+<tr><td class="rev">30760</td><td>2008-06-18</td><td>desruisseaux</td><td>Upgrated from JSR-108 to JSR-275 (GEOT-1266). Some opportunist javadoc fixes and @Override annotations in the process.</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">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">29870</td><td>2008-04-09</td><td>desruisseaux</td><td>Bug fixes and Java 5 leveraging.</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">28790</td><td>2008-01-16</td><td>desruisseaux</td><td>Renamed resources.i18n.Logging as resources.i18n.Loggings (with an s) for avoiding name clash with util.logging.Logging. The name clash would not have been an issue if those two classes were not typically used together... Also performed a few javadoc fixes in DirectPosition2D.</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">28521</td><td>2007-12-27</td><td>desruisseaux</td><td>Type safety.</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">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">27995</td><td>2007-11-22</td><td>desruisseaux</td><td>More generics type, and moved two methods from ReferencingFactoryContainer to GeoAPI MathTransformFactory interface. Note that the build fails in the arcsde module for a reason that seems unrelated to this work.</td></tr>
+<tr><td class="rev">27857</td><td>2007-11-12</td><td>desruisseaux</td><td>Replaced a few missed Logger.getLogger(...) by Logging.getLogger(...) - GEOT-1545.</td></tr>
+<tr><td class="rev">27856</td><td>2007-11-12</td><td>desruisseaux</td><td>Replaced 'Logger.getLogger(...)' calls by 'Logging.getLogger(...)' (GEOT-1545).</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">26709</td><td>2007-08-27</td><td>desruisseaux</td><td>Merged the unsupported/coverageio work from the 2.4 branch.</td></tr>
+<tr><td class="rev">25398</td><td>2007-05-02</td><td>desruisseaux</td><td>Cleanup. Also renamed some classes in unsupported/epsg-extension.</td></tr>
+<tr><td class="rev">25397</td><td>2007-05-01</td><td>desruisseaux</td><td>GEOT-1160: AllAuthoritiesFactory now work. It was the last step for making the connection with CRS.lookupIdentifier(...).</td></tr>
+<tr><td class="rev">25262</td><td>2007-04-23</td><td>desruisseaux</td><td>Finished review of metadata and factory hints change. Fixed a potential glitch in parameter names handling (some code were disabled in AbstractIdentifiedObject apparently in order to avoid a ClassCastException caused by the spit of org.opengis.metadata.Identifier in two interfaces, Identifier and ReferenceIdentifier. Fixed the exception and reenabled the code). Not sure yet what the consequence was. It may help for the stereographic projection issue, but need to check.</td></tr>
+<tr><td class="rev">24973</td><td>2007-03-30</td><td class="unav">chorner</td><td><a href="rev/24973/AbstractIdentifiedObject.xhtml">GEO-93: GeoTools/GeoAPI ISO 19115 Metadata synchronization</a></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">23632</td><td>2006-12-29</td><td>desruisseaux</td><td>GEOT-859: Refactored the URN syntax adapter for CRS factories. The adapter now apply to any factory. Some progress toward version management (but not yet there). NOTE: this new implementation forces axis order "as specified in the database", which is different from the original "URNEPSGAdapter" implementation which used (x,y) order. Various changes in many corners of "org.geotools.referencing.factory" as a side-effect of this work. Minor opportunist javadoc fixes in other modules.</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/AbstractIdentifiedObject.xhtml">ip review</a></td></tr>
+<tr><td class="rev">19643</td><td>2006-05-24</td><td>desruisseaux</td><td>First fix attempt for GEOT-854: CRS with modified axis order now preserve the metadata, including the authority code. The dangerous thing is that two CRS may now have the same authority code while being really different CRS. It caused an infinite loop in AuthorityBackedFactory, which was fixed in this commit as well. However, there is a risk that similar problems appear in user's code as well.</td></tr>
+<tr><td class="rev">19557</td><td>2006-05-18</td><td>desruisseaux</td><td>AuthorityBackedFactory now take inverse transform in account. Improved pseudo-WKT formatting for CoordinateOperation.</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">17038</td><td>2005-11-28</td><td>desruisseaux</td><td>Copied the AutoTest. Tuned AutoCRSFactory implementation (GEOT-773)</td></tr>
+<tr><td class="rev">16983</td><td>2005-11-25</td><td>desruisseaux</td><td>Replaced references to static fields and methods of CitationImpl.* by Citations.*</td></tr>
+<tr><td class="rev">16942</td><td>2005-11-23</td><td>desruisseaux</td><td>First draft of OrderedAxisAuthorityFactory (GEOT-694)</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">14834</td><td>2005-07-20</td><td>desruisseaux</td><td>Reorganized I18N resources</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">14608</td><td>2005-06-25</td><td>desruisseaux</td><td>EPSG authority factory now uses path informations for ConcatenatedOperation object creations / Added PostgreSQL plugin (mostly as a demo) / Javadoc fixes</td></tr>
+<tr><td class="rev">14564</td><td>2005-06-20</td><td>desruisseaux</td><td>Initial implementation of GEOT-589. Partially tested, more tests to come</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">14205</td><td>2005-06-09</td><td>desruisseaux</td><td>Updated to GeoAPI 2.0 final release</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">13762</td><td>2005-05-24</td><td>desruisseaux</td><td>Added DefiningConversion</td></tr>
+<tr><td class="rev">13387</td><td>2005-05-06</td><td>desruisseaux</td><td>Added Hints.LENIENT_DATUM_SHIFT and the necessary mechanic to honor it</td></tr>
+<tr><td class="rev">13361</td><td>2005-05-03</td><td>desruisseaux</td><td>First part of LocalizationGrid refactoring work (explanation email to be sent shortly)</td></tr>
+<tr><td class="rev">12212</td><td>2005-03-15</td><td>desruisseaux</td><td>First working version of DatumAliases as a DatumFactory</td></tr>
+<tr><td class="rev">11816</td><td>2005-03-07</td><td>desruisseaux</td><td>First draft of GridCoverage operation port</td></tr>
+<tr><td class="rev">11698</td><td>2005-02-28</td><td>desruisseaux</td><td>Moved tests from legacy to main module</td></tr>
+<tr><td class="rev">11371</td><td>2005-02-14</td><td>desruisseaux</td><td>Renamed DefaultObjectFactory as GeotoolsFactory (GEOT-420, now closed)</td></tr>
+<tr><td class="rev">11174</td><td>2005-02-08</td><td>desruisseaux</td><td>CoordinateOperationFactory now make use of 'Molodenski' transform (GEOT-399)</td></tr>
+<tr><td class="rev">11144</td><td>2005-02-07</td><td>desruisseaux</td><td>Fixed GEOT-400 (create appropriate instance of Operation subclasses)</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/AbstractIdentifiedObject.xhtml">imports cleaned</a></td></tr>
+<tr><td class="rev">10105</td><td>2004-12-30</td><td>desruisseaux</td><td>Improved Console implementation / Fixed erroneous conversion of dimensionless unit / Javadoc fixes</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">9243</td><td>2004-11-22</td><td>desruisseaux</td><td>Tuned WKT parsing and formatting</td></tr>
+<tr><td class="rev">9220</td><td>2004-11-21</td><td>desruisseaux</td><td>WKT bug fixes</td></tr>
+<tr><td class="rev">9118</td><td>2004-11-14</td><td>desruisseaux</td><td>Mercator projection port completed (but untested) as a use case for other projection ports</td></tr>
+<tr><td class="rev">9117</td><td>2004-11-13</td><td>desruisseaux</td><td>Added the capability to list all available MathTransforms</td></tr>
+<tr><td class="rev">8796</td><td>2004-10-22</td><td>desruisseaux</td><td>Cleaning referencing's operation basic package</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">7857</td><td>2004-09-09</td><td class="unav">jgarnett</td><td><a href="rev/07857/AbstractIdentifiedObject.xhtml">name to getName().toString( null )</a></td></tr>
+<tr><td class="rev">7848</td><td>2004-09-08</td><td class="unav">jgarnett</td><td><a href="rev/07857/AbstractIdentifiedObject.xhtml">round 2 of sync with geoapi</a></td></tr>
+<tr><td class="rev">7712</td><td>2004-08-31</td><td class="unav">jgarnett</td><td><a href="rev/07857/AbstractIdentifiedObject.xhtml">Intergrate ParameterValueGroup / ParameterGroupDescriptor and InternationalString</a></td></tr>
+<tr><td class="rev">7013</td><td>2004-07-19</td><td>desruisseaux</td><td>Slight adjustement after GeoAPI changes in metadata</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>
+</table>
+    </div>
+  </body>
+</html>

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

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

Added: sis/ip-review/rev/07857/AbstractIdentifiedObject.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/07857/AbstractIdentifiedObject.xhtml?rev=1518542&view=auto
==============================================================================
--- sis/ip-review/rev/07857/AbstractIdentifiedObject.xhtml (added)
+++ sis/ip-review/rev/07857/AbstractIdentifiedObject.xhtml Thu Aug 29 09:06:48 2013
@@ -0,0 +1,343 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>AbstractIdentifiedObject changes for revisions 7711:7857</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>AbstractIdentifiedObject changes for revisions 7711:7857</h1>
+<ul>
+  <li>The <code>NAME_PROPERTY</code> and <code>REMARKS_PROPERTY</code> constants moved to GeoAPI as
+      <code>NAME_KEY</code> and <code>REMARKS_KEY</code>, so they are not part of SIS or Geotk anymore.</li>
+  <li>The change of <code>name</code> type from <code>Map</code> to <code>InternationalString</code> has
+      been replaced by a change to the <code>GenericName</code> type instead.</li>
+  <li>The change of <code>remarks</code> type from <code>Map</code> to <code>InternationalString</code> is
+      a consequence of change in GeoAPI interface. The <code>InternationalString</code> type is mandated
+      by the return type of the GeoAPI <code>getRemarks()</code> method. Reverting the change in this commit
+      cause a compilation error, which can be naturally resolved only by redoing the same change of type.</li>
+  <li>The private <code>defaultMap(…)</code> helper method added in this commit does exist anymore in SIS.
+      The same work can be performed more efficiently by direct assignation of the corresponding fields.</li>
+  <li>The <code>IdentifiedObject(String, …)</code> convenience constructor added in this commit does not exist
+      in Geotk, which is the source of SIS code. Similar convenience constructors exists in sub-classes however,
+      but not with the same parameters (in particular, no <code>objectDescription</code> argument).</li>
+  <li>Assignation of empty <code>InternationalString</code> to <code>name</code> and <code>remarks</code>
+      fields do not exist anymore in Geotk/SIS.</li>
+  <li>Trivial change of case for the <code>check</code> label, which has been reverted in Geotk and removed in SIS anyway.</li>
+  <li>This commit contains a change in the <code>key.equals("identifiers")</code> case for unknown reason.
+      This change has not been retained in Geotk/SIS.</li>
+  <li>Replacement of the <code>"name"</code> and <code>"remarks"</code> strings by <code>NAME_PROPERTY</code> and
+      <code>REMARKS_PROPERTY</code> constants. This change exists also in SIS/Geotk, since this is a natural thing
+      to do after the constants moved to GeoAPI.</li>
+  <li>Changes in calls to <code>addLocalizedString(…)</code> is a consequence of the change of <code>remarks</code>
+      type, and is irrelevant for <code>name</code> field since the later became a <code>GenericName</code> later.</li>
+  <li>Changes in the <code>getName(Locale)</code> and <code>getRemarks(Locale)</code> methods are not incorporated
+      since those methods have been removed.</li>
+  <li>The <code>identifier.equalsIgnoreCase(…)</code> call does not exist anymore.</li>
+</ul>
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r7711:7857 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/AbstractIdentifiedObject.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 7711</th><th>Revision 7857</th></tr>
+<tr><td><pre>package org.geotools.referencing;
+
+// J2SE dependencies
+import java.util.Map;
+import java.util.Locale;
+import java.util.Iterator;</pre></td>
+<td><pre>package org.geotools.referencing;
+
+// J2SE dependencies
+<span class="add">import java.util.HashMap;</span>
+import java.util.Map;
+import java.util.Locale;
+import java.util.Iterator;</pre></td></tr>
+<tr><td><pre>import org.opengis.parameter.InvalidParameterValueException;
+
+// Geotools dependencies
+<span class="del">import org.geotools.util.WeakHashSet;</span>
+import org.geotools.resources.Utilities;
+import org.geotools.resources.cts.Resources;
+import org.geotools.resources.cts.ResourceKeys;
+import org.geotools.referencing.wkt.Formattable;
+
+<span class="del"></span>
+/**
+ * A base class for metadata applicable to reference system objects.
+ * When {@link AuthorityFactory} is used to create an object, the</pre></td>
+<td><pre>import org.opengis.parameter.InvalidParameterValueException;
+
+// Geotools dependencies
+import org.geotools.resources.Utilities;
+import org.geotools.resources.cts.Resources;
+import org.geotools.resources.cts.ResourceKeys;
+import org.geotools.referencing.wkt.Formattable;
+<span class="add">import org.geotools.util.InternationalString;</span>
+
+/**
+ * A base class for metadata applicable to reference system objects.
+ * When {@link AuthorityFactory} is used to create an object, the</pre></td></tr>
+<tr><td><pre>public class IdentifiedObject extends Formattable
+                           implements org.opengis.referencing.IdentifiedObject, Serializable
+{
+    /**
+     * Serial number for interoperability with different versions.
+     */</pre></td>
+<td><pre>public class IdentifiedObject extends Formattable
+                           implements org.opengis.referencing.IdentifiedObject, Serializable
+{
+<span class="add"></span>
+<span class="add">    /** "name" Key used to provide String for getName() */</span>
+<span class="add">    public static final String NAME_PROPERTY = "name";</span>
+<span class="add"></span>
+<span class="add">    /** "remarks" Key used to provide String for getRemarks() */</span>
+<span class="add">    public static final String REMARKS_PROPERTY = "remarks";</span>
+<span class="add"></span>
+    /**
+     * Serial number for interoperability with different versions.
+     */</pre></td></tr>
+<tr><td><pre> * The name for this object or code. Should never be &lt;code&gt;null&lt;/code&gt;.
+ * Keys are {@link Locale} objects and values are {@link String}.
+ */
+<span class="del">private final Map name;</span>
+<span class="del"></span>
+/**
+ * Set of alternative identifications of this object. The first identifier, if
+ * any, is normally the primary identification code, and any others are aliases.</pre></td>
+<td><pre> * The name for this object or code. Should never be &lt;code&gt;null&lt;/code&gt;.
+ * Keys are {@link Locale} objects and values are {@link String}.
+ */
+<span class="add">//private final Map name;</span>
+<span class="add">private final InternationalString name;</span>
+/**
+ * Set of alternative identifications of this object. The first identifier, if
+ * any, is normally the primary identification code, and any others are aliases.</pre></td></tr>
+<tr><td><pre> * Comments on or information about this object, or &lt;code&gt;null&lt;/code&gt; if none.
+ * Keys are {@link Locale} objects and values are {@link String}.
+ */
+<span class="del">private final Map remarks;</span>
+
+/**
+ * Constructs an object from a set of properties. Keys are strings from the table below.
+ * Key are case-insensitive, and leading and trailing spaces are ignored. The map given in</pre></td>
+<td><pre> * Comments on or information about this object, or &lt;code&gt;null&lt;/code&gt; if none.
+ * Keys are {@link Locale} objects and values are {@link String}.
+ */
+<span class="add">// private final Map remarks;</span>
+<span class="add">private final InternationalString remarks;</span>
+
+<span class="add">static private final Map defaultMap( String objectName, String objectDescription ){</span>
+<span class="add">    Map map = new HashMap();</span>
+<span class="add">    map.put( NAME_PROPERTY, objectName );</span>
+<span class="add">    map.put( REMARKS_PROPERTY, objectDescription );</span>
+<span class="add">    return map;</span>
+<span class="add">}</span>
+<span class="add">public IdentifiedObject( String objectName, String objectDescription ) throws IllegalArgumentException {</span>
+<span class="add">    this( defaultMap( objectName, objectDescription ));</span>
+<span class="add">}</span>
+/**
+ * Constructs an object from a set of properties. Keys are strings from the table below.
+ * Key are case-insensitive, and leading and trailing spaces are ignored. The map given in</pre></td></tr>
+<tr><td><pre>        throws IllegalArgumentException
+{
+    ensureNonNull("properties", properties);
+<span class="del">    Map          name        = null;</span>
+<span class="del">    Map          remarks     = null;</span>
+    Identifier[] identifiers = null;
+    /*
+     * Iterate through each map entry. This have two purposes:</pre></td>
+<td><pre>        throws IllegalArgumentException
+{
+    ensureNonNull("properties", properties);
+<span class="add"></span>
+<span class="add">    InternationalString name        = new org.geotools.util.InternationalString();</span>
+<span class="add">    InternationalString remarks     = new org.geotools.util.InternationalString();</span>
+    Identifier[] identifiers = null;
+    /*
+     * Iterate through each map entry. This have two purposes:</pre></td></tr>
+<tr><td><pre>         * This algorithm is sub-optimal if the map contains a lot of entries of no interest to
+         * this identifier. Hopefully, most users will fill a map only with usefull entries.
+         */
+<span class="del">check:  for (final Iterator it=properties.entrySet().iterator(); it.hasNext();) {</span>
+            Map.Entry entry = (Map.Entry) it.next();
+            String    key   = ((String) entry.getKey()).trim().toLowerCase();
+            Object    value = entry.getValue();</pre></td>
+<td><pre>         * This algorithm is sub-optimal if the map contains a lot of entries of no interest to
+         * this identifier. Hopefully, most users will fill a map only with usefull entries.
+         */
+<span class="add">CHECK:  for (final Iterator it=properties.entrySet().iterator(); it.hasNext();) {</span>
+            Map.Entry entry = (Map.Entry) it.next();
+            String    key   = ((String) entry.getKey()).trim().toLowerCase();
+            Object    value = entry.getValue();</pre></td></tr>
+<tr><td><pre>switch (key.hashCode()) {
+    case 1368189162: {
+        if (key.equals("identifiers")) {
+<span class="del">            identifiers = (Identifier[]) value;</span>
+<span class="del">            if (identifiers != null) {</span>
+<span class="del">                identifiers = (Identifier[]) identifiers.clone();</span>
+            }
+<span class="del">            continue check;</span>
+        }
+    }
+    // Fix case for common keywords.</pre></td>
+<td><pre>switch (key.hashCode()) {
+    case 1368189162: {
+        if (key.equals("identifiers")) {
+<span class="add">            if (value != null) {</span>
+<span class="add">                Identifier origional[] = (Identifier[]) value;</span>
+<span class="add">                identifiers = (Identifier[]) (origional.clone());</span>
+            }
+<span class="add">            continue CHECK;</span>
+        }
+    }
+    // Fix case for common keywords.</pre></td></tr>
+<tr><td><pre>    case  1127093059: if (key.equals("realizationepoch")) key="realizationEpoch"; break;
+    case -1109785975: if (key.equals("validarea"))        key="validArea";        break;
+}
+<span class="del">Locale locale = getLocale(key, "name");</span>
+if (locale != null) {
+<span class="del">    name = addLocalizedString(name, locale, value);</span>
+<span class="del">    continue check;</span>
+}
+<span class="del">locale = getLocale(key, "remarks");</span>
+if (locale != null) {
+<span class="del">    remarks = addLocalizedString(remarks, locale, value);</span>
+<span class="del">    continue check;</span>
+}
+if (localizables != null) {
+    for (int i=0; i&lt;localizables.length; i++) {
+        final String prefix = localizables[i];</pre></td>
+<td><pre>    case  1127093059: if (key.equals("realizationepoch")) key="realizationEpoch"; break;
+    case -1109785975: if (key.equals("validarea"))        key="validArea";        break;
+}
+<span class="add">Locale locale = getLocale(key, NAME_PROPERTY );</span>
+if (locale != null) {
+<span class="add">    if( value instanceof String ){</span>
+<span class="add">        name.addLocalizedString( locale, (String) value);</span>
+<span class="add">        continue CHECK;</span>
+}
+<span class="add">    else if ( value instanceof InternationalString ){</span>
+<span class="add">        name = (InternationalString) value;</span>
+<span class="add">        continue CHECK;</span>
+<span class="add">    }</span>
+<span class="add">}</span>
+<span class="add">locale = getLocale(key, REMARKS_PROPERTY );</span>
+if (locale != null) {
+<span class="add">    if( value instanceof String ){</span>
+<span class="add">        remarks.addLocalizedString( locale, (String) value);</span>
+<span class="add">        continue CHECK;</span>
+}
+<span class="add">    if ( value instanceof InternationalString ){</span>
+<span class="add">        remarks = (InternationalString) value;</span>
+<span class="add">        continue CHECK;</span>
+<span class="add">    }</span>
+<span class="add">}</span>
+if (localizables != null) {
+    for (int i=0; i&lt;localizables.length; i++) {
+        final String prefix = localizables[i];</pre></td></tr>
+<tr><td><pre>                    Map map = (Map)subProperties.get(prefix);
+                    map = addLocalizedString(map, locale, value);
+                    subProperties.put(prefix, map);
+<span class="del">                    continue check;</span>
+                }
+            }
+        }
+        subProperties.put(key, value);
+    }
+    this.name        = name;
+    this.identifiers = identifiers;
+    this.remarks     = remarks;
+    ensureNonNull("name", name);
+<span class="del">    ensureNonNull("name", name.get(null));</span>
+<span class="del">    org.geotools.referencing.Identifier.canonicalizeKeys(name);</span>
+<span class="del">    org.geotools.referencing.Identifier.canonicalizeKeys(remarks);</span>
+}
+
+/**</pre></td>
+<td><pre>                    Map map = (Map)subProperties.get(prefix);
+                    map = addLocalizedString(map, locale, value);
+                    subProperties.put(prefix, map);
+<span class="add">                    continue CHECK;</span>
+                }
+            }
+        }
+<span class="add">        if( subProperties != null ){</span>
+        subProperties.put(key, value);
+    }
+<span class="add">    }</span>
+    this.name        = name;
+    this.identifiers = identifiers;
+    this.remarks     = remarks;
+    ensureNonNull("name", name);
+<span class="add">    ensureNonNull("name", name.toString());</span>
+<span class="add">    //org.geotools.referencing.Identifier.canonicalizeKeys(name);</span>
+<span class="add">    //org.geotools.referencing.Identifier.canonicalizeKeys(remarks);</span>
+}
+
+/**</pre></td></tr>
+<tr><td><pre> * @return The name, or &lt;code&gt;null&lt;/code&gt; if not available.
+ */
+public String getName(final Locale locale) {
+<span class="del">    return getLocalized(name, locale);</span>
+}
+<span class="del"></span>
+/**
+ * Set of alternative identifications of this object. The first identifier, if
+ * any, is normally the primary identification code, and any others are aliases.</pre></td>
+<td><pre> * @return The name, or &lt;code&gt;null&lt;/code&gt; if not available.
+ */
+public String getName(final Locale locale) {
+<span class="add">    if( locale == null ){</span>
+<span class="add">        return name.toString();</span>
+}
+<span class="add">    return name.toString( locale );</span>
+<span class="add">}</span>
+<span class="add">public org.opengis.util.InternationalString getName(){</span>
+<span class="add">    return name;</span>
+<span class="add">}</span>
+/**
+ * Set of alternative identifications of this object. The first identifier, if
+ * any, is normally the primary identification code, and any others are aliases.</pre></td></tr>
+<tr><td><pre> * @return The remarks, or &lt;code&gt;null&lt;/code&gt; if not available.
+ */
+public String getRemarks(final Locale locale) {
+<span class="del">    return getLocalized(remarks, locale);</span>
+}
+
+/**
+ * Returns a hash value for this info. {@linkplain #getName Name},</pre></td>
+<td><pre> * @return The remarks, or &lt;code&gt;null&lt;/code&gt; if not available.
+ */
+public String getRemarks(final Locale locale) {
+<span class="add">    if( locale == null ){</span>
+<span class="add">        return remarks.toString();</span>
+}
+<span class="add">    return remarks.toString( locale);</span>
+<span class="add">}</span>
+<span class="add">public org.opengis.util.InternationalString getRemarks(){</span>
+<span class="add">    return remarks;</span>
+<span class="add">}</span>
+
+/**
+ * Returns a hash value for this info. {@linkplain #getName Name},</pre></td></tr>
+<tr><td><pre>{
+    identifier = identifier.trim();
+    if (identifiers==null || identifiers.length==0) {
+<span class="del">        return identifier.equalsIgnoreCase(info.getName(null).trim());</span>
+    }
+    final String code, codespace;
+    final int separator = identifier.indexOf(':');</pre></td>
+<td><pre>{
+    identifier = identifier.trim();
+    if (identifiers==null || identifiers.length==0) {
+<span class="add">        return identifier.equalsIgnoreCase(info.getName().toString(null).trim());</span>
+    }
+    final String code, codespace;
+    final int separator = identifier.indexOf(':');</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/07857/AbstractIdentifiedObject.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

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

Added: sis/ip-review/rev/07857/HEADER.html
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/07857/HEADER.html?rev=1518542&view=auto
==============================================================================
--- sis/ip-review/rev/07857/HEADER.html (added)
+++ sis/ip-review/rev/07857/HEADER.html Thu Aug 29 09:06:48 2013
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>Revision 7857</title>
+  </head>
+  <body>
+    <div>
+      <h1>Revision 7857</h1>
+<table>
+  <tr><td><b>Author:</b></td><td>jgarnett</td></tr>
+  <tr><td><b>Date:</b></td><td>2004-09-09</td></tr>
+  <tr><td><b>Message:</b></td><td>name to getName().toString( null )</td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/07857/HEADER.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/07857/HEADER.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/10796/AbstractIdentifiedObject.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/10796/AbstractIdentifiedObject.xhtml?rev=1518542&view=auto
==============================================================================
--- sis/ip-review/rev/10796/AbstractIdentifiedObject.xhtml (added)
+++ sis/ip-review/rev/10796/AbstractIdentifiedObject.xhtml Thu Aug 29 09:06:48 2013
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>AbstractIdentifiedObject changes for revisions 10795:10796</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>AbstractIdentifiedObject 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/AbstractIdentifiedObject.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>package org.geotools.referencing;
+
+// J2SE dependencies
+<span class="del">import java.util.HashMap;</span>
+<span class="del">import java.util.Map;</span>
+import java.util.Arrays;
+<span class="del">import java.util.Locale;  // For javadoc</span>
+import java.util.Iterator;
+<span class="del">import java.util.Comparator;</span>
+import java.util.logging.Logger;
+<span class="del">import java.io.Serializable;</span>
+<span class="del">import java.io.ObjectStreamException;</span>
+import javax.units.Unit;
+<span class="del">import javax.units.SI;</span>
+
+<span class="del">// OpenGIS dependencies</span>
+import org.opengis.metadata.Identifier;
+<span class="del">import org.opengis.metadata.citation.Citation; // For javadoc</span>
+import org.opengis.parameter.InvalidParameterValueException;
+import org.opengis.util.InternationalString;
+<span class="del">import org.opengis.util.GenericName;</span>
+
+<span class="del">// Geotools dependencies</span>
+<span class="del">import org.geotools.util.NameFactory;</span>
+<span class="del">import org.geotools.resources.Utilities;</span>
+<span class="del">import org.geotools.resources.cts.Resources;</span>
+<span class="del">import org.geotools.resources.cts.ResourceKeys;</span>
+<span class="del">import org.geotools.referencing.wkt.Formattable;</span>
+<span class="del">import org.geotools.util.GrowableInternationalString;</span>
+
+<span class="del"></span>
+/**
+ * A base class for metadata applicable to reference system objects.
+ * When {@link AuthorityFactory} is used to create an object, the</pre></td>
+<td><pre>package org.geotools.referencing;
+
+// J2SE dependencies
+<span class="add">import java.io.ObjectStreamException;</span>
+<span class="add">import java.io.Serializable;</span>
+import java.util.Arrays;
+<span class="add">import java.util.Comparator;</span>
+import java.util.Iterator;
+<span class="add">import java.util.Map;</span>
+import java.util.logging.Logger;
+<span class="add"></span>
+<span class="add">import javax.units.SI;</span>
+import javax.units.Unit;
+
+<span class="add">import org.geotools.referencing.wkt.Formattable;</span>
+<span class="add">import org.geotools.resources.Utilities;</span>
+<span class="add">import org.geotools.resources.cts.ResourceKeys;</span>
+<span class="add">import org.geotools.resources.cts.Resources;</span>
+<span class="add">import org.geotools.util.GrowableInternationalString;</span>
+<span class="add">import org.geotools.util.NameFactory;</span>
+import org.opengis.metadata.Identifier;
+<span class="add">import org.opengis.metadata.citation.Citation;</span>
+import org.opengis.parameter.InvalidParameterValueException;
+<span class="add">import org.opengis.util.GenericName;</span>
+import org.opengis.util.InternationalString;
+
+
+/**
+ * A base class for metadata applicable to reference system objects.
+ * When {@link AuthorityFactory} is used to create an object, the</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

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

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

Added: sis/ip-review/rev/20874/AbstractIdentifiedObject.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/20874/AbstractIdentifiedObject.xhtml?rev=1518542&view=auto
==============================================================================
--- sis/ip-review/rev/20874/AbstractIdentifiedObject.xhtml (added)
+++ sis/ip-review/rev/20874/AbstractIdentifiedObject.xhtml Thu Aug 29 09:06:48 2013
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>AbstractIdentifiedObject changes for revisions 20873:20874</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>AbstractIdentifiedObject 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/AbstractIdentifiedObject.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/AbstractIdentifiedObject.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

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

Added: sis/ip-review/rev/24973/AbstractIdentifiedObject.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/24973/AbstractIdentifiedObject.xhtml?rev=1518542&view=auto
==============================================================================
--- sis/ip-review/rev/24973/AbstractIdentifiedObject.xhtml (added)
+++ sis/ip-review/rev/24973/AbstractIdentifiedObject.xhtml Thu Aug 29 09:06:48 2013
@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>AbstractIdentifiedObject changes for revisions 24972:24973</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>AbstractIdentifiedObject changes for revisions 24972:24973</h1>
+<p>Replacement of <code>Identifier</code> type by <code>ReferenceIdentifier</code> for the <code>name</code> property.
+This change has been forced by a GeoAPI change. Reverting this change causes a compilation failure,
+which is resolved by restoring the <code>ReferenceIdentifier</code> values as required by GeoAPI interfaces.
+So rewriting this contribution produces identical result, except for the <code>if … else</code> block.
+The later is written in a different way in SIS.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r24972:24973 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/AbstractIdentifiedObject.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 24972</th><th>Revision 24973</th></tr>
+<tr><td><pre>import org.opengis.referencing.IdentifiedObject;
+import org.opengis.referencing.AuthorityFactory;
+import org.opengis.referencing.ObjectFactory;
+import org.opengis.util.GenericName;
+import org.opengis.util.InternationalString;
+import org.opengis.util.LocalName;</pre></td>
+<td><pre>import org.opengis.referencing.IdentifiedObject;
+import org.opengis.referencing.AuthorityFactory;
+import org.opengis.referencing.ObjectFactory;
+<span class="add">import org.opengis.referencing.ReferenceIdentifier;</span>
+import org.opengis.util.GenericName;
+import org.opengis.util.InternationalString;
+import org.opengis.util.LocalName;</pre></td></tr>
+<tr><td><pre>/**
+ * The name for this object or code. Should never be {@code null}.
+ */
+<span class="del">private final Identifier name;</span>
+
+/**
+ * An alternative name by which this object is identified.</pre></td>
+<td><pre>/**
+ * The name for this object or code. Should never be {@code null}.
+ */
+<span class="add">private final ReferenceIdentifier name;</span>
+
+/**
+ * An alternative name by which this object is identified.</pre></td></tr>
+<tr><td><pre>case  1126917133: if (key.equalsIgnoreCase("positionalAccuracy")) key="positionalAccuracy"; break;
+case  1127093059: if (key.equalsIgnoreCase("realizationEpoch"))   key="realizationEpoch";   break;
+case -1109785975: if (key.equalsIgnoreCase("validArea"))          key="validArea";          break;
+// ----------------------------
+// "name": String or Identifier
+// ----------------------------</pre></td>
+<td><pre>case  1126917133: if (key.equalsIgnoreCase("positionalAccuracy")) key="positionalAccuracy"; break;
+case  1127093059: if (key.equalsIgnoreCase("realizationEpoch"))   key="realizationEpoch";   break;
+case -1109785975: if (key.equalsIgnoreCase("validArea"))          key="validArea";          break;
+<span class="add"></span>
+// ----------------------------
+// "name": String or Identifier
+// ----------------------------</pre></td></tr>
+<tr><td><pre>    if (value instanceof String) {
+        name = new NamedIdentifier(properties, false);
+        assert value.equals(((Identifier) name).getCode()) : name;
+<span class="del">    } else {</span>
+        name = value;
+    }
+    continue NEXT_KEY;
+}
+break;</pre></td>
+<td><pre>    if (value instanceof String) {
+        name = new NamedIdentifier(properties, false);
+        assert value.equals(((Identifier) name).getCode()) : name;
+<span class="add">    } else if (value instanceof ReferenceIdentifier ){</span>
+        name = value;
+    }
+<span class="add">    else {</span>
+<span class="add">        // WARNING!</span>
+<span class="add">        name = value;</span>
+<span class="add">    }</span>
+    continue NEXT_KEY;
+}
+break;</pre></td></tr>
+<tr><td><pre> */
+String key=null; Object value=null;
+try {
+<span class="del">    key=        NAME_KEY; this.name        =          (Identifier) (value=name);</span>
+    key=       ALIAS_KEY; this.alias       = asSet((GenericName[]) (value=alias));
+    key= IDENTIFIERS_KEY; this.identifiers = asSet( (Identifier[]) (value=identifiers));
+    key=     REMARKS_KEY; this.remarks     = (InternationalString) (value=remarks);</pre></td>
+<td><pre> */
+String key=null; Object value=null;
+try {
+<span class="add">    key=        NAME_KEY; this.name        = (ReferenceIdentifier) (value=name);</span>
+    key=       ALIAS_KEY; this.alias       = asSet((GenericName[]) (value=alias));
+    key= IDENTIFIERS_KEY; this.identifiers = asSet( (Identifier[]) (value=identifiers));
+    key=     REMARKS_KEY; this.remarks     = (InternationalString) (value=remarks);</pre></td></tr>
+<tr><td><pre> *
+ * @see #getName(Citation)
+ */
+<span class="del">public Identifier getName() {</span>
+    return name;
+}</pre></td>
+<td><pre> *
+ * @see #getName(Citation)
+ */
+<span class="add">public ReferenceIdentifier getName() {</span>
+    return name;
+}</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/24973/AbstractIdentifiedObject.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

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



Mime
View raw message