sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
Date Wed, 13 Feb 2019 18:49:25 GMT
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git

commit e3e6efa0ee0f162d700b900661e64356db1ab6b4
Merge: 2caa9ba ababaae
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Wed Feb 13 19:24:06 2019 +0100

    Merge branch 'geoapi-4.0' into geoapi-3.1

 .../org/apache/sis/internal/gui/Resources.java     |   8 +-
 .../filter/AbstractBinaryComparisonOperator.java   | 219 +++++
 .../sis/filter/AbstractBinaryExpression.java       | 116 +++
 .../org/apache/sis/filter/AbstractExpression.java  |  37 +
 .../java/org/apache/sis/filter/DefaultAdd.java     |  80 ++
 .../java/org/apache/sis/filter/DefaultAnd.java     | 101 +++
 .../java/org/apache/sis/filter/DefaultDivide.java  |  80 ++
 .../org/apache/sis/filter/DefaultFeatureId.java    |  92 +++
 .../apache/sis/filter/DefaultFilterFactory.java    |  39 +-
 .../main/java/org/apache/sis/filter/DefaultId.java | 131 +++
 .../org/apache/sis/filter/DefaultMultiply.java     |  80 ++
 .../java/org/apache/sis/filter/DefaultNot.java     |  91 +++
 .../main/java/org/apache/sis/filter/DefaultOr.java | 101 +++
 .../sis/filter/DefaultPropertyIsGreaterThan.java   |  64 ++
 .../DefaultPropertyIsGreaterThanOrEqualTo.java     |  64 ++
 .../sis/filter/DefaultPropertyIsLessThan.java      |  64 ++
 .../filter/DefaultPropertyIsLessThanOrEqualTo.java |  64 ++
 .../apache/sis/filter/DefaultPropertyIsLike.java   |  93 +++
 .../org/apache/sis/filter/DefaultSubtract.java     |  81 ++
 .../java/org/apache/sis/internal/feature/ESRI.java |  57 +-
 .../apache/sis/internal/feature/Geometries.java    |  44 +-
 .../java/org/apache/sis/internal/feature/JTS.java  |  79 +-
 .../org/apache/sis/internal/feature/Java2D.java    |  78 +-
 .../org/apache/sis/internal/feature/Resources.java |  10 +-
 .../sis/internal/feature/j2d/ShapeProperties.java  | 258 ++++++
 .../sis/internal/feature}/j2d/package-info.java    |  15 +-
 .../feature/jts/GeometryCoordinateTransform.java   |  84 ++
 .../internal/feature/jts/GeometryTransform.java    | 166 ++++
 .../org/apache/sis/internal/feature/jts/JTS.java   | 156 ++++
 .../sis/internal/feature/jts}/package-info.java    |  14 +-
 .../java/org/apache/sis/filter/DefaultAddTest.java |  63 ++
 .../java/org/apache/sis/filter/DefaultAndTest.java | 104 +++
 .../org/apache/sis/filter/DefaultDivideTest.java   |  63 ++
 .../apache/sis/filter/DefaultFeatureIdTest.java    |  94 +++
 .../java/org/apache/sis/filter/DefaultIdTest.java  |  93 +++
 .../org/apache/sis/filter/DefaultMultiplyTest.java |  63 ++
 .../java/org/apache/sis/filter/DefaultNotTest.java |  79 ++
 .../java/org/apache/sis/filter/DefaultOrTest.java  | 104 +++
 .../org/apache/sis/filter/DefaultSubtractTest.java |  63 ++
 .../org/apache/sis/internal/feature/ESRITest.java  |  16 +
 .../sis/internal/feature/GeometriesTestCase.java   |  24 +-
 .../org/apache/sis/internal/feature/JTSTest.java   |   1 +
 .../internal/feature/j2d/ShapePropertiesTest.java  |  66 ++
 .../apache/sis/internal/feature/jts/JTSTest.java   | 116 +++
 .../apache/sis/test/suite/FeatureTestSuite.java    |  11 +
 .../sis/internal/jaxb/IdentifierMapAdapter.java    |   4 +-
 .../apache/sis/internal/jaxb/gml/TimeInstant.java  |   3 +-
 .../apache/sis/internal/jaxb/gml/TimePeriod.java   |   3 +-
 .../metadata/EllipsoidalHeightCombiner.java        |   9 +-
 .../sis/internal/metadata/MetadataUtilities.java   |   4 +-
 .../apache/sis/internal/metadata/NameMeaning.java  |   4 +-
 .../sis/internal/metadata/NameToIdentifier.java    |   8 +-
 .../apache/sis/internal/metadata/Resources.java    |   4 +-
 .../sis/internal/metadata/sql/SQLUtilities.java    |  95 ++-
 .../sis/internal/simple/CitationConstant.java      |   3 +-
 .../main/java/org/apache/sis/io/wkt/Formatter.java |  45 +-
 .../org/apache/sis/io/wkt/MathTransformParser.java |   4 +-
 .../main/java/org/apache/sis/io/wkt/Symbols.java   |  17 +-
 .../main/java/org/apache/sis/io/wkt/Warnings.java  |   6 +-
 .../org/apache/sis/metadata/MetadataStandard.java  |   3 +-
 .../org/apache/sis/metadata/sql/Dispatcher.java    |   3 +-
 .../apache/sis/metadata/sql/MetadataSource.java    |   3 +-
 .../apache/sis/util/iso/DefaultNameFactory.java    |   3 +-
 .../java/org/apache/sis/xml/NilObjectHandler.java  |   3 +-
 .../internal/metadata/sql/SQLUtilitiesTest.java    |  23 +-
 .../apache/sis/test/mock/IdentifiedObjectMock.java |   3 +-
 .../java/org/apache/sis/coverage/Category.java     | 195 +++--
 .../java/org/apache/sis/coverage/CategoryList.java | 469 +++++------
 .../org/apache/sis/coverage/ConvertedCategory.java |   4 +-
 .../coverage/MismatchedCoverageRangeException.java |  63 ++
 .../org/apache/sis/coverage/SampleDimension.java   | 135 ++--
 .../org/apache/sis/coverage/SampleRangeFormat.java |  43 +-
 ...ion.java => SubspaceNotSpecifiedException.java} |  37 +-
 .../main/java/org/apache/sis/coverage/ToNaN.java   |  32 +-
 .../org/apache/sis/coverage/grid/GridChange.java   | 476 -----------
 .../org/apache/sis/coverage/grid/GridCoverage.java |  67 +-
 .../apache/sis/coverage/grid/GridDerivation.java   | 896 +++++++++++++++++++++
 .../org/apache/sis/coverage/grid/GridExtent.java   | 538 +++++++++----
 .../org/apache/sis/coverage/grid/GridGeometry.java | 406 +++++-----
 ...tion.java => IllegalGridGeometryException.java} |  38 +-
 .../apache/sis/coverage/grid/ImageRenderer.java    | 374 +++++++++
 .../grid/IncompleteGridGeometryException.java      |  22 +-
 .../java/org/apache/sis/image/DefaultIterator.java |   2 +-
 .../sis/internal/raster/ColorModelFactory.java     |  35 +-
 .../apache/sis/internal/raster/RasterFactory.java  | 119 ++-
 .../org/apache/sis/internal/raster/Resources.java  |  97 ++-
 .../sis/internal/raster/Resources.properties       |  16 +-
 .../sis/internal/raster/Resources_fr.properties    |  16 +-
 .../sis/internal/raster/ScaledColorSpace.java      |   4 +-
 .../org/apache/sis/coverage/CategoryListTest.java  |  73 +-
 .../java/org/apache/sis/coverage/CategoryTest.java |  31 +-
 .../apache/sis/coverage/SampleDimensionTest.java   |  39 +-
 .../apache/sis/coverage/grid/GridChangeTest.java   | 104 ---
 .../sis/coverage/grid/GridDerivationTest.java      | 275 +++++++
 .../apache/sis/coverage/grid/GridExtentTest.java   |  78 +-
 .../apache/sis/coverage/grid/GridGeometryTest.java | 147 +---
 .../org/apache/sis/test/suite/RasterTestSuite.java |   2 +-
 .../apache/sis/internal/gazetteer/Resources.java   |   8 +-
 .../gazetteer/MilitaryGridReferenceSystem.java     |   3 +-
 .../sis/geometry/AbstractDirectPosition.java       |   5 +-
 .../org/apache/sis/geometry/AbstractEnvelope.java  |  10 +-
 .../org/apache/sis/geometry/CoordinateFormat.java  |   9 +-
 .../java/org/apache/sis/geometry/Envelopes.java    |   6 +-
 .../apache/sis/internal/referencing/Formulas.java  |   4 +-
 .../referencing/GeodeticObjectBuilder.java         |   4 +-
 .../internal/referencing/ReferencingUtilities.java |   1 +
 .../apache/sis/internal/referencing/Resources.java |  15 +-
 .../sis/internal/referencing/Resources.properties  |   1 +
 .../internal/referencing/Resources_fr.properties   |   1 +
 .../sis/internal/referencing/WKTUtilities.java     | 103 ++-
 .../referencing/j2d/IntervalRectangle.java         |   8 +-
 .../internal/referencing/j2d/ShapeUtilities.java   |  32 +-
 .../sis/internal/referencing/j2d/package-info.java |   7 +-
 .../provider/DatumShiftGridCompressed.java         |  18 +-
 .../referencing/provider/DatumShiftGridFile.java   |  20 +-
 .../referencing/provider/Equirectangular.java      |   6 +-
 .../org/apache/sis/parameter/ParameterFormat.java  |   2 +-
 .../java/org/apache/sis/parameter/Verifier.java    |   5 +-
 .../main/java/org/apache/sis/referencing/CRS.java  | 101 +++
 .../java/org/apache/sis/referencing/CommonCRS.java |  49 +-
 .../referencing/EllipsoidalHeightSeparator.java    | 136 ++++
 .../org/apache/sis/referencing/NameIterator.java   |   2 +-
 .../org/apache/sis/referencing/cs/AbstractCS.java  |   5 +-
 .../sis/referencing/cs/CoordinateSystems.java      |  10 +-
 .../sis/referencing/cs/DefaultCartesianCS.java     |   1 +
 .../sis/referencing/cs/DefaultEllipsoidalCS.java   |   2 +-
 .../sis/referencing/datum/AbstractDatum.java       |  19 +-
 .../sis/referencing/datum/BursaWolfParameters.java |  28 +-
 .../sis/referencing/datum/DatumShiftGrid.java      | 101 ++-
 .../sis/referencing/datum/DefaultEllipsoid.java    |  22 +-
 .../sis/referencing/datum/TimeDependentBWP.java    |  11 +-
 .../referencing/factory/AuthorityFactoryProxy.java |   3 +-
 .../referencing/factory/sql/EPSGDataAccess.java    | 531 +++++++-----
 .../sis/referencing/factory/sql/EPSGInstaller.java |   2 +-
 .../sis/referencing/factory/sql/SQLTranslator.java | 124 ++-
 .../sis/referencing/factory/sql/TableInfo.java     |  36 +-
 .../operation/DefaultConcatenatedOperation.java    |   3 +-
 .../operation/DefaultPassThroughOperation.java     |  24 +-
 .../operation/builder/LinearTransformBuilder.java  | 169 +++-
 .../operation/builder/LocalizationGridBuilder.java | 145 +++-
 .../operation/builder/ResidualGrid.java            | 163 +++-
 .../sis/referencing/operation/matrix/Matrices.java |  64 +-
 .../referencing/operation/matrix/MatrixSIS.java    |  22 +-
 .../operation/projection/AlbersEqualArea.java      |   8 +-
 .../operation/projection/CylindricalEqualArea.java |  11 +-
 .../operation/projection/Initializer.java          |  35 +-
 .../projection/LambertConicConformal.java          |  13 +-
 .../referencing/operation/projection/Mercator.java |   9 +-
 .../operation/projection/NormalizedProjection.java |   2 +-
 .../operation/projection/ObliqueMercator.java      |   4 +-
 .../operation/projection/PolarStereographic.java   |  10 +-
 .../operation/projection/TransverseMercator.java   |   6 +-
 .../transform/AbstractMathTransform2D.java         |   7 +-
 .../operation/transform/ContextualParameters.java  |   2 +-
 .../transform/CoordinateSystemTransform.java       |   2 +-
 .../transform/DefaultMathTransformFactory.java     |  24 +-
 .../transform/EllipsoidToCentricTransform.java     |   4 +-
 .../transform/InterpolatedGeocentricTransform.java |   2 +-
 .../transform/InterpolatedMolodenskyTransform.java |   2 +-
 .../operation/transform/InterpolatedTransform.java | 108 ++-
 .../operation/transform/MathTransforms.java        |  36 +-
 .../transform/MathTransformsOrFactory.java         |  14 +-
 .../operation/transform/PassThroughTransform.java  | 179 ++--
 .../transform/PassThroughTransform2D.java          |  15 +-
 .../operation/transform/TransformSeparator.java    |  15 +-
 .../sis/referencing/factory/sql/EPSG_Finish.sql    |   1 +
 .../org/apache/sis/geometry/ArrayEnvelopeTest.java |  10 +-
 .../apache/sis/geometry/GeneralEnvelopeTest.java   |  14 +
 .../sis/internal/referencing/WKTUtilitiesTest.java |  29 +-
 .../referencing/j2d/ShapeUtilitiesTest.java        |  13 +-
 .../java/org/apache/sis/referencing/CRSTest.java   |  39 +-
 .../apache/sis/referencing/crs/HardCodedCRS.java   |   8 +-
 .../apache/sis/referencing/cs/HardCodedAxes.java   |   4 +-
 .../sis/referencing/factory/TestFactorySource.java |  23 +-
 .../referencing/factory/sql/EPSGFactoryTest.java   |  12 +-
 .../referencing/factory/sql/TableInfoTest.java}    |  20 +-
 .../operation/builder/ResidualGridTest.java        |   2 +-
 .../transform/MathTransformFactoryBase.java        |   4 +-
 .../transform/MathTransformFactoryMock.java        |   8 +-
 .../transform/PassThroughTransformTest.java        |  20 +-
 .../transform/TransformSeparatorTest.java          |  71 +-
 .../sis/test/suite/ReferencingTestSuite.java       |   1 +
 .../org/apache/sis/internal/converter/Column.java  |   2 +-
 .../org/apache/sis/internal/util/DoubleDouble.java | 188 +++--
 .../org/apache/sis/internal/util/Numerics.java     | 120 ++-
 .../sis/internal/util/StandardDateFormat.java      |  74 +-
 .../internal/util/{Utilities.java => Strings.java} |  64 +-
 .../main/java/org/apache/sis/math/ArrayVector.java |  74 +-
 .../src/main/java/org/apache/sis/math/Line.java    |  23 +-
 .../java/org/apache/sis/math/MathFunctions.java    |   2 +-
 .../java/org/apache/sis/math/PackedVector.java     |   2 +-
 .../src/main/java/org/apache/sis/math/Plane.java   |  41 +-
 .../main/java/org/apache/sis/math/Statistics.java  |  22 +-
 .../java/org/apache/sis/math/StatisticsFormat.java |  29 +-
 .../src/main/java/org/apache/sis/math/Vector.java  |  42 +-
 .../org/apache/sis/measure/AbstractConverter.java  |  58 ++
 .../java/org/apache/sis/measure/AbstractUnit.java  | 139 +++-
 .../main/java/org/apache/sis/measure/Angle.java    |   4 +-
 .../java/org/apache/sis/measure/AngleFormat.java   |   3 +-
 .../org/apache/sis/measure/ConventionalUnit.java   |   6 +-
 .../org/apache/sis/measure/LinearConverter.java    |  10 -
 .../java/org/apache/sis/measure/Longitude.java     |  16 +-
 .../org/apache/sis/measure/MeasurementRange.java   |  52 +-
 .../java/org/apache/sis/measure/NumberRange.java   | 105 ++-
 .../java/org/apache/sis/measure/PowerOf10.java     | 208 +++++
 .../main/java/org/apache/sis/measure/Range.java    |  29 +-
 .../java/org/apache/sis/measure/RangeFormat.java   |  14 +-
 .../apache/sis/measure/SexagesimalConverter.java   |  51 --
 .../java/org/apache/sis/measure/SystemUnit.java    |  79 +-
 .../java/org/apache/sis/measure/UnitRegistry.java  |   2 +-
 .../main/java/org/apache/sis/measure/Units.java    |  21 +-
 .../java/org/apache/sis/util/ArgumentChecks.java   |  32 +-
 .../java/org/apache/sis/util/CharSequences.java    |  12 +-
 .../main/java/org/apache/sis/util/Characters.java  |   3 +-
 .../main/java/org/apache/sis/util/Emptiable.java   |   4 +-
 .../sis/util/iso/AbstractInternationalString.java  |   4 +-
 .../java/org/apache/sis/util/resources/Errors.java |  10 +-
 .../sis/util/resources/IndexedResourceBundle.java  |   7 +-
 .../org/apache/sis/util/resources/Messages.java    |  10 +-
 .../org/apache/sis/measure/UnitAliases.properties  |   2 +
 .../org/apache/sis/measure/UnitNames.properties    |   2 +
 .../org/apache/sis/measure/UnitNames_fr.properties |   1 +
 .../apache/sis/internal/util/DoubleDoubleTest.java |  51 +-
 .../org/apache/sis/internal/util/NumericsTest.java |  14 +-
 .../sis/internal/util/StandardDateFormatTest.java  |   7 +-
 .../util/{UtilitiesTest.java => StringsTest.java}  |  16 +-
 .../test/java/org/apache/sis/math/PlaneTest.java   |   2 +-
 .../test/java/org/apache/sis/math/VectorTest.java  |  39 +
 .../org/apache/sis/measure/NumberRangeTest.java    |  17 +-
 .../org/apache/sis/measure/UnitFormatTest.java     |  16 +-
 .../java/org/apache/sis/measure/UnitsTest.java     |  34 +
 .../apache/sis/test/suite/UtilityTestSuite.java    |   2 +-
 ide-project/NetBeans/nbproject/genfiles.properties |   2 +-
 ide-project/NetBeans/nbproject/project.properties  |  28 +-
 ide-project/NetBeans/nbproject/project.xml         |   4 +
 pom.xml                                            |   6 +-
 .../storage/earthobservation/LandsatReader.java    |  17 +-
 .../org/apache/sis/storage/gdal/MTFactory.java     |   2 +-
 .../org/apache/sis/storage/geotiff/CRSBuilder.java |   4 +-
 .../sis/storage/geotiff/GridGeometryBuilder.java   |   4 +-
 .../java/org/apache/sis/internal/netcdf/Axis.java  | 385 +++++++--
 .../org/apache/sis/internal/netcdf/CRSBuilder.java |   5 +-
 .../org/apache/sis/internal/netcdf/Convention.java | 114 +++
 .../org/apache/sis/internal/netcdf/Decoder.java    |  70 +-
 .../java/org/apache/sis/internal/netcdf/Grid.java  | 175 ++--
 .../org/apache/sis/internal/netcdf/Resources.java  |  20 +-
 .../sis/internal/netcdf/Resources.properties       |   2 +
 .../sis/internal/netcdf/Resources_fr.properties    |   2 +
 .../org/apache/sis/internal/netcdf/Variable.java   | 106 ++-
 .../apache/sis/internal/netcdf/VariableRole.java   |  32 +-
 .../sis/internal/netcdf/impl/ChannelDecoder.java   |  92 ++-
 .../sis/internal/netcdf/impl/FeaturesInfo.java     |   2 +-
 .../apache/sis/internal/netcdf/impl/GridInfo.java  |  63 +-
 .../sis/internal/netcdf/impl/VariableInfo.java     |  56 +-
 .../sis/internal/netcdf/ucar/DecoderWrapper.java   |  29 +-
 .../sis/internal/netcdf/ucar/GridWrapper.java      | 117 ++-
 .../sis/internal/netcdf/ucar/VariableWrapper.java  |  68 +-
 .../apache/sis/storage/netcdf/GridResource.java    | 117 +--
 .../java/org/apache/sis/storage/netcdf/Image.java  |  41 +-
 .../apache/sis/storage/netcdf/MetadataReader.java  |  41 +-
 .../org/apache/sis/storage/netcdf/NetcdfStore.java |   3 +-
 .../sis/storage/netcdf/NetcdfStoreProvider.java    |   4 +-
 .../org/apache/sis/internal/netcdf/GridTest.java   |  36 +-
 .../org/apache/sis/internal/netcdf/TestCase.java   |   7 +
 .../apache/sis/internal/netcdf/VariableTest.java   |  61 +-
 .../sis/internal/netcdf/impl/GridInfoTest.java     |   2 +
 .../apache/sis/internal/sql/feature/Analyzer.java  |  18 +-
 .../apache/sis/internal/sql/feature/Resources.java |   6 +-
 .../sis/internal/storage/AbstractGridResource.java |   7 +-
 .../sis/internal/storage/MetadataBuilder.java      |  40 +-
 .../org/apache/sis/internal/storage/Resources.java |   8 +-
 .../sis/internal/storage/io/ChannelDataOutput.java |   3 +-
 .../internal/storage/io/HyperRectangleReader.java  |   4 +-
 .../org/apache/sis/internal/storage/io/Region.java |   8 +-
 .../java/org/apache/sis/storage/DataStore.java     |   3 +-
 .../java/org/apache/sis/storage/ProbeResult.java   |   8 +-
 .../org/apache/sis/storage/StorageConnector.java   |   4 +-
 .../org/apache/sis/storage/WritableAggregate.java  |   4 +-
 .../storage/io/HyperRectangleReaderTest.java       |  12 +-
 .../internal/storage/xml/stream/StaxDataStore.java |   4 +-
 280 files changed, 11351 insertions(+), 3697 deletions(-)

diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/Dispatcher.java
index 956b3a9,fa2a268..11f2d8d
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/Dispatcher.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/Dispatcher.java
@@@ -31,11 -31,8 +31,12 @@@ import org.apache.sis.metadata.KeyNameP
  import org.apache.sis.metadata.ValueExistencePolicy;
  import org.apache.sis.internal.system.Semaphores;
  import org.apache.sis.internal.metadata.Dependencies;
+ import org.apache.sis.internal.util.Numerics;
  
 +// Branch-dependent imports
 +import org.opengis.metadata.citation.Responsibility;
 +import org.opengis.metadata.citation.ResponsibleParty;
 +
  
  /**
   * The handler for metadata proxy that implement (indirectly) metadata interfaces like
diff --cc core/sis-metadata/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java
index 4d85c36,74ad840..362ea9e
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java
@@@ -25,9 -25,10 +25,10 @@@ import javax.xml.bind.annotation.XmlRoo
  import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  import org.opengis.util.GenericName;
  import org.opengis.util.InternationalString;
 -import org.opengis.metadata.Identifier;
  import org.opengis.metadata.citation.Citation;
  import org.opengis.referencing.IdentifiedObject;
 +import org.opengis.referencing.ReferenceIdentifier;
+ import org.apache.sis.internal.util.Strings;
  import org.apache.sis.internal.util.CollectionsExt;
  import org.apache.sis.internal.jaxb.gco.GO_GenericName;
  
diff --cc core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
index 8093d4a,9decaff..2f45265
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
@@@ -109,12 -106,12 +109,12 @@@ public class DefaultPassThroughOperatio
      public DefaultPassThroughOperation(final Map<String,?>            properties,
                                         final CoordinateReferenceSystem sourceCRS,
                                         final CoordinateReferenceSystem targetCRS,
 -                                       final CoordinateOperation       operation,
 +                                       final SingleOperation           operation,
-                                        final int firstAffectedOrdinate,
-                                        final int numTrailingOrdinates)
+                                        final int firstAffectedCoordinate,
+                                        final int numTrailingCoordinates)
      {
          super(properties, sourceCRS, targetCRS, null, MathTransforms.passThrough(
-                 firstAffectedOrdinate, operation.getMathTransform(), numTrailingOrdinates));
+                 firstAffectedCoordinate, operation.getMathTransform(), numTrailingCoordinates));
          ArgumentChecks.ensureNonNull("operation", operation);
          this.operation = operation;
      }
diff --cc ide-project/NetBeans/nbproject/genfiles.properties
index 74bf923,ec9b777..3f06e92
--- a/ide-project/NetBeans/nbproject/genfiles.properties
+++ b/ide-project/NetBeans/nbproject/genfiles.properties
@@@ -3,6 -3,6 +3,6 @@@
  build.xml.data.CRC32=58e6b21c
  build.xml.script.CRC32=462eaba0
  build.xml.stylesheet.CRC32=28e38971@1.53.1.46
- nbproject/build-impl.xml.data.CRC32=aff02101
 -nbproject/build-impl.xml.data.CRC32=80e7865b
 -nbproject/build-impl.xml.script.CRC32=a7689f96
++nbproject/build-impl.xml.data.CRC32=f8afd8eb
 +nbproject/build-impl.xml.script.CRC32=aa8f5386
  nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.89.1.48
diff --cc ide-project/NetBeans/nbproject/project.properties
index 5c532c3,bfc691f..6551144
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@@ -98,11 -105,11 +98,12 @@@ test.fra-profile.dir = ${project.root}/
  # Those dependencies must exist in the local Maven repository.
  # Those numbers should match the ones declared in the pom.xml files.
  #
 +geoapi.version       = 3.1-SNAPSHOT
  jsr363.version       = 1.0
  jama.version         = 1.0.3
- esri.api.version     = 2.1.0
- jts.version          = 1.15.0
+ guava.version        = 18.0
+ esri.api.version     = 2.2.2
+ jts.version          = 1.16.0
  georss.version       = 0.9.8
  rome.version         = 0.9
  jdom1.version        = 1.0
@@@ -145,13 -152,13 +146,13 @@@ javac.processorpath=
      ${javac.classpath}
  javac.test.classpath=\
      ${javac.classpath}:\
-     ${maven.repository}/junit/junit/${junit.version}/junit-${junit.version}.jar:\
-     ${maven.repository}/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar:\
 +    ${maven.repository}/org/opengis/geoapi-conformance/${geoapi.version}/geoapi-conformance-${geoapi.version}.jar:\
      ${maven.repository}/org/apache/derby/derby/${derby.version}/derby-${derby.version}.jar:\
      ${maven.repository}/org/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar:\
      ${maven.repository}/org/hsqldb/hsqldb/${hsqldb.version}/hsqldb-${hsqldb.version}.jar:\
      ${maven.repository}/gov/nist/math/jama/${jama.version}/jama-${jama.version}.jar:\
+     ${maven.repository}/junit/junit/${junit.version}/junit-${junit.version}.jar:\
+     ${maven.repository}/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar:\
 -    ${project.GeoAPI}/dist/geoapi-tests.jar:\
      ${build.classes.dir}
  javac.test.processorpath=\
      ${javac.test.classpath}


Mime
View raw message