[sis] 02/03: Replace most of `org.apache.sis.storage.geotiff.Tags` by `javax.imageio.plugins.tiff`. The latter provides a more complete set of tags that we can use as labels in metadata.
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 871d8fd9a33739ae10d8716c30ad1e56a390b174
Author: Martin Desruisseaux
AuthorDate: Tue Dec 13 18:05:28 2022 +0100
Replace most of `org.apache.sis.storage.geotiff.Tags` by
`javax.imageio.plugins.tiff`.
The latter provides a more complete set of tags that we can use as labels
in metadata.
---
.../apache/sis/internal/geotiff/Compression.java | 36 ++--
.../org/apache/sis/internal/geotiff/Predictor.java | 8 +-
.../apache/sis/internal/geotiff/package-info.java | 2 +-
.../org/apache/sis/storage/geotiff/DataCube.java | 6 +-
.../apache/sis/storage/geotiff/GeoKeysLoader.java | 23 +--
.../sis/storage/geotiff/ImageFileDirectory.java| 222 +++--
.../sis/storage/geotiff/ImageMetadataBuilder.java | 18 +-
.../apache/sis/storage/geotiff/NativeMetadata.java | 26 +--
.../java/org/apache/sis/storage/geotiff/Tags.java | 192 --
.../apache/sis/storage/geotiff/package-info.java | 2 +-
.../org/apache/sis/storage/geotiff/TagsTest.java} | 33 ++-
.../apache/sis/test/suite/GeoTiffTestSuite.java| 3 +-
12 files changed, 255 insertions(+), 316 deletions(-)
diff --git
a/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Compression.java
b/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Compression.java
index e3d00695c9..384d6f9e51 100644
---
a/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Compression.java
+++
b/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Compression.java
@@ -16,6 +16,8 @@
*/
package org.apache.sis.internal.geotiff;
+import static javax.imageio.plugins.tiff.BaselineTIFFTagSet.*;
+
/**
* Possible values for {@link org.apache.sis.storage.geotiff.Tags#Compression}.
@@ -30,7 +32,7 @@ package org.apache.sis.internal.geotiff;
*
* @author Johann Sorel (Geomatys)
* @author Martin Desruisseaux (Geomatys)
- * @version 1.2
+ * @version 1.4
* @since 0.8
* @module
*/
@@ -43,7 +45,7 @@ public enum Compression {
* Name in WCS response: "None"
*
*/
-NONE(1),
+NONE(COMPRESSION_NONE),
/**
* CCITT Group 3, 1-Dimensional Modified Huffman run length encoding.
@@ -52,7 +54,7 @@ public enum Compression {
* Name in WCS response: "CCITTRLE"
*
*/
-CCITTRLE(2),
+CCITTRLE(COMPRESSION_CCITT_RLE),
/**
* PackBits compression, a simple byte-oriented run length scheme.
@@ -61,7 +63,7 @@ public enum Compression {
* Name in WCS response: "PackBits"
*
*/
-PACKBITS(32773),
+PACKBITS(COMPRESSION_PACKBITS),
// End of baseline GeoTIFF. Remaining are extensions cited by OGC
standard
@@ -72,7 +74,7 @@ public enum Compression {
* Name in WCS response: "LZW"
*
*/
-LZW(5),
+LZW(COMPRESSION_LZW),
/**
* Deflate compression, like ZIP format. This is sometimes named {@code
"ADOBE_DEFLATE"},
@@ -83,7 +85,7 @@ public enum Compression {
* Other name: "ADOBE_DEFLATE"
*
*/
-DEFLATE(8),
+DEFLATE(COMPRESSION_ZLIB),
/**
* JPEG compression.
@@ -93,12 +95,12 @@ public enum Compression {
* Name of old JPEG: "OJPEG" (code 6)
*
*/
-JPEG(7),
+JPEG(COMPRESSION_JPEG),
// Remaining are extension to both baseline and OGC standard
-/** Unsupported. */ CCITTFAX3(3),
-/** Unsupported. */ CCITTFAX4(4),
+/** Unsupported. */ CCITTFAX3(COMPRESSION_CCITT_T_4),
+/** Unsupported. */ CCITTFAX4(COMPRESSION_CCITT_T_6),
/** Unsupported. */ NEXT(32766),
/** Unsupported. */ CCITTRLEW(32771),
/** Unsupported. */ THUNDERSCAN(32809),
@@ -139,14 +141,14 @@ public enum Compression {
*/
public static Compression valueOf(final int code) {
switch (code) {
-case 1: return NONE;
-case 2: return CCITTRLE;
-case 5: return LZW;
-case 6: // "old-style" JPEG, later overriden in Technical
Notes 2.
-case 7: return JPEG;
-case 8:
-case 32946: return DEFLATE;
-case 32773: return PACKBITS;
+case 32946: // Fall through
+case COMPRESSION_ZLIB: return DEFLATE;
+case COMPRESSION_OLD_JPEG: // "old-style" JPEG, later overriden
in Technical Notes 2.
+case COMPRESSION_JPEG: return JPEG;
+case COMPRESSION_CCITT_RLE: return CCITTRLE;
+case COMPRESSION_LZW: return LZW;
+case COMPRESSION_PACKBITS: return PACKBITS;
+case COMPRESSION_NONE: return NONE;
default: {
// Fallback for uncommon formats.
for (final Compression c : values()) {
diff --git
[sis] branch geoapi-4.0 updated (9c4a34851d -> 7490457b36)
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 9c4a34851d Add `since` tag into `@Deprecated` annotations. Remove 4 deprecated methods that where not used anymore. new f83c833020 Post-merge cleanup. new 871d8fd9a3 Replace most of `org.apache.sis.storage.geotiff.Tags` by `javax.imageio.plugins.tiff`. The latter provides a more complete set of tags that we can use as labels in metadata. new 7490457b36 Fix an exception when GeoTIFF metadata contains rational numbers. The 3 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: .../apache/sis/gui/dataset/ExpandedFeature.java| 2 + .../apache/sis/metadata/PropertyInformation.java | 7 +- .../org/apache/sis/internal/util/Numerics.java | 20 ++ .../apache/sis/internal/geotiff/Compression.java | 36 ++-- .../org/apache/sis/internal/geotiff/Predictor.java | 8 +- .../apache/sis/internal/geotiff/package-info.java | 2 +- .../org/apache/sis/storage/geotiff/DataCube.java | 6 +- .../apache/sis/storage/geotiff/GeoKeysLoader.java | 23 +-- .../sis/storage/geotiff/ImageFileDirectory.java| 222 +++-- .../sis/storage/geotiff/ImageMetadataBuilder.java | 18 +- .../apache/sis/storage/geotiff/NativeMetadata.java | 26 +-- .../java/org/apache/sis/storage/geotiff/Tags.java | 192 -- .../java/org/apache/sis/storage/geotiff/Type.java | 76 --- .../apache/sis/storage/geotiff/package-info.java | 2 +- .../org/apache/sis/storage/geotiff/TagsTest.java | 24 ++- .../apache/sis/test/suite/GeoTiffTestSuite.java| 3 +- 16 files changed, 315 insertions(+), 352 deletions(-) copy core/sis-feature/src/test/java/org/apache/sis/filter/XPathTest.java => storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/TagsTest.java (60%)
[sis] 03/03: Fix an exception when GeoTIFF metadata contains rational numbers.
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 7490457b360472dce2414f7094999687540ba1ba
Author: Martin Desruisseaux
AuthorDate: Tue Dec 13 19:21:37 2022 +0100
Fix an exception when GeoTIFF metadata contains rational numbers.
---
.../org/apache/sis/internal/util/Numerics.java | 20 ++
.../java/org/apache/sis/storage/geotiff/Type.java | 76 +-
2 files changed, 66 insertions(+), 30 deletions(-)
diff --git
a/core/sis-utility/src/main/java/org/apache/sis/internal/util/Numerics.java
b/core/sis-utility/src/main/java/org/apache/sis/internal/util/Numerics.java
index a16dabd699..8886018831 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/util/Numerics.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/util/Numerics.java
@@ -29,6 +29,7 @@ import org.apache.sis.util.ComparisonMode;
import org.apache.sis.math.DecimalFunctions;
import org.apache.sis.math.MathFunctions;
import org.apache.sis.math.Statistics;
+import org.apache.sis.math.Fraction;
import static java.lang.Math.min;
import static java.lang.Math.max;
@@ -328,6 +329,25 @@ public final class Numerics extends Static {
return (int) value;
}
+/**
+ * Returns the given fraction as a {@link Fraction} instance if possible,
+ * or as a {@link Double} approximation otherwise.
+ *
+ * @param numeratornumerator of the fraction to return.
+ * @param denominator denominator of the fraction to return.
+ * @return the fraction as a {@link Fraction} or {@link Double} object.
+ */
+public static Number fraction(long numerator, long denominator) {
+final int simplify = Math.min(Long.numberOfTrailingZeros(numerator),
Long.numberOfTrailingZeros(denominator));
+final int num = (int) (numerator >>= simplify);
+final int den = (int) (denominator >>= simplify);
+if (num == numerator && den == denominator) {
+return new Fraction(num, den).unique();
+} else {
+return valueOf(numerator / (double) denominator);
+}
+}
+
/**
* If the given value is presents in the cache, returns the cached value.
* Otherwise returns the given value as-is.
diff --git
a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Type.java
b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Type.java
index 8737f7e806..8da57cbcbd 100644
--- a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Type.java
+++ b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Type.java
@@ -37,7 +37,7 @@ import org.apache.sis.util.resources.Errors;
* This enumeration rather match the Java primitive type names.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 1.2
+ * @version 1.4
* @since 0.8
* @module
*/
@@ -296,21 +296,16 @@ enum Type {
*
*/
RATIONAL(10, (2*Integer.BYTES), false) {
-private Fraction readFraction(final ChannelDataInput input, final long
count) throws IOException {
-final Fraction value = new Fraction(input.readInt(),
input.readInt());
-for (long i=1; i
*/
URATIONAL(5, (2*Integer.BYTES), true) {
-private Number readFraction(final ChannelDataInput input, final long
count) throws IOException {
-final long n = input.readUnsignedInt();
-final long d = input.readUnsignedInt();
-final int ni = (int) n;
-final int di = (int) d;
-final Number value = (ni == n && di == d) ? new Fraction(ni, di) :
Double.valueOf(n / (double) d);
-for (long i=1; i
[sis] 01/03: Post-merge cleanup.
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 f83c833020601517d36e42afb330ede853016e87
Author: Martin Desruisseaux
AuthorDate: Tue Dec 13 15:28:56 2022 +0100
Post-merge cleanup.
---
.../src/main/java/org/apache/sis/gui/dataset/ExpandedFeature.java | 2 ++
.../src/main/java/org/apache/sis/metadata/PropertyInformation.java | 7 +++
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git
a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ExpandedFeature.java
b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ExpandedFeature.java
index 26a78bc4ea..7b2a5c078c 100644
---
a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ExpandedFeature.java
+++
b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ExpandedFeature.java
@@ -20,6 +20,8 @@ import java.util.Arrays;
import java.util.Map;
import java.util.Collection;
import java.util.List;
+
+// Branch-dependent imports
import org.opengis.feature.Feature;
import org.opengis.feature.FeatureType;
import org.opengis.feature.Property;
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java
index ab15076f17..dfb2593c6b 100644
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java
@@ -17,8 +17,8 @@
package org.apache.sis.metadata;
import java.util.Locale;
-import java.util.Set;
import java.util.Collection;
+import java.util.Collections;
import java.lang.reflect.Method;
import org.opengis.annotation.UML;
import org.opengis.annotation.Obligation;
@@ -64,7 +64,6 @@ import static java.util.logging.Logger.getLogger;
*
* @see InformationMap
* @see MetadataStandard#asInformationMap(Class, KeyNamePolicy)
- * @see https://issues.apache.org/jira/browse/SIS-80;>SIS-80
*
* @since 0.3
* @module
@@ -134,7 +133,7 @@ final class PropertyInformation extends SimpleIdentifier
// Impleme
*/
@SuppressWarnings({"unchecked","rawtypes"})
PropertyInformation(final Citation standard, final String property, final
Method getter,
-final Class elementType, final ValueRange range)
+final Class elementType, final ValueRange range)
{
super(standard, property,
getter.isAnnotationPresent(Deprecated.class));
parent = getter.getDeclaringClass();
@@ -292,7 +291,7 @@ final class PropertyInformation extends SimpleIdentifier
// Impleme
*/
@Override
public Collection getParentEntity() {
-return Set.of(getCodeSpace());
+return Collections.singleton(getCodeSpace());
}
/**
[sis] 01/01: Merge branch 'geoapi-3.1'. This is the upgrade from Java 8 to Java 11.
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 e7c5ccf5a900bf49cf045ad9a55c5cb36b8b2477 Merge: 217df02d3e f5bc633ac3 Author: Martin Desruisseaux AuthorDate: Tue Dec 13 14:25:57 2022 +0100 Merge branch 'geoapi-3.1'. This is the upgrade from Java 8 to Java 11. https://issues.apache.org/jira/browse/SIS-561 README | 2 +- application/sis-console/pom.xml| 5 + .../org/apache/sis/console/IdentifierCommand.java | 1 + .../org/apache/sis/console/MetadataCommand.java| 4 +- .../apache/sis/console/ResourcesDownloader.java| 3 +- .../org/apache/sis/console/TransformCommand.java | 3 +- application/sis-javafx/pom.xml | 5 + application/sis-javafx/src/main/artifact/README| 6 +- application/sis-javafx/src/main/artifact/bin/sis | 2 +- .../sis-javafx/src/main/artifact/bin/sis.bat | 2 +- application/sis-javafx/src/main/artifact/bin/sisfx | 2 +- .../sis-javafx/src/main/artifact/bin/sisfx.bat | 2 +- .../main/java/org/apache/sis/gui/DataViewer.java | 3 +- .../main/java/org/apache/sis/gui/RecentFiles.java | 4 +- .../apache/sis/gui/coverage/CoverageControls.java | 4 +- .../apache/sis/gui/coverage/CoverageExplorer.java | 24 +- .../apache/sis/gui/coverage/CoverageStyling.java | 2 +- .../org/apache/sis/gui/coverage/package-info.java | 2 +- .../apache/sis/gui/dataset/ExpandedFeature.java| 8 +- .../org/apache/sis/gui/dataset/PathAction.java | 3 +- .../java/org/apache/sis/gui/map/StatusBar.java | 63 +--- .../java/org/apache/sis/gui/map/package-info.java | 2 +- .../sis/gui/metadata/StandardMetadataTree.java | 6 +- .../apache/sis/gui/referencing/AuthorityCodes.java | 3 +- .../gui/referencing/PositionableProjection.java| 2 +- .../gui/referencing/RecentReferenceSystems.java| 20 +- .../apache/sis/gui/referencing/package-info.java | 2 +- .../org/apache/sis/internal/gui/GUIUtilities.java | 4 +- .../apache/sis/internal/gui/ImageConverter.java| 5 +- .../org/apache/sis/internal/gui/RecentChoices.java | 4 +- .../apache/sis/internal/gui/GUIUtilitiesTest.java | 7 +- application/sis-openoffice/pom.xml | 5 + application/sis-webapp/pom.xml | 10 + .../org/apache/sis/services}/OSGiActivator.java| 7 +- .../org/apache/sis/services}/ServletListener.java | 8 +- .../org/apache/sis/internal/book/Assembler.java| 10 +- .../apache/sis/internal/book/CodeColorizer.java| 7 +- .../org/apache/sis/internal/book/package-info.java | 4 +- .../org/apache/sis/coverage/SampleDimension.java | 4 +- .../sis/coverage/grid/BufferedGridCoverage.java| 3 +- .../sis/coverage/grid/GridCoordinatesView.java | 5 +- .../org/apache/sis/coverage/grid/GridCoverage.java | 2 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 3 +- .../apache/sis/coverage/grid/GridDerivation.java | 3 +- .../org/apache/sis/coverage/grid/GridExtent.java | 42 +-- .../apache/sis/coverage/grid/GridExtentCRS.java| 3 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 31 +- .../apache/sis/coverage/grid/ImageRenderer.java| 3 +- .../apache/sis/coverage/grid/PixelTranslation.java | 23 +- .../org/apache/sis/coverage/grid/package-info.java | 2 +- .../org/apache/sis/feature/AbstractAttribute.java | 4 +- .../org/apache/sis/feature/AbstractFeature.java| 7 +- .../org/apache/sis/feature/DefaultFeatureType.java | 2 +- .../org/apache/sis/feature/FeatureOperations.java | 2 +- .../java/org/apache/sis/feature/LinkOperation.java | 3 +- .../sis/feature/builder/FeatureTypeBuilder.java| 9 +- .../org/apache/sis/filter/AssociationValue.java| 6 +- .../java/org/apache/sis/filter/BinaryFunction.java | 3 +- .../apache/sis/filter/BinaryGeometryFilter.java| 3 +- .../org/apache/sis/filter/ComparisonFilter.java| 3 +- .../org/apache/sis/filter/ConvertFunction.java | 4 +- .../java/org/apache/sis/filter/DistanceFilter.java | 7 +- .../org/apache/sis/filter/IdentifierFilter.java| 9 +- .../java/org/apache/sis/filter/LeafExpression.java | 3 +- .../java/org/apache/sis/filter/LikeFilter.java | 7 +- .../java/org/apache/sis/filter/LogicalFilter.java | 5 +- .../java/org/apache/sis/filter/Optimization.java | 5 +- .../java/org/apache/sis/filter/PropertyValue.java | 4 +- .../java/org/apache/sis/filter/UnaryFunction.java | 3 +- .../java/org/apache/sis/image/BandSelectImage.java | 3 +- .../java/org/apache/sis/image/ComputedImage.java | 2 +- .../java/org/apache/sis/image/ImageCombiner.java | 5 +- .../java/org/apache/sis/image/PlanarImage.java | 15 +- .../sis/image/PositionalConsistencyImage.java | 3 +-
[sis] branch master updated (217df02d3e -> e7c5ccf5a9)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/sis.git from 217df02d3e Set version number to 1.4-SNAPSHOT for next development cycle. add 123f05ebc0 Post-release cleanup. add 9bb1d80d20 Post-release: remove deprecated methods. add 0083d298c7 Set Java version requirement to Java 11 and update documentation. There is no code change in this commit. add a5835a6c1c Upgrade Derby dependency to series 10.15, which is the last series compatible with Java 11. add 3755cb816a Move JavaEE 8 dependency to `sis-webapp` module. Update links to Java 8 documentation. Update NetBeans project configuration. add ad687670cb Remove OSGi dependency from core SIS modules. OSGi support has never been completed anyway. The class moved to `sis-webapp` in case we want to try again in the future. add 036c9fb308 Remove a hack for a Java 8 limitation fixed in Java 9. add 929bc5d9c1 Delete some placeholder defined in the `JDK9` internal class, now replaced by their standard Java 11 counterparts. add 4108d96770 Replace more `JDK9` placeholder. Those replacements are more risky because they introduce slight behavioral changes (range checks in `Arrays.equals(…)`, different iteration order in `Set` and `Map`). add c33f347075 Rename `JDK9` as `JDK17` since it is now a placeholder for methods defined after Java 11. add 11293da0ed Rollback two changes from last commit where the order of elements in the `Set` matter. add ee6b293e6b Remove reference to JAXB internal implementation, which is not provided anymore. add eaf8024708 Reduce the use of `CollectionsExt` when Java 11 methods can do the work. add d37c8ce013 Use the safer Java 11 way to convert collection to array. add 7a733dc902 Resolve some of the cases (the easy ones) that where identified by a "Pending JDK9" comment. add d94732535a Resolve some more advanced cases that where identified by a "Pending JDK9" comment. add 922983279c Replace some `Collections` method calls by their `Map`, `Set` or `List` equivalent. The latter are immutable and check for null value. add 9a73feaadc Replace `Collections.singletonMap(…)` by `Map.of(…)` where applicabie. There is two cases where we don't do the replacement: - When the map needs to accept null values. - When the check for null value will be better done (with a better error message) by `IdentifiedObject` constructor. add 6b3c47f8e1 Replace more `Collections` method calls by `Map.of`, `List.of` or `Set.of`. The remaining `Collections` calls are intentional for accepting null values. add 2c7abea573 Resolve some "TODO" which were waiting for JDK 10 or JDK 11. add 9c4a34851d Add `since` tag into `@Deprecated` annotations. Remove 4 deprecated methods that where not used anymore. add f5bc633ac3 Merge branch 'geoapi-4.0' into geoapi-3.1. This is the upgrade from Java 8 to Java 11. new e7c5ccf5a9 Merge branch 'geoapi-3.1'. This is the upgrade from Java 8 to Java 11. 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: README | 2 +- application/sis-console/pom.xml| 5 + .../org/apache/sis/console/IdentifierCommand.java | 1 + .../org/apache/sis/console/MetadataCommand.java| 4 +- .../apache/sis/console/ResourcesDownloader.java| 3 +- .../org/apache/sis/console/TransformCommand.java | 3 +- application/sis-javafx/pom.xml | 5 + application/sis-javafx/src/main/artifact/README| 6 +- application/sis-javafx/src/main/artifact/bin/sis | 2 +- .../sis-javafx/src/main/artifact/bin/sis.bat | 2 +- application/sis-javafx/src/main/artifact/bin/sisfx | 2 +- .../sis-javafx/src/main/artifact/bin/sisfx.bat | 2 +- .../main/java/org/apache/sis/gui/DataViewer.java | 3 +- .../main/java/org/apache/sis/gui/RecentFiles.java | 4 +- .../apache/sis/gui/coverage/CoverageControls.java | 4 +- .../apache/sis/gui/coverage/CoverageExplorer.java | 24 +- .../apache/sis/gui/coverage/CoverageStyling.java | 2 +- .../org/apache/sis/gui/coverage/package-info.java | 2 +- .../apache/sis/gui/dataset/ExpandedFeature.java| 8 +- .../org/apache/sis/gui/dataset/PathAction.java | 3 +- .../java/org/apache/sis/gui/map/StatusBar.java | 63 +--- .../java/org/apache/sis/gui/map/package-info.java | 2 +- .../sis/gui/metadata/StandardMetadataTree.java | 6 +- .../apache/sis/gui/referencing/AuthorityCodes.java | 3 +- .../gui/referencing/PositionableProjection.java| 2 +- .../gui/referencing/RecentReferenceSystems.java| 20 +-
[sis] branch geoapi-3.1 updated (fee1fa85b1 -> f5bc633ac3)
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 fee1fa85b1 Fix an exception when parsing a WKT results in two or more identifiers on an object. This problem does not exist on the "geoapi-4.0" branch because the `ReferenceIdentifier` interface is specific to GeoAPI 3.x. add 123f05ebc0 Post-release cleanup. add 9bb1d80d20 Post-release: remove deprecated methods. add 0083d298c7 Set Java version requirement to Java 11 and update documentation. There is no code change in this commit. add a5835a6c1c Upgrade Derby dependency to series 10.15, which is the last series compatible with Java 11. add 3755cb816a Move JavaEE 8 dependency to `sis-webapp` module. Update links to Java 8 documentation. Update NetBeans project configuration. add ad687670cb Remove OSGi dependency from core SIS modules. OSGi support has never been completed anyway. The class moved to `sis-webapp` in case we want to try again in the future. add 036c9fb308 Remove a hack for a Java 8 limitation fixed in Java 9. add 929bc5d9c1 Delete some placeholder defined in the `JDK9` internal class, now replaced by their standard Java 11 counterparts. add 4108d96770 Replace more `JDK9` placeholder. Those replacements are more risky because they introduce slight behavioral changes (range checks in `Arrays.equals(…)`, different iteration order in `Set` and `Map`). add c33f347075 Rename `JDK9` as `JDK17` since it is now a placeholder for methods defined after Java 11. add 11293da0ed Rollback two changes from last commit where the order of elements in the `Set` matter. add ee6b293e6b Remove reference to JAXB internal implementation, which is not provided anymore. add eaf8024708 Reduce the use of `CollectionsExt` when Java 11 methods can do the work. add d37c8ce013 Use the safer Java 11 way to convert collection to array. add 7a733dc902 Resolve some of the cases (the easy ones) that where identified by a "Pending JDK9" comment. add d94732535a Resolve some more advanced cases that where identified by a "Pending JDK9" comment. add 922983279c Replace some `Collections` method calls by their `Map`, `Set` or `List` equivalent. The latter are immutable and check for null value. add 9a73feaadc Replace `Collections.singletonMap(…)` by `Map.of(…)` where applicabie. There is two cases where we don't do the replacement: - When the map needs to accept null values. - When the check for null value will be better done (with a better error message) by `IdentifiedObject` constructor. add 6b3c47f8e1 Replace more `Collections` method calls by `Map.of`, `List.of` or `Set.of`. The remaining `Collections` calls are intentional for accepting null values. add 2c7abea573 Resolve some "TODO" which were waiting for JDK 10 or JDK 11. add 9c4a34851d Add `since` tag into `@Deprecated` annotations. Remove 4 deprecated methods that where not used anymore. new f5bc633ac3 Merge branch 'geoapi-4.0' into geoapi-3.1. This is the upgrade from Java 8 to Java 11. 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: README | 2 +- application/sis-console/pom.xml| 5 + .../org/apache/sis/console/IdentifierCommand.java | 1 + .../org/apache/sis/console/MetadataCommand.java| 4 +- .../apache/sis/console/ResourcesDownloader.java| 3 +- .../org/apache/sis/console/TransformCommand.java | 3 +- application/sis-javafx/pom.xml | 5 + application/sis-javafx/src/main/artifact/README| 6 +- application/sis-javafx/src/main/artifact/bin/sis | 2 +- .../sis-javafx/src/main/artifact/bin/sis.bat | 2 +- application/sis-javafx/src/main/artifact/bin/sisfx | 2 +- .../sis-javafx/src/main/artifact/bin/sisfx.bat | 2 +- .../main/java/org/apache/sis/gui/DataViewer.java | 3 +- .../main/java/org/apache/sis/gui/RecentFiles.java | 4 +- .../apache/sis/gui/coverage/CoverageControls.java | 4 +- .../apache/sis/gui/coverage/CoverageExplorer.java | 24 +- .../apache/sis/gui/coverage/CoverageStyling.java | 2 +- .../org/apache/sis/gui/coverage/package-info.java | 2 +- .../apache/sis/gui/dataset/ExpandedFeature.java| 6 +- .../org/apache/sis/gui/dataset/PathAction.java | 3 +- .../java/org/apache/sis/gui/map/StatusBar.java | 63 +--- .../java/org/apache/sis/gui/map/package-info.java | 2 +- .../sis/gui/metadata/StandardMetadataTree.java | 6 +- .../apache/sis/gui/referencing/AuthorityCodes.java | 3 +- .../gui/referencing/PositionableProjection.java| 2 +-
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. This is the upgrade from Java 8 to Java 11.
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 f5bc633ac346e45db8e2cbab901c15cd7eb6e09e Merge: fee1fa85b1 9c4a34851d Author: Martin Desruisseaux AuthorDate: Tue Dec 13 11:33:53 2022 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1. This is the upgrade from Java 8 to Java 11. https://issues.apache.org/jira/browse/SIS-561 README | 2 +- application/sis-console/pom.xml| 5 + .../org/apache/sis/console/IdentifierCommand.java | 1 + .../org/apache/sis/console/MetadataCommand.java| 4 +- .../apache/sis/console/ResourcesDownloader.java| 3 +- .../org/apache/sis/console/TransformCommand.java | 3 +- application/sis-javafx/pom.xml | 5 + application/sis-javafx/src/main/artifact/README| 6 +- application/sis-javafx/src/main/artifact/bin/sis | 2 +- .../sis-javafx/src/main/artifact/bin/sis.bat | 2 +- application/sis-javafx/src/main/artifact/bin/sisfx | 2 +- .../sis-javafx/src/main/artifact/bin/sisfx.bat | 2 +- .../main/java/org/apache/sis/gui/DataViewer.java | 3 +- .../main/java/org/apache/sis/gui/RecentFiles.java | 4 +- .../apache/sis/gui/coverage/CoverageControls.java | 4 +- .../apache/sis/gui/coverage/CoverageExplorer.java | 24 +- .../apache/sis/gui/coverage/CoverageStyling.java | 2 +- .../org/apache/sis/gui/coverage/package-info.java | 2 +- .../apache/sis/gui/dataset/ExpandedFeature.java| 6 +- .../org/apache/sis/gui/dataset/PathAction.java | 3 +- .../java/org/apache/sis/gui/map/StatusBar.java | 63 +--- .../java/org/apache/sis/gui/map/package-info.java | 2 +- .../sis/gui/metadata/StandardMetadataTree.java | 6 +- .../apache/sis/gui/referencing/AuthorityCodes.java | 3 +- .../gui/referencing/PositionableProjection.java| 2 +- .../gui/referencing/RecentReferenceSystems.java| 20 +- .../apache/sis/gui/referencing/package-info.java | 2 +- .../org/apache/sis/internal/gui/GUIUtilities.java | 4 +- .../apache/sis/internal/gui/ImageConverter.java| 5 +- .../org/apache/sis/internal/gui/RecentChoices.java | 4 +- .../apache/sis/internal/gui/GUIUtilitiesTest.java | 7 +- application/sis-openoffice/pom.xml | 5 + application/sis-webapp/pom.xml | 10 + .../org/apache/sis/services}/OSGiActivator.java| 7 +- .../org/apache/sis/services}/ServletListener.java | 8 +- .../org/apache/sis/internal/book/Assembler.java| 10 +- .../apache/sis/internal/book/CodeColorizer.java| 7 +- .../org/apache/sis/internal/book/package-info.java | 4 +- .../org/apache/sis/coverage/SampleDimension.java | 4 +- .../sis/coverage/grid/BufferedGridCoverage.java| 3 +- .../sis/coverage/grid/GridCoordinatesView.java | 5 +- .../org/apache/sis/coverage/grid/GridCoverage.java | 2 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 3 +- .../apache/sis/coverage/grid/GridDerivation.java | 3 +- .../org/apache/sis/coverage/grid/GridExtent.java | 42 +-- .../apache/sis/coverage/grid/GridExtentCRS.java| 3 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 31 +- .../apache/sis/coverage/grid/ImageRenderer.java| 3 +- .../apache/sis/coverage/grid/PixelTranslation.java | 23 +- .../org/apache/sis/coverage/grid/package-info.java | 2 +- .../org/apache/sis/feature/AbstractAttribute.java | 4 +- .../org/apache/sis/feature/AbstractFeature.java| 7 +- .../org/apache/sis/feature/DefaultFeatureType.java | 2 +- .../org/apache/sis/feature/FeatureOperations.java | 2 +- .../java/org/apache/sis/feature/LinkOperation.java | 3 +- .../sis/feature/builder/FeatureTypeBuilder.java| 9 +- .../org/apache/sis/filter/AssociationValue.java| 6 +- .../java/org/apache/sis/filter/BinaryFunction.java | 3 +- .../apache/sis/filter/BinaryGeometryFilter.java| 3 +- .../java/org/apache/sis/filter/Capabilities.java | 3 +- .../org/apache/sis/filter/ComparisonFilter.java| 3 +- .../org/apache/sis/filter/ConvertFunction.java | 4 +- .../java/org/apache/sis/filter/DistanceFilter.java | 7 +- .../org/apache/sis/filter/IdentifierFilter.java| 5 +- .../java/org/apache/sis/filter/LeafExpression.java | 3 +- .../java/org/apache/sis/filter/LikeFilter.java | 7 +- .../java/org/apache/sis/filter/LogicalFilter.java | 5 +- .../java/org/apache/sis/filter/Optimization.java | 5 +- .../java/org/apache/sis/filter/PropertyValue.java | 4 +- .../java/org/apache/sis/filter/UnaryFunction.java | 3 +- .../java/org/apache/sis/image/BandSelectImage.java | 3 +- .../java/org/apache/sis/image/ComputedImage.java | 2 +- .../java/org/apache/sis/image/ImageCombiner.java | 5 +- .../java/org/apache/sis/image/PlanarImage.java | 15 +-
[sis] branch geoapi-4.0 updated: Add `since` tag into `@Deprecated` annotations. Remove 4 deprecated methods that where not used anymore.
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
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 9c4a34851d Add `since` tag into `@Deprecated` annotations. Remove 4
deprecated methods that where not used anymore.
9c4a34851d is described below
commit 9c4a34851d7aba17cfb0c80642d921646085dccd
Author: Martin Desruisseaux
AuthorDate: Tue Dec 13 10:49:32 2022 +0100
Add `since` tag into `@Deprecated` annotations.
Remove 4 deprecated methods that where not used anymore.
---
.../jaxb/metadata/CI_ResponsibleParty.java | 2 +-
.../iso/DefaultExtendedElementInformation.java | 16 +++
.../apache/sis/metadata/iso/DefaultMetadata.java | 50 +++---
.../sis/metadata/iso/citation/DefaultCitation.java | 6 +--
.../sis/metadata/iso/citation/DefaultContact.java | 12 +++---
.../iso/citation/DefaultResponsibleParty.java | 18
.../metadata/iso/citation/DefaultTelephone.java| 10 ++---
.../iso/constraint/DefaultReleasability.java | 26 +--
.../sis/metadata/iso/constraint/package-info.java | 2 +-
.../iso/content/DefaultCoverageDescription.java| 8 ++--
.../DefaultFeatureCatalogueDescription.java| 8 ++--
.../iso/content/DefaultRangeDimension.java | 4 +-
.../metadata/iso/distribution/DefaultDataFile.java | 6 +--
.../DefaultDigitalTransferOptions.java | 4 +-
.../metadata/iso/distribution/DefaultFormat.java | 12 +++---
.../metadata/iso/distribution/DefaultMedium.java | 4 +-
.../distribution/DefaultStandardOrderProcess.java | 24 ---
.../iso/identification/AbstractIdentification.java | 4 +-
.../DefaultAggregateInformation.java | 10 ++---
.../identification/DefaultDataIdentification.java | 8 ++--
.../metadata/iso/lineage/DefaultProcessStep.java | 4 +-
.../sis/metadata/iso/lineage/DefaultSource.java| 8 ++--
.../maintenance/DefaultMaintenanceInformation.java | 12 +++---
.../sis/metadata/iso/quality/AbstractElement.java | 28 ++--
.../iso/quality/AbstractTemporalAccuracy.java | 2 +-
.../iso/quality/DefaultCoverageResult.java | 6 +--
.../metadata/iso/quality/DefaultDataQuality.java | 6 +--
.../DefaultNonQuantitativeAttributeAccuracy.java | 2 +-
.../iso/quality/DefaultQuantitativeResult.java | 6 +--
.../sis/metadata/iso/quality/DefaultScope.java | 6 +--
.../sis/metadata/iso/quality/DefaultUsability.java | 2 +-
.../org/apache/sis/util/iso/DefaultRecordType.java | 2 +-
.../main/java/org/apache/sis/xml/Namespaces.java | 2 +-
.../sis/internal/referencing/provider/Affine.java | 2 +-
.../referencing/provider/GeodeticOperation.java| 2 +-
.../referencing/provider/MapProjection.java| 4 +-
.../referencing/provider/MapProjection3D.java | 6 +--
.../DefaultCoordinateOperationFactory.java | 2 +-
.../operation/DefaultOperationMethod.java | 14 +++---
.../transform/DefaultMathTransformFactory.java | 4 +-
.../org/apache/sis/internal/storage/gpx/Store.java | 2 +-
.../org/apache/sis/internal/storage/gpx/Types.java | 2 +-
.../sis/internal/storage/gpx/WritableStore.java| 2 +-
43 files changed, 156 insertions(+), 204 deletions(-)
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java
b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java
index 328e9fce15..e051f79e31 100644
---
a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java
@@ -43,7 +43,7 @@ import org.apache.sis.internal.jaxb.FilterByVersion;
* @since 0.3
* @module
*/
-@Deprecated
+@Deprecated(since="1.0")
public final class CI_ResponsibleParty extends
PropertyType {
/**
* Empty constructor for JAXB only.
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
index 0bfd97296e..7be8a0822f 100644
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
@@ -111,7 +111,7 @@ public class DefaultExtendedElementInformation extends
ISOMetadata implements Ex
/**
* Short form suitable for use in an implementation method such as XML or
SGML.
*/
-@Deprecated
+@Deprecated(since="1.0")
private String shortName;
/**
@@ -119,7 +119,7 @@ public class DefaultExtendedElementInformation extends
ISOMetadata implements Ex
* Non-null only if the {@linkplain
