sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1457718 [3/3] - in /sis/ip-review: ./ rev/10796/ rev/20874/ rev/24925/ rev/24973/ rev/24990/ rev/25001/
Date Mon, 18 Mar 2013 11:49:45 GMT
Added: sis/ip-review/rev/20874/DefaultVerticalExtent.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/20874/DefaultVerticalExtent.xhtml?rev=1457718&view=auto
==============================================================================
--- sis/ip-review/rev/20874/DefaultVerticalExtent.xhtml (added)
+++ sis/ip-review/rev/20874/DefaultVerticalExtent.xhtml Mon Mar 18 11:49:44 2013
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>DefaultVerticalExtent changes for revisions 20873:20874</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>DefaultVerticalExtent 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/metadata/src/main/java/org/geotools/metadata/iso/extent/VerticalExtentImpl.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) 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
+ *    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>/*
+<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
+ *    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/DefaultVerticalExtent.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

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

Added: sis/ip-review/rev/24925/DefaultTemporalExtent.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/24925/DefaultTemporalExtent.xhtml?rev=1457718&view=auto
==============================================================================
--- sis/ip-review/rev/24925/DefaultTemporalExtent.xhtml (added)
+++ sis/ip-review/rev/24925/DefaultTemporalExtent.xhtml Mon Mar 18 11:49:44 2013
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>DefaultTemporalExtent changes for revisions 24867:24925</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>DefaultTemporalExtent changes for revisions 24867:24925</h1>
+
+<p>This commit adds an empty skeleton for new method added in GeoAPI interface,
+but no implementation. Removing this contribution causes compilation error, which
+is solved by adding the method back. SIS provides a more complete implementation.</p>
+
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change --ignore-all-space
--ignore-eol-style" -r24867:24925 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/extent/TemporalExtentImpl.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 24867</th><th>Revision 24925</th></tr>
+<tr><td><pre>// OpenGIS dependencies
+import org.opengis.metadata.extent.TemporalExtent;
+
+// Geotools dependencies
+import org.geotools.metadata.iso.MetadataEntity;</pre></td>
+<td><pre>// OpenGIS dependencies
+import org.opengis.metadata.extent.TemporalExtent;
+<span class="add">import org.opengis.temporal.TemporalPrimitive;</span>
+<span class="add">import org.opengis.geometry.primitive.Primitive;</span>
+<span class="add">import org.opengis.geometry.primitive.PrimitiveBoundary;</span>
+
+// Geotools dependencies
+import org.geotools.metadata.iso.MetadataEntity;</pre></td></tr>
+<tr><td><pre>    public String toString() {
+        return String.valueOf(startTime);
+    }
+}</pre></td>
+<td><pre>    public String toString() {
+        return String.valueOf(startTime);
+    }
+<span class="add"></span>
+<span class="add">    /**</span>
+<span class="add">     * TODO What is needed here?</span>
+<span class="add">     */</span>
+<span class="add">    public TemporalPrimitive getExtent() {</span>
+<span class="add">        return null;</span>
+}
+<span class="add"></span>
+<span class="add">}</span></pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/24925/DefaultTemporalExtent.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

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

