You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2013/08/28 18:58:54 UTC
svn commit: r1518284 - in /sis/ip-review: NamedIdentifier.xhtml
rev/10796/NamedIdentifier.xhtml rev/20874/NamedIdentifier.xhtml
rev/24990/NamedIdentifier.xhtml
Author: desruisseaux
Date: Wed Aug 28 16:58:54 2013
New Revision: 1518284
URL: http://svn.apache.org/r1518284
Log:
Added IP review.
Added:
sis/ip-review/NamedIdentifier.xhtml (with props)
sis/ip-review/rev/10796/NamedIdentifier.xhtml (with props)
sis/ip-review/rev/20874/NamedIdentifier.xhtml (with props)
sis/ip-review/rev/24990/NamedIdentifier.xhtml (with props)
Added: sis/ip-review/NamedIdentifier.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/NamedIdentifier.xhtml?rev=1518284&view=auto
==============================================================================
--- sis/ip-review/NamedIdentifier.xhtml (added)
+++ sis/ip-review/NamedIdentifier.xhtml Wed Aug 28 16:58:54 2013
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta charset="UTF-8"/>
+ <title>NamedIdentifier history</title>
+ <style type="text/css" media="all">
+ @import url("./reports.css");
+ </style>
+ </head>
+ <body>
+ <div>
+ <h1>NamedIdentifier 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/NamedIdentifier.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">31182</td><td>2008-08-13</td><td>desruisseaux</td><td>Cheat with generic type for transition period.</td></tr>
+<tr><td class="rev">31179</td><td>2008-08-13</td><td>desruisseaux</td><td>Make GenericName implementation tolerant to wildcard bounds in getParsedNames() return type.</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">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">29825</td><td>2008-04-07</td><td>desruisseaux</td><td>Added synchronized statements. While the old approach was not exactly the deprecated double-check idiom, it was too close of that. A few unsynchronized blocks still exist which may need to be revisited later.</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">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">28051</td><td>2007-11-26</td><td>desruisseaux</td><td>More Java 5 parameterized types. Include a fix for GEOT-1599 (CitationImpl.getIdentifiers() should returns a set of Identifiers, not a set of Strings).</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">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">27545</td><td>2007-10-18</td><td>desruisseaux</td><td>More generic types. Note that the build is still falling in the main module for a reason apparently unrelated to this 'generic types' work; the failure seems to be related to other changes in the GeoAPI filter package (new abstract method in FilterFactory) that are not yet reflected in GeoTools.</td></tr>
+<tr><td class="rev">25389</td><td>2007-04-30</td><td>desruisseaux</td><td>GEOT-1160: Make IdentifiedObjectFinder public, so we can keep AbstractAuthorityFactory a little bit simplier (less methods there).</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">24990</td><td>2007-04-03</td><td class="unav">chorner</td><td><a href="rev/24990/NamedIdentifier.xhtml">Metadata; corrections after review of r24868</a></td></tr>
+<tr><td class="rev">24973</td><td>2007-03-30</td><td class="unav">chorner</td><td><a href="rev/24990/NamedIdentifier.xhtml">GEO-93: GeoTools/GeoAPI ISO 19115 Metadata synchronization</a></td></tr>
+<tr><td class="rev">24925</td><td>2007-03-27</td><td class="unav">jgarnett</td><td><a href="rev/24990/NamedIdentifier.xhtml">change to org.opengis.geometry</a></td></tr>
+<tr><td class="rev">24868</td><td>2007-03-22</td><td class="unav">jgarnett</td><td><a href="rev/24990/NamedIdentifier.xhtml">clean up metadata and referencing in response to GEO-93</a></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">21154</td><td>2006-08-22</td><td>desruisseaux</td><td>Moved around some GeoAPI 2.1 methods that were added, putting them close to related methods and adding javadoc. In the specific case of DefaultCoordinateSystemAxis, those new methods were fully implemented. For all other classes (related to naming), those new methods still empty stubs, but now throw UnsupportedOperationException instead of returning null. Those methods will need to be revisited and implemented when GeoAPI 2.1 will be ready.</td></tr>
+<tr><td class="rev">20874</td><td>2006-08-07</td><td class="unav">jgarnett</td><td><a href="rev/20874/NamedIdentifier.xhtml">ip review</a></td></tr>
+<tr><td class="rev">20816</td><td>2006-08-02</td><td class="unav">jgarnett</td><td><a href="rev/20874/NamedIdentifier.xhtml">pulled fixed from FM branch over to match geoapi 2.1-M0</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">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">16205</td><td>2005-10-11</td><td>desruisseaux</td><td>Cleaned javadoc warning. More work done on Maven 2 configuration (GEOT-691)</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">14550</td><td>2005-06-16</td><td>desruisseaux</td><td>Removed deprecated fields and methods</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">13906</td><td>2005-05-28</td><td>desruisseaux</td><td>Renamed some 'Default' prefix as 'Abstract'</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">13773</td><td>2005-05-24</td><td>desruisseaux</td><td>Removed old metadata implementations (they are now renamed with 'Impl' suffix) / Use OGC citation instead of OPEN_GIS</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">13752</td><td>2005-05-23</td><td>desruisseaux</td><td>Added the 'Impl' suffix to direct implementations of all metadata interfaces; deprecated the old implementations (not yet deleted).</td></tr>
+<tr><td class="rev">12952</td><td>2005-04-03</td><td>desruisseaux</td><td>Updated metadata implementation for GeoAPI changes (GEO-51 and GEO-56)</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">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/NamedIdentifier.xhtml">imports cleaned</a></td></tr>
+<tr><td class="rev">9092</td><td>2004-11-11</td><td>desruisseaux</td><td>Slight modification in the protected API for handling parameters</td></tr>
+<tr><td class="rev">8841</td><td>2004-10-26</td><td>desruisseaux</td><td>org.geotools.referencing.Identifier implementation implements GenericName as well, for use as alias</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">6383</td><td>2004-06-11</td><td>desruisseaux</td><td>Search for parameters and operation methods by identifiers</td></tr>
+<tr><td class="rev">6376</td><td>2004-06-10</td><td>desruisseaux</td><td>Added pre-defined citations</td></tr>
+<tr><td class="rev">6375</td><td>2004-06-10</td><td>desruisseaux</td><td>Work on parameters handling</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/NamedIdentifier.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sis/ip-review/NamedIdentifier.xhtml
------------------------------------------------------------------------------
svn:mime-type = text/html
Added: sis/ip-review/rev/10796/NamedIdentifier.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/10796/NamedIdentifier.xhtml?rev=1518284&view=auto
==============================================================================
--- sis/ip-review/rev/10796/NamedIdentifier.xhtml (added)
+++ sis/ip-review/rev/10796/NamedIdentifier.xhtml Wed Aug 28 16:58:54 2013
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta charset="UTF-8"/>
+ <title>NamedIdentifier changes for revisions 10795:10796</title>
+ <style type="text/css" media="all">
+ @import url("../../reports.css");
+ </style>
+ </head>
+ <body>
+ <div>
+ <h1>NamedIdentifier 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/NamedIdentifier.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) 2004, Geotools Project Managment Committee (PMC)
+<span class="del"> * (C) 2004, 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) 2004, Geotools Project Managment Committee (PMC)
+<span class="add"> * (C) 2004, 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.Map;</span>
+<span class="del">import java.util.List;</span>
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.logging.Logger;
+<span class="del">import java.io.Serializable;</span>
+<span class="del">import java.io.ObjectStreamException;</span>
+
+<span class="del">// OpenGIS dependencies</span>
+import org.opengis.util.LocalName;
+import org.opengis.util.ScopedName;
+<span class="del">import org.opengis.util.GenericName;</span>
+<span class="del">import org.opengis.util.InternationalString;</span>
+<span class="del">import org.opengis.metadata.citation.Citation;</span>
+<span class="del">import org.opengis.parameter.InvalidParameterValueException;</span>
+
+<span class="del">// Geotools dependencies</span>
+<span class="del">import org.geotools.util.NameFactory;</span>
+<span class="del">import org.geotools.util.WeakHashSet;</span>
+<span class="del">import org.geotools.util.WeakValueHashMap;</span>
+<span class="del">import org.geotools.util.GrowableInternationalString;</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"></span>
+/**
+ * An identification of a CRS object. The main interface implemented by this class
+ * is {@link org.opengis.metadata.Identifier}. However, this class also implements</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.HashMap;
+import java.util.Iterator;
+<span class="add">import java.util.List;</span>
+import java.util.Locale;
+<span class="add">import java.util.Map;</span>
+import java.util.logging.Logger;
+
+<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.WeakHashSet;</span>
+<span class="add">import org.geotools.util.WeakValueHashMap;</span>
+<span class="add">import org.opengis.metadata.citation.Citation;</span>
+<span class="add">import org.opengis.parameter.InvalidParameterValueException;</span>
+<span class="add">import org.opengis.util.GenericName;</span>
+<span class="add">import org.opengis.util.InternationalString;</span>
+import org.opengis.util.LocalName;
+import org.opengis.util.ScopedName;
+
+
+/**
+ * An identification of a CRS object. The main interface implemented by this class
+ * is {@link org.opengis.metadata.Identifier}. However, this class also implements</pre></td></tr>
+</table>
+ </div>
+ </body>
+</html>
Propchange: sis/ip-review/rev/10796/NamedIdentifier.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sis/ip-review/rev/10796/NamedIdentifier.xhtml
------------------------------------------------------------------------------
svn:mime-type = text/html
Added: sis/ip-review/rev/20874/NamedIdentifier.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/20874/NamedIdentifier.xhtml?rev=1518284&view=auto
==============================================================================
--- sis/ip-review/rev/20874/NamedIdentifier.xhtml (added)
+++ sis/ip-review/rev/20874/NamedIdentifier.xhtml Wed Aug 28 16:58:54 2013
@@ -0,0 +1,130 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta charset="UTF-8"/>
+ <title>NamedIdentifier changes for revisions 20815:20874</title>
+ <style type="text/css" media="all">
+ @import url("../../reports.css");
+ </style>
+ </head>
+ <body>
+ <div>
+ <h1>NamedIdentifier changes for revisions 20815:20874</h1>
+<p>Changes in GeoTools header. 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>This commit contains also implementations for new methods added in the GeoAPI 2.1 interface.
+Removing this commit causes <code>javac</code> to report compilation errors, which are fixed by
+letting the IDE generating skeleton implementations of those methods. After the IDE generated
+skeletons, method bodies are straightforward replication of the implementations that existed
+for the GeoAPI 2.0 methods.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r20815:20874 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/NamedIdentifier.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 20815</th><th>Revision 20874</th></tr>
+<tr><td><pre>/*
+<span class="del"> * Geotools 2 - OpenSource mapping toolkit</span>
+<span class="del"> * (C) 2004, Geotools Project Managment Committee (PMC)</span>
+ * (C) 2004, 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) 2004-2006, GeoTools Project Managment Committee (PMC)</span>
+ * (C) 2004, 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>
+<tr><td><pre>import org.opengis.util.GenericName;
+import org.opengis.util.InternationalString;
+import org.opengis.util.LocalName;
+import org.opengis.util.ScopedName;
+
+// Geotools dependencies</pre></td>
+<td><pre>import org.opengis.util.GenericName;
+import org.opengis.util.InternationalString;
+import org.opengis.util.LocalName;
+<span class="add">import org.opengis.util.NameSpace;</span>
+import org.opengis.util.ScopedName;
+
+// Geotools dependencies</pre></td></tr>
+<tr><td><pre>/**
+ * Returns the scope (name space) of this generic name. If this name has no scope
+ * (e.g. is the root), then this method returns {@code null}.
+ */
+public GenericName getScope() {
+ return getName().getScope();</pre></td>
+<td><pre>/**
+ * Returns the scope (name space) of this generic name. If this name has no scope
+ * (e.g. is the root), then this method returns {@code null}.
+<span class="add"> *</span>
+<span class="add"> * @deprecated Repalced by scope()</span>
+ */
+public GenericName getScope() {
+ return getName().getScope();</pre></td></tr>
+<tr><td><pre> }
+ return hash;
+ }
+}</pre></td>
+<td><pre> }
+ return hash;
+ }
+<span class="add"></span>
+<span class="add"> /**</span>
+<span class="add"> * @since GeoAPI 2.1</span>
+<span class="add"> */</span>
+<span class="add"> public NameSpace scope() {</span>
+<span class="add"> return getName().scope();</span>
+}
+<span class="add"> /**</span>
+<span class="add"> * @since GeoAPI 2.1</span>
+<span class="add"> */</span>
+<span class="add"> public int depth() {</span>
+<span class="add"> return getName().depth();</span>
+<span class="add"> }</span>
+<span class="add"> /** @since GeoAPI 2.1 */</span>
+<span class="add"> public LocalName name() {</span>
+<span class="add"> return getName().name();</span>
+<span class="add"> }</span>
+<span class="add"> /** @since GeoAPI 2.1 */</span>
+<span class="add"> public GenericName toFullyQualifiedName() {</span>
+<span class="add"> return getName().toFullyQualifiedName();</span>
+<span class="add"> }</span>
+<span class="add"> /** @since GeoAPI 2.1 */</span>
+<span class="add"> public ScopedName push(GenericName scope) {</span>
+<span class="add"> return getName().push( scope );</span>
+<span class="add"> }</span>
+<span class="add">}</span></pre></td></tr>
+</table>
+ </div>
+ </body>
+</html>
Propchange: sis/ip-review/rev/20874/NamedIdentifier.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sis/ip-review/rev/20874/NamedIdentifier.xhtml
------------------------------------------------------------------------------
svn:mime-type = text/html
Added: sis/ip-review/rev/24990/NamedIdentifier.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/24990/NamedIdentifier.xhtml?rev=1518284&view=auto
==============================================================================
--- sis/ip-review/rev/24990/NamedIdentifier.xhtml (added)
+++ sis/ip-review/rev/24990/NamedIdentifier.xhtml Wed Aug 28 16:58:54 2013
@@ -0,0 +1,130 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta charset="UTF-8"/>
+ <title>NamedIdentifier changes for revisions 24867:24990</title>
+ <style type="text/css" media="all">
+ @import url("../../reports.css");
+ </style>
+ </head>
+ <body>
+ <div>
+ <h1>NamedIdentifier changes for revisions 24867:24990</h1>
+<p>Since the <code>getCodeSpace()</code> method has been added in the GeoAPI interface,
+reverting this commit causes a compilation error which can be fixed only by adding back
+<code>getCodeSpace()</code> in this class. Implementation of that method is a straightforward
+copy of the <code>getCode()</code> field and method body with only the name changed.
+The <code>(String)</code> cast has been reverted.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r24867:24990 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/NamedIdentifier.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 24867</th><th>Revision 24990</th></tr>
+<tr><td><pre>import org.opengis.metadata.Identifier;
+import org.opengis.metadata.citation.Citation;
+import org.opengis.parameter.InvalidParameterValueException;
+import org.opengis.util.GenericName;
+import org.opengis.util.InternationalString;
+import org.opengis.util.LocalName;</pre></td>
+<td><pre>import org.opengis.metadata.Identifier;
+import org.opengis.metadata.citation.Citation;
+import org.opengis.parameter.InvalidParameterValueException;
+<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> * @version $Id$
+ * @author Martin Desruisseaux
+ */
+<span class="del">public class NamedIdentifier implements Identifier, GenericName, Serializable {</span>
+ /**
+ * Serial number for interoperability with different versions.
+ */</pre></td>
+<td><pre> * @version $Id$
+ * @author Martin Desruisseaux
+ */
+<span class="add">public class NamedIdentifier implements ReferenceIdentifier, GenericName, Serializable {</span>
+ /**
+ * Serial number for interoperability with different versions.
+ */</pre></td></tr>
+<tr><td><pre>private final String code;
+
+/**
+ * Organization or party responsible for definition and maintenance of the
+ * code space or code.
+ */</pre></td>
+<td><pre>private final String code;
+
+/**
+<span class="add"> * Name or identifier of the person or organization responsible for namespace.</span>
+<span class="add"> */</span>
+<span class="add">private final String codespace;</span>
+<span class="add"></span>
+<span class="add">/**</span>
+ * Organization or party responsible for definition and maintenance of the
+ * code space or code.
+ */</pre></td></tr>
+<tr><td><pre>NamedIdentifier(final Map properties, final boolean standalone) throws IllegalArgumentException {
+ ensureNonNull("properties", properties);
+ Object code = null;
+ Object version = null;
+ Object authority = null;
+ Object remarks = null;</pre></td>
+<td><pre>NamedIdentifier(final Map properties, final boolean standalone) throws IllegalArgumentException {
+ ensureNonNull("properties", properties);
+ Object code = null;
+<span class="add"> Object codespace = null;</span>
+ Object version = null;
+ Object authority = null;
+ Object remarks = null;</pre></td></tr>
+<tr><td><pre>}
+case 351608024: {
+ if (key.equals(VERSION_KEY)) {
+<span class="del"> version = value;</span>
+ continue;
+ }
+ break;</pre></td>
+<td><pre>}
+case 351608024: {
+ if (key.equals(VERSION_KEY)) {
+<span class="add"> version = (String) value;</span>
+ continue;
+ }
+ break;</pre></td></tr>
+<tr><td><pre>try {
+ key= CODE_KEY; this.code = (String) (value=code);
+ key= VERSION_KEY; this.version = (String) (value=version);
+ key= AUTHORITY_KEY; this.authority = (Citation) (value=authority);
+ key= REMARKS_KEY; this.remarks = (InternationalString) (value=remarks);
+} catch (ClassCastException exception) {</pre></td>
+<td><pre>try {
+ key= CODE_KEY; this.code = (String) (value=code);
+ key= VERSION_KEY; this.version = (String) (value=version);
+<span class="add"> key= CODESPACE_KEY; this.codespace = (String) (value=codespace);</span>
+ key= AUTHORITY_KEY; this.authority = (Citation) (value=authority);
+ key= REMARKS_KEY; this.remarks = (InternationalString) (value=remarks);
+} catch (ClassCastException exception) {</pre></td></tr>
+<tr><td><pre>}
+
+/**
+ * Organization or party responsible for definition and maintenance of the
+ * {@linkplain #getCode code}.
+ *</pre></td>
+<td><pre>}
+
+/**
+<span class="add"> * Name or identifier of the person or organization responsible for namespace.</span>
+<span class="add"> *</span>
+<span class="add"> * @return The codespace, or {@code null} if not available.</span>
+<span class="add"> */</span>
+<span class="add">public String getCodeSpace() {</span>
+<span class="add"> return codespace;</span>
+<span class="add">}</span>
+<span class="add"></span>
+<span class="add">/**</span>
+ * Organization or party responsible for definition and maintenance of the
+ * {@linkplain #getCode code}.
+ *</pre></td></tr>
+</table>
+ </div>
+ </body>
+</html>
Propchange: sis/ip-review/rev/24990/NamedIdentifier.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sis/ip-review/rev/24990/NamedIdentifier.xhtml
------------------------------------------------------------------------------
svn:mime-type = text/html