You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2016/01/08 19:29:07 UTC
svn commit: r1723780 [3/12] - in /sis/branches/JDK7: ./
application/sis-console/src/main/artifact/bin/
application/sis-console/src/main/artifact/log/
application/sis-console/src/main/java/org/apache/sis/console/
core/sis-build-helper/src/main/java/org/...
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -48,7 +48,7 @@ import org.apache.sis.referencing.Abstra
* <li>Create a {@code GeocentricCRS} from one of the static convenience shortcuts listed in
* {@link org.apache.sis.referencing.CommonCRS#geocentric()}.</li>
* <li>Create a {@code GeocentricCRS} from an identifier in a database by invoking
- * {@link org.opengis.referencing.crs.CRSAuthorityFactory#createGeocentricCRS(String)}.</li>
+ * {@link org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createGeocentricCRS(String)}.</li>
* <li>Create a {@code GeocentricCRS} by invoking the {@code CRSFactory.createGeocentricCRS(…)} method
* (implemented for example by {@link org.apache.sis.referencing.factory.GeodeticObjectFactory}).</li>
* <li>Create a {@code GeocentricCRS} by invoking the
@@ -70,6 +70,8 @@ import org.apache.sis.referencing.Abstra
* @since 0.4
* @version 0.4
* @module
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createGeocentricCRS(String)
*/
@XmlTransient
public class DefaultGeocentricCRS extends DefaultGeodeticCRS implements GeocentricCRS {
@@ -137,6 +139,8 @@ public class DefaultGeocentricCRS extend
* @param properties The properties to be given to the coordinate reference system.
* @param datum The datum.
* @param cs The coordinate system, which must be three-dimensional.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createGeocentricCRS(Map, GeodeticDatum, CartesianCS)
*/
public DefaultGeocentricCRS(final Map<String,?> properties,
final GeodeticDatum datum,
@@ -153,6 +157,8 @@ public class DefaultGeocentricCRS extend
* @param properties The properties to be given to the coordinate reference system.
* @param datum The datum.
* @param cs The coordinate system.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createGeocentricCRS(Map, GeodeticDatum, SphericalCS)
*/
public DefaultGeocentricCRS(final Map<String,?> properties,
final GeodeticDatum datum,
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -62,7 +62,7 @@ import static org.apache.sis.internal.ut
* {@link org.apache.sis.referencing.CommonCRS#geographic()} or
* {@link org.apache.sis.referencing.CommonCRS#geographic3D()}.</li>
* <li>Create a {@code GeographicCRS} from an identifier in a database by invoking
- * {@link org.opengis.referencing.crs.CRSAuthorityFactory#createGeographicCRS(String)}.</li>
+ * {@link org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createGeographicCRS(String)}.</li>
* <li>Create a {@code GeographicCRS} by invoking the {@code CRSFactory.createGeographicCRS(…)} method
* (implemented for example by {@link org.apache.sis.referencing.factory.GeodeticObjectFactory}).</li>
* <li>Create a {@code GeographicCRS} by invoking the
@@ -85,6 +85,8 @@ import static org.apache.sis.internal.ut
* @since 0.4
* @version 0.6
* @module
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createGeographicCRS(String)
*/
@XmlTransient
public class DefaultGeographicCRS extends DefaultGeodeticCRS implements GeographicCRS {
@@ -151,6 +153,8 @@ public class DefaultGeographicCRS extend
* @param properties The properties to be given to the coordinate reference system.
* @param datum The datum.
* @param cs The two- or three-dimensional coordinate system.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createGeographicCRS(Map, GeodeticDatum, EllipsoidalCS)
*/
public DefaultGeographicCRS(final Map<String,?> properties,
final GeodeticDatum datum,
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -53,6 +53,9 @@ import static org.apache.sis.util.Argume
* @since 0.4
* @version 0.7
* @module
+ *
+ * @see org.apache.sis.referencing.datum.DefaultImageDatum
+ * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createImageCRS(String)
*/
@XmlType(name = "ImageCRSType", propOrder = {
"cartesianCS",
@@ -124,6 +127,8 @@ public class DefaultImageCRS extends Abs
* @param properties The properties to be given to the coordinate reference system.
* @param datum The datum.
* @param cs The coordinate system.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createImageCRS(Map, ImageDatum, AffineCS)
*/
public DefaultImageCRS(final Map<String,?> properties,
final ImageDatum datum,
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -55,9 +55,9 @@ import static org.apache.sis.internal.re
/**
* A 2-dimensional coordinate reference system used to approximate the shape of the earth on a planar surface.
- * It is done in such a way that the distortion that is inherent to the approximation is carefully
- * controlled and known. Distortion correction is commonly applied to calculated bearings and
- * distances to produce values that are a close match to actual field values.
+ * It is done in such a way that the distortion that is inherent to the approximation is carefully controlled and known.
+ * Distortion correction is commonly applied to calculated bearings and distances to produce values
+ * that are a close match to actual field values.
*
* <p><b>Used with coordinate system type:</b>
* {@linkplain org.apache.sis.referencing.cs.DefaultCartesianCS Cartesian}.
@@ -72,6 +72,8 @@ import static org.apache.sis.internal.re
* @since 0.6
* @version 0.6
* @module
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createProjectedCRS(String)
*/
@XmlType(name="ProjectedCRSType", propOrder = {
"baseCRS",
@@ -141,6 +143,8 @@ public class DefaultProjectedCRS extends
* must match the target dimension of the {@code baseToDerived} transform.
* @throws MismatchedDimensionException if the source and target dimensions of {@code baseToDerived}
* do not match the dimensions of {@code base} and {@code derivedCS} respectively.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createProjectedCRS(Map, GeographicCRS, Conversion, CartesianCS)
*/
public DefaultProjectedCRS(final Map<String,?> properties,
final GeographicCRS baseCRS,
@@ -284,6 +288,12 @@ public class DefaultProjectedCRS extends
/**
* Compares this coordinate reference system with the specified object for equality.
+ * In addition to the metadata documented in the
+ * {@linkplain org.apache.sis.referencing.AbstractIdentifiedObject#equals(Object, ComparisonMode) parent class},
+ * this method considers coordinate system axes of the {@linkplain #getBaseCRS() base CRS} as metadata.
+ * This means that if the given {@code ComparisonMode} is {@code IGNORE_METADATA} or {@code APPROXIMATIVE},
+ * then axis order of the base geographic CRS are ignored
+ * (but <strong>not</strong> axis order of <strong>this</strong> projected CRS).
*
* @param object The object to compare to {@code this}.
* @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison, or
@@ -293,7 +303,7 @@ public class DefaultProjectedCRS extends
*/
@Override
public boolean equals(final Object object, final ComparisonMode mode) {
- return (object == this) || super.equals(object, mode);
+ return super.equals(object, mode);
}
/**
Modified: 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=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -62,6 +62,7 @@ import static org.apache.sis.util.Argume
*
* @see org.apache.sis.referencing.datum.DefaultTemporalDatum
* @see org.apache.sis.referencing.cs.DefaultTimeCS
+ * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createTemporalCRS(String)
*/
@XmlType(name = "TemporalCRSType", propOrder = {
"coordinateSystem",
@@ -145,6 +146,8 @@ public class DefaultTemporalCRS extends
* @param properties The properties to be given to the coordinate reference system.
* @param datum The datum.
* @param cs The coordinate system.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createTemporalCRS(Map, TemporalDatum, TimeCS)
*/
public DefaultTemporalCRS(final Map<String,?> properties,
final TemporalDatum datum,
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=1723780&r1=1723779&r2=1723780&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] Fri Jan 8 18:29:04 2016
@@ -54,6 +54,7 @@ import static org.apache.sis.util.Argume
*
* @see org.apache.sis.referencing.datum.DefaultVerticalDatum
* @see org.apache.sis.referencing.cs.DefaultVerticalCS
+ * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createVerticalCRS(String)
*/
@XmlType(name = "VerticalCRSType", propOrder = {
"coordinateSystem",
@@ -124,6 +125,8 @@ public class DefaultVerticalCRS extends
* @param properties The properties to be given to the coordinate reference system.
* @param datum The datum.
* @param cs The coordinate system.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createVerticalCRS(Map, VerticalDatum, VerticalCS)
*/
public DefaultVerticalCRS(final Map<String,?> properties,
final VerticalDatum datum,
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -408,9 +408,11 @@ public class AbstractCS extends Abstract
if (dimension != that.getDimension()) {
return false;
}
- for (int i=0; i<dimension; i++) {
- if (!deepEquals(getAxis(i), that.getAxis(i), mode)) {
- return false;
+ if (mode != ComparisonMode.ALLOW_VARIANT) {
+ for (int i=0; i<dimension; i++) {
+ if (!deepEquals(getAxis(i), that.getAxis(i), mode)) {
+ return false;
+ }
}
}
return true;
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -287,10 +287,10 @@ public final class CoordinateSystems ext
if (!Classes.implementSameInterfaces(sourceCS.getClass(), targetCS.getClass(), CoordinateSystem.class)) {
throw new IllegalArgumentException(Errors.format(Errors.Keys.IncompatibleCoordinateSystemTypes));
}
- final AxisDirection[] sourceAxis = getAxisDirections(sourceCS);
- final AxisDirection[] targetAxis = getAxisDirections(targetCS);
- final MatrixSIS matrix = Matrices.createTransform(sourceAxis, targetAxis);
- assert Arrays.equals(sourceAxis, targetAxis) == matrix.isIdentity() : matrix;
+ final AxisDirection[] srcAxes = getAxisDirections(sourceCS);
+ final AxisDirection[] dstAxes = getAxisDirections(targetCS);
+ final MatrixSIS matrix = Matrices.createTransform(srcAxes, dstAxes);
+ assert Arrays.equals(srcAxes, dstAxes) == matrix.isIdentity() : matrix;
/*
* The previous code computed a matrix for swapping axes. Usually, this
* matrix contains only 0 and 1 values with only one "1" value by row.
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -109,6 +109,8 @@ public class DefaultAffineCS extends Abs
* @param properties The properties to be given to the identified object.
* @param axis0 The first axis.
* @param axis1 The second axis.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createAffineCS(Map, CoordinateSystemAxis, CoordinateSystemAxis)
*/
public DefaultAffineCS(final Map<String,?> properties,
final CoordinateSystemAxis axis0,
@@ -125,6 +127,8 @@ public class DefaultAffineCS extends Abs
* @param axis0 The first axis.
* @param axis1 The second axis.
* @param axis2 The third axis.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createAffineCS(Map, CoordinateSystemAxis, CoordinateSystemAxis, CoordinateSystemAxis)
*/
public DefaultAffineCS(final Map<String,?> properties,
final CoordinateSystemAxis axis0,
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -59,6 +59,8 @@ import org.apache.sis.measure.Angle;
* @since 0.4
* @version 0.4
* @module
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createCartesianCS(String)
*/
@XmlType(name = "CartesianCSType")
@XmlRootElement(name = "CartesianCS")
@@ -115,6 +117,8 @@ public class DefaultCartesianCS extends
* @param properties The properties to be given to the identified object.
* @param axis0 The first axis (e.g. “Easting”).
* @param axis1 The second axis (e.g. “Northing”).
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createCartesianCS(Map, CoordinateSystemAxis, CoordinateSystemAxis)
*/
public DefaultCartesianCS(final Map<String,?> properties,
final CoordinateSystemAxis axis0,
@@ -133,6 +137,8 @@ public class DefaultCartesianCS extends
* @param axis0 The first axis (e.g. “Geocentric X”).
* @param axis1 The second axis (e.g. “Geocentric Y”).
* @param axis2 The third axis (e.g. “Geocentric Z”).
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createCartesianCS(Map, CoordinateSystemAxis, CoordinateSystemAxis, CoordinateSystemAxis)
*/
public DefaultCartesianCS(final Map<String,?> properties,
final CoordinateSystemAxis axis0,
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -292,6 +292,8 @@ public class DefaultCoordinateSystemAxis
* @param abbreviation The {@linkplain #getAbbreviation() abbreviation} used for this coordinate system axis.
* @param direction The {@linkplain #getDirection() direction} of this coordinate system axis.
* @param unit The {@linkplain #getUnit() unit of measure} used for this coordinate system axis.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createCoordinateSystemAxis(Map, String, AxisDirection, Unit)
*/
public DefaultCoordinateSystemAxis(final Map<String,?> properties,
final String abbreviation,
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -53,6 +53,7 @@ import org.apache.sis.measure.Units;
* @module
*
* @see DefaultPolarCS
+ * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createCylindricalCS(String)
*/
@XmlType(name = "CylindricalCSType")
@XmlRootElement(name = "CylindricalCS")
@@ -110,6 +111,8 @@ public class DefaultCylindricalCS extend
* @param axis0 The first axis.
* @param axis1 The second axis.
* @param axis2 The third axis.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createCylindricalCS(Map, CoordinateSystemAxis, CoordinateSystemAxis, CoordinateSystemAxis)
*/
public DefaultCylindricalCS(final Map<String,?> properties,
final CoordinateSystemAxis axis0,
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -51,6 +51,8 @@ import org.apache.sis.measure.Units;
* @since 0.4
* @version 0.4
* @module
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createEllipsoidalCS(String)
*/
@XmlType(name = "EllipsoidalCSType")
@XmlRootElement(name = "EllipsoidalCS")
@@ -108,6 +110,8 @@ public class DefaultEllipsoidalCS extend
* @param properties The properties to be given to the identified object.
* @param axis0 The first axis (e.g. “Geodetic latitude”).
* @param axis1 The second axis (e.g. “Geodetic longitude”).
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createEllipsoidalCS(Map, CoordinateSystemAxis, CoordinateSystemAxis)
*/
public DefaultEllipsoidalCS(final Map<String,?> properties,
final CoordinateSystemAxis axis0,
@@ -126,6 +130,8 @@ public class DefaultEllipsoidalCS extend
* @param axis0 The first axis (e.g. “Geodetic latitude”).
* @param axis1 The second axis (e.g. “Geodetic longitude”).
* @param axis2 The third axis (e.g. “Ellipsoidal height”).
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createEllipsoidalCS(Map, CoordinateSystemAxis, CoordinateSystemAxis, CoordinateSystemAxis)
*/
public DefaultEllipsoidalCS(final Map<String,?> properties,
final CoordinateSystemAxis axis0,
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -107,6 +107,8 @@ public class DefaultLinearCS extends Abs
*
* @param properties The properties to be given to the identified object.
* @param axis The axis.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createLinearCS(Map, CoordinateSystemAxis)
*/
public DefaultLinearCS(final Map<String,?> properties, final CoordinateSystemAxis axis) {
super(properties, axis);
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -51,6 +51,9 @@ import org.apache.sis.measure.Units;
* @since 0.4
* @version 0.4
* @module
+ *
+ * @see DefaultCylindricalCS
+ * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createPolarCS(String)
*/
@XmlType(name = "PolarCSType")
@XmlRootElement(name = "PolarCS")
@@ -107,6 +110,8 @@ public class DefaultPolarCS extends Abst
* @param properties The properties to be given to the identified object.
* @param axis0 The first axis.
* @param axis1 The second axis.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createPolarCS(Map, CoordinateSystemAxis, CoordinateSystemAxis)
*/
public DefaultPolarCS(final Map<String,?> properties,
final CoordinateSystemAxis axis0,
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -55,6 +55,8 @@ import org.apache.sis.measure.Units;
* @since 0.4
* @version 0.4
* @module
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createSphericalCS(String)
*/
@XmlType(name = "SphericalCSType")
@XmlRootElement(name = "SphericalCS")
@@ -112,6 +114,8 @@ public class DefaultSphericalCS extends
* @param axis0 The first axis (e.g. “Spherical latitude”).
* @param axis1 The second axis (e.g. “Spherical longitude”).
* @param axis2 The third axis (e.g. “Geocentric radius”).
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createSphericalCS(Map, CoordinateSystemAxis, CoordinateSystemAxis, CoordinateSystemAxis)
*/
public DefaultSphericalCS(final Map<String,?> properties,
final CoordinateSystemAxis axis0,
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=1723780&r1=1723779&r2=1723780&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] Fri Jan 8 18:29:04 2016
@@ -54,6 +54,7 @@ import org.apache.sis.measure.Units;
*
* @see org.apache.sis.referencing.crs.DefaultTemporalCRS
* @see org.apache.sis.referencing.datum.DefaultTemporalDatum
+ * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createTimeCS(String)
*/
@XmlType(name = "TimeCSType")
@XmlRootElement(name = "TimeCS")
@@ -109,6 +110,8 @@ public class DefaultTimeCS extends Abstr
*
* @param properties The properties to be given to the identified object.
* @param axis The axis.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createTimeCS(Map, CoordinateSystemAxis)
*/
public DefaultTimeCS(final Map<String,?> properties, final CoordinateSystemAxis axis) {
super(properties, axis);
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -102,6 +102,8 @@ public class DefaultUserDefinedCS extend
* @param properties The properties to be given to the identified object.
* @param axis0 The first axis.
* @param axis1 The second axis.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createUserDefinedCS(Map, CoordinateSystemAxis, CoordinateSystemAxis)
*/
public DefaultUserDefinedCS(final Map<String,?> properties,
final CoordinateSystemAxis axis0,
@@ -119,6 +121,8 @@ public class DefaultUserDefinedCS extend
* @param axis0 The first axis.
* @param axis1 The second axis.
* @param axis2 The third axis.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createUserDefinedCS(Map, CoordinateSystemAxis, CoordinateSystemAxis, CoordinateSystemAxis)
*/
public DefaultUserDefinedCS(final Map<String,?> properties,
final CoordinateSystemAxis axis0,
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -64,6 +64,7 @@ import org.apache.sis.internal.metadata.
*
* @see org.apache.sis.referencing.crs.DefaultVerticalCRS
* @see org.apache.sis.referencing.datum.DefaultVerticalDatum
+ * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createVerticalCS(String)
*/
@XmlType(name = "VerticalCSType")
@XmlRootElement(name = "VerticalCS")
@@ -119,6 +120,8 @@ public class DefaultVerticalCS extends A
*
* @param properties The properties to be given to the identified object.
* @param axis The single axis (e.g. “height” or “depth”).
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createVerticalCS(Map, CoordinateSystemAxis)
*/
public DefaultVerticalCS(final Map<String,?> properties, final CoordinateSystemAxis axis) {
super(properties, axis);
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -60,7 +60,7 @@ import java.util.Objects;
* while the <cite>legacy</cite> column lists the identifiers used in the legacy OGC 01-009 specification
* (still used in some <cite>Well Known Texts</cite>).
*
- * <table class="compact" summary="Parameters and formula"><tr><td>
+ * <table summary="Parameters and formula"><tr><td>
* <table class="sis">
* <caption>Parameters defined by EPSG</caption>
* <tr><th>Code</th> <th>Name</th> <th>Abbr.</th> <th>Legacy</th></tr>
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -117,6 +117,7 @@ import java.util.Objects;
* @module
*
* @see org.apache.sis.referencing.CommonCRS#ellipsoid()
+ * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createEllipsoid(String)
*/
@XmlType(name = "EllipsoidType", propOrder = {
"semiMajorAxisMeasure",
@@ -277,6 +278,8 @@ public class DefaultEllipsoid extends Ab
* @param semiMinorAxis The polar radius in the given unit.
* @param unit The units of the semi-major and semi-minor axis values.
* @return An ellipsoid with the given axis length.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createEllipsoid(Map, double, double, Unit)
*/
public static DefaultEllipsoid createEllipsoid(final Map<String,?> properties,
final double semiMajorAxis,
@@ -301,6 +304,8 @@ public class DefaultEllipsoid extends Ab
* @param inverseFlattening The inverse flattening value.
* @param unit The units of the semi-major and semi-minor axis values.
* @return An ellipsoid with the given axis length.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createFlattenedSphere(Map, double, double, Unit)
*/
public static DefaultEllipsoid createFlattenedSphere(final Map<String,?> properties,
final double semiMajorAxis,
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -42,6 +42,9 @@ import org.apache.sis.io.wkt.Formatter;
* @since 0.4
* @version 0.4
* @module
+ *
+ * @see org.apache.sis.referencing.crs.DefaultEngineeringCRS
+ * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createEngineeringDatum(String)
*/
@XmlType(name = "EngineeringDatumType")
@XmlRootElement(name = "EngineeringDatum")
@@ -106,6 +109,8 @@ public class DefaultEngineeringDatum ext
* </table>
*
* @param properties The properties to be given to the identified object.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createEngineeringDatum(Map)
*/
public DefaultEngineeringDatum(final Map<String,?> properties) {
super(properties);
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -129,6 +129,7 @@ import java.util.Objects;
* @see DefaultEllipsoid
* @see DefaultPrimeMeridian
* @see org.apache.sis.referencing.CommonCRS#datum()
+ * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createGeodeticDatum(String)
*/
@XmlType(name = "GeodeticDatumType", propOrder = {
"primeMeridian",
@@ -243,6 +244,8 @@ public class DefaultGeodeticDatum extend
* @param properties The properties to be given to the identified object.
* @param ellipsoid The ellipsoid.
* @param primeMeridian The prime meridian.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createGeodeticDatum(Map, Ellipsoid, PrimeMeridian)
*/
public DefaultGeodeticDatum(final Map<String,?> properties,
final Ellipsoid ellipsoid,
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -51,6 +51,9 @@ import java.util.Objects;
* @since 0.4
* @version 0.7
* @module
+ *
+ * @see org.apache.sis.referencing.crs.DefaultImageCRS
+ * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createImageDatum(String)
*/
@XmlType(name = "ImageDatumType")
@XmlRootElement(name = "ImageDatum")
@@ -126,6 +129,8 @@ public class DefaultImageDatum extends A
*
* @param properties The properties to be given to the identified object.
* @param pixelInCell The way the image grid is associated with the image data attributes.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createImageDatum(Map, PixelInCell)
*/
public DefaultImageDatum(final Map<String,?> properties, final PixelInCell pixelInCell) {
super(properties);
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -88,6 +88,7 @@ import org.apache.sis.internal.referenci
* @module
*
* @see org.apache.sis.referencing.CommonCRS#primeMeridian()
+ * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createPrimeMeridian(String)
*/
@XmlType(name = "PrimeMeridianType")
@XmlRootElement(name = "PrimeMeridian")
@@ -150,6 +151,8 @@ public class DefaultPrimeMeridian extend
* @param properties The properties to be given to the identified object.
* @param greenwichLongitude The longitude value relative to the Greenwich Meridian.
* @param angularUnit The angular unit of the longitude.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createPrimeMeridian(Map, double, Unit)
*/
public DefaultPrimeMeridian(final Map<String,?> properties, final double greenwichLongitude,
final Unit<Angle> angularUnit)
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=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -80,6 +80,7 @@ import java.util.Objects;
* @see org.apache.sis.referencing.CommonCRS.Temporal#datum()
* @see org.apache.sis.referencing.cs.DefaultTimeCS
* @see org.apache.sis.referencing.crs.DefaultTemporalCRS
+ * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createTemporalDatum(String)
*/
@XmlType(name = "TemporalDatumType")
@XmlRootElement(name = "TemporalDatum")
@@ -155,6 +156,8 @@ public class DefaultTemporalDatum extend
*
* @param properties The properties to be given to the identified object.
* @param origin The date and time origin of this temporal datum.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createTemporalDatum(Map, Date)
*/
public DefaultTemporalDatum(final Map<String,?> properties, final Date origin) {
super(properties);
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java?rev=1723780&r1=1723779&r2=1723780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -81,6 +81,7 @@ import java.util.Objects;
* @see org.apache.sis.referencing.CommonCRS.Vertical#datum()
* @see org.apache.sis.referencing.cs.DefaultVerticalCS
* @see org.apache.sis.referencing.crs.DefaultVerticalCRS
+ * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createVerticalDatum(String)
*/
@XmlType(name = "VerticalDatumType")
@XmlRootElement(name = "VerticalDatum")
@@ -155,6 +156,8 @@ public class DefaultVerticalDatum extend
*
* @param properties The properties to be given to the identified object.
* @param type The type of this vertical datum.
+ *
+ * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createVerticalDatum(Map, VerticalDatumType)
*/
public DefaultVerticalDatum(final Map<String,?> properties, final VerticalDatumType type) {
super(properties);
Copied: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java (from r1723735, sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java?p2=sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java&p1=sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java&r1=1723735&r2=1723780&rev=1723780&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java [UTF-8] Fri Jan 8 18:29:04 2016
@@ -61,6 +61,9 @@ import org.apache.sis.util.logging.Perfo
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.resources.Messages;
+// Branch-dependent imports
+import org.apache.sis.internal.jdk8.JDK8;
+
/**
* A concurrent authority factory that caches all objects created by another factory.
@@ -1840,7 +1843,7 @@ public abstract class ConcurrentAuthorit
result = CollectionsExt.unmodifiableOrCopy(result);
FindEntry entry = new FindEntry();
synchronized (findPool) {
- final FindEntry c = findPool.putIfAbsent(object, entry);
+ final FindEntry c = JDK8.putIfAbsent(findPool, object, entry);
if (c != null) {
entry = c; // May happen if the same set has been computed in another thread.
}