Added: sis/ip-review/rev/24973/DefaultExtent.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/24973/DefaultExtent.xhtml?rev=1457718&view=auto
==============================================================================
--- sis/ip-review/rev/24973/DefaultExtent.xhtml (added)
+++ sis/ip-review/rev/24973/DefaultExtent.xhtml Mon Mar 18 11:49:44 2013
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>DefaultExtent changes for revisions 24972:24973</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>DefaultExtent changes for revisions 24972:24973</h1>
+
+<p>Replacement of <code>boolean</code> primitive type by <code>Boolean</code>
wrapper.
+This change has been forced by a GeoAPI change. This contribution has been "reverted"
+(actually, rely on auto-unboxing) 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/metadata/src/main/java/org/geotools/metadata/iso/extent/ExtentImpl.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 24972</th><th>Revision 24973</th></tr>
+<tr><td><pre> * ones (if any). All exclusion boxes before the first inclusion
box are ignored.
+ */
+if (candidate == null) {
+<span class="del">    if (bounds.getInclusion()) {</span>
+        candidate = bounds;
+    }
+} else {</pre></td>
+<td><pre> * ones (if any). All exclusion boxes before the first inclusion box
are ignored.
+ */
+if (candidate == null) {
+<span class="add">    if (bounds.getInclusion().booleanValue()) {</span>
+        candidate = bounds;
+    }
+} else {</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

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

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

Added: sis/ip-review/rev/24990/DefaultVerticalExtent.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/24990/DefaultVerticalExtent.xhtml?rev=1457718&view=auto
==============================================================================
--- sis/ip-review/rev/24990/DefaultVerticalExtent.xhtml (added)
+++ sis/ip-review/rev/24990/DefaultVerticalExtent.xhtml Mon Mar 18 11:49:44 2013
@@ -0,0 +1,230 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>DefaultVerticalExtent changes for revisions 24867:24990</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>DefaultVerticalExtent changes for revisions 24867:24990</h1>
+
+<p>Replacement of primitive <code>double</code> type by the <code>Double</code>
wrapper.
+This change has been forced by a GeoAPI change. Reverting this change causes a compilation
failure,
+which is resolved by restoring the <code>Double</code> values as required by
GeoAPI interfaces. So
+rewriting this contribution produces identical result.</p>
+
+<p>This commit adds an empty skeleton for new method added in GeoAPI interface (<code>getVerticalCRS()</code>),
+but no implementation. Removing this contribution causes compilation error, which
+is solved by adding the method back. SIS provides a more complete implementation.</p>
+
+<p>Contains also an update of the <code>equals(Object)</code> method more
complicated than needed
+given the nature of the <code>Double</code> objects. This method has been rewritten
in Geotk/SIS.</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/metadata/src/main/java/org/geotools/metadata/iso/extent/VerticalExtentImpl.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 24867</th><th>Revision 24990</th></tr>
+<tr><td><pre>// OpenGIS dependencies
+import org.opengis.metadata.extent.VerticalExtent;
+import org.opengis.referencing.datum.VerticalDatum;
+
+// Geotools dependencies</pre></td>
+<td><pre>// OpenGIS dependencies
+import org.opengis.metadata.extent.VerticalExtent;
+<span class="add">import org.opengis.referencing.crs.CoordinateReferenceSystem;</span>
+import org.opengis.referencing.datum.VerticalDatum;
+
+// Geotools dependencies</pre></td></tr>
+<tr><td><pre>/**
+ * The lowest vertical extent contained in the dataset.
+ */
+<span class="del">private double minimumValue;</span>
+
+/**
+ * The highest vertical extent contained in the dataset.
+ */
+<span class="del">private double maximumValue;</span>
+
+/**
+ * The vertical units used for vertical extent information.</pre></td>
+<td><pre>/**
+ * The lowest vertical extent contained in the dataset.
+ */
+<span class="add">private Double minimumValue;</span>
+
+/**
+ * The highest vertical extent contained in the dataset.
+ */
+<span class="add">private Double maximumValue;</span>
+
+/**
+ * The vertical units used for vertical extent information.</pre></td></tr>
+<tr><td><pre>/**
+ * Provides information about the origin from which the
+ * maximum and minimum elevation values are measured.
+ */
+private VerticalDatum verticalDatum;</pre></td>
+<td><pre>/**
+ * Provides information about the origin from which the
+ * maximum and minimum elevation values are measured.
+<span class="add"> * @deprecated</span>
+ */
+private VerticalDatum verticalDatum;</pre></td></tr>
+<tr><td><pre>/**
+ * Creates a vertical extent initialized to the specified values.
+ */
+<span class="del">public VerticalExtentImpl(final double minimumValue,</span>
+<span class="del">                      final double maximumValue,</span>
+                      final Unit   unit,
+                      final VerticalDatum verticalDatum)
+{</pre></td>
+<td><pre>/**
+ * Creates a vertical extent initialized to the specified values.
+ */
+<span class="add">public VerticalExtentImpl(final Double minimumValue,</span>
+<span class="add">                      final Double maximumValue,</span>
+                      final Unit   unit,
+                      final VerticalDatum verticalDatum)
+{</pre></td></tr>
+<tr><td><pre>}
+
+/**
+ * Returns the lowest vertical extent contained in the dataset.
+ */
+<span class="del">public double getMinimumValue() {</span>
+    return minimumValue;
+}
+
+/**
+ * Set the lowest vertical extent contained in the dataset.
+ */
+<span class="del">public synchronized void setMinimumValue(final double newValue) {</span>
+    checkWritePermission();
+    minimumValue = newValue;
+}</pre></td>
+<td><pre>}
+
+/**
+<span class="add"> * Creates a vertical extent initialized to the specified values.</span>
+<span class="add"> */</span>
+<span class="add">public VerticalExtentImpl(final double minimumValue,</span>
+<span class="add">                      final double maximumValue,</span>
+<span class="add">                      final Unit   unit,</span>
+<span class="add">                      final VerticalDatum verticalDatum)</span>
+<span class="add">{</span>
+<span class="add">    setMinimumValue (new Double(minimumValue));</span>
+<span class="add">    setMaximumValue (new Double(maximumValue));</span>
+<span class="add">    setUnit         (unit);</span>
+<span class="add">    setVerticalDatum(verticalDatum);</span>
+<span class="add">}</span>
+<span class="add"></span>
+<span class="add">/**</span>
+ * Returns the lowest vertical extent contained in the dataset.
+ */
+<span class="add">public Double getMinimumValue() {</span>
+    return minimumValue;
+}
+
+/**
+ * Set the lowest vertical extent contained in the dataset.
+ */
+<span class="add">public synchronized void setMinimumValue(final Double newValue) {</span>
+    checkWritePermission();
+    minimumValue = newValue;
+}</pre></td></tr>
+<tr><td><pre>/**
+ * Returns the highest vertical extent contained in the dataset.
+ */
+<span class="del">public double getMaximumValue() {</span>
+    return maximumValue;
+}
+
+/**
+ * Set the highest vertical extent contained in the dataset.
+ */
+<span class="del">public synchronized void setMaximumValue(final double newValue) {</span>
+    checkWritePermission();
+    maximumValue = newValue;
+}</pre></td>
+<td><pre>/**
+ * Returns the highest vertical extent contained in the dataset.
+ */
+<span class="add">public Double getMaximumValue() {</span>
+    return maximumValue;
+}
+
+/**
+ * Set the highest vertical extent contained in the dataset.
+ */
+<span class="add">public synchronized void setMaximumValue(final Double newValue) {</span>
+    checkWritePermission();
+    maximumValue = newValue;
+}</pre></td></tr>
+<tr><td><pre>/**
+ * Provides information about the origin from which the
+ * maximum and minimum elevation values are measured.
+ */
+public VerticalDatum getVerticalDatum()  {
+    return verticalDatum;</pre></td>
+<td><pre>/**
+ * Provides information about the origin from which the
+ * maximum and minimum elevation values are measured.
+<span class="add"> *</span>
+<span class="add"> * @deprecated use getVerticalCRS</span>
+ */
+public VerticalDatum getVerticalDatum()  {
+    return verticalDatum;</pre></td></tr>
+<tr><td><pre>/**
+ * Set information about the origin from which the
+ * maximum and minimum elevation values are measured.
+ */
+public synchronized void setVerticalDatum(final VerticalDatum newValue ) {
+    checkWritePermission();</pre></td>
+<td><pre>/**
+ * Set information about the origin from which the
+ * maximum and minimum elevation values are measured.
+<span class="add"> *</span>
+<span class="add"> * @deprecated use setVerticalCRS</span>
+ */
+public synchronized void setVerticalDatum(final VerticalDatum newValue ) {
+    checkWritePermission();</pre></td></tr>
+<tr><td><pre>        final VerticalExtentImpl that = (VerticalExtentImpl)
object;
+        return Utilities.equals(this.unit,           that.unit          ) &amp;&amp;
+               Utilities.equals(this.verticalDatum,  that.verticalDatum ) &amp;&amp;
+<span class="del">               Double.doubleToLongBits(this.minimumValue) ==</span>
+<span class="del">               Double.doubleToLongBits(that.minimumValue) &amp;&amp;</span>
+<span class="del">               Double.doubleToLongBits(this.maximumValue) ==</span>
+<span class="del">               Double.doubleToLongBits(that.maximumValue);</span>
+    }
+    return false;
+}</pre></td>
+<td><pre>        final VerticalExtentImpl that = (VerticalExtentImpl) object;
+        return Utilities.equals(this.unit,           that.unit          ) &amp;&amp;
+               Utilities.equals(this.verticalDatum,  that.verticalDatum ) &amp;&amp;
+<span class="add">               Double.doubleToLongBits(this.minimumValue.doubleValue())
==</span>
+<span class="add">               Double.doubleToLongBits(that.minimumValue.doubleValue())
&amp;&amp;</span>
+<span class="add">               Double.doubleToLongBits(this.maximumValue.doubleValue())
==</span>
+<span class="add">               Double.doubleToLongBits(that.maximumValue.doubleValue());</span>
+    }
+    return false;
+}</pre></td></tr>
+<tr><td><pre>    public String toString() {
+        return String.valueOf(verticalDatum);
+    }
+}</pre></td>
+<td><pre>    public String toString() {
+        return String.valueOf(verticalDatum);
+    }
+<span class="add"></span>
+<span class="add">    // TODO: provide CRS</span>
+<span class="add">    public CoordinateReferenceSystem getVerticalCRS() {</span>
+<span class="add">        return null; // can probably create from verticalData, min/max
unit info</span>
+}
+<span class="add">}</span></pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/24990/DefaultVerticalExtent.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

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

