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-3.1'. Contains merge and split of modules (no code changes other than those modules refactoring).
Date Tue, 04 Jun 2019 13:40:15 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit 7e0dc419ba938415ec814d68ed94211c655c651f
Merge: dffc143 c74628e
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Tue Jun 4 15:38:51 2019 +0200

    Merge branch 'geoapi-3.1'.  Contains merge and split of modules (no code changes other
than those modules refactoring).

 core/pom.xml                                       |   1 -
 core/sis-feature/pom.xml                           |  35 ++-
 .../java/org/apache/sis/coverage/Category.java     |   2 +-
 .../java/org/apache/sis/coverage/CategoryList.java |   2 +-
 .../org/apache/sis/coverage/ConvertedCategory.java |   0
 .../org/apache/sis/coverage/ConvertedRange.java    |   0
 .../coverage/MismatchedCoverageRangeException.java |   0
 .../org/apache/sis/coverage/SampleDimension.java   |   2 +-
 .../org/apache/sis/coverage/SampleRangeFormat.java |   0
 .../coverage/SubspaceNotSpecifiedException.java    |   0
 .../main/java/org/apache/sis/coverage/ToNaN.java   |   2 +-
 .../sis/coverage/grid/DisjointExtentException.java |   2 +-
 .../sis/coverage/grid/GridCoordinatesView.java     |   0
 .../org/apache/sis/coverage/grid/GridCoverage.java |   0
 .../apache/sis/coverage/grid/GridDerivation.java   |   2 +-
 .../org/apache/sis/coverage/grid/GridExtent.java   |   2 +-
 .../org/apache/sis/coverage/grid/GridGeometry.java |   2 +-
 .../apache/sis/coverage/grid/GridRoundingMode.java |   0
 .../grid/IllegalGridGeometryException.java         |   2 +-
 .../apache/sis/coverage/grid/ImageRenderer.java    |   6 +-
 .../grid/IncompleteGridGeometryException.java      |   0
 .../apache/sis/coverage/grid/PixelTranslation.java |   0
 .../org/apache/sis/coverage/grid/package-info.java |   0
 .../java/org/apache/sis/coverage/package-info.java |   0
 .../java/org/apache/sis/image/DefaultIterator.java |   2 +-
 .../java/org/apache/sis/image/LinearIterator.java  |   2 +-
 .../java/org/apache/sis/image/PixelIterator.java   |   0
 .../java/org/apache/sis/image/SequenceType.java    |   0
 .../java/org/apache/sis/image/TransferType.java    |   0
 .../apache/sis/image/WritablePixelIterator.java    |   2 +-
 .../java/org/apache/sis/image/package-info.java    |   0
 .../internal/coverage/BufferedGridCoverage.java    |   0
 .../sis/internal/coverage}/ColorModelFactory.java  |   2 +-
 .../sis/internal/coverage}/ColorModelPatch.java    |   2 +-
 .../internal/coverage/ConvertedGridCoverage.java   |   2 +-
 .../coverage}/MultiBandsIndexColorModel.java       |   2 +-
 .../sis/internal/coverage}/RasterFactory.java      |   3 +-
 .../sis/internal/coverage}/ScaledColorSpace.java   |   2 +-
 .../apache/sis/internal/coverage/package-info.java |   0
 .../org/apache/sis/internal/feature/Resources.java | 165 ++++++++++
 .../sis/internal/feature/Resources.properties      |  32 ++
 .../sis/internal/feature/Resources_fr.properties   |  35 ++-
 .../org/apache/sis/coverage/CategoryListTest.java  |   0
 .../java/org/apache/sis/coverage/CategoryTest.java |   0
 .../apache/sis/coverage/SampleDimensionTest.java   |   0
 .../sis/coverage/grid/GridDerivationTest.java      |   0
 .../apache/sis/coverage/grid/GridExtentTest.java   |   0
 .../apache/sis/coverage/grid/GridGeometryTest.java |   0
 .../sis/coverage/grid/PixelTranslationTest.java    |   0
 .../org/apache/sis/image/DefaultIteratorTest.java  |   0
 .../java/org/apache/sis/image/ImageTestCase.java   |   0
 .../org/apache/sis/image/LinearIteratorTest.java   |   0
 .../test/java/org/apache/sis/image/TestViewer.java |   0
 .../java/org/apache/sis/image/TiledImageMock.java  |   0
 .../coverage/BufferedGridCoverageTest.java         |   0
 .../internal/coverage}/ScaledColorSpaceTest.java   |   2 +-
 .../apache/sis/test/suite/FeatureTestSuite.java    |  15 +-
 .../org/apache/sis/internal/raster/Resources.java  | 340 ---------------------
 .../sis/internal/raster/Resources.properties       |  53 ----
 .../sis/internal/raster/Resources_fr.properties    |  59 ----
 .../transform/SpecializableTransform1D.txt         |   2 +-
 ide-project/NetBeans/build.xml                     |   3 -
 ide-project/NetBeans/nbproject/build-impl.xml      |  66 ++--
 .../nbproject/{build-impl.xml => build-impl.xml~}  |  66 ++--
 ide-project/NetBeans/nbproject/genfiles.properties |   6 +-
 ide-project/NetBeans/nbproject/project.properties  |   4 +-
 ide-project/NetBeans/nbproject/project.xml         |   4 +-
 pom.xml                                            |   2 +-
 profiles/pom.xml                                   |   8 +
 .../apache/sis/profile/france/package-info.java    |   2 +-
 .../sis-japan-profile}/pom.xml                     |  79 ++---
 .../apache/sis/internal/earth/netcdf/GCOM_C.java   |   3 +-
 .../apache/sis/internal/earth/netcdf/GCOM_W.java   |   0
 .../sis/internal/earth/netcdf/package-info.java    |   0
 .../apache/sis/profile/japan}/package-info.java    |  13 +-
 .../org.apache.sis.internal.netcdf.Convention      |   0
 .../apache/sis/profile/japan/JapanProfileTest.java |  52 ++++
 .../sis/test/suite/JapanProfileTestSuite.java      |  24 +-
 .../org/apache/sis/test/suite/package-info.txt     |   0
 storage/sis-earth-observation/pom.xml              |   6 -
 .../apache/sis/internal/netcdf/RasterResource.java |   2 +-
 storage/sis-storage/pom.xml                        |   5 -
 82 files changed, 481 insertions(+), 646 deletions(-)

