From commits-return-3387-apmail-sis-commits-archive=sis.apache.org@sis.apache.org Sat Jan 4 03:17:12 2014 Return-Path: X-Original-To: apmail-sis-commits-archive@www.apache.org Delivered-To: apmail-sis-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EAEA41015F for ; Sat, 4 Jan 2014 03:17:12 +0000 (UTC) Received: (qmail 47424 invoked by uid 500); 4 Jan 2014 03:17:06 -0000 Delivered-To: apmail-sis-commits-archive@sis.apache.org Received: (qmail 47356 invoked by uid 500); 4 Jan 2014 03:17:03 -0000 Mailing-List: contact commits-help@sis.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sis-dev@sis.apache.org Delivered-To: mailing list commits@sis.apache.org Received: (qmail 47320 invoked by uid 99); 4 Jan 2014 03:17:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Jan 2014 03:17:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Jan 2014 03:16:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E979F2388868; Sat, 4 Jan 2014 03:16:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1555314 - in /sis: branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/ branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/ ip-review/ ip-review/rev/07848/ ip-review/rev/10796/ ip-review... Date: Sat, 04 Jan 2014 03:16:31 -0000 To: commits@sis.apache.org From: desruisseaux@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140104031631.E979F2388868@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: desruisseaux Date: Sat Jan 4 03:16:29 2014 New Revision: 1555314 URL: http://svn.apache.org/r1555314 Log: Ported AbstractCRS. Added: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java (with props) sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/package-info.java (with props) sis/ip-review/AbstractCRS.xhtml (with props) sis/ip-review/rev/07848/AbstractCRS.xhtml (with props) sis/ip-review/rev/10796/AbstractCRS.xhtml (with props) sis/ip-review/rev/20874/AbstractCRS.xhtml (with props) sis/ip-review/rev/24925/AbstractCRS.xhtml (with props) Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java?rev=1555314&r1=1555313&r2=1555314&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java [UTF-8] Sat Jan 4 03:16:29 2014 @@ -119,7 +119,7 @@ import java.util.Objects; "remarks" }) @XmlSeeAlso({ - AbstractReferenceSystem.class, + org.apache.sis.referencing.crs.AbstractCRS.class, org.apache.sis.referencing.datum.AbstractDatum.class, org.apache.sis.referencing.datum.DefaultEllipsoid.class, org.apache.sis.referencing.datum.DefaultPrimeMeridian.class, Added: 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=1555314&view=auto ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java (added) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java [UTF-8] Sat Jan 4 03:16:29 2014 @@ -0,0 +1,266 @@ +/* + * 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 javax.measure.unit.Unit; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlRootElement; +import org.opengis.referencing.cs.CoordinateSystem; +import org.opengis.referencing.crs.CoordinateReferenceSystem; +import org.apache.sis.internal.referencing.ReferencingUtilities; +import org.apache.sis.referencing.AbstractReferenceSystem; +import org.apache.sis.referencing.cs.AbstractCS; +import org.apache.sis.util.ComparisonMode; +import org.apache.sis.io.wkt.Formatter; + +import static org.apache.sis.util.Utilities.deepEquals; +import static org.apache.sis.util.ArgumentChecks.ensureNonNull; + + +/** + * Abstract coordinate reference system, usually defined by a coordinate system and a datum. + * {@code AbstractCRS} can have an arbitrary number of dimensions. The actual dimension of a + * given instance can be determined as below: + * + * {@preformat java + * int dimension = crs.getCoordinateSystem().getDimension(); + * } + * + * However most subclasses restrict the allowed number of dimensions. + * + * @author Martin Desruisseaux (IRD, Geomatys) + * @since 0.4 (derived from geotk-1.2) + * @version 0.4 + * @module + * + * @see AbstractCS + * @see org.apache.sis.referencing.datum.AbstractDatum + */ +@XmlType(name="AbstractCRSType") +@XmlRootElement(name = "AbstractCRS") +public class AbstractCRS extends AbstractReferenceSystem implements CoordinateReferenceSystem { + /** + * Serial number for inter-operability with different versions. + */ + private static final long serialVersionUID = -7433284548909530047L; + + /** + * The coordinate system. + * + *

