This commit is partially a revert of commit 10796 (which we reverted in the whole code base anyway), and a change in a constant name. That constant has an other name and location in Apache SIS.
Command line:
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r12213:12215 https://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/crs/AbstractDerivedCRS.java
Revision 12213 | Revision 12215 |
---|---|
/*
* Geotools 2 - OpenSource mapping toolkit
* (C) 2003, Geotools Project Managment Committee (PMC)
* (C) 2003, 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) 2003, 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 |
* because {@link org.geotools.referencing.operation.CoordinateOperation} lives in
* a different package.
*/
public static IdentifiedObject \u00A4COMPARING;
/**
* The base coordinate reference system. |
* because {@link org.geotools.referencing.operation.CoordinateOperation} lives in
* a different package.
*/
public static IdentifiedObject COMPARING;
/**
* The base coordinate reference system. |
* from the CoordinateOperation super-class) that is set to this GeneralDerivedCRS. */ synchronized (GeneralDerivedCRS.class) { if (\u00A4COMPARING != null) { // NOTE: the following assertion fails for deserialized objects. // assert \u00A4COMPARING == conversionFromBase; return true; } try { \u00A4COMPARING = this; return equals(this.conversionFromBase, that.conversionFromBase, compareMetadata); } finally { \u00A4COMPARING = null; } } } |
* from the CoordinateOperation super-class) that is set to this GeneralDerivedCRS. */ synchronized (GeneralDerivedCRS.class) { if (COMPARING != null) { // NOTE: the following assertion fails for deserialized objects. // assert \u00A4COMPARING == conversionFromBase; return true; } try { COMPARING = this; return equals(this.conversionFromBase, that.conversionFromBase, compareMetadata); } finally { COMPARING = null; } } } |