Added: sis/ip-review/rev/25001/DefaultGeographicBoundingBox.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/25001/DefaultGeographicBoundingBox.xhtml?rev=1457718&view=auto
==============================================================================
--- sis/ip-review/rev/25001/DefaultGeographicBoundingBox.xhtml (added)
+++ sis/ip-review/rev/25001/DefaultGeographicBoundingBox.xhtml Mon Mar 18 11:49:44 2013
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>DefaultGeographicBoundingBox changes for revisions 24924:25001</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>DefaultGeographicBoundingBox changes for revisions 24924:25001</h1>
+
+<p>This commit propagates the package names change which was done in GeoAPI.
+There is no way such change could be done differently,
+since not renaming the packages cause a compilation error.</p>
+
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change --ignore-all-space
--ignore-eol-style" -r24924:25001 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/extent/GeographicBoundingBoxImpl.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 24924</th><th>Revision 25001</th></tr>
+<tr><td><pre>// OpenGIS dependencies
+import org.opengis.metadata.extent.GeographicBoundingBox;
+import org.opengis.referencing.operation.TransformException;
+<span class="del">import org.opengis.spatialschema.geometry.Envelope;</span>
+
+// Geotools dependencies
+import org.geotools.resources.i18n.Errors;</pre></td>
+<td><pre>// OpenGIS dependencies
+import org.opengis.metadata.extent.GeographicBoundingBox;
+import org.opengis.referencing.operation.TransformException;
+<span class="add">import org.opengis.geometry.Envelope;</span>
+
+// Geotools dependencies
+import org.geotools.resources.i18n.Errors;</pre></td></tr>
+<tr><td><pre> * The rectangle is assumed in {@linkplain DefaultGeographicCRS#WGS84
WGS 84} CRS.
+ */
+public GeographicBoundingBoxImpl(final Rectangle2D bounds) {
+<span class="del">    this(bounds.getMinX(), bounds.getMaxX(), bounds.getMinY(), bounds.getMaxY());</span>
+}
+
+/**</pre></td>
+<td><pre> * The rectangle is assumed in {@linkplain DefaultGeographicCRS#WGS84
WGS 84} CRS.
+ */
+public GeographicBoundingBoxImpl(final Rectangle2D bounds) {
+<span class="add">    this(bounds.getMinX(), bounds.getMaxX(),</span>
+<span class="add">         bounds.getMinY(), bounds.getMaxY());</span>
+}
+
+/**</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/25001/DefaultGeographicBoundingBox.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

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



Mime
View raw message