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 <martin.desruisse...@geomatys.com>
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 <S> TableView<S> newTable() {
TableView<S> 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<TableColumn<SampleDimension,Numbe
TableView<SampleDimension> create(final Vocabulary vocabulary) {
final TableView<SampleDimension> 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
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageStyling.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageStyling.java
index 899adffaba..f41a557a66 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageStyling.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageStyling.java
@@ -190,7 +190,7 @@ final class CoverageStyling extends
ColorColumnHandler<Category> implements Func
*/
final TableView<Category> table = new TableView<>();
table.getColumns().add(name);
- table.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
+
table.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN);
addColumnTo(table, vocabulary.getString(Vocabulary.Keys.Colors));
/*
* Add contextual menu items.
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/ImagePropertyExplorer.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/ImagePropertyExplorer.java
index ee1d3117e1..ab3ebb93d1 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/ImagePropertyExplorer.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/ImagePropertyExplorer.java
@@ -414,7 +414,7 @@ public class ImagePropertyExplorer extends Widget {
yCol .setCellValueFactory((cell) -> cell.getValue().yp);
label.setCellValueFactory((cell) -> cell.getValue());
layout.getColumns().setAll(label, xCol, yCol);
- layout.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
+
layout.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN);
layout.getColumns().forEach((c) -> {
c.setReorderable(false);
c.setSortable(false);
@@ -436,7 +436,7 @@ public class ImagePropertyExplorer extends Widget {
value.setCellValueFactory((cell) -> cell.getValue().value);
value.setCellFactory((column) -> new PropertyCell(locale));
properties.getColumns().setAll(label, value);
-
properties.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
+
properties.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN);
properties.getColumns().forEach((c) -> c.setReorderable(false));
}
/*
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/FeatureTable.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/FeatureTable.java
index 9b2c9ca228..b2ec46e6e5 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/FeatureTable.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/FeatureTable.java
@@ -169,7 +169,7 @@ public class FeatureTable extends TableView<Feature> {
*/
private void initialize() {
featuresProperty.addListener((p,o,n) -> startFeaturesLoading(n));
- setColumnResizePolicy(CONSTRAINED_RESIZE_POLICY);
+ setColumnResizePolicy(CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN);
setTableMenuButtonVisible(true);
}
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/LogViewer.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/LogViewer.java
index 07a0a79da5..c36cbdc1ec 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/LogViewer.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/LogViewer.java
@@ -235,7 +235,7 @@ public class LogViewer extends Widget {
shortDates = DateFormat.getDateTimeInstance(DateFormat.SHORT,
DateFormat.SHORT, vocabulary.getLocale());
longDates = DateFormat.getDateTimeInstance(DateFormat.LONG,
DateFormat.LONG, vocabulary.getLocale());
table = new TableView<>(FXCollections.emptyObservableList());
- table.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
+
table.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN);
table.setTableMenuButtonVisible(true);
table.getColumns().setAll(column(vocabulary, Vocabulary.Keys.Level),
column(vocabulary,
Vocabulary.Keys.DateAndTime),
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/FixedHeaderColumnSize.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/FixedHeaderColumnSize.java
index 83b4e47dc9..68471971bf 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/FixedHeaderColumnSize.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/FixedHeaderColumnSize.java
@@ -70,7 +70,7 @@ public final class FixedHeaderColumnSize<E> implements
Callback<TableView.Resize
try {
column.setMinWidth(width);
column.setMaxWidth(width);
- result = TableView.CONSTRAINED_RESIZE_POLICY.call(prop);
+ result =
TableView.CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN.call(prop);
} finally {
if (reducing) {
column.setMinWidth(save);
@@ -81,6 +81,6 @@ public final class FixedHeaderColumnSize<E> implements
Callback<TableView.Resize
return result;
}
}
- return TableView.CONSTRAINED_RESIZE_POLICY.call(prop);
+ return TableView.CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN.call(prop);
}
}
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/MetadataTree.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/MetadataTree.java
index bc2da545a2..900d6a9f21 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/MetadataTree.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/MetadataTree.java
@@ -208,7 +208,7 @@ check: if (data != null) {
nameColumn .setCellValueFactory(MetadataTree::getPropertyName);
valueColumn.setCellValueFactory(formatter);
- setColumnResizePolicy(CONSTRAINED_RESIZE_POLICY);
+ setColumnResizePolicy(CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN);
getColumns().setAll(nameColumn, valueColumn);
contentProperty.addListener(MetadataTree::applyChange);
}
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/CRSChooser.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/CRSChooser.java
index 507c76d116..f7ed2c585d 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/CRSChooser.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/CRSChooser.java
@@ -171,7 +171,7 @@ public class CRSChooser extends
Dialog<CoordinateReferenceSystem> {
codes.setMaxWidth (120); // Seems to be required for
preventing `codes` to be as large as `names`.
table.setPrefWidth(500);
table.getColumns().setAll(codes, names);
- table.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
+
table.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN);
final Label clock = new Label("\u23F3"); // Unicode U+23F3:
Hourglass With Flowing Sand.
clock.setFont(Font.font(30));
table.setPlaceholder(clock);
