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 JDK9.
Date Wed, 15 Aug 2018 15:46:34 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit d2076f2e5f49d15deaf718624d5752d302e3660b
Merge: 46faa24 879060d
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Wed Aug 15 17:46:12 2018 +0200

    Merge branch 'geoapi-4.0' into JDK9.

 .../apache/sis/internal/book/CodeColorizer.java    | 32 ++++++-------
 .../org/apache/sis/internal/doclet/Doclet.java     |  2 +-
 .../org/apache/sis/internal/doclet/Include.java    |  2 +-
 .../apache/sis/internal/doclet/InlineTaglet.java   |  2 +-
 .../org/apache/sis/internal/doclet/Module.java     |  2 +-
 .../org/apache/sis/internal/doclet/Preformat.java  |  2 +-
 .../org/apache/sis/internal/doclet/Rewriter.java   |  2 +-
 .../apache/sis/internal/doclet/package-info.java   |  2 +-
 .../org/apache/sis/feature/DefaultFeatureType.java |  2 +-
 .../apache/sis/internal/jaxb/gco/PropertyType.java |  2 +-
 .../sis/internal/metadata/sql/Initializer.java     | 55 +++++++++++++++++++++-
 .../org/apache/sis/metadata/sql/Installer.java     | 13 ++++-
 .../org/apache/sis/metadata/sql/Contents.sql       | 36 ++++++++++++++
 .../org/apache/sis/metadata/sql/Metadata.sql       | 15 ++++++
 .../org/apache/sis/metadata/sql/Referencing.sql    | 25 ++++++++++
 .../internal/jaxb/cat/CodeListMarshallingTest.java | 18 +++----
 .../sis/internal/jaxb/cat/EnumMarshallingTest.java |  6 +--
 .../sis/internal/jaxb/lan/LanguageCodeTest.java    |  2 +-
 .../sis/internal/jaxb/lan/PT_LocaleTest.java       |  2 +-
 .../apache/sis/metadata/iso/MarshallingTest.java   |  2 +-
 .../extent/DefaultGeographicBoundingBoxTest.java   |  2 +-
 .../gazetteer/MilitaryGridReferenceSystem.java     |  6 +--
 .../gazetteer/MilitaryGridReferenceSystemTest.java |  2 +-
 .../apache/sis/referencing/IdentifiedObjects.java  |  4 +-
 .../sis/referencing/datum/BursaWolfParameters.java |  8 ++--
 .../sis/referencing/datum/DefaultEllipsoid.java    |  2 +-
 .../factory/ConcurrentAuthorityFactory.java        |  2 +-
 .../factory/IdentifiedObjectFinder.java            |  8 ++--
 .../referencing/factory/sql/EPSGDataAccess.java    |  2 +-
 .../operation/CoordinateOperationRegistry.java     |  2 +-
 .../operation/builder/LinearTransformBuilder.java  |  2 +-
 .../operation/builder/TransformBuilder.java        |  2 +-
 .../operation/matrix/GeneralMatrix.java            |  2 +-
 .../operation/projection/ConformalProjection.java  |  2 +-
 .../referencing/operation/projection/Mercator.java |  2 +-
 .../operation/projection/NormalizedProjection.java |  2 +-
 .../transform/AbstractLinearTransform.java         |  2 +-
 .../operation/transform/AbstractMathTransform.java |  2 +-
 .../operation/transform/ConcatenatedTransform.java |  2 +-
 .../transform/EllipsoidToCentricTransform.java     |  2 +-
 .../datum/DefaultVerticalDatumTest.java            |  2 +-
 .../operation/CoordinateOperationFinderTest.java   |  2 +-
 .../builder/LocalizationGridBuilderTest.java       |  2 +-
 .../operation/matrix/MatrixTestCase.java           |  6 +--
 .../projection/MercatorMethodComparison.java       |  2 +-
 .../projection/ProjectionResultComparator.java     |  4 +-
 .../operation/transform/CoordinateDomainTest.java  |  4 +-
 .../operation/transform/CopyTransformTest.java     |  2 +-
 .../transform/InterpolatedTransformTest.java       |  2 +-
 .../transform/MolodenskyTransformTest.java         |  4 +-
 .../sis/test/integration/ConsistencyTest.java      |  2 +-
 .../sis/referencing/operation/Conversion.xml       |  4 +-
 .../org/apache/sis/internal/system/Loggers.java    |  2 +-
 .../org/apache/sis/internal/util/DoubleDouble.java |  6 +--
 .../org/apache/sis/internal/util/Numerics.java     |  6 +--
 .../java/org/apache/sis/math/DecimalFunctions.java |  6 +--
 .../main/java/org/apache/sis/math/Statistics.java  |  2 +-
 .../src/main/java/org/apache/sis/math/Vector.java  |  2 +-
 .../main/java/org/apache/sis/measure/Prefixes.java |  2 +-
 .../java/org/apache/sis/measure/UnitFormat.java    |  4 +-
 .../main/java/org/apache/sis/measure/Units.java    | 14 +++---
 .../java/org/apache/sis/measure/package-info.java  | 33 +++++++++++++
 .../java/org/apache/sis/util/ComparisonMode.java   |  4 +-
 .../main/java/org/apache/sis/util/Utilities.java   |  6 +--
 .../apache/sis/util/collection/CodeListSet.java    |  2 +-
 .../apache/sis/util/logging/MonolineFormatter.java |  2 +-
 .../sis/util/resources/IndexedResourceBundle.java  |  2 +-
 .../apache/sis/internal/util/DoubleDoubleTest.java |  4 +-
 .../src/test/java/org/apache/sis/test/Assert.java  |  6 +--
 .../sis/util/collection/WeakValueHashMapTest.java  |  2 +-
 ide-project/NetBeans/build.xml                     | 10 ++++
 ide-project/NetBeans/nbproject/project.properties  |  2 +-
 pom.xml                                            |  6 +--
 .../org/apache/sis/storage/geotiff/CRSBuilder.java |  2 +-
 .../apache/sis/storage/netcdf/MetadataReader.java  |  2 +-
 .../shapefile/jdbc/connection/DBFConnection.java   |  2 +-
 .../jdbc/resultset/AbstractResultSet.java          |  2 +-
 .../shapefile/jdbc/statement/DBFStatement.java     |  4 +-
 .../sis/internal/storage/MetadataBuilder.java      |  2 +-
 79 files changed, 317 insertions(+), 138 deletions(-)

diff --cc core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakValueHashMapTest.java
index 38c3749,92160d8..c1688ff
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakValueHashMapTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakValueHashMapTest.java
@@@ -106,8 -106,9 +106,8 @@@ public final strictfp class WeakValueHa
       * Implementation of the {@link #testWeakReferences()} method,
       * to be reused by {@link CacheTest}.
       *
-      * @param weakMap The map implementation to test.
+      * @param weakMap  the map implementation to test.
       */
 -    @SuppressWarnings("UnnecessaryBoxing")
      static void testWeakReferences(final Map<Integer,Integer> weakMap) throws InterruptedException
{
          final Random random = new Random();
          for (int pass=0; pass<NUM_RETRY; pass++) {


Mime
View raw message