sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1555416 - in /sis: branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/ branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/ branches/JDK7/core/sis-referencing/src/main/java/org/apache...
Date Sat, 04 Jan 2014 20:43:43 GMT
Author: desruisseaux
Date: Sat Jan  4 20:43:42 2014
New Revision: 1555416

URL: http://svn.apache.org/r1555416
Log:
Ported DefaultTemporalCRS.

Added:
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
  (with props)
    sis/ip-review/DefaultTemporalCRS.xhtml   (with props)
    sis/ip-review/rev/10796/DefaultTemporalCRS.xhtml   (with props)
    sis/ip-review/rev/20874/DefaultTemporalCRS.xhtml   (with props)
Modified:
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java?rev=1555416&r1=1555415&r2=1555416&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
[UTF-8] Sat Jan  4 20:43:42 2014
@@ -73,6 +73,7 @@ import java.util.Objects;
 @XmlRootElement(name = "AbstractCRS")
 @XmlSeeAlso({
     DefaultVerticalCRS.class,
+    DefaultTemporalCRS.class,
     DefaultCompoundCRS.class
 })
 public class AbstractCRS extends AbstractReferenceSystem implements CoordinateReferenceSystem
{

Added: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java?rev=1555416&view=auto
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
(added)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
[UTF-8] Sat Jan  4 20:43:42 2014
@@ -0,0 +1,260 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.referencing.crs;
+
+import java.util.Map;
+import java.util.Date;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.measure.quantity.Duration;
+import javax.measure.converter.UnitConverter;
+import org.opengis.referencing.cs.TimeCS;
+import org.opengis.referencing.crs.TemporalCRS;
+import org.opengis.referencing.datum.TemporalDatum;
+import org.apache.sis.referencing.AbstractReferenceSystem;
+import org.apache.sis.measure.Units;
+
+
+/**
+ * A 1D coordinate reference system used for the recording of time.
+ *
+ * <table class="sis">
+ * <tr><th>Used with CS type(s)</th></tr>
+ * <tr><td>
+ *   {@link org.apache.sis.referencing.cs.DefaultTimeCS TimeCS}
+ * </td></tr></table>
+ *
+ * @author  Martin Desruisseaux (IRD, Geomatys)
+ * @since   0.4 (derived from geotk-1.2)
+ * @version 0.4
+ * @module
+ *
+ * @see org.apache.sis.referencing.datum.DefaultTemporalDatum
+ * @see org.apache.sis.referencing.cs.DefaultTimeCS
+ */
+@XmlType(name = "TemporalCRSType")
+@XmlRootElement(name = "TemporalCRS")
+public class DefaultTemporalCRS extends AbstractCRS implements TemporalCRS {
+    /**
+     * Serial number for inter-operability with different versions.
+     */
+    private static final long serialVersionUID = 3000119849197222007L;
+
+    /**
+     * A converter from values in this CRS to values in milliseconds.
+     * Will be constructed only when first needed.
+     */
+    private transient UnitConverter toMillis;
+
+    /**
+     * The {@linkplain TemporalDatum#getOrigin origin} in milliseconds since January 1st,
1970.
+     * This field could be implicit in the {@link #toMillis} converter, but we still handle
it
+     * explicitly in order to use integer arithmetic.
+     */
+    private transient long origin;
+
+    /**
+     * Constructs a new object in which every attributes are set to a null value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly
+     * reserved to JAXB, which will assign values to the fields using reflexion.
+     */
+    private DefaultTemporalCRS() {
+    }
+
+    /**
+     * Creates a coordinate reference system from the given properties, datum and coordinate
system.
+     * The properties given in argument follow the same rules than for the
+     * {@linkplain AbstractReferenceSystem#AbstractReferenceSystem(Map) super-class constructor}.
+     * The following table is a reminder of main (not all) properties:
+     *
+     * <table class="sis">
+     *   <tr>
+     *     <th>Property name</th>
+     *     <th>Value type</th>
+     *     <th>Returned by</th>
+     *   </tr>
+     *   <tr>
+     *     <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td>
+     *     <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td>
+     *     <td>{@link #getName()}</td>
+     *   </tr>
+     *   <tr>
+     *     <td>{@value org.opengis.referencing.IdentifiedObject#ALIAS_KEY}</td>
+     *     <td>{@link org.opengis.util.GenericName} or {@link CharSequence} (optionally
as array)</td>
+     *     <td>{@link #getAlias()}</td>
+     *   </tr>
+     *   <tr>
+     *     <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td>
+     *     <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td>
+     *     <td>{@link #getIdentifiers()}</td>
+     *   </tr>
+     *   <tr>
+     *     <td>{@value org.opengis.referencing.IdentifiedObject#REMARKS_KEY}</td>
+     *     <td>{@link org.opengis.util.InternationalString} or {@link String}</td>
+     *     <td>{@link #getRemarks()}</td>
+     *   </tr>
+     *   <tr>
+     *     <td>{@value org.opengis.referencing.datum.Datum#DOMAIN_OF_VALIDITY_KEY}</td>
+     *     <td>{@link org.opengis.metadata.extent.Extent}</td>
+     *     <td>{@link #getDomainOfValidity()}</td>
+     *   </tr>
+     *   <tr>
+     *     <td>{@value org.opengis.referencing.datum.Datum#SCOPE_KEY}</td>
+     *     <td>{@link org.opengis.util.InternationalString} or {@link String}</td>
+     *     <td>{@link #getScope()}</td>
+     *   </tr>
+     * </table>
+     *
+     * @param properties The properties to be given to the coordinate reference system.
+     * @param datum The datum.
+     * @param cs The coordinate system.
+     */
+    public DefaultTemporalCRS(final Map<String,?> properties,
+                              final TemporalDatum datum,
+                              final TimeCS        cs)
+    {
+        super(properties, datum, cs);
+    }
+
+    /**
+     * Constructs a new coordinate reference system with the same values than the specified
one.
+     * This copy constructor provides a way to convert an arbitrary implementation into a
SIS one
+     * or a user-defined one (as a subclass), usually in order to leverage some implementation-specific
API.
+     *
+     * <p>This constructor performs a shallow copy, i.e. the properties are not cloned.</p>
+     *
+     * @param crs The coordinate reference system to copy.
+     *
+     * @see #castOrCopy(TemporalCRS)
+     */
+    protected DefaultTemporalCRS(final TemporalCRS crs) {
+        super(crs);
+    }
+
+    /**
+     * Returns a SIS coordinate reference system 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 DefaultTemporalCRS castOrCopy(final TemporalCRS object) {
+        return (object == null || object instanceof DefaultTemporalCRS)
+                ? (DefaultTemporalCRS) object : new DefaultTemporalCRS(object);
+    }
+
+    /**
+     * Returns the GeoAPI interface implemented by this class.
+     * The SIS implementation returns {@code TemporalCRS.class}.
+     *
+     * {@note Subclasses usually do not need to override this method since GeoAPI does not
define
+     *        <code>TemporalCRS</code> sub-interface. Overriding possibility
is left mostly for
+     *        implementors who wish to extend GeoAPI with their own set of interfaces.}
+     *
+     * @return {@code TemporalCRS.class} or a user-defined sub-interface.
+     */
+    @Override
+    public Class<? extends TemporalCRS> getInterface() {
+        return TemporalCRS.class;
+    }
+
+    /**
+     * Initialize the fields required for {@link #toDate} and {@link #toValue} operations.
+     */
+    private void initializeConverter() {
+        origin   = getDatum().getOrigin().getTime();
+        toMillis = getCoordinateSystem().getAxis(0).getUnit().asType(Duration.class).getConverterTo(Units.MILLISECOND);
+    }
+
+    /**
+     * Returns the coordinate system.
+     *
+     * @return The coordinate system.
+     */
+    @Override
+    @XmlElement(name = "timeCS")
+    public TimeCS getCoordinateSystem() {
+        return (TimeCS) super.getCoordinateSystem();
+    }
+
+    /**
+     * Used by JAXB only (invoked by reflection).
+     */
+    final void setCoordinateSystem(final TimeCS cs) {
+        super.setCoordinateSystem("timeCS", cs);
+    }
+
+    /**
+     * Returns the datum.
+     *
+     * @return The datum.
+     */
+    @Override
+    @XmlElement(name = "temporalDatum")
+    public TemporalDatum getDatum() {
+        return (TemporalDatum) super.getDatum();
+    }
+
+    /**
+     * Used by JAXB only (invoked by reflection).
+     */
+    final void setDatum(final TemporalDatum datum) {
+        super.setDatum("temporalDatum", datum);
+    }
+
+    /**
+     * Convert the given value into a {@link Date} object.
+     * If the given value is {@link Double#NaN NaN} or infinite, then this method returns
{@code null}.
+     *
+     * <p>This method is the converse of {@link #toValue(Date)}.</p>
+     *
+     * @param  value A value in this axis unit.
+     * @return The value as a {@linkplain Date date}, or {@code null} if the given value
is NaN or infinite.
+     */
+    public Date toDate(final double value) {
+        if (Double.isNaN(value) || Double.isInfinite(value)) {
+            return null;
+        }
+        if (toMillis == null) {
+            initializeConverter();
+        }
+        return new Date(Math.round(toMillis.convert(value)) + origin);
+    }
+
+    /**
+     * Convert the given {@linkplain Date date} into a value in this axis unit.
+     * If the given time is {@code null}, then this method returns {@link Double#NaN NaN}.
+     *
+     * <p>This method is the converse of {@link #toDate(double)}.</p>
+     *
+     * @param  time The value as a {@linkplain Date date}, or {@code null}.
+     * @return value A value in this axis unit, or {@link Double#NaN NaN} if the given time
is {@code null}.
+     */
+    public double toValue(final Date time) {
+        if (time == null) {
+            return Double.NaN;
+        }
+        if (toMillis == null) {
+            initializeConverter();
+        }
+        return toMillis.inverse().convert(time.getTime() - origin);
+    }
+}

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

Propchange: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java?rev=1555416&r1=1555415&r2=1555416&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
[UTF-8] Sat Jan  4 20:43:42 2014
@@ -17,6 +17,7 @@
 package org.apache.sis.referencing.crs;
 
