sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1519960 - in /sis: branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/ branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/ ip-review/ ip-review/rev/10796/ ip-review/rev/20874/
Date Wed, 04 Sep 2013 09:50:44 GMT
Author: desruisseaux
Date: Wed Sep  4 09:50:43 2013
New Revision: 1519960

URL: http://svn.apache.org/r1519960
Log:
Ported DefaultTemporalDatum.

Added:
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
  (with props)
    sis/ip-review/DefaultTemporalDatum.xhtml   (with props)
    sis/ip-review/rev/10796/DefaultTemporalDatum.xhtml   (with props)
    sis/ip-review/rev/20874/DefaultTemporalDatum.xhtml   (with props)
Modified:
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties

Added: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java?rev=1519960&view=auto
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
(added)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
Wed Sep  4 09:50:43 2013
@@ -0,0 +1,219 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.referencing.datum;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.Collections;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlRootElement;
+import org.opengis.referencing.datum.TemporalDatum;
+import org.apache.sis.util.resources.Vocabulary;
+import org.apache.sis.util.ComparisonMode;
+import org.apache.sis.util.Immutable;
+
+import static org.apache.sis.internal.util.Numerics.hash;
+import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
+
+// Related to JDK7
+import java.util.Objects;
+
+
+/**
+ * A temporal datum defines the origin of a temporal coordinate reference system.
+ *
+ * @author  Martin Desruisseaux (IRD, Geomatys)
+ * @since   0.4 (derived from geotk-1.2)
+ * @version 0.4
+ * @module
+ */
+@Immutable
+@XmlType(name = "TemporalDatumType")
+@XmlRootElement(name = "TemporalDatum")
+public class DefaultTemporalDatum extends AbstractDatum implements TemporalDatum {
+    /**
+     * Serial number for inter-operability with different versions.
+     */
+    private static final long serialVersionUID = 3357241732140076884L;
+
+    /**
+     * Datum for time measured since January 1st, 4713 BC at 12:00 UTC.
+     *
+     * @see org.apache.sis.referencing.crs.DefaultTemporalCRS#JULIAN
+     */
+    public static final DefaultTemporalDatum JULIAN = new DefaultTemporalDatum(
+            name(Vocabulary.Keys.Julian), new Date(-2440588 * (24*60*60*1000L) + (12*60*60*1000L)));
+
+    /**
+     * Datum for time measured since November 17, 1858 at 00:00 UTC.
+     * A <cite>Modified Julian day</cite> (MJD) is defined relative to
+     * <cite>Julian day</cite> (JD) as {@code MJD = JD − 2400000.5}.
+     *
+     * @see org.apache.sis.referencing.crs.DefaultTemporalCRS#MODIFIED_JULIAN
+     */
+    public static final DefaultTemporalDatum MODIFIED_JULIAN = new DefaultTemporalDatum(
+            name(Vocabulary.Keys.ModifiedJulian), new Date(-40587 * (24*60*60*1000L)));
+
+    /**
+     * Datum for time measured since May 24, 1968 at 00:00 UTC.
+     * This epoch was introduced by NASA for the space program.
+     * A <cite>Truncated Julian day</cite> (TJD) is defined relative to
+     * <cite>Julian day</cite> (JD) as {@code TJD = JD − 2440000.5}.
+     *
+     * @see org.apache.sis.referencing.crs.DefaultTemporalCRS#TRUNCATED_JULIAN
+     */
+    public static final DefaultTemporalDatum TRUNCATED_JULIAN = new DefaultTemporalDatum(
+            name(Vocabulary.Keys.TruncatedJulian), new Date(-587 * (24*60*60*1000L)));
+
+    /**
+     * Datum for time measured since December 31, 1899 at 12:00 UTC.
+     * A <cite>Dublin Julian day</cite> (DJD) is defined relative to
+     * <cite>Julian day</cite> (JD) as {@code DJD = JD − 2415020}.
+     *
+     * @see org.apache.sis.referencing.crs.DefaultTemporalCRS#DUBLIN_JULIAN
+     */
+    public static final DefaultTemporalDatum DUBLIN_JULIAN = new DefaultTemporalDatum(
+            name(Vocabulary.Keys.DublinJulian), new Date(-25568 * (24*60*60*1000L) + (12*60*60*1000L)));
+
+    /**
+     * Default datum for time measured since January 1st, 1970 at 00:00 UTC.
+     *
+     * @see org.apache.sis.referencing.crs.DefaultTemporalCRS#UNIX
+     * @see org.apache.sis.referencing.crs.DefaultTemporalCRS#JAVA
+     */
+    public static final DefaultTemporalDatum UNIX = new DefaultTemporalDatum("UNIX", new
Date(0));
+
+    /**
+     * The date and time origin of this temporal datum.
+     */
+    private final long origin;
+
+    /**
+     * Constructs a new datum with the same values than the specified one.
+     * This copy constructor provides a way to convert an arbitrary implementation into a
SIS one
+     * or a user-defined one (as a subclass), usually in order to leverage some implementation-specific
API.
+     *
+     * <p>This constructor performs a shallow copy, i.e. the properties are not cloned.</p>
+     *
+     * @param datum The datum to copy.
+     */
+    public DefaultTemporalDatum(final TemporalDatum datum) {
+        super(datum);
+        origin = datum.getOrigin().getTime();
+    }
+
+    /**
+     * Constructs a temporal datum from a name.
+     *
+     * @param name   The datum name.
+     * @param origin The date and time origin of this temporal datum.
+     */
+    public DefaultTemporalDatum(final String name, final Date origin) {
+        this(Collections.singletonMap(NAME_KEY, name), origin);
+    }
+
+    /**
+     * Constructs a temporal datum from a set of properties. The properties map is given
+     * unchanged to the {@linkplain AbstractDatum#AbstractDatum(Map) super-class constructor}.
+     *
+     * @param properties Set of properties. Should contains at least {@code "name"}.
+     * @param origin The date and time origin of this temporal datum.
+     */
+    public DefaultTemporalDatum(final Map<String,?> properties, final Date origin)
{
+        super(properties);
+        ensureNonNull("origin", origin);
+        this.origin = origin.getTime();
+    }
+
+    /**
+     * Returns a SIS datum implementation with the same values than the given arbitrary implementation.
+     * If the given object is {@code null}, then this method returns {@code null}.
+     * Otherwise if the given object is already a SIS implementation, then the given object
is returned unchanged.
+     * Otherwise a new SIS implementation is created and initialized to the attribute values
of the given object.
+     *
+     * @param  object The object to get as a SIS implementation, or {@code null} if none.
+     * @return A SIS implementation containing the values of the given object (may be the
+     *         given object itself), or {@code null} if the argument was null.
+     */
+    public static DefaultTemporalDatum castOrCopy(final TemporalDatum object) {
+        return (object == null) || (object instanceof DefaultTemporalDatum)
+                ? (DefaultTemporalDatum) object : new DefaultTemporalDatum(object);
+    }
+
+    /**
+     * Returns the date and time origin of this temporal datum.
+     *
+     * @return The date and time origin of this temporal datum.
+     */
+    @Override
+    public Date getOrigin() {
+        return new Date(origin);
+    }
+
+    /**
+     * Compares this temporal datum with the specified object for equality.
+     *
+     * @param  object The object to compare to {@code this}.
+     * @param  mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison,
or
+     *         {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only
properties
+     *         relevant to transformations.
+     * @return {@code true} if both objects are equal.
+     */
+    @Override
+    public boolean equals(final Object object, final ComparisonMode mode) {
+        if (object == this) {
+            return true; // Slight optimization.
+        }
+        if (super.equals(object, mode)) {
+            switch (mode) {
+                case STRICT: {
+                    final DefaultTemporalDatum that = (DefaultTemporalDatum) object;
+                    return this.origin == that.origin;
+                }
+                default: {
+                    if (!(object instanceof TemporalDatum)) break;
+                    final TemporalDatum that = (TemporalDatum) object;
+                    return Objects.equals(getOrigin(), that.getOrigin());
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Computes a hash value consistent with the given comparison mode.
+     */
+    @Override
+    public int hashCode(final ComparisonMode mode) throws IllegalArgumentException {
+        /*
+         * The "^ (int) serialVersionUID" is an arbitrary change applied to the hash code
value in order to
+         * differentiate TemporalDatum implementations from implementations of other GeoAPI
interfaces.
+         */
+        int code = super.hashCode(mode) ^ (int) serialVersionUID;
+        switch (mode) {
+            case STRICT: {
+                code = hash(origin, code);
+                break;
+            }
+            default: {
+                code += Objects.hashCode(getOrigin());
+                break;
+            }
+        }
+        return code;
+    }
+}

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

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

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java?rev=1519960&r1=1519959&r2=1519960&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java
[UTF-8] Wed Sep  4 09:50:43 2013
@@ -135,6 +135,11 @@ public final class Vocabulary extends In
         public static final int Directory = 36;
 
         /**
+         * Dublin Julian
+         */
+        public static final int DublinJulian = 56;
+
+        /**
          * Identifier
          */
         public static final int Identifier = 42;
@@ -160,6 +165,11 @@ public final class Vocabulary extends In
         public static final int JavaHome = 30;
 
         /**
+         * Julian
+         */
+        public static final int Julian = 57;
+
+        /**
          * Latitude
          */
         public static final int Latitude = 40;
@@ -210,6 +220,11 @@ public final class Vocabulary extends In
         public static final int MinimumValue = 4;
 
         /**
+         * Modified Julian
+         */
+        public static final int ModifiedJulian = 58;
+
+        /**
          * Name
          */
         public static final int Name = 0;
@@ -290,6 +305,11 @@ public final class Vocabulary extends In
         public static final int Timezone = 20;
 
         /**
+         * Truncated Julian
+         */
+        public static final int TruncatedJulian = 59;
+
+        /**
          * Type
          */
         public static final int Type = 1;

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties?rev=1519960&r1=1519959&r2=1519960&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties
[ISO-8859-1] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties
[ISO-8859-1] Wed Sep  4 09:50:43 2013
@@ -30,11 +30,13 @@ DaylightTime       = Daylight time
 Destination        = Destination
 Dimensions         = Dimensions
 Directory          = Directory
+DublinJulian       = Dublin Julian
 Identifier         = Identifier
 Implementation     = Implementation
 Index              = Index
 JavaExtensions     = Java extensions
 JavaHome           = Java home directory
+Julian             = Julian
 Latitude           = Latitude
 Longitude          = Longitude
 Libraries          = Libraries
@@ -45,6 +47,7 @@ Logging            = Logging
 MaximumValue       = Maximum value
 MeanValue          = Mean value
 MinimumValue       = Minimum value
+ModifiedJulian     = Modified Julian
 Name               = Name
 NumberOfValues     = Number of values
 NumberOfNaN        = Number of \u2018NaN\u2019
@@ -61,6 +64,7 @@ Source             = Source
 StandardDeviation  = Standard deviation
 TemporaryFiles     = Temporary files
 Timezone           = Timezone
+TruncatedJulian    = Truncated Julian
 Type               = Type
 Untitled           = Untitled
 UnavailableContent = Unavailable content.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties?rev=1519960&r1=1519959&r2=1519960&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties
[ISO-8859-1] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties
[ISO-8859-1] Wed Sep  4 09:50:43 2013
@@ -30,11 +30,13 @@ DaylightTime       = Heure normale
 Destination        = Destination
 Dimensions         = Dimensions
 Directory          = R\u00e9pertoire
+DublinJulian       = Julien Dublin
 Identifier         = Identifiant
 Implementation     = Impl\u00e9mentation
 Index              = Index
 JavaExtensions     = Extensions du Java
 JavaHome           = R\u00e9pertoire du Java
+Julian             = Julien
 Latitude           = Latitude
 Longitude          = Longitude
 Libraries          = Biblioth\u00e8ques
@@ -45,6 +47,7 @@ Logging            = Journalisation
 MaximumValue       = Valeur maximale
 MeanValue          = Valeur moyenne
 MinimumValue       = Valeur minimale
+ModifiedJulian     = Julien modifi\u00e9
 Name               = Nom
 NumberOfValues     = Nombre de valeurs
 NumberOfNaN        = Nombre de \u2018NaN\u2019
@@ -61,6 +64,7 @@ Source             = Source
 StandardDeviation  = \u00c9cart type
 TemporaryFiles     = Fichiers temporaires
 Timezone           = Fuseau horaire
+TruncatedJulian    = Julien tronqu\u00e9
 Type               = Type
 Untitled           = Sans titre
 UnavailableContent = Contenu non-disponible.

Added: sis/ip-review/DefaultTemporalDatum.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/DefaultTemporalDatum.xhtml?rev=1519960&view=auto
==============================================================================
--- sis/ip-review/DefaultTemporalDatum.xhtml (added)
+++ sis/ip-review/DefaultTemporalDatum.xhtml Wed Sep  4 09:50:43 2013
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>DefaultTemporalDatum history</title>
+    <style type="text/css" media="all">
+      @import url("./reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>DefaultTemporalDatum history</h1>
+  <p>Click on the commit message for inspecting the <code>diff</code> and
how the code has been rewritten.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn log -r31996:1 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/datum/DefaultTemporalDatum.java</code></blockquote>
+<table>
+  <tr>
+    <th>Rev.</th>
+    <th>Date</th>
+    <th>Author</th>
+    <th class="last">Message</th>
+  </tr>
+<tr><td class="rev">31000</td><td>2008-07-10</td><td>desruisseaux</td><td>Avoid
usage of 2 deprecated constructors from CRSFactory. Their replacement were tricky and required
more sophesticated code in ReferencingFactoryContainer.toGeodetic3D.</td></tr>
+<tr><td class="rev">30641</td><td>2008-06-12</td><td>acuster</td><td>Copyright
headers: lib/referencing, this time with feeling (and the el in Toolkit)</td></tr>
+<tr><td class="rev">30521</td><td>2008-06-05</td><td>acuster</td><td>Copyright:
Update referencing headers</td></tr>
+<tr><td class="rev">30258</td><td>2008-05-08</td><td>acuster</td><td>Reshuffle
the top level repo: drop uDig, move up trunk, tags, and branches.</td></tr>
+<tr><td class="rev">30257</td><td>2008-05-08</td><td>acuster</td><td>Move
trunk/gt/ directory contents up to trunk/ and drop gt</td></tr>
+<tr><td class="rev">29776</td><td>2008-04-03</td><td>desruisseaux</td><td>More
predefined CRS constants, especially for TemporalCRS.</td></tr>
+<tr><td class="rev">29770</td><td>2008-04-02</td><td>desruisseaux</td><td>Added
a check against DimensionMismatchException during reprojection backed by the EPSG database.
Added some TemporalDatum predefined constants for some kind of julian days.</td></tr>
+<tr><td class="rev">28922</td><td>2008-01-24</td><td>acuster</td><td>Bump
the (at)since version to 2.5 since WKTParser was cut from 2.4</td></tr>
+<tr><td class="rev">28540</td><td>2007-12-29</td><td>acuster</td><td>Hide
buttons which are not yet used</td></tr>
+<tr><td class="rev">28393</td><td>2007-12-17</td><td>desruisseaux</td><td>WKT
formatting now includes the semi-major and semi-minor axis length if they differ from the
datum. Applied Java 5 features. Uses WarpAffine when applicable during Raster reprojection.</td></tr>
+<tr><td class="rev">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">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/DefaultTemporalDatum.xhtml">ip review</a></td></tr>
+<tr><td class="rev">17672</td><td>2006-01-19</td><td>desruisseaux</td><td>Added
@source tag.</td></tr>
+<tr><td class="rev">17660</td><td>2006-01-18</td><td>desruisseaux</td><td>Fixed
SVN attributes, including the addition of URL attribute.</td></tr>
+<tr><td class="rev">15350</td><td>2005-08-16</td><td>desruisseaux</td><td>Merged
the 'split-main' branch to trunk (GEOT-662)</td></tr>
+<tr><td class="rev">15256</td><td>2005-08-09</td><td>desruisseaux</td><td>Extraction
of referencing module from main</td></tr>
+<tr><td class="rev">15255</td><td>2005-08-09</td><td>desruisseaux</td><td>Prepare
branch for splitting main</td></tr>
+<tr><td class="rev">14545</td><td>2005-06-15</td><td>desruisseaux</td><td>Initial
port of coverage I/O helper classes (work in progress)</td></tr>
+<tr><td class="rev">14235</td><td>2005-06-10</td><td>desruisseaux</td><td>Replaced
_PROPERTY suffix by _KEY as of GEOT-577</td></tr>
+<tr><td class="rev">13925</td><td>2005-05-30</td><td>desruisseaux</td><td>Added
@since javadoc tag</td></tr>
+<tr><td class="rev">13906</td><td>2005-05-28</td><td>desruisseaux</td><td>Renamed
some 'Default' prefix as 'Abstract'</td></tr>
+<tr><td class="rev">13869</td><td>2005-05-27</td><td>desruisseaux</td><td>Added
'Default' or 'Abstract' prefix in CRS's 'datum' and 'cs' packages</td></tr>
+<tr><td class="rev">13836</td><td>2005-05-26</td><td>desruisseaux</td><td>Added
'Default' suffix to some CRS implementations: partial work</td></tr>
+<tr><td class="rev">11001</td><td>2005-02-02</td><td>desruisseaux</td><td>Fixed
wrong encoding in main/src</td></tr>
+<tr><td class="rev">10796</td><td>2005-01-28</td><td class="unav">dzwiers</td><td><a
href="rev/10796/DefaultTemporalDatum.xhtml">imports cleaned</a></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">6888</td><td>2004-07-14</td><td>desruisseaux</td><td>Update
for GeoAPI changes (Info -->  IdentifiedObject)</td></tr>
+<tr><td class="rev">6343</td><td>2004-06-07</td><td>desruisseaux</td><td>More
ports of legacy CTS to new CRS</td></tr>
+<tr><td class="rev">6098</td><td>2004-05-23</td><td>desruisseaux</td><td>Partial
implementation of GeoAPI referencing package</td></tr>
+</table>
+    </div>
+  </body>
+</html>

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

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

Added: sis/ip-review/rev/10796/DefaultTemporalDatum.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/10796/DefaultTemporalDatum.xhtml?rev=1519960&view=auto
==============================================================================
--- sis/ip-review/rev/10796/DefaultTemporalDatum.xhtml (added)
+++ sis/ip-review/rev/10796/DefaultTemporalDatum.xhtml Wed Sep  4 09:50:43 2013
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>DefaultTemporalDatum changes for revisions 10795:10796</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>DefaultTemporalDatum 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/datum/DefaultTemporalDatum.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.datum;
+
+// J2SE direct dependencies
+import java.util.Map;
+<span class="del">import java.util.Date;</span>
+<span class="del">import java.util.Collections;</span>
+
+<span class="del">// OpenGIS dependencies</span>
+import org.opengis.util.InternationalString;
+
+<span class="del">// Geotools dependencies</span>
+<span class="del">import org.geotools.referencing.IdentifiedObject;</span>
+
+<span class="del"></span>
+/**
+ * A temporal datum defines the origin of a temporal coordinate reference system.
+ *</pre></td>
+<td><pre>package org.geotools.referencing.datum;
+
+// J2SE direct dependencies
+<span class="add">import java.util.Collections;</span>
+<span class="add">import java.util.Date;</span>
+import java.util.Map;
+
+<span class="add">import org.geotools.referencing.IdentifiedObject;</span>
+import org.opengis.util.InternationalString;
+
+
+/**
+ * A temporal datum defines the origin of a temporal coordinate reference system.
+ *</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

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

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

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

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



Mime
View raw message