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 a51935a96ba1b836ded7d39c69948a1cf2e583df Author: Martin Desruisseaux <[email protected]> AuthorDate: Wed Aug 12 13:28:40 2020 +0200 Minor adjustments: make colors column not sortable, documentation, NetBeans configuration. --- application/sis-javafx/doc/readme.txt | 4 ++-- .../java/org/apache/sis/gui/coverage/CategoryColors.java | 12 ++++++++---- .../org/apache/sis/gui/coverage/CategoryColorsCell.java | 1 + .../org/apache/sis/util/logging/MonolineFormatter.java | 16 ++++++++-------- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/application/sis-javafx/doc/readme.txt b/application/sis-javafx/doc/readme.txt index 2b0f3fb..279505e 100644 --- a/application/sis-javafx/doc/readme.txt +++ b/application/sis-javafx/doc/readme.txt @@ -12,8 +12,8 @@ NetBeans Ant project, open the following file: And add the following lines: - javac.source = 9 - javac.target = 9 + javac.source = 14 + javac.target = 14 javac.modulepath = /path/to/my/install/javafx-sdk/lib javafx.options = --add-modules javafx.graphics,javafx.controls,javafx.fxml src.javafx.dir = ${project.root}/application/sis-javafx/src/main/java diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CategoryColors.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CategoryColors.java index e4cf01f..c8f122b 100644 --- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CategoryColors.java +++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CategoryColors.java @@ -41,8 +41,12 @@ final class CategoryColors { /** * Default color palette. */ - static final CategoryColors GRAYSCALE = new CategoryColors(0xFF000000, 0xFFFFFFFF), - BELL = new CategoryColors(0xFF0000FF, 0xFF00FFFF, 0xFFFFFFFF, 0xFFFFFF00, 0xFFFF0000); + static final CategoryColors GRAYSCALE = new CategoryColors(0xFF000000, 0xFFFFFFFF); + + /** + * Blue – Cyan – White – Yellow – Red. + */ + static final CategoryColors BELL = new CategoryColors(0xFF0000FF, 0xFF00FFFF, 0xFFFFFFFF, 0xFFFFFF00, 0xFFFF0000); /** * ARGB codes of this single color or color ramp. @@ -137,9 +141,9 @@ final class CategoryColors { if (n > 1) { final StringBuilder buffer = new StringBuilder(name); if (n > 2) { - buffer.append(" … ").append(ColorName.of(colors[n / 2])); + buffer.append(" – ").append(ColorName.of(colors[n / 2])); } - name = buffer.append(" … ").append(ColorName.of(colors[n - 1])).toString(); + name = buffer.append(" – ").append(ColorName.of(colors[n - 1])).toString(); } } } diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CategoryColorsCell.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CategoryColorsCell.java index bbae3e2..c223341 100644 --- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CategoryColorsCell.java +++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CategoryColorsCell.java @@ -334,6 +334,7 @@ final class CategoryColorsCell extends TableCell<Category,CategoryColors> implem colors.setCellValueFactory(styling); colors.setCellFactory((column) -> new CategoryColorsCell(styling)); colors.setId("colors"); + colors.setSortable(false); final TableView<Category> table = new TableView<>(); table.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY); diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java b/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java index a473629..f972303 100644 --- a/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java +++ b/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java @@ -76,19 +76,19 @@ import static org.apache.sis.internal.util.StandardDateFormat.UTC; * </ul> * * <h2>Configuration from {@code logging.properties}</h2> - * The format can also be set from the {@code jre/lib/logging.properties} file. + * The format can also be set from a {@code logging.properties} file. * For example, user can cut and paste the following properties into {@code logging.properties}: * * {@preformat text * ########################################################################### - * # Properties for the apache.sis.org's MonolineFormatter. - * # By default, the monoline formatter display only the level - * # and the message. Additional fields can be specified here: + * # Properties for the apache.sis.org MonolineFormatter. + * # By default, MonolineFormatter displays only the log level + * # and the message. Additional options can be specified here: * # - * # time: If set, writes the time elapsed since the initialization. - * # The argument specifies the output pattern. For example, the - * # pattern "HH:mm:ss.SSSS" displays the hours, minutes, seconds - * # and milliseconds. + * # time: If set, writes the time elapsed since initialization. + * # The argument specifies the output pattern. For example, + * # the "HH:mm:ss.SSSS" pattern displays the hours, minutes, + * # seconds and milliseconds. * # * # source: If set, writes the source logger name or the source class name. * # Valid argument values are "none", "logger:short", "logger:long",