Consider this field as final! + * This field is modified only at unmarshalling time by {@link #setCoordinateSystem(CoordinateSystem)}

+ */ + private CoordinateSystem coordinateSystem; + + /** + * Constructs a new object in which every attributes are set to a null value. + * This is not a valid object. This constructor is strictly + * reserved to JAXB, which will assign values to the fields using reflexion. + */ + AbstractCRS() { + super(org.apache.sis.internal.referencing.NilReferencingObject.INSTANCE); + } + + /** + * Creates a coordinate reference system from the given properties 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: + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
Property nameValue typeReturned by
{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}{@link #getName()}
{@value org.opengis.referencing.IdentifiedObject#ALIAS_KEY}{@link org.opengis.util.GenericName} or {@link CharSequence} (optionally as array){@link #getAlias()}
{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array){@link #getIdentifiers()}
{@value org.opengis.referencing.IdentifiedObject#REMARKS_KEY}{@link org.opengis.util.InternationalString} or {@link String}{@link #getRemarks()}
{@value org.opengis.referencing.datum.Datum#DOMAIN_OF_VALIDITY_KEY}{@link org.opengis.metadata.extent.Extent}{@link #getDomainOfValidity()}
{@value org.opengis.referencing.datum.Datum#SCOPE_KEY}{@link InternationalString} or {@link String}{@link #getScope()}
+ * + * @param properties The properties to be given to the reference system. + * @param cs The coordinate system. + */ + public AbstractCRS(final Map properties, final CoordinateSystem cs) { + super(properties); + ensureNonNull("cs", cs); + coordinateSystem = 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. + * + *

This constructor performs a shallow copy, i.e. the properties are not cloned.

+ * + * @param crs The coordinate reference system to copy. + */ + protected AbstractCRS(final CoordinateReferenceSystem crs) { + super(crs); + coordinateSystem = crs.getCoordinateSystem(); + } + + /** + * Returns the GeoAPI interface implemented by this class. + * The default implementation returns {@code CoordinateReferenceSystem.class}. + * Subclasses implementing a more specific GeoAPI interface shall override this method. + * + * @return The coordinate reference system interface implemented by this class. + */ + @Override + public Class getInterface() { + return CoordinateReferenceSystem.class; + } + + /** + * Returns the coordinate system. + * + * @return The coordinate system. + */ + @Override + public CoordinateSystem getCoordinateSystem() { + return coordinateSystem; + } + + /** + * Sets the coordinate system to the given value. This method is invoked only by JAXB at + * unmarshalling time and can be invoked only if the coordinate system has never been set. + * + * @param name The property name, used only in case of error message to format. + * @throws IllegalStateException If the coordinate system has already been set. + */ + final void setCoordinateSystem(final String name, final CoordinateSystem cs) { + if (cs != null && ReferencingUtilities.canSetProperty(name, coordinateSystem != null)) { + coordinateSystem = cs; + } + } + + /** + * Returns the unit used for all axis, or {@code null} if not all axis uses the same unit. + * This method is often used for formatting according Well Know Text (WKT) version 1. + */ + final Unit getUnit() { + return ReferencingUtilities.getUnit(coordinateSystem); + } + + /** + * Compares this coordinate reference system with the specified object for equality. + * If the {@code mode} argument value is {@link ComparisonMode#STRICT STRICT} or + * {@link ComparisonMode#BY_CONTRACT BY_CONTRACT}, then all available properties are + * compared including the {@linkplain #getDomainOfValidity() domain of validity} and + * the {@linkplain #getScope() scope}. + * + * @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 coordinate transformations. + * @return {@code true} if both objects are equal. + */ + @Override + public boolean equals(final Object object, final ComparisonMode mode) { + if (super.equals(object, mode)) { + switch (mode) { + case STRICT: { + return coordinateSystem.equals(((AbstractCRS) object).coordinateSystem); + } + default: { + final CoordinateReferenceSystem that = (CoordinateReferenceSystem) object; + return deepEquals(getCoordinateSystem(), that.getCoordinateSystem(), mode); + } + } + } + return false; + } + + /** + * Invoked by {@link #hashCode()} for computing the hash code when first needed. + * See {@link org.apache.sis.referencing.AbstractIdentifiedObject#computeHashCode()} + * for more information. + * + * @return The hash code value. This value may change in any future Apache SIS version. + */ + @Override + protected long computeHashCode() { + return super.computeHashCode() + 31*coordinateSystem.hashCode(); + } + + /** + * Formats the inner part of a Well Known Text (WKT) element. + * The default implementation writes the following elements: + * + *
    + *
  • The {@linkplain AbstractSingleCRS#getDatum() datum}, if any.
    • + *
  • The unit if all axes use the same unit. Otherwise the unit is omitted and the WKT format + * is {@linkplain Formatter#setInvalidWKT(IdentifiedObject) flagged as invalid}.
    • + *
  • All {@linkplain #getCoordinateSystem() coordinate system}'s axis.
    • + *
+ * + * @param formatter The formatter to use. + * @return The name of the WKT element type (e.g. {@code "GEOGCS"}). + */ + @Override + protected String formatTo(final Formatter formatter) { + formatDefaultWKT(formatter); + // Will declares the WKT as invalid. + return super.formatTo(formatter); + } + + /** + * Default implementation of {@link #formatTo(Formatter)}. + * For {@link DefaultEngineeringCRS} and {@link DefaultVerticalCRS} use only. + */ + void formatDefaultWKT(final Formatter formatter) { + final Unit unit = getUnit(); + formatter.append(unit); + final int dimension = coordinateSystem.getDimension(); + for (int i=0; iThe root class for this package is {@link org.apache.sis.referencing.crs.AbstractCRS}. + * Coordinate Reference System (CRS) can have various number of dimensions, but some restriction + * apply depending on the CRS type:

+ * + *
    + *
  • Three-dimensional: + * {@link org.apache.sis.referencing.crs.DefaultGeographicCRS GeographicCRS} and + * {@link org.apache.sis.referencing.crs.DefaultGeocentricCRS GeocentricCRS} + * (note: ISO 19111 uses the same class, {@code GeodeticCRS}, for those two cases).
    • + *
  • Two-dimensional: + * {@link org.apache.sis.referencing.crs.DefaultGeographicCRS GeographicCRS} and + * {@link org.apache.sis.referencing.crs.DefaultProjectedCRS ProjectedCRS} + * (note that {@code GeographicCRS} can also be 3D).
    • + *
  • One-dimensional: + * {@link org.apache.sis.referencing.crs.DefaultVerticalCRS VerticalCRS} and + * {@link org.apache.sis.referencing.crs.DefaultTemporalCRS TemporalCRS}.
    • + *
  • Any number of dimensions: + * {@link org.geotoolkit.referencing.crs.DefaultCompoundCRS CompoundCRS} + * (often used for adding a time axis to the above CRS). + *
+ * + * @author Martin Desruisseaux (IRD, Geomatys) + * @author Cédric Briançon (Geomatys) + * @since 0.4 (derived from geotk-1.2) + * @version 0.4 + * @module + */ +@XmlSchema(elementFormDefault= XmlNsForm.QUALIFIED, namespace = Namespaces.GML, xmlns = { + @XmlNs(prefix = "gml", namespaceURI = Namespaces.GML), + @XmlNs(prefix = "xsi", namespaceURI = Namespaces.XSI) +}) +@XmlAccessorType(XmlAccessType.NONE) +@XmlJavaTypeAdapters({ + @XmlJavaTypeAdapter(CD_GeodeticDatum.class), + @XmlJavaTypeAdapter(CD_ImageDatum.class), + @XmlJavaTypeAdapter(CD_TemporalDatum.class), + @XmlJavaTypeAdapter(CD_VerticalDatum.class), + @XmlJavaTypeAdapter(CS_AffineCS.class), + @XmlJavaTypeAdapter(CS_CartesianCS.class), + @XmlJavaTypeAdapter(CS_EllipsoidalCS.class), + @XmlJavaTypeAdapter(CS_TimeCS.class), + @XmlJavaTypeAdapter(CS_VerticalCS.class), + @XmlJavaTypeAdapter(StringAdapter.class), + @XmlJavaTypeAdapter(InternationalStringConverter.class) +}) +package org.apache.sis.referencing.crs; + +import javax.xml.bind.annotation.XmlNs; +import javax.xml.bind.annotation.XmlNsForm; +import javax.xml.bind.annotation.XmlSchema; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters; +import org.apache.sis.xml.Namespaces; +import org.apache.sis.internal.jaxb.gco.*; +import org.apache.sis.internal.jaxb.referencing.*; Propchange: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/package-info.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/package-info.java ------------------------------------------------------------------------------ svn:mime-type = text/plain;charset=UTF-8 Added: sis/ip-review/AbstractCRS.xhtml URL: http://svn.apache.org/viewvc/sis/ip-review/AbstractCRS.xhtml?rev=1555314&view=auto ============================================================================== --- sis/ip-review/AbstractCRS.xhtml (added) +++ sis/ip-review/AbstractCRS.xhtml Sat Jan 4 03:16:29 2014 @@ -0,0 +1,68 @@ + + + + + AbstractCRS history + + + +
+

AbstractCRS history

+

Click on the commit message for inspecting the diff and how the code has been rewritten.

+

Command line:

+
svn log -r31996:1 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/crs/AbstractCRS.java
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Rev.DateAuthorMessage
310002008-07-10desruisseauxAvoid usage of 2 deprecated constructors from CRSFactory. Their replacement were tricky and required more sophesticated code in ReferencingFactoryContainer.toGeodetic3D.
307602008-06-18desruisseauxUpgrated from JSR-108 to JSR-275 (GEOT-1266). Some opportunist javadoc fixes and @Override annotations in the process.
306412008-06-12acusterCopyright headers: lib/referencing, this time with feeling (and the el in Toolkit)
305212008-06-05acusterCopyright: Update referencing headers
304972008-06-03desruisseauxRenamed Position.getPosition() as getDirectPosition() in GeoAPI interface for avoiding ambiguity (GEO-87). Javadoc fixes.
302582008-05-08acusterReshuffle the top level repo: drop uDig, move up trunk, tags, and branches.
302572008-05-08acusterMove trunk/gt/ directory contents up to trunk/ and drop gt
289222008-01-24acusterBump the (at)since version to 2.5 since WKTParser was cut from 2.4
285402007-12-29acusterHide buttons which are not yet used
282672007-12-06desruisseauxGeoTools trunk now build against GeoAPI 2.2-SNAPSHOT.
280302007-11-23desruisseauxMore Java 5 generics. Added implementation for three new GeoAPI methods for alignment with RFC 07-073r1.
275752007-10-22desruisseauxConverted Java source files from ISO-LATIN-1 encoding to UTF-8 (GEOT-1516).
249252007-03-27jgarnettchange to org.opengis.geometry
246092007-02-26desruisseauxRemoved the package-private 'getTypeWKT()' method; it was not needed after all.
246072007-02-26desruisseauxAvoid UnformattableObjectException for 'LOCAL_CS' and 'VERT_CS' WKT elements. Try to provides some hints about the cause for the other cases of unformattable WKT.
223272006-10-23desruisseauxGEOT-982: regroup 'module', 'plugin', 'ext' and 'unsupported' in a common directory.
223152006-10-22desruisseauxReorganisation of directory tree structure (GEOT-982) phase 1: moved 'src' to 'src/main/java'.
208742006-08-07jgarnettip review
197552006-05-31desruisseauxAdded FORCE_LONGITUDE_FIRST_AXIS_ORDER hint (GEOT-858). This work implied a large amount of work, hunting for infinite recursive method calls in many places.
176722006-01-19desruisseauxAdded @source tag.
176602006-01-18desruisseauxFixed SVN attributes, including the addition of URL attribute.
175222006-01-11desruisseauxAdded a few experimental @tutorial javadoc tags.
153502005-08-16desruisseauxMerged the 'split-main' branch to trunk (GEOT-662)
152562005-08-09desruisseauxExtraction of referencing module from main
152552005-08-09desruisseauxPrepare branch for splitting main
151502005-08-05desruisseauxAdded more localizations / Bug fix in image sample values table widget
145642005-06-20desruisseauxInitial implementation of GEOT-589. Partially tested, more tests to come
145452005-06-15desruisseauxInitial port of coverage I/O helper classes (work in progress)
139252005-05-30desruisseauxAdded @since javadoc tag
139062005-05-28desruisseauxRenamed some 'Default' prefix as 'Abstract'
138692005-05-27desruisseauxAdded 'Default' or 'Abstract' prefix in CRS's 'datum' and 'cs' packages
138362005-05-26desruisseauxAdded 'Default' suffix to some CRS implementations: partial work
110012005-02-02desruisseauxFixed wrong encoding in main/src
107962005-01-28dzwiersimports cleaned
101672005-01-02desruisseauxImproved console: added distance computation
85182004-10-11desruisseauxApply changes voted in OGC meeting at Southampton: use of Identifier and GenericName
78482004-09-08jgarnettround 2 of sync with geoapi
68882004-07-14desruisseauxUpdate for GeoAPI changes (Info --> IdentifiedObject)
65362004-06-25desruisseauxAdded SingleCRS class / Renamed ObliqueCartesianCS as AffineCS / Moved Position as super-interface for DirectPosition and Point
63432004-06-07desruisseauxMore ports of legacy CTS to new CRS
62542004-05-30desruisseauxAdded new CRS
60982004-05-23desruisseauxPartial implementation of GeoAPI referencing package
+
+ + Propchange: sis/ip-review/AbstractCRS.xhtml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sis/ip-review/AbstractCRS.xhtml ------------------------------------------------------------------------------ svn:mime-type = text/html Added: sis/ip-review/rev/07848/AbstractCRS.xhtml URL: http://svn.apache.org/viewvc/sis/ip-review/rev/07848/AbstractCRS.xhtml?rev=1555314&view=auto ============================================================================== --- sis/ip-review/rev/07848/AbstractCRS.xhtml (added) +++ sis/ip-review/rev/07848/AbstractCRS.xhtml Sat Jan 4 03:16:29 2014 @@ -0,0 +1,33 @@ + + + + + AbstractCRS changes for revisions 7847:7848 + + + +
+

AbstractCRS changes for revisions 7847:7848

+

The line modified by this commit has been deleted.

+

Command line:

+
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r7847:7848 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/crs/AbstractCRS.java
+ + + + +
Revision 7847Revision 7848
// OpenGIS dependencies
+import org.opengis.referencing.cs.CoordinateSystem;
+import org.opengis.referencing.cs.CoordinateSystemAxis;
+
+// Geotools dependencies
+import org.geotools.referencing.IdentifiedObject;
// OpenGIS dependencies
+import org.opengis.referencing.cs.CoordinateSystem;
+//import org.opengis.referencing.cs.CoordinateSystemAxis;
+
+// Geotools dependencies
+import org.geotools.referencing.IdentifiedObject;
+
+ + Propchange: sis/ip-review/rev/07848/AbstractCRS.xhtml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sis/ip-review/rev/07848/AbstractCRS.xhtml ------------------------------------------------------------------------------ svn:mime-type = text/html Added: sis/ip-review/rev/10796/AbstractCRS.xhtml URL: http://svn.apache.org/viewvc/sis/ip-review/rev/10796/AbstractCRS.xhtml?rev=1555314&view=auto ============================================================================== --- sis/ip-review/rev/10796/AbstractCRS.xhtml (added) +++ sis/ip-review/rev/10796/AbstractCRS.xhtml Sat Jan 4 03:16:29 2014 @@ -0,0 +1,74 @@ + + + + + AbstractCRS changes for revisions 10795:10796 + + + +
+

AbstractCRS changes for revisions 10795:10796

+

Changes in this commit seem to be the result of some "auto reformat" tool execution. +The Java - GeoAPI - GeoTools 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.

+

Command line:

+
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/AbstractCRS.java
+ + + + + + +
Revision 10795Revision 10796
/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+ * (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
/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+ * (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
// J2SE dependencies
+import java.util.Map;
+import javax.units.Unit;
+
+// OpenGIS dependencies
+import org.opengis.referencing.cs.CoordinateSystem;
+import org.opengis.spatialschema.geometry.MismatchedDimensionException;
+
+// Geotools dependencies
+import org.geotools.util.UnsupportedImplementationException;
+import org.geotools.referencing.ReferenceSystem;
+import org.geotools.referencing.IdentifiedObject;
+import org.geotools.referencing.wkt.Formatter;
+import org.geotools.measure.Measure;
+
+
+/**
+ * Abstract coordinate reference system, usually defined by a coordinate system and a datum.
+ *
// J2SE dependencies
+import java.util.Map;
+
+import javax.units.Unit;
+
+import org.geotools.measure.Measure;
+import org.geotools.referencing.IdentifiedObject;
+import org.geotools.referencing.ReferenceSystem;
+import org.geotools.referencing.wkt.Formatter;
+import org.geotools.util.UnsupportedImplementationException;
+import org.opengis.referencing.cs.CoordinateSystem;
+import org.opengis.spatialschema.geometry.MismatchedDimensionException;
+
+
+/**
+ * Abstract coordinate reference system, usually defined by a coordinate system and a datum.
+ *
+
+ + Propchange: sis/ip-review/rev/10796/AbstractCRS.xhtml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sis/ip-review/rev/10796/AbstractCRS.xhtml ------------------------------------------------------------------------------ svn:mime-type = text/html Added: sis/ip-review/rev/20874/AbstractCRS.xhtml URL: http://svn.apache.org/viewvc/sis/ip-review/rev/20874/AbstractCRS.xhtml?rev=1555314&view=auto ============================================================================== --- sis/ip-review/rev/20874/AbstractCRS.xhtml (added) +++ sis/ip-review/rev/20874/AbstractCRS.xhtml Sat Jan 4 03:16:29 2014 @@ -0,0 +1,64 @@ + + + + + AbstractCRS changes for revisions 20873:20874 + + + +
+

AbstractCRS changes for revisions 20873:20874

+

Changes in GeoTools header only. The removal of the "or (at your option) any later version" 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.

+

Command line:

+
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/AbstractCRS.java
+ + + + + + +
Revision 20873Revision 20874
/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+ * (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
+ *    License as published by the Free Software Foundation; either
+ *    version 2.1 of the License, or (at your option) any later version.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
/*
+ *    GeoTools - OpenSource mapping toolkit
+ *    http://geotools.org
+ *    (C) 2003-2006, GeoTools Project Managment Committee (PMC)
+ * (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
+ *    License as published by the Free Software Foundation;
+ *    version 2.1 of the License.
+ *
+ *    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.
+*
+*    You should have received a copy of the GNU Lesser General Public
+*    License along with this library; if not, write to the Free Software
+*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*
+*    This package contains documentation from OpenGIS specifications.
+*    OpenGIS consortium's work is fully acknowledged here.
+*/
*    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.
+*/
+
+ + Propchange: sis/ip-review/rev/20874/AbstractCRS.xhtml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sis/ip-review/rev/20874/AbstractCRS.xhtml ------------------------------------------------------------------------------ svn:mime-type = text/html Added: sis/ip-review/rev/24925/AbstractCRS.xhtml URL: http://svn.apache.org/viewvc/sis/ip-review/rev/24925/AbstractCRS.xhtml?rev=1555314&view=auto ============================================================================== --- sis/ip-review/rev/24925/AbstractCRS.xhtml (added) +++ sis/ip-review/rev/24925/AbstractCRS.xhtml Sat Jan 4 03:16:29 2014 @@ -0,0 +1,37 @@ + + + + + AbstractCRS changes for revisions 24924:24925 + + + +
+

AbstractCRS changes for revisions 24924:24925

+

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.

+

Command line:

+
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r24924:24925 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/crs/AbstractCRS.java
+ + + + +
Revision 24924Revision 24925
// OpenGIS dependencies
+import org.opengis.referencing.cs.CoordinateSystem;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.spatialschema.geometry.MismatchedDimensionException;
+import org.opengis.util.InternationalString;
+
+// Geotools dependencies
// OpenGIS dependencies
+import org.opengis.referencing.cs.CoordinateSystem;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.util.InternationalString;
+
+// Geotools dependencies
+
+ + Propchange: sis/ip-review/rev/24925/AbstractCRS.xhtml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sis/ip-review/rev/24925/AbstractCRS.xhtml ------------------------------------------------------------------------------ svn:mime-type = text/html