(sis) branch main updated (8783e66c1f -> ed9308d56c)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from 8783e66c1f Merge branch 'geoapi-3.1' add 34f2e7c373 Add more classes or packages to qualify as test dependencies when organizing import statements. add b4fbe3c1d5 Remove NullArgumentException. https://issues.apache.org/jira/browse/SIS-562 add a7331c907e Remove the deprecated `InterpolatedMolodenskyTransform` class. add 4956bf7511 Following the removal of `InterpolatedMolodenskyTransform`, retrofit `MolodenskyFormula` into `MolodenskyTransform`. add c4a3614aa0 Remove deprecated methods. add dc7ec34832 Remove the @since and @version javadoc tags in incubator modules. Those tags are relevant only for classes and members in public API. add 65b60e8471 Minor formatting: fix a few spelling errors in comments, add comments about non-endorsed modules, adjust some white spaces. add c586f3e587 Replace "..." by Previous form was a wrong usage of HTML tag. add 374dc41dd6 Deprecate `DefaultRecordSchema` for removal. add 3afc7a15bf Resolve a few warnings. add 0a72e06db9 Merge branch 'geoapi-4.0' into geoapi-3.1 new ed9308d56c Merge branch 'geoapi-3.1' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../sis/buildtools/coding/ReorganizeImports.java | 31 +- endorsed/build.gradle.kts | 2 +- .../main/org/apache/sis/console/CommandRunner.java | 2 +- .../org.apache.sis.feature/main/module-info.java | 2 +- .../main/org/apache/sis/coverage/Category.java | 2 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 7 +- .../org/apache/sis/coverage/grid/package-info.java | 2 +- .../org/apache/sis/feature/AbstractAttribute.java | 2 +- .../apache/sis/feature/AbstractIdentifiedType.java | 8 +- .../apache/sis/feature/DefaultAssociationRole.java | 2 +- .../apache/sis/feature/DefaultAttributeType.java | 4 +- .../sis/feature/builder/AttributeTypeBuilder.java | 4 +- .../apache/sis/feature/builder/TypeBuilder.java| 13 +- .../apache/sis/feature/builder/package-info.java | 2 +- .../sis/geometry/wrapper/GeometryWrapper.java | 5 +- .../main/org/apache/sis/image/Colorizer.java | 4 +- .../main/org/apache/sis/image/ImageProcessor.java | 151 +-- .../main/org/apache/sis/image/Visualization.java | 12 - .../main/org/apache/sis/image/package-info.java| 2 +- .../org.apache.sis.metadata/main/module-info.java | 4 +- .../apache/sis/metadata/internal/AxisNames.java| 48 +- .../apache/sis/metadata/internal/NameMeaning.java | 2 +- .../sis/metadata/internal/ReferencingServices.java | 2 +- .../apache/sis/metadata/iso/DefaultMetadata.java | 88 +--- .../sis/metadata/iso/citation/Citations.java | 12 +- .../iso/constraint/DefaultConstraints.java | 6 +- .../metadata/iso/distribution/DefaultFormat.java | 2 +- .../iso/extent/DefaultGeographicBoundingBox.java | 4 +- .../iso/extent/DefaultGeographicDescription.java | 6 +- .../apache/sis/metadata/iso/extent/Extents.java| 4 +- .../org/apache/sis/metadata/iso/package-info.java | 2 +- .../apache/sis/util/iso/DefaultRecordSchema.java | 5 +- .../org/apache/sis/util/iso/DefaultRecordType.java | 57 +-- .../main/org/apache/sis/util/iso/Types.java| 2 +- .../main/org/apache/sis/util/iso/package-info.java | 2 +- .../main/org/apache/sis/xml/bind/Context.java | 2 +- .../test/org/apache/sis/metadata/TreeNodeTest.java | 6 +- .../sis/openoffice/ReferencingFunctions.java | 4 +- .../org/apache/sis/openoffice/XReferencing.java| 4 +- .../referencing/gazetteer/FinalLocationType.java | 12 +- .../gazetteer/ModifiableLocationType.java | 12 +- .../main/module-info.java | 2 +- .../main/org/apache/sis/io/wkt/Convention.java | 2 +- .../main/org/apache/sis/io/wkt/Formatter.java | 4 +- .../org/apache/sis/io/wkt/MathTransformParser.java | 4 +- .../main/org/apache/sis/io/wkt/StoredTree.java | 4 +- .../main/org/apache/sis/io/wkt/Transliterator.java | 30 +- .../main/org/apache/sis/io/wkt/package-info.java | 4 +- .../parameter/DefaultParameterDescriptorGroup.java | 4 +- .../sis/parameter/DefaultParameterValue.java | 4 +- .../org/apache/sis/parameter/ParameterBuilder.java | 10 +- .../org/apache/sis/parameter/TensorParameters.java | 2 +- .../sis/referencing/AbstractIdentifiedObject.java | 12 +- .../main/org/apache/sis/referencing/Builder.java | 10 +- .../main/org/apache/sis/referencing/CRS.java | 6 +- .../main/org/apache/sis/referencing/CommonCRS.java | 6 +-
(sis) 01/01: Merge branch 'geoapi-3.1'
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/sis.git commit ed9308d56ca9d5a4ea42c66936d54bc6f362a4c6 Merge: 8783e66c1f 0a72e06db9 Author: Martin Desruisseaux AuthorDate: Sun Oct 29 18:54:28 2023 +0100 Merge branch 'geoapi-3.1' .../sis/buildtools/coding/ReorganizeImports.java | 31 +- endorsed/build.gradle.kts | 2 +- .../main/org/apache/sis/console/CommandRunner.java | 2 +- .../org.apache.sis.feature/main/module-info.java | 2 +- .../main/org/apache/sis/coverage/Category.java | 2 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 7 +- .../org/apache/sis/coverage/grid/package-info.java | 2 +- .../org/apache/sis/feature/AbstractAttribute.java | 2 +- .../apache/sis/feature/AbstractIdentifiedType.java | 8 +- .../apache/sis/feature/DefaultAssociationRole.java | 2 +- .../apache/sis/feature/DefaultAttributeType.java | 4 +- .../sis/feature/builder/AttributeTypeBuilder.java | 4 +- .../apache/sis/feature/builder/TypeBuilder.java| 13 +- .../apache/sis/feature/builder/package-info.java | 2 +- .../sis/geometry/wrapper/GeometryWrapper.java | 5 +- .../main/org/apache/sis/image/Colorizer.java | 4 +- .../main/org/apache/sis/image/ImageProcessor.java | 151 +-- .../main/org/apache/sis/image/Visualization.java | 12 - .../main/org/apache/sis/image/package-info.java| 2 +- .../org.apache.sis.metadata/main/module-info.java | 4 +- .../apache/sis/metadata/internal/AxisNames.java| 48 +- .../apache/sis/metadata/internal/NameMeaning.java | 2 +- .../sis/metadata/internal/ReferencingServices.java | 2 +- .../apache/sis/metadata/iso/DefaultMetadata.java | 88 +--- .../sis/metadata/iso/citation/Citations.java | 12 +- .../iso/constraint/DefaultConstraints.java | 6 +- .../metadata/iso/distribution/DefaultFormat.java | 2 +- .../iso/extent/DefaultGeographicBoundingBox.java | 4 +- .../iso/extent/DefaultGeographicDescription.java | 6 +- .../apache/sis/metadata/iso/extent/Extents.java| 4 +- .../org/apache/sis/metadata/iso/package-info.java | 2 +- .../apache/sis/util/iso/DefaultRecordSchema.java | 5 +- .../org/apache/sis/util/iso/DefaultRecordType.java | 57 +-- .../main/org/apache/sis/util/iso/Types.java| 2 +- .../main/org/apache/sis/util/iso/package-info.java | 2 +- .../main/org/apache/sis/xml/bind/Context.java | 2 +- .../test/org/apache/sis/metadata/TreeNodeTest.java | 6 +- .../sis/openoffice/ReferencingFunctions.java | 4 +- .../org/apache/sis/openoffice/XReferencing.java| 4 +- .../referencing/gazetteer/FinalLocationType.java | 12 +- .../gazetteer/ModifiableLocationType.java | 12 +- .../main/module-info.java | 2 +- .../main/org/apache/sis/io/wkt/Convention.java | 2 +- .../main/org/apache/sis/io/wkt/Formatter.java | 4 +- .../org/apache/sis/io/wkt/MathTransformParser.java | 4 +- .../main/org/apache/sis/io/wkt/StoredTree.java | 4 +- .../main/org/apache/sis/io/wkt/Transliterator.java | 30 +- .../main/org/apache/sis/io/wkt/package-info.java | 4 +- .../parameter/DefaultParameterDescriptorGroup.java | 4 +- .../sis/parameter/DefaultParameterValue.java | 4 +- .../org/apache/sis/parameter/ParameterBuilder.java | 10 +- .../org/apache/sis/parameter/TensorParameters.java | 2 +- .../sis/referencing/AbstractIdentifiedObject.java | 12 +- .../main/org/apache/sis/referencing/Builder.java | 10 +- .../main/org/apache/sis/referencing/CRS.java | 6 +- .../main/org/apache/sis/referencing/CommonCRS.java | 6 +- .../apache/sis/referencing/IdentifiedObjects.java | 4 +- .../apache/sis/referencing/NamedIdentifier.java| 2 +- .../sis/referencing/crs/DefaultDerivedCRS.java | 2 +- .../apache/sis/referencing/cs/AxesConvention.java | 2 +- .../org/apache/sis/referencing/cs/AxisFilter.java | 4 +- .../sis/referencing/cs/CoordinateSystems.java | 12 +- .../cs/DefaultCoordinateSystemAxis.java| 16 +- .../sis/referencing/cs/DirectionAlongMeridian.java | 8 +- .../sis/referencing/datum/DatumShiftGrid.java | 2 +- .../referencing/datum/DefaultGeodeticDatum.java| 4 +- .../factory/CommonAuthorityFactory.java| 4 +- .../factory/IdentifiedObjectFinder.java| 2 +- .../referencing/factory/IdentifiedObjectSet.java | 2 +- .../referencing/factory/sql/EPSGDataAccess.java| 6 +- .../sis/referencing/factory/sql/package-info.java | 4 +- .../sis/referencing/internal/DeprecatedCode.java | 2 +- .../sis/referencing/internal/DeprecatedName.java | 2 +- .../operation/CoordinateOperationContext.java | 6 +- .../operation/CoordinateOperationRegistry.java | 2 +- .../DefaultCoordinateOperationFactory.java | 7 +-
(sis) branch geoapi-3.1 updated (e0f5cfa3ec -> 0a72e06db9)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from e0f5cfa3ec Merge branch 'geoapi-4.0' into geoapi-3.1 add 34f2e7c373 Add more classes or packages to qualify as test dependencies when organizing import statements. add b4fbe3c1d5 Remove NullArgumentException. https://issues.apache.org/jira/browse/SIS-562 add a7331c907e Remove the deprecated `InterpolatedMolodenskyTransform` class. add 4956bf7511 Following the removal of `InterpolatedMolodenskyTransform`, retrofit `MolodenskyFormula` into `MolodenskyTransform`. add c4a3614aa0 Remove deprecated methods. add dc7ec34832 Remove the @since and @version javadoc tags in incubator modules. Those tags are relevant only for classes and members in public API. add 65b60e8471 Minor formatting: fix a few spelling errors in comments, add comments about non-endorsed modules, adjust some white spaces. add c586f3e587 Replace "..." by Previous form was a wrong usage of HTML tag. add 374dc41dd6 Deprecate `DefaultRecordSchema` for removal. add 3afc7a15bf Resolve a few warnings. new 0a72e06db9 Merge branch 'geoapi-4.0' into geoapi-3.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../sis/buildtools/coding/ReorganizeImports.java | 31 +- endorsed/build.gradle.kts | 2 +- .../main/org/apache/sis/console/CommandRunner.java | 2 +- .../org.apache.sis.feature/main/module-info.java | 2 +- .../main/org/apache/sis/coverage/Category.java | 2 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 7 +- .../org/apache/sis/coverage/grid/package-info.java | 2 +- .../org/apache/sis/feature/AbstractAttribute.java | 2 +- .../apache/sis/feature/AbstractIdentifiedType.java | 8 +- .../apache/sis/feature/DefaultAssociationRole.java | 2 +- .../apache/sis/feature/DefaultAttributeType.java | 4 +- .../sis/feature/builder/AttributeTypeBuilder.java | 4 +- .../apache/sis/feature/builder/TypeBuilder.java| 13 +- .../apache/sis/feature/builder/package-info.java | 2 +- .../sis/geometry/wrapper/GeometryWrapper.java | 5 +- .../main/org/apache/sis/image/Colorizer.java | 4 +- .../main/org/apache/sis/image/ImageProcessor.java | 151 +-- .../main/org/apache/sis/image/Visualization.java | 12 - .../main/org/apache/sis/image/package-info.java| 2 +- .../org.apache.sis.metadata/main/module-info.java | 4 +- .../apache/sis/metadata/internal/AxisNames.java| 48 +- .../apache/sis/metadata/internal/NameMeaning.java | 2 +- .../sis/metadata/internal/ReferencingServices.java | 2 +- .../apache/sis/metadata/iso/DefaultMetadata.java | 88 +--- .../sis/metadata/iso/citation/Citations.java | 12 +- .../iso/constraint/DefaultConstraints.java | 6 +- .../metadata/iso/distribution/DefaultFormat.java | 2 +- .../iso/extent/DefaultGeographicBoundingBox.java | 4 +- .../iso/extent/DefaultGeographicDescription.java | 6 +- .../apache/sis/metadata/iso/extent/Extents.java| 4 +- .../org/apache/sis/metadata/iso/package-info.java | 2 +- .../apache/sis/util/iso/DefaultRecordSchema.java | 5 +- .../org/apache/sis/util/iso/DefaultRecordType.java | 57 +-- .../main/org/apache/sis/util/iso/Types.java| 2 +- .../main/org/apache/sis/util/iso/package-info.java | 2 +- .../main/org/apache/sis/xml/bind/Context.java | 2 +- .../test/org/apache/sis/metadata/TreeNodeTest.java | 6 +- .../sis/openoffice/ReferencingFunctions.java | 4 +- .../org/apache/sis/openoffice/XReferencing.java| 4 +- .../referencing/gazetteer/FinalLocationType.java | 12 +- .../gazetteer/ModifiableLocationType.java | 12 +- .../main/module-info.java | 2 +- .../main/org/apache/sis/io/wkt/Convention.java | 2 +- .../main/org/apache/sis/io/wkt/Formatter.java | 4 +- .../org/apache/sis/io/wkt/MathTransformParser.java | 4 +- .../main/org/apache/sis/io/wkt/StoredTree.java | 4 +- .../main/org/apache/sis/io/wkt/Transliterator.java | 30 +- .../main/org/apache/sis/io/wkt/package-info.java | 4 +- .../parameter/DefaultParameterDescriptorGroup.java | 4 +- .../sis/parameter/DefaultParameterValue.java | 4 +- .../org/apache/sis/parameter/ParameterBuilder.java | 10 +- .../org/apache/sis/parameter/TensorParameters.java | 2 +- .../sis/referencing/AbstractIdentifiedObject.java | 12 +- .../main/org/apache/sis/referencing/Builder.java | 10 +- .../main/org/apache/sis/referencing/CRS.java | 6 +- .../main/org/apache/sis/referencing/CommonCRS.java | 6 +-
(sis) 05/06: Resolve a few warnings.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 3afc7a15bfc1d21333bf0241c918da7878d41d54
Author: Martin Desruisseaux
AuthorDate: Sun Oct 29 18:39:12 2023 +0100
Resolve a few warnings.
---
endorsed/build.gradle.kts | 2 +-
.../main/org/apache/sis/io/stream/OutputStreamAdapter.java| 2 +-
optional/src/org.apache.sis.gui/bundle/README | 2 +-
.../main/org/apache/sis/gui/controls/TabularWidget.java | 2 +-
.../main/org/apache/sis/gui/coverage/BandRangeTable.java | 2 +-
.../main/org/apache/sis/gui/coverage/CoverageStyling.java | 2 +-
.../main/org/apache/sis/gui/coverage/ImagePropertyExplorer.java | 4 ++--
.../main/org/apache/sis/gui/dataset/FeatureTable.java | 2 +-
.../org.apache.sis.gui/main/org/apache/sis/gui/dataset/LogViewer.java | 2 +-
.../main/org/apache/sis/gui/internal/FixedHeaderColumnSize.java | 4 ++--
.../main/org/apache/sis/gui/metadata/MetadataTree.java| 2 +-
.../main/org/apache/sis/gui/referencing/CRSChooser.java | 2 +-
12 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/endorsed/build.gradle.kts b/endorsed/build.gradle.kts
index abf77b66cc..380a387a90 100644
--- a/endorsed/build.gradle.kts
+++ b/endorsed/build.gradle.kts
@@ -58,7 +58,7 @@ dependencies {
api(libs.jaxb.api)
// Optional dependencies
-runtimeOnly(libs.jaxb.impl)
+api(libs.jaxb.impl) // Actually runtime only, but declared
as API for avoiding compiler warnings.
compileOnly(libs.jts.core)
compileOnly(libs.esri.geometry)
compileOnly(libs.libreoffice)
diff --git
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/OutputStreamAdapter.java
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/OutputStreamAdapter.java
index efa982cc4a..25b6831e67 100644
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/OutputStreamAdapter.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/OutputStreamAdapter.java
@@ -52,7 +52,7 @@ final class OutputStreamAdapter extends OutputStream
implements Markable {
*/
@Override
public void write(final int b) throws IOException {
-output.write(b);
+output.writeByte(b);
}
/**
diff --git a/optional/src/org.apache.sis.gui/bundle/README
b/optional/src/org.apache.sis.gui/bundle/README
index b93a37074b..950807eb18 100644
--- a/optional/src/org.apache.sis.gui/bundle/README
+++ b/optional/src/org.apache.sis.gui/bundle/README
@@ -15,7 +15,7 @@ Installation
For developing applications using the SIS library or for using on command-line,
the only requirement is Java 11 or later. For launching the desktop
application,
-requirements are Java 16 or later and JavaFX 13 or later.
+requirements are Java 16 or later and JavaFX 20 or later.
1) Unzip `apache-sis-1.4-bin.zip` in any directory.
2) Invoke `./apache-sis-1.4/bin/sis` for the command-line.
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/TabularWidget.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/TabularWidget.java
index baa5c86bb2..0843a18e3d 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/TabularWidget.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/TabularWidget.java
@@ -51,7 +51,7 @@ abstract class TabularWidget extends Widget {
*/
static TableView newTable() {
TableView table = new TableView<>();
-table.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
+
table.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN);
table.setEditable(true);
return table;
}
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/BandRangeTable.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/BandRangeTable.java
index 4b22b8194c..43070574a1 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/BandRangeTable.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/BandRangeTable.java
@@ -71,7 +71,7 @@ final class BandRangeTable implements
Callback create(final Vocabulary vocabulary) {
final TableView table = new TableView<>();
table.setPrefHeight(NUM_VISIBLE_ROW * Styles.ROW_HEIGHT);
-table.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
+
table.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN);
table.getColumns().setAll(
createStringColumn(vocabulary, Vocabulary.Keys.Name,NAME),
createNumberColumn(vocabulary, Vocabulary.Keys.Minimum,
MINIMUM),
diff --git
(sis) 02/06: Minor formatting: fix a few spelling errors in comments, add comments about non-endorsed modules, adjust some white spaces.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 65b60e8471794794e6fd86999808b4f772ac1b1f
Author: Martin Desruisseaux
AuthorDate: Sun Oct 29 15:14:00 2023 +0100
Minor formatting: fix a few spelling errors in comments,
add comments about non-endorsed modules, adjust some white spaces.
---
.../main/org/apache/sis/coverage/Category.java | 2 +-
.../org.apache.sis.metadata/main/module-info.java | 2 +-
.../sis/storage/geotiff/writer/GeoEncoder.java | 2 +-
.../src/org.apache.sis.util/main/module-info.java | 12 +++---
.../storage/coveragejson/CoverageJsonStore.java| 9 ++---
.../sis/storage/coveragejson/CoverageResource.java | 46 +-
.../storage/coveragejson/binding/Parameters.java | 2 +-
.../sis/storage/coveragejson/package-info.java | 2 +-
8 files changed, 32 insertions(+), 45 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/Category.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/Category.java
index c305f2bdb2..6569b0c9cf 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/Category.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/Category.java
@@ -49,7 +49,7 @@ import static java.lang.Double.doubleToRawLongBits;
* Example of quantitative observation:
* another sample dimension may have a {@code Category} instance specifying
that sample values in the range [0…100]
* stands for elevation data. Those sample values are related to
measurements in the real world (altitudes in metres)
- * through a transfer function, foe example altitude
= (sample value)×100 - 25.
+ * through a transfer function, for example altitude
= (sample value)×100 - 25.
*
*
* Some image mixes both qualitative and quantitative categories. For example,
images of Sea Surface Temperature
diff --git a/endorsed/src/org.apache.sis.metadata/main/module-info.java
b/endorsed/src/org.apache.sis.metadata/main/module-info.java
index 8c23031110..76bb50ec4c 100644
--- a/endorsed/src/org.apache.sis.metadata/main/module-info.java
+++ b/endorsed/src/org.apache.sis.metadata/main/module-info.java
@@ -150,7 +150,7 @@ module org.apache.sis.metadata {
exports org.apache.sis.metadata.sql.util to
org.apache.sis.referencing,
org.apache.sis.storage.sql,
-org.apache.sis.referencing.database;
+org.apache.sis.referencing.database;// In the "non-free"
subproject.
exports org.apache.sis.metadata.simple to
org.apache.sis.referencing,
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/writer/GeoEncoder.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/writer/GeoEncoder.java
index 4774e5b3ea..c85ffcfa28 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/writer/GeoEncoder.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/writer/GeoEncoder.java
@@ -631,7 +631,7 @@ public final class GeoEncoder {
*
* @param value the value to cast to an unsigned short.
* @return the value as an unsigned short.
- * @throws ArithmeticException if the given value can not be stored as an
unsigned 16 bits integer.
+ * @throws ArithmeticException if the given value cannot be stored as an
unsigned 16 bits integer.
*
* @see #toShortEPSG(Integer)
*/
diff --git a/endorsed/src/org.apache.sis.util/main/module-info.java
b/endorsed/src/org.apache.sis.util/main/module-info.java
index 4f83c5a36f..dd5262f706 100644
--- a/endorsed/src/org.apache.sis.util/main/module-info.java
+++ b/endorsed/src/org.apache.sis.util/main/module-info.java
@@ -113,8 +113,8 @@ module org.apache.sis.util {
org.apache.sis.console,
org.apache.sis.openoffice,
org.apache.sis.gui, // In the "optional"
sub-project.
-org.apache.sis.referencing.epsg,
-org.apache.sis.referencing.database;
+org.apache.sis.referencing.epsg,// In the "non-free"
sub-project.
+org.apache.sis.referencing.database;// In the "non-free"
sub-project.
exports org.apache.sis.util.internal to
org.apache.sis.metadata,
@@ -132,8 +132,8 @@ module org.apache.sis.util {
org.apache.sis.cloud.aws,
org.apache.sis.console,
org.apache.sis.gui, // In the "optional"
sub-project.
-org.apache.sis.referencing.epsg,
-org.apache.sis.referencing.database;
+org.apache.sis.referencing.epsg,// In the "non-free"
sub-project.
+org.apache.sis.referencing.database;// In the
(sis) 01/06: Remove the @since and @version javadoc tags in incubator modules. Those tags are relevant only for classes and members in public API.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit dc7ec34832914fff0cf91ec427b12496e9661589
Author: Martin Desruisseaux
AuthorDate: Sun Oct 29 14:55:08 2023 +0100
Remove the @since and @version javadoc tags in incubator modules.
Those tags are relevant only for classes and members in public API.
---
incubator/src/org.apache.sis.cql/main/module-info.java | 2 --
incubator/src/org.apache.sis.storage.shapefile/main/module-info.java | 2 --
.../main/org/apache/sis/storage/shapefile/DataStoreQueryException.java | 2 --
.../apache/sis/storage/shapefile/DataStoreQueryResultException.java| 2 --
.../org/apache/sis/storage/shapefile/DbaseFileNotFoundException.java | 2 --
.../main/org/apache/sis/storage/shapefile/InputFeatureStream.java | 2 --
.../apache/sis/storage/shapefile/InvalidDbaseFileFormatException.java | 2 --
.../apache/sis/storage/shapefile/InvalidShapefileFormatException.java | 2 --
.../main/org/apache/sis/storage/shapefile/ShapeFile.java | 3 ---
.../main/org/apache/sis/storage/shapefile/ShapeTypeEnum.java | 3 ---
.../org/apache/sis/storage/shapefile/ShapefileNotFoundException.java | 2 --
.../main/org/apache/sis/storage/shapefile/cpg/CpgFiles.java| 2 --
.../main/org/apache/sis/storage/shapefile/package-info.java| 2 --
incubator/src/org.apache.sis.test.incubator/test/module-info.java | 2 --
.../main/org/apache/sis/services/OSGiActivator.java| 2 --
.../main/org/apache/sis/services/ServletListener.java | 2 --
16 files changed, 34 deletions(-)
diff --git a/incubator/src/org.apache.sis.cql/main/module-info.java
b/incubator/src/org.apache.sis.cql/main/module-info.java
index 97d51b54e5..4307e9c627 100644
--- a/incubator/src/org.apache.sis.cql/main/module-info.java
+++ b/incubator/src/org.apache.sis.cql/main/module-info.java
@@ -19,8 +19,6 @@
* CQL parser.
*
* @author Johann Sorel (Geomatys)
- * @version 1.4
- * @since 1.1
*/
module org.apache.sis.cql {
requires transitive org.apache.sis.feature;
diff --git
a/incubator/src/org.apache.sis.storage.shapefile/main/module-info.java
b/incubator/src/org.apache.sis.storage.shapefile/main/module-info.java
index 1a2171b427..7a525d550b 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/module-info.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/module-info.java
@@ -20,8 +20,6 @@
*
* @author Travis L. Pinney
* @author Marc Le Bihan
- * @version 0.5
- * @since 0.5
*/
module org.apache.sis.storage.shapefile {
requires java.sql;
diff --git
a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/DataStoreQueryException.java
b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/DataStoreQueryException.java
index a1dc0b8879..6a0a51b954 100644
---
a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/DataStoreQueryException.java
+++
b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/DataStoreQueryException.java
@@ -26,8 +26,6 @@ import org.apache.sis.storage.DataStoreException;
* not yet target for any Apache SIS release at this time.
*
* @author Marc Le Bihan
- * @version 0.6
- * @since 0.6
*/
public class DataStoreQueryException extends DataStoreException {
/** Serial UID. */
diff --git
a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/DataStoreQueryResultException.java
b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/DataStoreQueryResultException.java
index a957fc6958..6e18addd20 100644
---
a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/DataStoreQueryResultException.java
+++
b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/DataStoreQueryResultException.java
@@ -26,8 +26,6 @@ import org.apache.sis.storage.DataStoreException;
* not yet target for any Apache SIS release at this time.
*
* @author Marc Le Bihan
- * @version 0.6
- * @since 0.6
*/
public class DataStoreQueryResultException extends DataStoreException {
/** Serial UID. */
diff --git
a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/DbaseFileNotFoundException.java
b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/DbaseFileNotFoundException.java
index 88197b2008..ad1aeceb4d 100644
---
a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/DbaseFileNotFoundException.java
+++
b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/DbaseFileNotFoundException.java
@@ -26,8 +26,6 @@ import
(sis) branch geoapi-4.0 updated (c4a3614aa0 -> 0de784f0e4)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git from c4a3614aa0 Remove deprecated methods. new dc7ec34832 Remove the @since and @version javadoc tags in incubator modules. Those tags are relevant only for classes and members in public API. new 65b60e8471 Minor formatting: fix a few spelling errors in comments, add comments about non-endorsed modules, adjust some white spaces. new c586f3e587 Replace "..." by Previous form was a wrong usage of HTML tag. new 374dc41dd6 Deprecate `DefaultRecordSchema` for removal. new 3afc7a15bf Resolve a few warnings. new 0de784f0e4 Reorganize import statements with a better separation of test dependencies. The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: endorsed/build.gradle.kts | 2 +- .../main/org/apache/sis/console/CommandRunner.java | 2 +- .../main/org/apache/sis/coverage/Category.java | 2 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 2 +- .../org/apache/sis/feature/AbstractAttribute.java | 2 +- .../apache/sis/feature/AbstractIdentifiedType.java | 8 +-- .../apache/sis/feature/DefaultAssociationRole.java | 2 +- .../apache/sis/feature/DefaultAttributeType.java | 4 +- .../sis/feature/builder/AttributeTypeBuilder.java | 4 +- .../apache/sis/feature/builder/TypeBuilder.java| 6 +-- .../main/org/apache/sis/image/Colorizer.java | 4 +- .../grid/BandAggregateGridCoverageTest.java| 4 +- .../coverage/grid/ConvertedGridCoverageTest.java | 6 +-- .../coverage/grid/DimensionalityReductionTest.java | 2 +- .../sis/coverage/grid/GridCoverage2DTest.java | 4 +- .../sis/coverage/grid/GridCoverageBuilderTest.java | 2 +- .../sis/coverage/grid/GridDerivationTest.java | 8 +-- .../apache/sis/coverage/grid/GridExtentTest.java | 2 +- .../apache/sis/coverage/grid/GridGeometryTest.java | 8 +-- .../coverage/grid/ResampledGridCoverageTest.java | 8 +-- .../sis/coverage/grid/ReshapedImageTest.java | 6 +-- .../coverage/grid/TranslatedGridCoverageTest.java | 2 +- .../apache/sis/feature/EnvelopeOperationTest.java | 2 +- .../apache/sis/feature/FeatureOperationsTest.java | 6 +-- .../feature/builder/FeatureTypeBuilderTest.java| 8 +-- .../feature/internal/AttributeConventionTest.java | 2 +- .../sis/filter/BinarySpatialFilterTestCase.java| 4 +- .../apache/sis/filter/sqlmm/RegistryTestCase.java | 4 +- .../org/apache/sis/filter/sqlmm/SQLMMTest.java | 2 +- .../sis/geometry/wrapper/GeometriesTestCase.java | 4 +- .../org/apache/sis/image/ResamplingGridTest.java | 4 +- .../org.apache.sis.metadata/main/module-info.java | 2 +- .../apache/sis/metadata/internal/AxisNames.java| 48 +- .../apache/sis/metadata/internal/NameMeaning.java | 2 +- .../sis/metadata/internal/ReferencingServices.java | 2 +- .../sis/metadata/iso/citation/Citations.java | 12 ++--- .../iso/constraint/DefaultConstraints.java | 6 +-- .../metadata/iso/distribution/DefaultFormat.java | 2 +- .../iso/extent/DefaultGeographicBoundingBox.java | 4 +- .../iso/extent/DefaultGeographicDescription.java | 6 +-- .../apache/sis/metadata/iso/extent/Extents.java| 4 +- .../apache/sis/util/iso/DefaultRecordSchema.java | 5 +- .../org/apache/sis/util/iso/DefaultRecordType.java | 57 +++--- .../main/org/apache/sis/util/iso/Types.java| 2 +- .../main/org/apache/sis/util/iso/package-info.java | 2 +- .../main/org/apache/sis/xml/bind/Context.java | 2 +- .../apache/sis/metadata/MetadataCopierTest.java| 4 +- .../apache/sis/metadata/MetadataStandardTest.java | 6 +-- .../apache/sis/metadata/PropertyAccessorTest.java | 14 +++--- .../sis/metadata/PropertyInformationTest.java | 2 +- .../org/apache/sis/metadata/SpecialCasesTest.java | 6 +-- .../test/org/apache/sis/metadata/TreeNodeTest.java | 6 +-- .../sis/metadata/sql/IdentifierGeneratorTest.java | 1 - .../sis/metadata/sql/MetadataWriterTest.java | 4 +- .../sis/openoffice/ReferencingFunctions.java | 4 +- .../org/apache/sis/openoffice/XReferencing.java| 4 +- .../xml/bind/fra/DirectReferenceSystemTest.java| 4 +- .../referencing/gazetteer/FinalLocationType.java | 12 ++--- .../gazetteer/ModifiableLocationType.java | 12 ++--- .../main/org/apache/sis/io/wkt/Convention.java | 2 +- .../main/org/apache/sis/io/wkt/Formatter.java | 4 +- .../org/apache/sis/io/wkt/MathTransformParser.java | 4 +- .../main/org/apache/sis/io/wkt/StoredTree.java | 4 +- .../main/org/apache/sis/io/wkt/Transliterator.java | 30 ++--
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 0a72e06db91f4d8b115f1a5f2d1e76fc32136242 Merge: e0f5cfa3ec 3afc7a15bf Author: Martin Desruisseaux AuthorDate: Sun Oct 29 18:42:14 2023 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 .../sis/buildtools/coding/ReorganizeImports.java | 31 +- endorsed/build.gradle.kts | 2 +- .../main/org/apache/sis/console/CommandRunner.java | 2 +- .../org.apache.sis.feature/main/module-info.java | 2 +- .../main/org/apache/sis/coverage/Category.java | 2 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 7 +- .../org/apache/sis/coverage/grid/package-info.java | 2 +- .../org/apache/sis/feature/AbstractAttribute.java | 2 +- .../apache/sis/feature/AbstractIdentifiedType.java | 8 +- .../apache/sis/feature/DefaultAssociationRole.java | 2 +- .../apache/sis/feature/DefaultAttributeType.java | 4 +- .../sis/feature/builder/AttributeTypeBuilder.java | 4 +- .../apache/sis/feature/builder/TypeBuilder.java| 13 +- .../apache/sis/feature/builder/package-info.java | 2 +- .../sis/geometry/wrapper/GeometryWrapper.java | 5 +- .../main/org/apache/sis/image/Colorizer.java | 4 +- .../main/org/apache/sis/image/ImageProcessor.java | 151 +-- .../main/org/apache/sis/image/Visualization.java | 12 - .../main/org/apache/sis/image/package-info.java| 2 +- .../org.apache.sis.metadata/main/module-info.java | 4 +- .../apache/sis/metadata/internal/AxisNames.java| 48 +- .../apache/sis/metadata/internal/NameMeaning.java | 2 +- .../sis/metadata/internal/ReferencingServices.java | 2 +- .../apache/sis/metadata/iso/DefaultMetadata.java | 88 +--- .../sis/metadata/iso/citation/Citations.java | 12 +- .../iso/constraint/DefaultConstraints.java | 6 +- .../metadata/iso/distribution/DefaultFormat.java | 2 +- .../iso/extent/DefaultGeographicBoundingBox.java | 4 +- .../iso/extent/DefaultGeographicDescription.java | 6 +- .../apache/sis/metadata/iso/extent/Extents.java| 4 +- .../org/apache/sis/metadata/iso/package-info.java | 2 +- .../apache/sis/util/iso/DefaultRecordSchema.java | 5 +- .../org/apache/sis/util/iso/DefaultRecordType.java | 57 +-- .../main/org/apache/sis/util/iso/Types.java| 2 +- .../main/org/apache/sis/util/iso/package-info.java | 2 +- .../main/org/apache/sis/xml/bind/Context.java | 2 +- .../test/org/apache/sis/metadata/TreeNodeTest.java | 6 +- .../sis/openoffice/ReferencingFunctions.java | 4 +- .../org/apache/sis/openoffice/XReferencing.java| 4 +- .../referencing/gazetteer/FinalLocationType.java | 12 +- .../gazetteer/ModifiableLocationType.java | 12 +- .../main/module-info.java | 2 +- .../main/org/apache/sis/io/wkt/Convention.java | 2 +- .../main/org/apache/sis/io/wkt/Formatter.java | 4 +- .../org/apache/sis/io/wkt/MathTransformParser.java | 4 +- .../main/org/apache/sis/io/wkt/StoredTree.java | 4 +- .../main/org/apache/sis/io/wkt/Transliterator.java | 30 +- .../main/org/apache/sis/io/wkt/package-info.java | 4 +- .../parameter/DefaultParameterDescriptorGroup.java | 4 +- .../sis/parameter/DefaultParameterValue.java | 4 +- .../org/apache/sis/parameter/ParameterBuilder.java | 10 +- .../org/apache/sis/parameter/TensorParameters.java | 2 +- .../sis/referencing/AbstractIdentifiedObject.java | 12 +- .../main/org/apache/sis/referencing/Builder.java | 10 +- .../main/org/apache/sis/referencing/CRS.java | 6 +- .../main/org/apache/sis/referencing/CommonCRS.java | 6 +- .../apache/sis/referencing/IdentifiedObjects.java | 4 +- .../apache/sis/referencing/NamedIdentifier.java| 2 +- .../sis/referencing/crs/DefaultDerivedCRS.java | 2 +- .../apache/sis/referencing/cs/AxesConvention.java | 2 +- .../org/apache/sis/referencing/cs/AxisFilter.java | 4 +- .../sis/referencing/cs/CoordinateSystems.java | 12 +- .../cs/DefaultCoordinateSystemAxis.java| 16 +- .../sis/referencing/cs/DirectionAlongMeridian.java | 8 +- .../sis/referencing/datum/DatumShiftGrid.java | 2 +- .../referencing/datum/DefaultGeodeticDatum.java| 4 +- .../factory/CommonAuthorityFactory.java| 4 +- .../factory/IdentifiedObjectFinder.java| 2 +- .../referencing/factory/IdentifiedObjectSet.java | 2 +- .../referencing/factory/sql/EPSGDataAccess.java| 6 +- .../sis/referencing/factory/sql/package-info.java | 4 +- .../sis/referencing/internal/DeprecatedCode.java | 2 +- .../sis/referencing/internal/DeprecatedName.java | 2 +- .../operation/CoordinateOperationContext.java | 6 +- .../operation/CoordinateOperationRegistry.java | 2 +-
(sis) 06/06: Reorganize import statements with a better separation of test dependencies.
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git commit 0de784f0e41bb369f761ebc5f0a99d080212ab95 Author: Martin Desruisseaux AuthorDate: Sun Oct 29 20:05:12 2023 +0100 Reorganize import statements with a better separation of test dependencies. --- .../sis/coverage/grid/BandAggregateGridCoverageTest.java | 4 ++-- .../sis/coverage/grid/ConvertedGridCoverageTest.java | 6 +++--- .../sis/coverage/grid/DimensionalityReductionTest.java | 2 +- .../org/apache/sis/coverage/grid/GridCoverage2DTest.java | 4 ++-- .../apache/sis/coverage/grid/GridCoverageBuilderTest.java | 2 +- .../org/apache/sis/coverage/grid/GridDerivationTest.java | 8 .../test/org/apache/sis/coverage/grid/GridExtentTest.java | 2 +- .../org/apache/sis/coverage/grid/GridGeometryTest.java | 8 .../sis/coverage/grid/ResampledGridCoverageTest.java | 8 .../org/apache/sis/coverage/grid/ReshapedImageTest.java| 6 +++--- .../sis/coverage/grid/TranslatedGridCoverageTest.java | 2 +- .../test/org/apache/sis/feature/EnvelopeOperationTest.java | 2 +- .../test/org/apache/sis/feature/FeatureOperationsTest.java | 6 +++--- .../apache/sis/feature/builder/FeatureTypeBuilderTest.java | 8 .../sis/feature/internal/AttributeConventionTest.java | 2 +- .../org/apache/sis/filter/BinarySpatialFilterTestCase.java | 4 ++-- .../test/org/apache/sis/filter/sqlmm/RegistryTestCase.java | 4 ++-- .../test/org/apache/sis/filter/sqlmm/SQLMMTest.java| 2 +- .../apache/sis/geometry/wrapper/GeometriesTestCase.java| 4 ++-- .../test/org/apache/sis/image/ResamplingGridTest.java | 4 ++-- .../test/org/apache/sis/metadata/MetadataCopierTest.java | 4 ++-- .../test/org/apache/sis/metadata/MetadataStandardTest.java | 6 +++--- .../test/org/apache/sis/metadata/PropertyAccessorTest.java | 14 +++--- .../org/apache/sis/metadata/PropertyInformationTest.java | 2 +- .../test/org/apache/sis/metadata/SpecialCasesTest.java | 6 +++--- .../apache/sis/metadata/sql/IdentifierGeneratorTest.java | 1 - .../org/apache/sis/metadata/sql/MetadataWriterTest.java| 4 ++-- .../apache/sis/xml/bind/fra/DirectReferenceSystemTest.java | 4 ++-- .../test/org/apache/sis/geometry/AbstractEnvelopeTest.java | 6 +++--- .../test/org/apache/sis/geometry/ArrayEnvelopeTest.java| 4 ++-- .../test/org/apache/sis/geometry/CoordinateFormatTest.java | 6 +++--- .../test/org/apache/sis/geometry/Envelope2DTest.java | 2 +- .../test/org/apache/sis/geometry/EnvelopesTest.java| 2 +- .../org/apache/sis/geometry/GeneralDirectPositionTest.java | 2 +- .../test/org/apache/sis/geometry/GeneralEnvelopeTest.java | 4 ++-- .../org/apache/sis/geometry/ImmutableEnvelopeTest.java | 2 +- .../test/org/apache/sis/geometry/SubEnvelopeTest.java | 2 +- .../test/org/apache/sis/geometry/TransformTestCase.java| 8 .../org/apache/sis/geometry/WraparoundAdjustmentTest.java | 4 ++-- .../org/apache/sis/referencing/AuthorityFactoriesTest.java | 4 ++-- .../test/org/apache/sis/referencing/CRSTest.java | 6 +++--- .../apache/sis/referencing/GeodesicsOnEllipsoidTest.java | 2 +- .../org/apache/sis/referencing/GeodeticCalculatorTest.java | 2 +- .../org/apache/sis/referencing/IdentifiedObjectsTest.java | 2 +- .../apache/sis/referencing/StandardDefinitionsTest.java| 10 +- .../org/apache/sis/referencing/crs/AbstractCRSTest.java| 4 ++-- .../apache/sis/referencing/crs/DefaultCompoundCRSTest.java | 4 ++-- .../apache/sis/referencing/crs/DefaultDerivedCRSTest.java | 4 ++-- .../sis/referencing/crs/DefaultEngineeringCRSTest.java | 2 +- .../apache/sis/referencing/crs/DefaultImageCRSTest.java| 4 ++-- .../sis/referencing/crs/DefaultProjectedCRSTest.java | 2 +- .../apache/sis/referencing/crs/DefaultTemporalCRSTest.java | 2 +- .../test/org/apache/sis/referencing/crs/HardCodedCRS.java | 4 +++- .../org/apache/sis/referencing/crs/HardCodedCRSTest.java | 2 +- .../sis/referencing/datum/DefaultTemporalDatumTest.java| 2 +- .../org/apache/sis/referencing/datum/HardCodedDatum.java | 4 +++- .../sis/referencing/factory/AuthorityFactoryMock.java | 2 ++ .../referencing/factory/MultiAuthoritiesFactoryTest.java | 6 +++--- .../sis/referencing/internal/ServicesForMetadataTest.java | 2 +- .../operation/CoordinateOperationFinderTest.java | 4 ++-- .../operation/DefaultConcatenatedOperationTest.java| 4 ++-- .../sis/referencing/operation/DefaultConversionTest.java | 12 ++-- .../referencing/operation/DefaultTransformationTest.java | 8 .../sis/referencing/operation/HardCodedConversions.java| 2 ++ .../operation/builder/LinearTransformBuilderTest.java | 6 +++---
(sis) 04/06: Deprecate `DefaultRecordSchema` for removal.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 374dc41dd60c8c27e24a3e8f1e13fa4521ac6a75
Author: Martin Desruisseaux
AuthorDate: Sun Oct 29 17:41:45 2023 +0100
Deprecate `DefaultRecordSchema` for removal.
---
.../apache/sis/util/iso/DefaultRecordSchema.java | 5 +-
.../org/apache/sis/util/iso/DefaultRecordType.java | 57 +++---
.../main/org/apache/sis/util/iso/package-info.java | 2 +-
3 files changed, 34 insertions(+), 30 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordSchema.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordSchema.java
index d79d09f6d4..014dcaaa27 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordSchema.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordSchema.java
@@ -72,13 +72,16 @@ import org.opengis.feature.AttributeType;
* {@link java.io.Serializable} interface) returning a system-wide static
constant for their schema.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 1.4
+ * @version 1.5
*
* @see DefaultRecordType
* @see DefaultRecord
*
* @since 0.5
+ *
+ * @deprecated The {@code RecordSchema} interface has been removed in the 2015
revision of the ISO 19103 standard.
*/
+@Deprecated(since = "1.5", forRemoval = true)
public class DefaultRecordSchema implements RecordSchema {
/**
* The factory to use for creating names.
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordType.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordType.java
index 009deac054..0ce1f6f2dc 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordType.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordType.java
@@ -60,23 +60,6 @@ import org.opengis.util.NameFactory;
* The set of fields in a {@code RecordType} can be though as equivalent to
the set of fields in a class.
*
*
- * Instantiation
- * The easiest way to create {@code DefaultRecordType} instances is to use the
- * {@link DefaultRecordSchema#createRecordType(CharSequence, Map)} method.
- * Example:
- *
- * {@snippet lang="java" :
- * DefaultRecordSchema schema = new DefaultRecordSchema(null, null,
"MySchema");
- * // The same instance can be reused for all records to create in that
schema.
- *
- * Map> fields = new LinkedHashMap<>();
- * fields.put("city",String .class);
- * fields.put("latitude",Double .class);
- * fields.put("longitude", Double .class);
- * fields.put("population", Integer.class);
- * RecordType record = schema.createRecordType("MyRecordType", fields);
- * }
- *
* Immutability and thread safety
* This class is immutable and thus inherently thread-safe if the {@link
TypeName}, the {@link RecordSchema}
* and all ({@link MemberName}, {@link Type}) entries in the map given to the
constructor are also immutable.
@@ -89,10 +72,9 @@ import org.opengis.util.NameFactory;
* so users wanting serialization may need to provide their own schema.
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @version 1.4
+ * @version 1.5
*
* @see DefaultRecord
- * @see DefaultRecordSchema
* @see DefaultMemberName
*
* @since 0.3
@@ -113,7 +95,7 @@ public class DefaultRecordType extends RecordDefinition
implements RecordType, S
private final TypeName typeName;
/**
- * The schema that contains this record type.
+ * The schema that contains this record type, or {@code null} if none.
*
* @see #getContainer()
*/
@@ -139,6 +121,18 @@ public class DefaultRecordType extends RecordDefinition
implements RecordType, S
fieldTypes = computeTransientFields(other.getFieldTypes());
}
+/**
+ * Creates a new record type.
+ *
+ * @param typeName the name that identifies this record type.
+ * @param fieldsthe name and type of the fields to be included in this
record type.
+ *
+ * @since 1.5
+ */
+public DefaultRecordType(final TypeName typeName, final Map fields) {
+this(typeName, null, fields);
+}
+
/**
* Creates a new record in the given schema.
* It is caller responsibility to add the new {@code RecordType} in the
container
@@ -150,17 +144,19 @@ public class DefaultRecordType extends RecordDefinition
implements RecordType, S
* method provides an easier alternative.
*
* @param typeName the name that identifies this record type.
- * @param container the schema that contains this record type.
+ * @param container the schema that contains this record type, or {@code
null} if none.
* @param fields the