 import java.util.Map;
+import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import org.opengis.referencing.cs.VerticalCS;
@@ -34,7 +35,7 @@ import org.apache.sis.io.wkt.Formatter;
  * <table class="sis">
  * <tr><th>Used with CS type(s)</th></tr>
  * <tr><td>
- *   {@link org.apache.sis.referencing.cs.DefaultVerticalCS Vertical}
+ *   {@link org.apache.sis.referencing.cs.DefaultVerticalCS VerticalCS}
  * </td></tr></table>
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
@@ -45,6 +46,7 @@ import org.apache.sis.io.wkt.Formatter;
  * @see org.apache.sis.referencing.datum.DefaultVerticalDatum
  * @see org.apache.sis.referencing.cs.DefaultVerticalCS
  */
+@XmlType(name = "VerticalCRSType")
 @XmlRootElement(name = "VerticalCRS")
 public class DefaultVerticalCRS extends AbstractCRS implements VerticalCRS {
     /**

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java?rev=1555416&r1=1555415&r2=1555416&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java
[UTF-8] Sat Jan  4 20:43:42 2014
@@ -49,6 +49,9 @@ import org.apache.sis.measure.Units;
  * @since   0.4 (derived from geotk-2.0)
  * @version 0.4
  * @module
+ *
+ * @see org.apache.sis.referencing.crs.DefaultTemporalCRS
+ * @see org.apache.sis.referencing.datum.DefaultTemporalDatum
  */
 @XmlType(name = "TimeCSType")
 @XmlRootElement(name = "TimeCS")

Modified: 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=1555416&r1=1555415&r2=1555416&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
(original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
Sat Jan  4 20:43:42 2014
@@ -74,6 +74,8 @@ import java.util.Objects;
  * @module
  *
  * @see org.apache.sis.referencing.GeodeticObjects.Temporal#datum()
+ * @see org.apache.sis.referencing.cs.DefaultTimeCS
+ * @see org.apache.sis.referencing.crs.DefaultTemporalCRS
  */
 @XmlType(name = "TemporalDatumType")
 @XmlRootElement(name = "TemporalDatum")

Added: sis/ip-review/DefaultTemporalCRS.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/DefaultTemporalCRS.xhtml?rev=1555416&view=auto
==============================================================================
--- sis/ip-review/DefaultTemporalCRS.xhtml (added)
+++ sis/ip-review/DefaultTemporalCRS.xhtml Sat Jan  4 20:43:42 2014
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>DefaultTemporalCRS history</title>
+    <style type="text/css" media="all">
+      @import url("./reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>DefaultTemporalCRS history</h1>
+  <p>Click on the commit message for inspecting the <code>diff</code> and
how the code has been rewritten.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn log -r31996:1 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/crs/DefaultTemporalCRS.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">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">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">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">28267</td><td>2007-12-06</td><td>desruisseaux</td><td>GeoTools
trunk now build against GeoAPI 2.2-SNAPSHOT.</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/DefaultTemporalCRS.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">15736</td><td>2005-09-19</td><td>desruisseaux</td><td>Added
convenience methods or constructors</td></tr>
+<tr><td class="rev">15350</td><td>2005-08-16</td><td>desruisseaux</td><td>Merged
the 'split-main' branch to trunk (GEOT-662)</td></tr>
+<tr><td class="rev">15256</td><td>2005-08-09</td><td>desruisseaux</td><td>Extraction
of referencing module from main</td></tr>
+<tr><td class="rev">15255</td><td>2005-08-09</td><td>desruisseaux</td><td>Prepare
branch for splitting main</td></tr>
+<tr><td class="rev">15150</td><td>2005-08-05</td><td>desruisseaux</td><td>Added
more localizations / Bug fix in image sample values table widget</td></tr>
+<tr><td class="rev">14545</td><td>2005-06-15</td><td>desruisseaux</td><td>Initial
port of coverage I/O helper classes (work in progress)</td></tr>
+<tr><td class="rev">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">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">12960</td><td>2005-04-04</td><td>desruisseaux</td><td>Added
convenience wrapper methods</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/DefaultTemporalCRS.xhtml">imports cleaned</a></td></tr>
+<tr><td class="rev">8596</td><td>2004-10-12</td><td>desruisseaux</td><td>Redirected
javadoc links toward org.opengis.* instead org.geotools.* when the discussion is general enough</td></tr>
+<tr><td class="rev">8518</td><td>2004-10-11</td><td>desruisseaux</td><td>Apply
changes voted in OGC meeting at Southampton: use of Identifier and GenericName</td></tr>
+<tr><td class="rev">6536</td><td>2004-06-25</td><td>desruisseaux</td><td>Added
SingleCRS class / Renamed ObliqueCartesianCS as AffineCS / Moved Position as super-interface
for DirectPosition and Point</td></tr>
+<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">6254</td><td>2004-05-30</td><td>desruisseaux</td><td>Added
new CRS</td></tr>
+</table>
+    </div>
+  </body>
+</html>

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

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

Added: sis/ip-review/rev/10796/DefaultTemporalCRS.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/10796/DefaultTemporalCRS.xhtml?rev=1555416&view=auto
==============================================================================
--- sis/ip-review/rev/10796/DefaultTemporalCRS.xhtml (added)
+++ sis/ip-review/rev/10796/DefaultTemporalCRS.xhtml Sat Jan  4 20:43:42 2014
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>DefaultTemporalCRS changes for revisions 10795:10796</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>DefaultTemporalCRS changes for revisions 10795:10796</h1>
+<p>Changes in this commit seem to be the result of some "<cite>auto reformat</cite>"
tool execution.
+The <cite>Java</cite> - <cite>GeoAPI</cite> - <cite>GeoTools</cite>
import ordering is altered,
+imports used only in Javadoc are lost and the encoding of non-ASCII characters is broken.
+This commit has been reverted, except for the removal of really unused imports which are
keep removed.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change --ignore-all-space
--ignore-eol-style" -r10795:10796 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/crs/DefaultTemporalCRS.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.crs;
+
+// J2SE dependencies
+import java.util.Map;
+<span class="del">import java.util.Date;</span>
+<span class="del">import java.util.Collections;</span>
+import javax.units.Converter;
+import javax.units.Unit;
+<span class="del">import javax.units.SI;</span>
+
+<span class="del">// OpenGIS dependencies</span>
+import org.opengis.referencing.cs.TimeCS;
+import org.opengis.referencing.datum.TemporalDatum;</pre></td>
+<td><pre>package org.geotools.referencing.crs;
+
+// J2SE dependencies
+<span class="add">import java.util.Collections;</span>
+<span class="add">import java.util.Date;</span>
+import java.util.Map;
+<span class="add"></span>
+import javax.units.Converter;
+<span class="add">import javax.units.SI;</span>
+import javax.units.Unit;
+
+import org.opengis.referencing.cs.TimeCS;
+import org.opengis.referencing.datum.TemporalDatum;</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

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

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

Added: sis/ip-review/rev/20874/DefaultTemporalCRS.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/20874/DefaultTemporalCRS.xhtml?rev=1555416&view=auto
==============================================================================
--- sis/ip-review/rev/20874/DefaultTemporalCRS.xhtml (added)
+++ sis/ip-review/rev/20874/DefaultTemporalCRS.xhtml Sat Jan  4 20:43:42 2014
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>DefaultTemporalCRS changes for revisions 20873:20874</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>DefaultTemporalCRS changes for revisions 20873:20874</h1>
+<p>Changes in GeoTools header only. The removal of the "<cite>or (at your option)
any later version</cite>" clause
+must be keep in Geotk for every classes having contribution from a developer other than those
who accepted re-licensing.
+This header does not apply to Apache SIS, since the above-cited contributions are omitted.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change --ignore-all-space
--ignore-eol-style" -r20873:20874 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/crs/DefaultTemporalCRS.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/DefaultTemporalCRS.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

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



Mime
View raw message