diff --cc core/sis-feature/src/main/java/org/apache/sis/image/DefaultIterator.java
index f873993,41ad3c8..b430c60
--- a/core/sis-feature/src/main/java/org/apache/sis/image/DefaultIterator.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/DefaultIterator.java
@@@ -29,7 -29,8 +29,7 @@@ import java.nio.Buffer
  import java.nio.IntBuffer;
  import java.nio.FloatBuffer;
  import java.nio.DoubleBuffer;
- import org.apache.sis.internal.raster.Resources;
 -import org.opengis.coverage.grid.SequenceType;
+ import org.apache.sis.internal.feature.Resources;
  import org.apache.sis.util.resources.Errors;
  import org.apache.sis.util.ArgumentChecks;
  
diff --cc core/sis-feature/src/main/java/org/apache/sis/image/LinearIterator.java
index ab6c190,0a1bd64..386e061
--- a/core/sis-feature/src/main/java/org/apache/sis/image/LinearIterator.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/LinearIterator.java
@@@ -23,7 -23,8 +23,7 @@@ import java.awt.image.RenderedImage
  import java.awt.image.WritableRaster;
  import java.awt.image.WritableRenderedImage;
  import java.awt.image.RasterFormatException;
- import org.apache.sis.internal.raster.Resources;
 -import org.opengis.coverage.grid.SequenceType;
+ import org.apache.sis.internal.feature.Resources;
  
  
  /**
diff --cc ide-project/NetBeans/nbproject/genfiles.properties
index ff6646a,b78aacf..da6ac3c
--- 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=625d92e7
- nbproject/build-impl.xml.script.CRC32=3a1dc6ad
- nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.89.1.48
 -nbproject/build-impl.xml.data.CRC32=8636dfa3
 -nbproject/build-impl.xml.script.CRC32=f4ace637
++nbproject/build-impl.xml.data.CRC32=fb5ce999
++nbproject/build-impl.xml.script.CRC32=1aba96b2
+ nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.91.1.48
diff --cc profiles/sis-japan-profile/pom.xml
index af813dd,ac4b852..9dfc9b6
--- a/profiles/sis-japan-profile/pom.xml
+++ b/profiles/sis-japan-profile/pom.xml
@@@ -27,8 -27,8 +27,8 @@@
  
    <parent>
      <groupId>org.apache.sis</groupId>
-     <artifactId>core</artifactId>
+     <artifactId>profiles</artifactId>
 -    <version>1.x-SNAPSHOT</version>
 +    <version>1.0-SNAPSHOT</version>
    </parent>
  
  


Mime
View raw message