diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f0ee1ac65..fd0fadc10d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ # included templates include: - - 'https://gitlab.com/senbox-org/snap-engine/raw/master/.gitlab-ci.yml' + - 'https://gitlab.com/senbox-org/snap-engine/raw/JDK11/.gitlab-ci.yml' mvn-build: artifacts: diff --git a/lib-gdal-preferences-ui/pom.xml b/lib-gdal-preferences-ui/pom.xml index 24e718d7c2..08f0c0ebb8 100644 --- a/lib-gdal-preferences-ui/pom.xml +++ b/lib-gdal-preferences-ui/pom.xml @@ -8,7 +8,7 @@ org.esa.snap snap-desktop - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT lib-gdal-preferences-ui @@ -46,6 +46,10 @@ org-openide-awt ${netbeans.version} + + org.netbeans.api + org-openide-util + org.netbeans.api org-openide-util-lookup diff --git a/lib-gdal-preferences-ui/src/main/nbm/manifest.mf b/lib-gdal-preferences-ui/src/main/nbm/manifest.mf index 53a2cb5981..3f59e29332 100644 --- a/lib-gdal-preferences-ui/src/main/nbm/manifest.mf +++ b/lib-gdal-preferences-ui/src/main/nbm/manifest.mf @@ -3,7 +3,7 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion} OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion} AutoUpdate-Show-In-Client: false AutoUpdate-Essential-Module: true -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Long-Description:

This modules provides some GDAL binaries for use with GDAL readers and writers.

Vendor: CS ROMANIA

< diff --git a/nbexec/pom.xml b/nbexec/pom.xml index 1fccb15bc1..53ad43f4cc 100644 --- a/nbexec/pom.xml +++ b/nbexec/pom.xml @@ -7,7 +7,7 @@ nbexec jar - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT Java NetBeans Launcher Plain Java launcher for NetBeans Platform (Maven) development in IDEs other than NetBeans IDE @@ -67,8 +67,8 @@ maven-compiler-plugin 3.2 - 1.8 - 1.8 + 11 + 11 diff --git a/pom.xml b/pom.xml index 555271d269..5967b91b98 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.esa.snap snap-engine - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT snap-desktop @@ -16,8 +16,9 @@ Desktop GUI for SNAP based on NetBeans Platform - RELEASE82 - 1.0 + RELEASE113 + 1.2.0 + 1.0.0 en true **/classes @@ -79,11 +80,6 @@ org-netbeans-modules-autoupdate-ui ${netbeans.version} - - org.netbeans.api - org-netbeans-modules-javahelp - ${netbeans.version} - org.netbeans.api org-netbeans-modules-options-api @@ -171,11 +167,6 @@ org-openide-windows ${netbeans.version} - - org.netbeans.external - beansbinding-1.2.1 - ${netbeans.version} - org.netbeans.api org-netbeans-api-progress-nb @@ -192,6 +183,11 @@ snap-gui-lib ${snap-gui-lib.version} + + eu.esa.snap.netbeans + snap-help-system + ${snap-help-system.version} + ${project.groupId} snap-rcp @@ -236,6 +232,7 @@ test + @@ -259,7 +256,6 @@ maven-javadoc-plugin - true org.esa.snap.rcp:org.esa.snap.ui: @@ -337,4 +333,30 @@ + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + + aggregate + false + + aggregate + + + + default + + javadoc + + + + + + + diff --git a/snap-application/pom.xml b/snap-application/pom.xml index db62e409a1..c1edb4cdf1 100644 --- a/snap-application/pom.xml +++ b/snap-application/pom.xml @@ -5,7 +5,7 @@ org.esa.snap snap-desktop - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT snap-application @@ -248,7 +248,7 @@ [3.2.5,) - 1.8 + 11 diff --git a/snap-binning-ui/pom.xml b/snap-binning-ui/pom.xml index c584b91c76..2eec963717 100644 --- a/snap-binning-ui/pom.xml +++ b/snap-binning-ui/pom.xml @@ -5,7 +5,7 @@ org.esa.snap snap-desktop - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT snap-binning-ui @@ -90,8 +90,8 @@ org-openide-util-ui - org.netbeans.api - org-netbeans-modules-javahelp + eu.esa.snap.netbeans + snap-help-system diff --git a/snap-binning-ui/src/main/java/org/esa/snap/binning/docs/package-info.java b/snap-binning-ui/src/main/java/org/esa/snap/binning/docs/package-info.java index 0753369f61..2ea5bc41e0 100644 --- a/snap-binning-ui/src/main/java/org/esa/snap/binning/docs/package-info.java +++ b/snap-binning-ui/src/main/java/org/esa/snap/binning/docs/package-info.java @@ -1,4 +1,4 @@ @HelpSetRegistration(helpSet = "help.hs", position = 4300) package org.esa.snap.binning.docs; -import org.netbeans.api.javahelp.HelpSetRegistration; +import eu.esa.snap.netbeans.javahelp.api.HelpSetRegistration; diff --git a/snap-binning-ui/src/main/nbm/manifest.mf b/snap-binning-ui/src/main/nbm/manifest.mf index d977c24663..d96790132d 100644 --- a/snap-binning-ui/src/main/nbm/manifest.mf +++ b/snap-binning-ui/src/main/nbm/manifest.mf @@ -3,7 +3,7 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion} OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion} AutoUpdate-Show-In-Client: false AutoUpdate-Essential-Module: true -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Layer: org/esa/snap/binning/layer.xml OpenIDE-Module-Long-Description:

The GUI for the Level-3 Binning diff --git a/snap-binning-ui/src/main/resources/org/esa/snap/binning/docs/binning/SpatialDataDay.html b/snap-binning-ui/src/main/resources/org/esa/snap/binning/docs/binning/SpatialDataDay.html index 02e242c557..380940a25f 100644 --- a/snap-binning-ui/src/main/resources/org/esa/snap/binning/docs/binning/SpatialDataDay.html +++ b/snap-binning-ui/src/main/resources/org/esa/snap/binning/docs/binning/SpatialDataDay.html @@ -43,7 +43,7 @@

Spatial Data-Day

extension allows to select pixels with the lowest temporal discrepancy for the same spatial area.
More detailed information can be found in the - + diff --git a/snap-binning-ui/src/main/resources/org/esa/snap/binning/docs/binning/overview.html b/snap-binning-ui/src/main/resources/org/esa/snap/binning/docs/binning/overview.html index 932b8215b9..0a9f76c0dd 100644 --- a/snap-binning-ui/src/main/resources/org/esa/snap/binning/docs/binning/overview.html +++ b/snap-binning-ui/src/main/resources/org/esa/snap/binning/docs/binning/overview.html @@ -36,7 +36,7 @@

Overview

The SNAP Level 3 Binning Operator is based on the NASA SeaWiFS binning algorithm as described in: - + 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Layer: org/esa/snap/change/detection/layer.xml OpenIDE-Module-Long-Description:

SNAP Change Detection UI

diff --git a/snap-classification-ui/pom.xml b/snap-classification-ui/pom.xml index 08d940674d..2db59ae41e 100644 --- a/snap-classification-ui/pom.xml +++ b/snap-classification-ui/pom.xml @@ -23,7 +23,7 @@ org.esa.snap snap-desktop - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT SNAP Classification UI @@ -96,8 +96,8 @@ ${netbeans.version} - org.netbeans.api - org-netbeans-modules-javahelp + eu.esa.snap.netbeans + snap-help-system diff --git a/snap-classification-ui/src/main/java/org/esa/snap/classification/docs/package-info.java b/snap-classification-ui/src/main/java/org/esa/snap/classification/docs/package-info.java index ff3f83dc68..6f5ec247e8 100644 --- a/snap-classification-ui/src/main/java/org/esa/snap/classification/docs/package-info.java +++ b/snap-classification-ui/src/main/java/org/esa/snap/classification/docs/package-info.java @@ -1,4 +1,4 @@ @HelpSetRegistration(helpSet = "help.hs", position = 5920) package org.esa.snap.classification.docs; -import org.netbeans.api.javahelp.HelpSetRegistration; \ No newline at end of file +import eu.esa.snap.netbeans.javahelp.api.HelpSetRegistration; \ No newline at end of file diff --git a/snap-classification-ui/src/main/nbm/manifest.mf b/snap-classification-ui/src/main/nbm/manifest.mf index ffb8e5d527..1a30f32980 100644 --- a/snap-classification-ui/src/main/nbm/manifest.mf +++ b/snap-classification-ui/src/main/nbm/manifest.mf @@ -3,7 +3,7 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion} OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion} AutoUpdate-Show-In-Client: false AutoUpdate-Essential-Module: true -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Layer: org/esa/snap/classification/layer.xml OpenIDE-Module-Long-Description:

SNAP Classification UI

Vendor: Array Systems Computing Inc

diff --git a/snap-classification-ui/src/main/resources/org/esa/snap/classification/docs/operators/KDTreeKNNClassifierOp.html b/snap-classification-ui/src/main/resources/org/esa/snap/classification/docs/operators/KDTreeKNNClassifierOp.html index d964063a1d..da588974b6 100644 --- a/snap-classification-ui/src/main/resources/org/esa/snap/classification/docs/operators/KDTreeKNNClassifierOp.html +++ b/snap-classification-ui/src/main/resources/org/esa/snap/classification/docs/operators/KDTreeKNNClassifierOp.html @@ -56,7 +56,7 @@ At the end, the class with the largest total weight wins. Commonly used weight functions include Fraction, Stairs, Inverse distance and Inverse square distance.

The KD Tree KNN classifier uses a - + @@ -64,7 +64,7 @@ but, should give the same result as the slow KNN classifier.


- + diff --git a/snap-classification-ui/src/main/resources/org/esa/snap/classification/docs/operators/MaximumLikelihoodClassifierOp.html b/snap-classification-ui/src/main/resources/org/esa/snap/classification/docs/operators/MaximumLikelihoodClassifierOp.html index fb4679479c..4866ae8a62 100644 --- a/snap-classification-ui/src/main/resources/org/esa/snap/classification/docs/operators/MaximumLikelihoodClassifierOp.html +++ b/snap-classification-ui/src/main/resources/org/esa/snap/classification/docs/operators/MaximumLikelihoodClassifierOp.html @@ -23,7 +23,7 @@ the maximum likelihood is classified into the corresponding class. The likelihood is defined as the posterior probability of a pixel belonging to a given class.


- + diff --git a/snap-classification-ui/src/main/resources/org/esa/snap/classification/docs/operators/RandomForestClassifierOp.html b/snap-classification-ui/src/main/resources/org/esa/snap/classification/docs/operators/RandomForestClassifierOp.html index 90e6977b1a..116cba18c5 100644 --- a/snap-classification-ui/src/main/resources/org/esa/snap/classification/docs/operators/RandomForestClassifierOp.html +++ b/snap-classification-ui/src/main/resources/org/esa/snap/classification/docs/operators/RandomForestClassifierOp.html @@ -36,7 +36,7 @@ associated with correlated variables and over fitting (Breiman).


- + diff --git a/snap-classification-ui/src/main/resources/org/esa/snap/classification/docs/operators/SVMClassifierOp.html b/snap-classification-ui/src/main/resources/org/esa/snap/classification/docs/operators/SVMClassifierOp.html index cc0a084138..cc957147d1 100644 --- a/snap-classification-ui/src/main/resources/org/esa/snap/classification/docs/operators/SVMClassifierOp.html +++ b/snap-classification-ui/src/main/resources/org/esa/snap/classification/docs/operators/SVMClassifierOp.html @@ -45,7 +45,7 @@ split into ten different groups, or folds, each containing an approximately equal number of valid and invalid samples. The SVM is run ten times, using each fold once for testing, and the remaining nine folds for training.


- + diff --git a/snap-collocation-ui/pom.xml b/snap-collocation-ui/pom.xml index 16f8633d04..37930f48e5 100644 --- a/snap-collocation-ui/pom.xml +++ b/snap-collocation-ui/pom.xml @@ -20,7 +20,7 @@ snap-desktop org.esa.snap - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT snap-collocation-ui @@ -86,8 +86,8 @@ org-netbeans-api-annotations-common - org.netbeans.api - org-netbeans-modules-javahelp + eu.esa.snap.netbeans + snap-help-system diff --git a/snap-collocation-ui/src/main/java/org/esa/snap/collocation/docs/package-info.java b/snap-collocation-ui/src/main/java/org/esa/snap/collocation/docs/package-info.java index 24803d3470..78e9aa98dc 100644 --- a/snap-collocation-ui/src/main/java/org/esa/snap/collocation/docs/package-info.java +++ b/snap-collocation-ui/src/main/java/org/esa/snap/collocation/docs/package-info.java @@ -1,4 +1,4 @@ @HelpSetRegistration(helpSet = "help.hs", position = 4110) package org.esa.snap.collocation.docs; -import org.netbeans.api.javahelp.HelpSetRegistration; +import eu.esa.snap.netbeans.javahelp.api.HelpSetRegistration; diff --git a/snap-collocation-ui/src/main/nbm/manifest.mf b/snap-collocation-ui/src/main/nbm/manifest.mf index 448390923b..2638852708 100644 --- a/snap-collocation-ui/src/main/nbm/manifest.mf +++ b/snap-collocation-ui/src/main/nbm/manifest.mf @@ -3,7 +3,7 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion} OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion} AutoUpdate-Show-In-Client: false AutoUpdate-Essential-Module: true -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Layer: org/esa/snap/collocation/layer.xml OpenIDE-Module-Long-Description:

The GUI for the geographic colloc diff --git a/snap-dem-ui/pom.xml b/snap-dem-ui/pom.xml index 89d7b7aac8..5476675062 100644 --- a/snap-dem-ui/pom.xml +++ b/snap-dem-ui/pom.xml @@ -21,7 +21,7 @@ org.esa.snap snap-desktop - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT snap-dem-ui @@ -73,8 +73,8 @@ - org.netbeans.api - org-netbeans-modules-javahelp + eu.esa.snap.netbeans + snap-help-system org.netbeans.api diff --git a/snap-dem-ui/src/main/java/org/esa/snap/dem/docs/package-info.java b/snap-dem-ui/src/main/java/org/esa/snap/dem/docs/package-info.java index 65ddf3e712..96811ef7a0 100644 --- a/snap-dem-ui/src/main/java/org/esa/snap/dem/docs/package-info.java +++ b/snap-dem-ui/src/main/java/org/esa/snap/dem/docs/package-info.java @@ -1,4 +1,4 @@ @HelpSetRegistration(helpSet = "help.hs", position = 5300) package org.esa.snap.dem.docs; -import org.netbeans.api.javahelp.HelpSetRegistration; \ No newline at end of file +import eu.esa.snap.netbeans.javahelp.api.HelpSetRegistration; \ No newline at end of file diff --git a/snap-dem-ui/src/main/nbm/manifest.mf b/snap-dem-ui/src/main/nbm/manifest.mf index 942697f33b..be66a74b8f 100644 --- a/snap-dem-ui/src/main/nbm/manifest.mf +++ b/snap-dem-ui/src/main/nbm/manifest.mf @@ -3,7 +3,7 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion} OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion} AutoUpdate-Show-In-Client: false AutoUpdate-Essential-Module: true -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Layer: org/esa/snap/dem/layer.xml OpenIDE-Module-Long-Description:

Digital Elevation Models UI

Vendor: Array Systems Computing Inc

diff --git a/snap-gpf-ui/pom.xml b/snap-gpf-ui/pom.xml index 2ca28f54ce..63be2510cb 100644 --- a/snap-gpf-ui/pom.xml +++ b/snap-gpf-ui/pom.xml @@ -21,7 +21,7 @@ org.esa.snap snap-desktop - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT snap-gpf-ui @@ -36,8 +36,8 @@ - org.netbeans.api - org-netbeans-modules-javahelp + eu.esa.snap.netbeans + snap-help-system org.netbeans.api @@ -124,7 +124,7 @@ org.mockito - mockito-all + mockito-core junit @@ -153,6 +153,7 @@ Java Virtual Machine Specification + diff --git a/snap-gpf-ui/src/main/java/org/esa/snap/core/gpf/docs/package-info.java b/snap-gpf-ui/src/main/java/org/esa/snap/core/gpf/docs/package-info.java index 6b2698adb2..a9ab98a43e 100644 --- a/snap-gpf-ui/src/main/java/org/esa/snap/core/gpf/docs/package-info.java +++ b/snap-gpf-ui/src/main/java/org/esa/snap/core/gpf/docs/package-info.java @@ -1,4 +1,4 @@ @HelpSetRegistration(helpSet = "help.hs", position = 3000) package org.esa.snap.core.gpf.docs; -import org.netbeans.api.javahelp.HelpSetRegistration; +import eu.esa.snap.netbeans.javahelp.api.HelpSetRegistration; diff --git a/snap-gpf-ui/src/main/nbm/manifest.mf b/snap-gpf-ui/src/main/nbm/manifest.mf index d3e25810a7..52903eea21 100644 --- a/snap-gpf-ui/src/main/nbm/manifest.mf +++ b/snap-gpf-ui/src/main/nbm/manifest.mf @@ -3,7 +3,7 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion} OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion} AutoUpdate-Show-In-Client: false AutoUpdate-Essential-Module: true -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Layer: org/esa/snap/core/gpf/layer.xml OpenIDE-Module-Long-Description:

The basic framework for processing diff --git a/snap-graph-builder/pom.xml b/snap-graph-builder/pom.xml index ac6f2c3b2b..9a00f73ad2 100644 --- a/snap-graph-builder/pom.xml +++ b/snap-graph-builder/pom.xml @@ -5,7 +5,7 @@ snap-desktop org.esa.snap - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT snap-graph-builder diff --git a/snap-graph-builder/src/main/java/org/esa/snap/graphbuilder/docs/package-info.java b/snap-graph-builder/src/main/java/org/esa/snap/graphbuilder/docs/package-info.java index b0a4e8d172..ca3d23606e 100644 --- a/snap-graph-builder/src/main/java/org/esa/snap/graphbuilder/docs/package-info.java +++ b/snap-graph-builder/src/main/java/org/esa/snap/graphbuilder/docs/package-info.java @@ -1,4 +1,4 @@ @HelpSetRegistration(helpSet = "help.hs", position = 2420) package org.esa.snap.graphbuilder.docs; -import org.netbeans.api.javahelp.HelpSetRegistration; \ No newline at end of file +import eu.esa.snap.netbeans.javahelp.api.HelpSetRegistration; \ No newline at end of file diff --git a/snap-graph-builder/src/main/nbm/manifest.mf b/snap-graph-builder/src/main/nbm/manifest.mf index cf68e8c6ea..76b3341511 100644 --- a/snap-graph-builder/src/main/nbm/manifest.mf +++ b/snap-graph-builder/src/main/nbm/manifest.mf @@ -3,7 +3,7 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion} OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion} AutoUpdate-Show-In-Client: false AutoUpdate-Essential-Module: true -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Layer: org/esa/snap/graphbuilder/layer.xml OpenIDE-Module-Long-Description:

SNAP Graph Builder

Fundin diff --git a/snap-help/pom.xml b/snap-help/pom.xml index 0270428eed..103ea955cc 100644 --- a/snap-help/pom.xml +++ b/snap-help/pom.xml @@ -20,7 +20,7 @@ snap-desktop org.esa.snap - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT snap-help @@ -50,11 +50,11 @@ - + - org.netbeans.api - org-netbeans-modules-javahelp + eu.esa.snap.netbeans + snap-help-system diff --git a/snap-help/src/main/java/org/esa/snap/snap/help/docs/package-info.java b/snap-help/src/main/java/org/esa/snap/snap/help/docs/package-info.java index e203975501..6510d8127d 100644 --- a/snap-help/src/main/java/org/esa/snap/snap/help/docs/package-info.java +++ b/snap-help/src/main/java/org/esa/snap/snap/help/docs/package-info.java @@ -1,4 +1,4 @@ @HelpSetRegistration(helpSet = "help.hs", position = 1000) package org.esa.snap.snap.help.docs; -import org.netbeans.api.javahelp.HelpSetRegistration; +import eu.esa.snap.netbeans.javahelp.api.HelpSetRegistration; diff --git a/snap-help/src/main/nbm/manifest.mf b/snap-help/src/main/nbm/manifest.mf index 6ffc94c93f..fc26feed45 100644 --- a/snap-help/src/main/nbm/manifest.mf +++ b/snap-help/src/main/nbm/manifest.mf @@ -3,7 +3,7 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion} OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion} AutoUpdate-Show-In-Client: false AutoUpdate-Essential-Module: true -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Long-Description:

Provides the software user manual.

Vendor: Brockmann Consult GmbH

Contact address diff --git a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ExportEnviGcpFile.html b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ExportEnviGcpFile.html index 9b21334b40..29d852eb85 100644 --- a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ExportEnviGcpFile.html +++ b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ExportEnviGcpFile.html @@ -38,8 +38,9 @@

Export Envi GCP File

ENVI GCP File Format

Text taken from the - - + + .


diff --git a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ExportHDF.html b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ExportHDF.html index cd2341a977..e0b5d329d1 100644 --- a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ExportHDF.html +++ b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ExportHDF.html @@ -34,7 +34,7 @@

Export HDF5 Product

This command allows to export the data of the current product to - + diff --git a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ExportKml.html b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ExportKml.html index e19f9e0338..6547c0b02b 100644 --- a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ExportKml.html +++ b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ExportKml.html @@ -46,12 +46,12 @@

Export Displayed Image as KML

The exported image is saved in the KML the Keyhole Markup Language (link: - + ). - To view this file a version of Google Earth (link: - + To view this file a version of Google Earth (link: + ) diff --git a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/GETASSE30ElevationModel.html b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/GETASSE30ElevationModel.html index 30bf85d621..486c335780 100644 --- a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/GETASSE30ElevationModel.html +++ b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/GETASSE30ElevationModel.html @@ -43,7 +43,7 @@

GETASSE30 Elevation Model

first use the Toolbox will offer to download the DEM for you. Alternatively the GETASSE30 dataset can be manually downloaded from the STEP home page at - + @@ -152,22 +152,23 @@

The GETASSE30 Data

Input Data used in GETASSE30 Generation

  • ACE DEM at 30 arc second resolution referenced to the EGM96 geoid
    - See ACE Report at - + See ACE Report at + - - + +
  • SRTM30 data are reference to the EGM96 geoid
    - See - + See +
  • Mean Sea Surface (MSS) height at 2 minutes resolution referenced to the WGS84 ellipsoid.
    From the RA2 auxilliary file RA2_MSS_AXVIEC20031208_145545_20020101_000000_20200101_000000
    - See RA2 product handbook at - + See RA2 product handbook at + diff --git a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/HelpMenu.html b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/HelpMenu.html index b75ec74500..0e89dba2fe 100644 --- a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/HelpMenu.html +++ b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/HelpMenu.html @@ -47,7 +47,7 @@

    Help Menu

  • STEP Home Page
    Opens the STEP web site: - + @@ -56,7 +56,7 @@

    Help Menu

  • Report an issue
    Directs to a web page where it is explained how you can report issues: - + @@ -65,7 +65,7 @@

    Help Menu

  • Tutorials
    Open the tutorials page on the step web site: - + diff --git a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ImportCsvProduct.html b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ImportCsvProduct.html index 7272fc00a2..4e5dbb7ade 100644 --- a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ImportCsvProduct.html +++ b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ImportCsvProduct.html @@ -67,7 +67,7 @@

    Import CSV Product

  • timePattern: In order to parse the time provided in one of the columns the format can be specified. This must follow the documentation of - + SimpleDateFormat diff --git a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ImportMermaid.html b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ImportMermaid.html index 89cfb0c164..323584dc41 100644 --- a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ImportMermaid.html +++ b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ImportMermaid.html @@ -46,7 +46,7 @@

    Import MERMAID Extraction Files

    A comprehensive description of the MERMAID project and details on the matchup extraction data format can be found - + . diff --git a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ImportNetCDF.html b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ImportNetCDF.html index f2e03f53cd..2b8e906fc0 100644 --- a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ImportNetCDF.html +++ b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ImportNetCDF.html @@ -39,13 +39,13 @@

    Import NetCDF/CF

    NetCDF version 3.5. The currently used NetCDF Java library version is 4.3.22.

    Note: You can find additional information about NetCDF at - + and about the NetCDF Climate and Forecast (CF) Metadata Convention - at - + at + . diff --git a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ImportSeaDASTrack.html b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ImportSeaDASTrack.html index c2279ef6da..c52af09d9e 100644 --- a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ImportSeaDASTrack.html +++ b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/ImportSeaDASTrack.html @@ -38,7 +38,7 @@

    Import SeaDAS Track Data

    As another special case of CSV import, the Sentinel Toolbox supports the import of - + diff --git a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/LayerManagerWindow.html b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/LayerManagerWindow.html index c883bdc7eb..88e59ab8c9 100644 --- a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/LayerManagerWindow.html +++ b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/LayerManagerWindow.html @@ -136,7 +136,7 @@

    Functions

    • Image from Web Map Service (WMS) - Downloads a thematic image map layer from a dedicated internet WMS. Applicable to map-projected (geo-referenced) views only. A good list of public services is provided at - + . diff --git a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/OptionsDialog.html b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/OptionsDialog.html index 300eca8b91..f9165230fe 100644 --- a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/OptionsDialog.html +++ b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/OptionsDialog.html @@ -330,7 +330,7 @@

      Performance Settings

      Both settings might be computed by SNAP or being reset to default values.

      • VM Parameters - Please refer to - + diff --git a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/OrthorectificationAlgo.html b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/OrthorectificationAlgo.html index 772160ff3b..19f03a29a0 100644 --- a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/OrthorectificationAlgo.html +++ b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/OrthorectificationAlgo.html @@ -47,11 +47,11 @@

        Introduction

        Equations and algorithms provided in this page are extracted from the "Envisat MERIS Geometry Handbook" written by Serge RIAZANOFF, Director of VisioTerra and Professor at the University of Marne-la-Vallée (France).
        For more information, please check - + and - + (folder "Publications"). diff --git a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/RGBImageProfile.html b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/RGBImageProfile.html index e80fa1a05c..a1fff0a657 100644 --- a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/RGBImageProfile.html +++ b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/RGBImageProfile.html @@ -151,7 +151,7 @@

        RGB-Profile File

        Example: The following profile yields good RGB images from MERIS Level-1b data products. The linear-combinations for the red, green and blue components are based on the colour matching functions of the - + .

        diff --git a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/WorldMap.html b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/WorldMap.html index 041a335deb..90e6e5af5a 100644 --- a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/WorldMap.html +++ b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/desktop/WorldMap.html @@ -49,7 +49,7 @@

        Note: The owner of the used world map image is the NASA and it can be obtained at - + . diff --git a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/envisat-products/index.html b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/envisat-products/index.html index ae70712621..1ff37827f3 100644 --- a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/envisat-products/index.html +++ b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/envisat-products/index.html @@ -44,7 +44,7 @@

        Introduction

        generated from the SNAP data descriptor database (DDDB). This database is internally used by the SNAP software. It does therefore not replace ESA's official ENVISAT Product Handbook, which is provided with the ESA - + tool.

        diff --git a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/overview/BeamDimapFormat.html b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/overview/BeamDimapFormat.html index b9571c0ea4..170bcef505 100644 --- a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/overview/BeamDimapFormat.html +++ b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/overview/BeamDimapFormat.html @@ -37,7 +37,7 @@

        Introduction

        The Sentinel Toolbox and the scientific data processors use a simple data input/output format, which makes it easy to import SNAP data in other imaging applications. The format is called - + @@ -46,8 +46,8 @@

        Introduction

        The BEAM-DIMAP is the standard I/O product format for the Sentinel Toolbox and the Scientific Tools. The format was chosen because it has a very simple and easy-to-understand structure. - It was originally developed for the - + It was originally developed for the + ,hence the name. diff --git a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/overview/SnapDataSources.html b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/overview/SnapDataSources.html index d6517d6c88..38330e5803 100644 --- a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/overview/SnapDataSources.html +++ b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/overview/SnapDataSources.html @@ -41,9 +41,10 @@

        More information about access to ESA data can be obtained from - + - +

        @@ -64,12 +65,14 @@

        Data Sources Overview

        Envisat N1 MERCI (both RR and FRS available): - + - -
        + +         +
        ESA Online Dissemination: - + @@ -80,8 +83,8 @@

        Data Sources Overview

        MERIS Binned Level-3 Envisat netCDF - Level 3: - + Level 3: + @@ -93,19 +96,22 @@

        Data Sources Overview

        ERS / Envisat ERS / Envisat N1 - EOLI-SA catalogue and ordering tool: - + EOLI-SA catalogue and ordering tool: +
        - NERC data centre: - - - -
        - AATSR MERCI: - + NERC data centre: + + + + +
        + AATSR MERCI: + @@ -117,8 +123,8 @@

        Data Sources Overview

        Envisat Envisat N1 - EOLI-SA catalogue and ordering tool: - + EOLI-SA catalogue and ordering tool: + @@ -129,10 +135,11 @@

        Data Sources Overview

        SAR ERS Envisat N1 - - + + - + . @@ -142,15 +149,18 @@

        Data Sources Overview

        Proba HDF4 - EOLI-SA catalogue and ordering tool: - + EOLI-SA catalogue and ordering tool: + -
        - HTTP: - - - + +
        + HTTP: + + + @@ -160,10 +170,12 @@

        Data Sources Overview

        SMOS Earth Explorer - - - - + + + + @@ -173,8 +185,8 @@

        Data Sources Overview

        ALOS CEOS - EOLI-SA catalogue and ordering tool: - + EOLI-SA catalogue and ordering tool: + @@ -186,8 +198,8 @@

        Data Sources Overview

        ALOS CEOS - EOLI-SA catalogue and ordering tool: - + EOLI-SA catalogue and ordering tool: + @@ -198,21 +210,24 @@

        Data Sources Overview

        MODIS Aqua, Terra HDF - MERCI: - + MERCI: + -
        - Ocean data: - + +
        + Ocean data: + -
        - Land data: - + +
        + Land data: + -
        +         +
        @@ -221,15 +236,18 @@

        Data Sources Overview

        NOAA-KLM NOAA METOP - NOAA - + NOAA + -
        - METOP: - - - + +
        + METOP: + + + @@ -239,11 +257,12 @@

        Data Sources Overview

        Landsat 5 Fast Format - EOLI-SA catalogue and ordering tool: - + EOLI-SA catalogue and ordering tool: + -

        +         +

        @@ -252,21 +271,24 @@

        Data Sources Overview

        Landsat 4, 5, 7, 8 GeoTIFF Format - USGS EROS (Earth Resources Observation and Science Center): - + USGS EROS (Earth Resources Observation and Science Center): + -
        - USGS Earth Explorer: - + +
        + USGS Earth Explorer: + -
        - USGS GloVis: - + +
        + USGS GloVis: + -
        +         +
        @@ -274,11 +296,12 @@

        Data Sources Overview

        SPOT VEGETATION SPOT HDF - The SPOT VEGETATION homepage: - + The SPOT VEGETATION homepage: + -
        +         +
        @@ -288,10 +311,11 @@

        Data Sources Overview

        HDF FTP: ftp://podaac-ftp.jpl.nasa.gov/allData/aquarius/
        - OPeNDAP: - + OPeNDAP: + - + @@ -301,15 +325,17 @@

        Data Sources Overview

        Suomi NPP HDF - NASA: - + NASA: + -
        - NOAA: - + +
        + NOAA: + - + @@ -327,7 +353,7 @@

        Data Sources Overview

        multiple NetCDF - + @@ -339,9 +365,11 @@

        Data Sources Overview

        n/a NetCDF - - - + + + @@ -351,7 +379,7 @@

        Data Sources Overview

        n/a Generic - + @@ -438,10 +466,11 @@

        Data Access Details and Distribution Policy

        Ordering of (A)ATSR data from the EOLI-SA catalogue requires an accepted - Cat-1 proposal. The proposal can be submitted from - + Cat-1 proposal. The proposal can be submitted from + - + .

        @@ -468,10 +497,11 @@

        Data Access Details and Distribution Policy

        Download of ASAR MR data from the EOLI-SA catalogue requires an accepted Cat-1 proposal. - The proposal can be submitted from - + The proposal can be submitted from + - + .

        @@ -493,10 +523,11 @@

        Data Access Details and Distribution Policy

        - In order to download this kind of data, register at - + In order to download this kind of data, register at + - +

        @@ -518,20 +549,23 @@

        Data Access Details and Distribution Policy

        - In order to download CHRIS data from the ESA Earthnet portal, registration on - - - + In order to download CHRIS data from the ESA Earthnet portal, registration on + + + is required.

        Download of CHRIS data from the EOLI-SA catalogue requires an accepted Cat-1 proposal. - The proposal can be submitted from - + The proposal can be submitted from + - + .

        @@ -553,10 +587,12 @@

        Data Access Details and Distribution Policy

        - In order to download CHRIS data from the ESA Earthnet portal, registration on - - - + In order to download CHRIS data from the ESA Earthnet portal, registration on + + + is required.

        @@ -577,10 +613,11 @@

        Data Access Details and Distribution Policy

        Data Policy
        ESA is offering, to PIs resident in the ADEN Zone (Europe and Africa), ALOS data for Research and Application development. Download from the EOLI-SA catalogue requires an accepted Cat-1 proposal. - The proposal can be submitted from - + The proposal can be submitted from + - + .

        @@ -600,10 +637,11 @@

        Data Access Details and Distribution Policy

        Data Policy
        ESA is offering, to PIs resident in the ADEN Zone (Europe and Africa), ALOS data for Research and Application development. Download from the EOLI-SA catalogue requires an accepted Cat-1 proposal. - The proposal can be submitted from - + The proposal can be submitted from + - + .

        @@ -705,8 +743,8 @@

        Data Access Details and Distribution Policy

        - See - + See + @@ -828,10 +866,12 @@

        Data Access Details and Distribution Policy

        - The Getasse DEM can be downloaded from the - - - page. + The Getasse DEM can be downloaded from the + + + + + page.

        diff --git a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/overview/SnapDefinitions.html b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/overview/SnapDefinitions.html index 4d180b351d..9360d716c5 100644 --- a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/overview/SnapDefinitions.html +++ b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/overview/SnapDefinitions.html @@ -156,8 +156,9 @@

        Acronyms, Abbreviations

        AATSR - - + + @@ -166,7 +167,7 @@

        Acronyms, Abbreviations

        ADS - + @@ -176,8 +177,9 @@

        Acronyms, Abbreviations

        ASAR - - + + @@ -206,9 +208,10 @@

        Acronyms, Abbreviations

        EnviView - + - + @@ -221,7 +224,7 @@

        Acronyms, Abbreviations

        ESA - + @@ -231,7 +234,7 @@

        Acronyms, Abbreviations

        ESRI - + @@ -241,7 +244,7 @@

        Acronyms, Abbreviations

        ESRIN - + @@ -251,7 +254,7 @@

        Acronyms, Abbreviations

        ESTEC - + @@ -261,8 +264,9 @@

        Acronyms, Abbreviations

        ENVISAT - - + + @@ -271,7 +275,7 @@

        Acronyms, Abbreviations

        GADS - + @@ -281,7 +285,7 @@

        Acronyms, Abbreviations

        HDF - + @@ -291,7 +295,7 @@

        Acronyms, Abbreviations

        HDF-EOS - + @@ -306,7 +310,7 @@

        Acronyms, Abbreviations

        MDS - + @@ -316,8 +320,9 @@

        Acronyms, Abbreviations

        MERIS - - + + @@ -326,7 +331,7 @@

        Acronyms, Abbreviations

        MERMAID - + @@ -336,7 +341,7 @@

        Acronyms, Abbreviations

        MODIS - + @@ -346,7 +351,7 @@

        Acronyms, Abbreviations

        MPH - + @@ -356,7 +361,7 @@

        Acronyms, Abbreviations

        OSSD - + @@ -366,7 +371,7 @@

        Acronyms, Abbreviations

        OBPG - + @@ -376,8 +381,9 @@

        Acronyms, Abbreviations

        SAR - - + + @@ -386,7 +392,7 @@

        Acronyms, Abbreviations

        SeaDAS - + @@ -396,7 +402,7 @@

        Acronyms, Abbreviations

        SeaWiFS - + @@ -406,7 +412,7 @@

        Acronyms, Abbreviations

        SNAP - + @@ -416,7 +422,7 @@

        Acronyms, Abbreviations

        SPH - + diff --git a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/overview/SnapOverview.html b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/overview/SnapOverview.html index fd74e3cf4b..0fded41615 100644 --- a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/overview/SnapOverview.html +++ b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/overview/SnapOverview.html @@ -82,7 +82,7 @@

        Standard Product Format

        Source Code

        The complete SNAP software has been developed under the GNU public license and comes with full source code (JavaTM). The source code is available on GitHub - + diff --git a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/overview/SnapRelatedLinks.html b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/overview/SnapRelatedLinks.html index c4797b99a8..38380b3421 100644 --- a/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/overview/SnapRelatedLinks.html +++ b/snap-help/src/main/resources/org/esa/snap/snap/help/docs/general/overview/SnapRelatedLinks.html @@ -38,148 +38,206 @@

        The Science Exploitation Platform (STEP)

        -

        - - -

        - -

        - - -

        - -

        - - -

        - -

        - - -

        +

        + + + + +

        + +

        + + + + +

        + +

        + + + + +

        + +

        + + + + +

        Related Projects

        -

        - - -

        - -

        - - -

        - -

        - - -

        - -

        - - -

        - -

        - - -

        - -

        - - -

        - -

        - - -

        +

        + + + + +

        + +

        + + + + +

        + +

        + + + + +

        + +

        + + + + +

        + +

        + + + + +

        + +

        + + + + +

        + +

        + + + + +

        Data Formats

        -

        - - - at NCSA

        - -

        - - - - -

        - - -

        - -

        - - -

        +

        + + + + + at NCSA +

        + +

        + + + + + +

        + + + + +

        + +

        + + + + +

        Scientific Application Development

        -

        - - - at Oracle

        - -

        - - -

        - -

        - - -

        - - +

        + + + + + at Oracle +

        + +

        + + + + +

        + +

        + + + + +

        + + -

        - - -

        - -

        - - -

        - -

        - - -

        +

        + + + + +

        + +

        + + + + +

        + +

        + + + + +

        Related Remote Sensing Software

        -

        - - - at NASA

        - -

        - - - at MathWorks

        - -

        - - - at L3Harris Geospatial

        - -

        - - - at ESRI

        - -

        - - - at HEXAGON

        +

        + + + + + at NASA +

        + +

        + + + + + at MathWorks +

        + +

        + + + + + at L3Harris Geospatial +

        + +

        + + + + + at ESRI +

        + +

        + + + + + at HEXAGON +

        diff --git a/snap-land-cover-ui/pom.xml b/snap-land-cover-ui/pom.xml index 19c1321ba5..b8fbf5d419 100644 --- a/snap-land-cover-ui/pom.xml +++ b/snap-land-cover-ui/pom.xml @@ -6,7 +6,7 @@ org.esa.snap snap-desktop - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT snap-land-cover-ui diff --git a/snap-land-cover-ui/src/main/nbm/manifest.mf b/snap-land-cover-ui/src/main/nbm/manifest.mf index 2bb32a311a..7446933b8e 100644 --- a/snap-land-cover-ui/src/main/nbm/manifest.mf +++ b/snap-land-cover-ui/src/main/nbm/manifest.mf @@ -3,7 +3,7 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion} OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion} AutoUpdate-Show-In-Client: false AutoUpdate-Essential-Module: true -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Layer: org/esa/snap/landcover/layer.xml OpenIDE-Module-Long-Description:

        SNAP Land Cover UI

        Vendor: Array Systems Computing Inc

        diff --git a/snap-main/pom.xml b/snap-main/pom.xml index 184cea190f..c6711bf938 100644 --- a/snap-main/pom.xml +++ b/snap-main/pom.xml @@ -6,7 +6,7 @@ org.esa.snap snap-desktop - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT snap-main diff --git a/snap-pixel-extraction-ui/pom.xml b/snap-pixel-extraction-ui/pom.xml index 02e45dd005..41b520beef 100644 --- a/snap-pixel-extraction-ui/pom.xml +++ b/snap-pixel-extraction-ui/pom.xml @@ -20,7 +20,7 @@ snap-desktop org.esa.snap - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT snap-pixel-extraction-ui @@ -97,8 +97,8 @@ org-netbeans-api-annotations-common - org.netbeans.api - org-netbeans-modules-javahelp + eu.esa.snap.netbeans + snap-help-system diff --git a/snap-pixel-extraction-ui/src/main/java/org/esa/snap/pixex/docs/package-info.java b/snap-pixel-extraction-ui/src/main/java/org/esa/snap/pixex/docs/package-info.java index 26c94370ca..ec0008f3a2 100644 --- a/snap-pixel-extraction-ui/src/main/java/org/esa/snap/pixex/docs/package-info.java +++ b/snap-pixel-extraction-ui/src/main/java/org/esa/snap/pixex/docs/package-info.java @@ -1,4 +1,4 @@ @HelpSetRegistration(helpSet = "help.hs", position = 2395) package org.esa.snap.pixex.docs; -import org.netbeans.api.javahelp.HelpSetRegistration; +import eu.esa.snap.netbeans.javahelp.api.HelpSetRegistration; diff --git a/snap-pixel-extraction-ui/src/main/nbm/manifest.mf b/snap-pixel-extraction-ui/src/main/nbm/manifest.mf index e5cce79c42..8cbd8b48cc 100644 --- a/snap-pixel-extraction-ui/src/main/nbm/manifest.mf +++ b/snap-pixel-extraction-ui/src/main/nbm/manifest.mf @@ -3,7 +3,7 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion} OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion} AutoUpdate-Show-In-Client: false AutoUpdate-Essential-Module: true -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Layer: org/esa/snap/pixex/layer.xml OpenIDE-Module-Long-Description:

        The SNAP Pixel Extraction Tool can diff --git a/snap-product-library-ui-v2/pom.xml b/snap-product-library-ui-v2/pom.xml index c268d9dadc..58a4f74609 100644 --- a/snap-product-library-ui-v2/pom.xml +++ b/snap-product-library-ui-v2/pom.xml @@ -9,7 +9,7 @@ org.esa.snap snap-desktop - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT snap-product-library-ui-v2 @@ -77,22 +77,22 @@ gov.nasa worldwind - 2.1.0 + 2.2.1 gov.nasa worldwindx - 2.1.0 + 2.2.1 org.jogamp.gluegen gluegen-rt-main - 2.1.5-01 + 2.4.0 org.jogamp.jogl jogl-all-main - 2.1.5-01 + 2.4.0 org.apache.httpcomponents @@ -122,6 +122,22 @@ + + + snap-repo-public + Public Maven Repository for SNAP + https://snap-build-server.tilaa.cloud/nexus/repository/snap-maven-public/ + + true + warn + + + true + warn + + + + diff --git a/snap-product-library-ui-v2/src/main/java/org/esa/snap/product/library/ui/v2/docs/package-info.java b/snap-product-library-ui-v2/src/main/java/org/esa/snap/product/library/ui/v2/docs/package-info.java index 1fb668734f..edae465ee3 100644 --- a/snap-product-library-ui-v2/src/main/java/org/esa/snap/product/library/ui/v2/docs/package-info.java +++ b/snap-product-library-ui-v2/src/main/java/org/esa/snap/product/library/ui/v2/docs/package-info.java @@ -1,4 +1,4 @@ @HelpSetRegistration(helpSet = "help.hs", position = 1678) package org.esa.snap.product.library.ui.v2.docs; -import org.netbeans.api.javahelp.HelpSetRegistration; \ No newline at end of file +import eu.esa.snap.netbeans.javahelp.api.HelpSetRegistration; \ No newline at end of file diff --git a/snap-product-library-ui-v2/src/main/java/org/esa/snap/product/library/ui/v2/repository/local/AttributesParameterComponent.java b/snap-product-library-ui-v2/src/main/java/org/esa/snap/product/library/ui/v2/repository/local/AttributesParameterComponent.java index 20b5125804..3c1c645fd8 100644 --- a/snap-product-library-ui-v2/src/main/java/org/esa/snap/product/library/ui/v2/repository/local/AttributesParameterComponent.java +++ b/snap-product-library-ui-v2/src/main/java/org/esa/snap/product/library/ui/v2/repository/local/AttributesParameterComponent.java @@ -94,7 +94,7 @@ public AttributesParameterComponent(JComboBox attributesComboBox, JCombo this.attributesList.setVisibleRowCount(5); this.attributesList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); int cellItemHeight = this.attributeNamesComboBox.getPreferredSize().height; - LabelListCellRenderer listCellRenderer = new LabelListCellRenderer(cellItemHeight) { + LabelListCellRenderer listCellRenderer = new LabelListCellRenderer<>(cellItemHeight) { @Override protected String getItemDisplayText(AttributeFilter attribute) { if (attribute == null) { diff --git a/snap-product-library-ui-v2/src/main/nbm/manifest.mf b/snap-product-library-ui-v2/src/main/nbm/manifest.mf index 6f9f29943b..ad6a819e17 100644 --- a/snap-product-library-ui-v2/src/main/nbm/manifest.mf +++ b/snap-product-library-ui-v2/src/main/nbm/manifest.mf @@ -3,6 +3,6 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion} OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion} AutoUpdate-Show-In-Client: false AutoUpdate-Essential-Module: true -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Long-Description:

        SNAP Product Library UI v2

        diff --git a/snap-raster-ui/pom.xml b/snap-raster-ui/pom.xml index 70107496da..5acf94a3d3 100644 --- a/snap-raster-ui/pom.xml +++ b/snap-raster-ui/pom.xml @@ -20,7 +20,7 @@ org.esa.snap snap-desktop - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT snap-raster-ui @@ -56,10 +56,6 @@ snap-engine-utilities - - eu.esa.snap.netbeans - snap-gui-lib - org.netbeans.api org-openide-util @@ -72,6 +68,10 @@ org.netbeans.api org-netbeans-api-progress-nb + + eu.esa.snap.netbeans + snap-gui-lib + org.netbeans.api org-openide-util-ui @@ -81,8 +81,8 @@ org-netbeans-api-annotations-common - org.netbeans.api - org-netbeans-modules-javahelp + eu.esa.snap.netbeans + snap-help-system junit diff --git a/snap-raster-ui/src/main/java/org/esa/snap/raster/docs/package-info.java b/snap-raster-ui/src/main/java/org/esa/snap/raster/docs/package-info.java index 12d7cafd77..baf35a3f3b 100644 --- a/snap-raster-ui/src/main/java/org/esa/snap/raster/docs/package-info.java +++ b/snap-raster-ui/src/main/java/org/esa/snap/raster/docs/package-info.java @@ -1,4 +1,4 @@ @HelpSetRegistration(helpSet = "help.hs", position = 5310) package org.esa.snap.raster.docs; -import org.netbeans.api.javahelp.HelpSetRegistration; \ No newline at end of file +import eu.esa.snap.netbeans.javahelp.api.HelpSetRegistration; \ No newline at end of file diff --git a/snap-raster-ui/src/main/nbm/manifest.mf b/snap-raster-ui/src/main/nbm/manifest.mf index a54eb38ad9..24c3c903ba 100644 --- a/snap-raster-ui/src/main/nbm/manifest.mf +++ b/snap-raster-ui/src/main/nbm/manifest.mf @@ -3,7 +3,7 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion} OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion} AutoUpdate-Show-In-Client: false AutoUpdate-Essential-Module: true -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Layer: org/esa/snap/raster/layer.xml OpenIDE-Module-Long-Description:

        General Raster Processing Tools

        Vendor: Array Systems Computing Inc

        diff --git a/snap-rcp/pom.xml b/snap-rcp/pom.xml index f20b30b94e..25273432ea 100644 --- a/snap-rcp/pom.xml +++ b/snap-rcp/pom.xml @@ -5,7 +5,7 @@ org.esa.snap snap-desktop - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT snap-rcp @@ -57,6 +57,7 @@ org.esa.snap.rcp.actions.* org.esa.snap.rcp.util.* org.jfree.* + eu.esa.snap.netbeans.* @@ -134,8 +135,8 @@ org-netbeans-modules-options-api - org.netbeans.api - org-netbeans-modules-javahelp + eu.esa.snap.netbeans + snap-help-system org.netbeans.api @@ -173,10 +174,6 @@ org.netbeans.api org-netbeans-modules-sendopts - - org.netbeans.external - beansbinding-1.2.1 - org.netbeans.api org-netbeans-api-progress-nb @@ -303,7 +300,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/snap-rcp/src/main/java/org/esa/snap/rcp/about/AboutBoxProcessor.java b/snap-rcp/src/main/java/org/esa/snap/rcp/about/AboutBoxProcessor.java index 69e08a96dc..31ee670d62 100644 --- a/snap-rcp/src/main/java/org/esa/snap/rcp/about/AboutBoxProcessor.java +++ b/snap-rcp/src/main/java/org/esa/snap/rcp/about/AboutBoxProcessor.java @@ -27,7 +27,7 @@ */ @ServiceProvider(service = Processor.class) @SupportedAnnotationTypes("org.esa.snap.rcp.about.AboutBox") -@SupportedSourceVersion(SourceVersion.RELEASE_8) +@SupportedSourceVersion(SourceVersion.RELEASE_11) public class AboutBoxProcessor extends LayerGeneratingProcessor { @Override diff --git a/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/shapefile/FeatureLayer.java b/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/shapefile/FeatureLayer.java index 46490d256a..ea12f76429 100644 --- a/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/shapefile/FeatureLayer.java +++ b/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/shapefile/FeatureLayer.java @@ -22,9 +22,9 @@ import com.bc.ceres.grender.Rendering; import org.geotools.feature.FeatureCollection; import org.geotools.geometry.jts.ReferencedEnvelope; -import org.geotools.map.DefaultMapContext; -import org.geotools.map.MapContext; -import org.geotools.map.MapLayer; +import org.geotools.map.MapContent; +import org.geotools.map.MapViewport; +import org.geotools.map.StyleLayer; import org.geotools.referencing.crs.DefaultGeographicCRS; import org.geotools.renderer.label.LabelCacheImpl; import org.geotools.renderer.lite.LabelCache; @@ -61,7 +61,8 @@ */ public class FeatureLayer extends Layer { - private MapContext mapContext; + private final MapContent mapContent; + //private MapContext mapContext; private CoordinateReferenceSystem crs; private StreamingRenderer renderer; @@ -82,14 +83,31 @@ public FeatureLayer(LayerType layerType, final FeatureCollection check how this works tb 2023-04-24 + //mapContext = new DefaultMapContext(crs); + //mapContext.addLayer(fc, style); + renderer = new StreamingRenderer(); workaroundLabelCacheBug(); style.accept(new RetrievingStyleVisitor()); - renderer.setContext(mapContext); - + // @todo 1 tb/tb this is the old geoTools code + //renderer.setContext(mapContext); + renderer.setMapContent(mapContent); } @Override @@ -161,7 +179,8 @@ protected void renderLayer(final Rendering rendering) { final AffineTransform v2mTransform = rendering.getViewport().getViewToModelTransform(); Rectangle2D bounds2D = v2mTransform.createTransformedShape(bounds).getBounds2D(); ReferencedEnvelope mapArea = new ReferencedEnvelope(bounds2D, crs); - mapContext.setAreaOfInterest(mapArea); + //mapContext.setAreaOfInterest(mapArea); + mapContent.getViewport().setBounds(mapArea); labelCache.clear(); // workaround for labelCache bug final AffineTransform modelToViewTransform = rendering.getViewport().getModelToViewTransform(); @@ -169,7 +188,7 @@ protected void renderLayer(final Rendering rendering) { } private void applyOpacity() { - final MapLayer layer = mapContext.getLayer(0); + final StyleLayer layer = (StyleLayer) mapContent.layers().get(0); if (layer != null) { Style style = layer.getStyle(); DuplicatingStyleVisitor copyStyle = new ApplyingStyleVisitor(); diff --git a/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/shapefile/FeatureLayerType.java b/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/shapefile/FeatureLayerType.java index f7a95e3107..f2f3aaeabc 100644 --- a/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/shapefile/FeatureLayerType.java +++ b/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/shapefile/FeatureLayerType.java @@ -16,11 +16,7 @@ package org.esa.snap.rcp.layermanager.layersrc.shapefile; -import com.bc.ceres.binding.ConversionException; -import com.bc.ceres.binding.Property; -import com.bc.ceres.binding.PropertyContainer; -import com.bc.ceres.binding.PropertySet; -import com.bc.ceres.binding.ValidationException; +import com.bc.ceres.binding.*; import com.bc.ceres.binding.dom.DefaultDomConverter; import com.bc.ceres.binding.dom.DomConverter; import com.bc.ceres.binding.dom.DomElement; @@ -33,17 +29,17 @@ import com.thoughtworks.xstream.io.copy.HierarchicalStreamCopier; import com.thoughtworks.xstream.io.xml.XppDomWriter; import com.thoughtworks.xstream.io.xml.XppReader; -import org.locationtech.jts.geom.Coordinate; -import org.locationtech.jts.geom.Geometry; import org.esa.snap.core.util.FeatureUtils; import org.geotools.data.FeatureSource; import org.geotools.factory.CommonFactoryFinder; import org.geotools.feature.FeatureCollection; import org.geotools.referencing.CRS; import org.geotools.referencing.crs.DefaultGeographicCRS; -import org.geotools.styling.SLDParser; -import org.geotools.styling.SLDTransformer; import org.geotools.styling.Style; +import org.geotools.xml.styling.SLDParser; +import org.geotools.xml.styling.SLDTransformer; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.Geometry; import org.opengis.feature.simple.SimpleFeature; import org.opengis.feature.simple.SimpleFeatureType; import org.opengis.referencing.FactoryException; @@ -62,7 +58,7 @@ * Unstable API. Use at own risk. */ @LayerTypeMetadata(name = "FeatureLayerType", - aliasNames = {"FeatureLayerType"}) + aliasNames = {"FeatureLayerType"}) public class FeatureLayerType extends LayerType { public static final String PROPERTY_NAME_SLD_STYLE = "sldStyle"; @@ -99,12 +95,12 @@ public Layer createLayer(LayerContext ctx, PropertySet configuration) { FeatureLayerType.PROPERTY_NAME_FEATURE_COLLECTION_CLIP_GEOMETRY); fc = FeatureUtils.clipCollection(fc, - featureCrs, - clipGeometry, - DefaultGeographicCRS.WGS84, - null, - targetCrs, - ProgressMonitor.NULL); + featureCrs, + clipGeometry, + DefaultGeographicCRS.WGS84, + null, + targetCrs, + ProgressMonitor.NULL); return new FeatureLayer(this, fc, configuration); } diff --git a/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/shapefile/SLDUtils.java b/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/shapefile/SLDUtils.java index 6eeae37bde..1f554f42ea 100644 --- a/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/shapefile/SLDUtils.java +++ b/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/shapefile/SLDUtils.java @@ -9,27 +9,21 @@ import org.geotools.feature.FeatureTypes; import org.geotools.feature.simple.SimpleFeatureBuilder; import org.geotools.feature.simple.SimpleFeatureTypeBuilder; -import org.geotools.styling.FeatureTypeStyle; -import org.geotools.styling.LineSymbolizer; -import org.geotools.styling.PolygonSymbolizer; -import org.geotools.styling.Rule; -import org.geotools.styling.SLD; -import org.geotools.styling.SLDParser; import org.geotools.styling.Stroke; -import org.geotools.styling.Style; -import org.geotools.styling.StyleFactory; -import org.geotools.styling.Symbolizer; +import org.geotools.styling.*; +import org.geotools.xml.styling.SLDParser; import org.opengis.feature.simple.SimpleFeature; import org.opengis.feature.simple.SimpleFeatureType; +import org.opengis.feature.type.Name; import org.opengis.filter.Filter; -import java.awt.BasicStroke; -import java.awt.Color; +import java.awt.*; import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.Set; public class SLDUtils { private static final StyleFactory styleFactory = CommonFactoryFinder.getStyleFactory(null); @@ -105,7 +99,7 @@ public static void applyStyle(Style style, String defaultCss, while (featureIterator.hasNext()) { SimpleFeature simpleFeature = featureIterator.next(); SimpleFeature styledFeature = processRules(simpleFeature, styledFeatureType, ruleList, - elseRuleList); + elseRuleList); if (styledFeature != null) { styledCollection.add(styledFeature); featureIterator.remove(); @@ -164,7 +158,7 @@ public static SimpleFeature processSymbolizers(SimpleFeatureType sft, SimpleFeat Color strokeColor = SLD.color(stroke); int width = SLD.width(stroke); FigureStyle figureStyle = DefaultFigureStyle.createPolygonStyle(fillColor, strokeColor, - new BasicStroke(width)); + new BasicStroke(width)); String cssStyle = figureStyle.toCssString(); return createStyledFeature(sft, feature, cssStyle); } @@ -173,9 +167,17 @@ public static SimpleFeature processSymbolizers(SimpleFeatureType sft, SimpleFeat } public static boolean isFeatureTypeStyleActive(SimpleFeatureType ftype, FeatureTypeStyle fts) { - return ((ftype.getTypeName() != null) - && (ftype.getTypeName().equalsIgnoreCase(fts.getFeatureTypeName()) || - FeatureTypes.isDecendedFrom(ftype, null, fts.getFeatureTypeName()))); + if (ftype.getTypeName() == null) { + return false; + } + Set ftNames = fts.featureTypeNames(); + for (Name ftName : ftNames) { + if (ftype.getTypeName().equalsIgnoreCase(ftName.toString()) || + FeatureTypes.isDecendedFrom(ftype, null, ftName.toString())) { + return true; + } + } + return false; } public static SimpleFeatureType createStyledFeatureType(SimpleFeatureType type) { diff --git a/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsAssistantPage1.java b/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsAssistantPage1.java index f8eb6ab8f6..8a04d071c5 100644 --- a/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsAssistantPage1.java +++ b/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsAssistantPage1.java @@ -21,8 +21,8 @@ import org.esa.snap.ui.UserInputHistory; import org.esa.snap.ui.layer.AbstractLayerSourceAssistantPage; import org.esa.snap.ui.layer.LayerSourcePageContext; -import org.geotools.data.ows.WMSCapabilities; -import org.geotools.data.wms.WebMapServer; +import org.geotools.ows.wms.WMSCapabilities; +import org.geotools.ows.wms.WebMapServer; import javax.swing.JComboBox; import javax.swing.JLabel; diff --git a/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsAssistantPage2.java b/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsAssistantPage2.java index 30a1bb9102..751688d85f 100644 --- a/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsAssistantPage2.java +++ b/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsAssistantPage2.java @@ -21,10 +21,10 @@ import org.esa.snap.rcp.SnapApp; import org.esa.snap.ui.layer.AbstractLayerSourceAssistantPage; import org.esa.snap.ui.layer.LayerSourcePageContext; -import org.geotools.data.ows.CRSEnvelope; -import org.geotools.data.ows.Layer; -import org.geotools.data.ows.StyleImpl; -import org.geotools.data.ows.WMSCapabilities; +import org.geotools.ows.wms.CRSEnvelope; +import org.geotools.ows.wms.Layer; +import org.geotools.ows.wms.StyleImpl; +import org.geotools.ows.wms.WMSCapabilities; import org.geotools.referencing.CRS; import org.opengis.referencing.FactoryException; import org.opengis.referencing.crs.CoordinateReferenceSystem; diff --git a/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsAssistantPage3.java b/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsAssistantPage3.java index 61f5297072..efcbaf656f 100644 --- a/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsAssistantPage3.java +++ b/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsAssistantPage3.java @@ -19,9 +19,9 @@ import com.bc.ceres.glayer.swing.LayerCanvas; import org.esa.snap.ui.layer.AbstractLayerSourceAssistantPage; import org.esa.snap.ui.layer.LayerSourcePageContext; -import org.geotools.data.ows.CRSEnvelope; -import org.geotools.data.ows.Layer; -import org.geotools.data.ows.StyleImpl; +import org.geotools.ows.wms.CRSEnvelope; +import org.geotools.ows.wms.Layer; +import org.geotools.ows.wms.StyleImpl; import org.opengis.util.InternationalString; import javax.swing.DefaultListCellRenderer; diff --git a/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsLayerType.java b/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsLayerType.java index 21aec20110..197a2fc2a3 100644 --- a/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsLayerType.java +++ b/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsLayerType.java @@ -31,12 +31,12 @@ import com.bc.ceres.glevel.support.DefaultMultiLevelSource; import org.esa.snap.core.datamodel.Product; import org.esa.snap.core.datamodel.RasterDataNode; -import org.geotools.data.ows.CRSEnvelope; -import org.geotools.data.ows.StyleImpl; -import org.geotools.data.wms.WebMapServer; -import org.geotools.data.wms.request.GetMapRequest; -import org.geotools.data.wms.response.GetMapResponse; import org.geotools.ows.ServiceException; +import org.geotools.ows.wms.CRSEnvelope; +import org.geotools.ows.wms.StyleImpl; +import org.geotools.ows.wms.WebMapServer; +import org.geotools.ows.wms.request.GetMapRequest; +import org.geotools.ows.wms.response.GetMapResponse; import javax.imageio.ImageIO; import javax.media.jai.PlanarImage; @@ -73,11 +73,11 @@ public Layer createLayer(LayerContext ctx, PropertySet configuration) { mapServer = getWmsServer(configuration); } catch (Exception e) { final String message = String.format("Not able to access Web Mapping Server: %s", - configuration.getValue(WmsLayerType.PROPERTY_NAME_URL)); + configuration.getValue(WmsLayerType.PROPERTY_NAME_URL)); throw new RuntimeException(message, e); } final int layerIndex = configuration.getValue(WmsLayerType.PROPERTY_NAME_LAYER_INDEX); - final org.geotools.data.ows.Layer wmsLayer = getLayer(mapServer, layerIndex); + final org.geotools.ows.wms.Layer wmsLayer = getLayer(mapServer, layerIndex); final MultiLevelSource multiLevelSource = createMultiLevelSource(configuration, mapServer, wmsLayer); final ImageLayer.Type imageLayerType = LayerTypeRegistry.getLayerType(ImageLayer.Type.class); @@ -110,7 +110,7 @@ public PropertySet createLayerConfig(LayerContext ctx) { private static DefaultMultiLevelSource createMultiLevelSource(PropertySet configuration, WebMapServer wmsServer, - org.geotools.data.ows.Layer layer) { + org.geotools.ows.wms.Layer layer) { DefaultMultiLevelSource multiLevelSource; final String styleName = configuration.getValue(WmsLayerType.PROPERTY_NAME_STYLE_NAME); final Dimension size = configuration.getValue(WmsLayerType.PROPERTY_NAME_IMAGE_SIZE); @@ -150,7 +150,7 @@ private static DefaultMultiLevelSource createMultiLevelSource(PropertySet config return multiLevelSource; } - private static org.geotools.data.ows.Layer getLayer(WebMapServer server, int layerIndex) { + private static org.geotools.ows.wms.Layer getLayer(WebMapServer server, int layerIndex) { return server.getCapabilities().getLayerList().get(layerIndex); } diff --git a/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsWorker.java b/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsWorker.java index e73a60e932..15f8ed0749 100644 --- a/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsWorker.java +++ b/snap-rcp/src/main/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsWorker.java @@ -23,10 +23,10 @@ import org.esa.snap.core.datamodel.RasterDataNode; import org.esa.snap.rcp.SnapApp; import org.esa.snap.ui.layer.LayerSourcePageContext; -import org.geotools.data.ows.CRSEnvelope; -import org.geotools.data.ows.Layer; -import org.geotools.data.ows.StyleImpl; -import org.geotools.data.wms.WebMapServer; +import org.geotools.ows.wms.CRSEnvelope; +import org.geotools.ows.wms.Layer; +import org.geotools.ows.wms.StyleImpl; +import org.geotools.ows.wms.WebMapServer; import java.awt.Dimension; import java.net.URL; diff --git a/snap-rcp/src/test/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsLayerConfigurationPersistencyTest.java b/snap-rcp/src/test/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsLayerConfigurationPersistencyTest.java index 967d8ef46a..c80bcd6981 100644 --- a/snap-rcp/src/test/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsLayerConfigurationPersistencyTest.java +++ b/snap-rcp/src/test/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsLayerConfigurationPersistencyTest.java @@ -31,7 +31,7 @@ import org.esa.snap.core.datamodel.ProductManager; import org.esa.snap.core.datamodel.VirtualBand; import org.esa.snap.rcp.session.dom.SessionDomConverter; -import org.geotools.data.ows.CRSEnvelope; +import org.geotools.ows.wms.CRSEnvelope; import org.junit.Before; import org.junit.Test; diff --git a/snap-rcp/src/test/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsLayerTypeTest.java b/snap-rcp/src/test/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsLayerTypeTest.java index 7e22f0cae9..f487a491ad 100644 --- a/snap-rcp/src/test/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsLayerTypeTest.java +++ b/snap-rcp/src/test/java/org/esa/snap/rcp/layermanager/layersrc/wms/WmsLayerTypeTest.java @@ -7,7 +7,7 @@ import org.esa.snap.core.datamodel.Product; import org.esa.snap.core.datamodel.ProductData; import org.esa.snap.core.datamodel.VirtualBand; -import org.geotools.data.ows.CRSEnvelope; +import org.geotools.ows.wms.CRSEnvelope; import org.geotools.referencing.crs.DefaultGeographicCRS; import org.junit.Assume; import org.junit.BeforeClass; diff --git a/snap-rcp/src/test/java/org/esa/snap/rcp/session/dom/FeatureLayerConfigurationPersistencyTest.java b/snap-rcp/src/test/java/org/esa/snap/rcp/session/dom/FeatureLayerConfigurationPersistencyTest.java index 6e0c28104f..660c3e9069 100644 --- a/snap-rcp/src/test/java/org/esa/snap/rcp/session/dom/FeatureLayerConfigurationPersistencyTest.java +++ b/snap-rcp/src/test/java/org/esa/snap/rcp/session/dom/FeatureLayerConfigurationPersistencyTest.java @@ -20,6 +20,7 @@ import com.bc.ceres.glayer.Layer; import com.bc.ceres.glayer.LayerType; import com.bc.ceres.glayer.LayerTypeRegistry; +import org.geotools.styling.*; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.LinearRing; @@ -30,13 +31,6 @@ import org.geotools.factory.CommonFactoryFinder; import org.geotools.feature.FeatureCollection; import org.geotools.referencing.crs.DefaultGeographicCRS; -import org.geotools.styling.FeatureTypeStyle; -import org.geotools.styling.Fill; -import org.geotools.styling.PolygonSymbolizer; -import org.geotools.styling.Rule; -import org.geotools.styling.Style; -import org.geotools.styling.StyleFactory; -import org.geotools.styling.Symbolizer; import org.opengis.feature.simple.SimpleFeature; import org.opengis.feature.simple.SimpleFeatureType; import org.opengis.filter.FilterFactory; @@ -80,7 +74,6 @@ protected Layer createLayer(LayerType layerType) throws Exception { return new FeatureLayer(layerType, fc, configuration); } - @SuppressWarnings({"deprecation"}) private static Style createStyle() { StyleFactory styleFactory = CommonFactoryFinder.getStyleFactory(null); FilterFactory filterFactory = CommonFactoryFinder.getFilterFactory(null); @@ -90,14 +83,16 @@ private static Style createStyle() { filterFactory.literal(0.5) ); symbolizer.setFill(fill); - Rule rule = styleFactory.createRule(); - rule.setSymbolizers(new Symbolizer[]{symbolizer}); - FeatureTypeStyle fts = styleFactory.createFeatureTypeStyle(); - fts.setRules(new Rule[]{rule}); - Style style = styleFactory.createStyle(); + StyleBuilder styleBuilder = new StyleBuilder(); + Rule rule = styleBuilder.createRule(symbolizer); + //rule.setSymbolizers(new Symbolizer[]{symbolizer}); + FeatureTypeStyle fts = styleFactory.createFeatureTypeStyle(rule); + //fts.setRules(new Rule[]{rule}); + + // @todo 1 tb/tb test this 2023-04-26 + StyleImpl style = (StyleImpl) styleFactory.createStyle(); style.addFeatureTypeStyle(fts); return style; } - } diff --git a/snap-remote-execution-ui/pom.xml b/snap-remote-execution-ui/pom.xml index 4f04db2d22..898a29c072 100644 --- a/snap-remote-execution-ui/pom.xml +++ b/snap-remote-execution-ui/pom.xml @@ -9,7 +9,7 @@ org.esa.snap snap-desktop - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT snap-remote-execution-ui @@ -68,8 +68,8 @@ org-netbeans-api-annotations-common - org.netbeans.api - org-netbeans-modules-javahelp + eu.esa.snap.netbeans + snap-help-system com.googlecode.json-simple diff --git a/snap-remote-execution-ui/src/main/java/org/esa/snap/remote/execution/docs/package-info.java b/snap-remote-execution-ui/src/main/java/org/esa/snap/remote/execution/docs/package-info.java index de9bfde462..27a16f0b45 100644 --- a/snap-remote-execution-ui/src/main/java/org/esa/snap/remote/execution/docs/package-info.java +++ b/snap-remote-execution-ui/src/main/java/org/esa/snap/remote/execution/docs/package-info.java @@ -20,4 +20,4 @@ @HelpSetRegistration(helpSet = "help.hs", position = 5432) package org.esa.snap.remote.execution.docs; -import org.netbeans.api.javahelp.HelpSetRegistration; +import eu.esa.snap.netbeans.javahelp.api.HelpSetRegistration; diff --git a/snap-remote-execution-ui/src/main/java/org/esa/snap/remote/execution/machines/EditRemoteMachineCredentialsDialog.java b/snap-remote-execution-ui/src/main/java/org/esa/snap/remote/execution/machines/EditRemoteMachineCredentialsDialog.java index 27ddf6f689..de17d636de 100644 --- a/snap-remote-execution-ui/src/main/java/org/esa/snap/remote/execution/machines/EditRemoteMachineCredentialsDialog.java +++ b/snap-remote-execution-ui/src/main/java/org/esa/snap/remote/execution/machines/EditRemoteMachineCredentialsDialog.java @@ -152,7 +152,7 @@ private void createComponents(Insets defaultTextFieldMargins, Insets defaultList this.operatingSystemsComboBox.addItem(RemoteMachineProperties.LINUX_OPERATING_SYSTEM); this.operatingSystemsComboBox.addItem(RemoteMachineProperties.WINDOWS_OPERATING_SYSTEM); this.operatingSystemsComboBox.setSelectedItem(null); - LabelListCellRenderer renderer = new LabelListCellRenderer(defaultListItemMargins) { + LabelListCellRenderer renderer = new LabelListCellRenderer<>(defaultListItemMargins) { @Override protected String getItemDisplayText(String value) { return value; diff --git a/snap-remote-execution-ui/src/main/nbm/manifest.mf b/snap-remote-execution-ui/src/main/nbm/manifest.mf index a667f86174..065fa45b85 100644 --- a/snap-remote-execution-ui/src/main/nbm/manifest.mf +++ b/snap-remote-execution-ui/src/main/nbm/manifest.mf @@ -4,7 +4,7 @@ OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion} AutoUpdate-Show-In-Client: false AutoUpdate-Essential-Module: true OpenIDE-Module-Layer: org/esa/snap/remote/execution/layer.xml -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Long-Description:

        The Remote Execution Processor is a multi-steps iterative process that executes on the remote machines a slave graph and then on the host machine it executes a master graph diff --git a/snap-smart-configurator-ui/pom.xml b/snap-smart-configurator-ui/pom.xml index e273f64464..9dc0a61688 100644 --- a/snap-smart-configurator-ui/pom.xml +++ b/snap-smart-configurator-ui/pom.xml @@ -4,7 +4,7 @@ org.esa.snap snap-desktop - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT snap-smart-configurator-ui nbm diff --git a/snap-sta-adapters/OTB-BandMath/pom.xml b/snap-sta-adapters/OTB-BandMath/pom.xml index 235b2cf72d..c7917d29a3 100644 --- a/snap-sta-adapters/OTB-BandMath/pom.xml +++ b/snap-sta-adapters/OTB-BandMath/pom.xml @@ -6,7 +6,7 @@ snap-sta-adapters org.esa.snap - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT OTB-BandMath diff --git a/snap-sta-adapters/OTB-BandMath/resources/META-INF/MANIFEST.MF b/snap-sta-adapters/OTB-BandMath/resources/META-INF/MANIFEST.MF index 862c7d93fe..a4808f2e5e 100644 --- a/snap-sta-adapters/OTB-BandMath/resources/META-INF/MANIFEST.MF +++ b/snap-sta-adapters/OTB-BandMath/resources/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 OpenIDE-Module-Specification-Version: 1 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Implementation-Version: 1 -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Type: STA OpenIDE-Module-Short-Description: OTB-BandMath OpenIDE-Module: org.esa.snap.OTB.BandMath diff --git a/snap-sta-adapters/OTB-EdgeExtraction/pom.xml b/snap-sta-adapters/OTB-EdgeExtraction/pom.xml index a56bbbaaed..7824a0074e 100644 --- a/snap-sta-adapters/OTB-EdgeExtraction/pom.xml +++ b/snap-sta-adapters/OTB-EdgeExtraction/pom.xml @@ -6,7 +6,7 @@ snap-sta-adapters org.esa.snap - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT OTB-EdgeExtraction diff --git a/snap-sta-adapters/OTB-EdgeExtraction/resources/META-INF/MANIFEST.MF b/snap-sta-adapters/OTB-EdgeExtraction/resources/META-INF/MANIFEST.MF index 4067647774..e78911aa77 100644 --- a/snap-sta-adapters/OTB-EdgeExtraction/resources/META-INF/MANIFEST.MF +++ b/snap-sta-adapters/OTB-EdgeExtraction/resources/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 OpenIDE-Module-Specification-Version: 1 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Implementation-Version: 1 -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Type: STA OpenIDE-Module-Short-Description: OTB Edge Extraction OpenIDE-Module: org.esa.snap.OTB.EdgeExtraction diff --git a/snap-sta-adapters/pom.xml b/snap-sta-adapters/pom.xml index ef19d5a240..ee25c1919f 100644 --- a/snap-sta-adapters/pom.xml +++ b/snap-sta-adapters/pom.xml @@ -6,7 +6,7 @@ snap-desktop org.esa.snap - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT snap-sta-adapters diff --git a/snap-sta-adapters/src/main/nbm/manifest.mf b/snap-sta-adapters/src/main/nbm/manifest.mf index 16ed74faa7..9ad23ee4f8 100644 --- a/snap-sta-adapters/src/main/nbm/manifest.mf +++ b/snap-sta-adapters/src/main/nbm/manifest.mf @@ -3,6 +3,6 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion} OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion} AutoUpdate-Show-In-Client: false AutoUpdate-Essential-Module: true -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Long-Description: OTB Adapters Bundle diff --git a/snap-sta-ui/pom.xml b/snap-sta-ui/pom.xml index 736e2c9639..3030ad0510 100644 --- a/snap-sta-ui/pom.xml +++ b/snap-sta-ui/pom.xml @@ -22,7 +22,7 @@ snap-desktop org.esa.snap - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT snap-sta-ui @@ -91,8 +91,8 @@ - org.netbeans.api - org-netbeans-modules-javahelp + eu.esa.snap.netbeans + snap-help-system diff --git a/snap-sta-ui/src/main/java/org/esa/snap/ui/tooladapter/docs/package-info.java b/snap-sta-ui/src/main/java/org/esa/snap/ui/tooladapter/docs/package-info.java index 5e3acf5d8d..8fb62965a9 100644 --- a/snap-sta-ui/src/main/java/org/esa/snap/ui/tooladapter/docs/package-info.java +++ b/snap-sta-ui/src/main/java/org/esa/snap/ui/tooladapter/docs/package-info.java @@ -1,4 +1,4 @@ @HelpSetRegistration(helpSet = "help.hs", position = 2480) package org.esa.snap.ui.tooladapter.docs; -import org.netbeans.api.javahelp.HelpSetRegistration; \ No newline at end of file +import eu.esa.snap.netbeans.javahelp.api.HelpSetRegistration; \ No newline at end of file diff --git a/snap-sta-ui/src/main/nbm/manifest.mf b/snap-sta-ui/src/main/nbm/manifest.mf index de2b5d5c76..24f834c18d 100644 --- a/snap-sta-ui/src/main/nbm/manifest.mf +++ b/snap-sta-ui/src/main/nbm/manifest.mf @@ -3,6 +3,6 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion} OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion} AutoUpdate-Show-In-Client: false AutoUpdate-Essential-Module: true -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Long-Description:

        The GUI for defining external tool adapters

        diff --git a/snap-tango/pom.xml b/snap-tango/pom.xml index d3fedbe5b1..32a347dc92 100644 --- a/snap-tango/pom.xml +++ b/snap-tango/pom.xml @@ -5,7 +5,7 @@ org.esa.snap snap-desktop - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT snap-tango diff --git a/snap-ui/pom.xml b/snap-ui/pom.xml index 0451fff248..d6fb4719f1 100644 --- a/snap-ui/pom.xml +++ b/snap-ui/pom.xml @@ -20,7 +20,7 @@ org.esa.snap snap-desktop - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT snap-ui @@ -70,12 +70,6 @@ org.esa.snap snap-tango         - - javax.help - javahelp - ${javahelp.version} - provided - junit @@ -86,17 +80,6 @@ snap-core test-jar - - tec.uom - uom-se - 1.0.8 - - - javax.measure - unit-api - - - org.netbeans.api diff --git a/snap-ui/src/main/java/org/esa/snap/ui/SnapFileChooser.java b/snap-ui/src/main/java/org/esa/snap/ui/SnapFileChooser.java index 11c6907c31..5ed3ceee7b 100644 --- a/snap-ui/src/main/java/org/esa/snap/ui/SnapFileChooser.java +++ b/snap-ui/src/main/java/org/esa/snap/ui/SnapFileChooser.java @@ -27,23 +27,31 @@ import org.esa.snap.vfs.preferences.model.VFSRemoteFileRepository; import org.esa.snap.vfs.remote.VFSPath; import org.esa.snap.vfs.ui.file.chooser.VirtualFileSystemView; -import sun.swing.FilePane; -import javax.swing.*; +import javax.swing.Icon; +import javax.swing.ImageIcon; +import javax.swing.JDialog; +import javax.swing.JFileChooser; +import javax.swing.JOptionPane; import javax.swing.filechooser.FileFilter; import javax.swing.filechooser.FileNameExtensionFilter; import javax.swing.filechooser.FileSystemView; -import java.awt.*; +import java.awt.Component; +import java.awt.Container; +import java.awt.Graphics; +import java.awt.GraphicsDevice; +import java.awt.GraphicsEnvironment; +import java.awt.HeadlessException; +import java.awt.Rectangle; +import java.awt.Window; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; import java.io.File; import java.io.IOException; import java.nio.file.Path; import java.util.List; +import java.util.Objects; import java.util.logging.Level; -import java.util.prefs.BackingStoreException; import java.util.prefs.Preferences; /** @@ -57,12 +65,10 @@ public class SnapFileChooser extends JFileChooser { private static final String PREFERENCES_BOUNDS_OPEN = "snap.fileChooser.dialogBounds.open"; private static final String PREFERENCES_BOUNDS_SAVE = "snap.fileChooser.dialogBounds.save"; private static final String PREFERENCES_BOUNDS_CUSTOM = "snap.fileChooser.dialogBounds.custom"; - private static final String PREFERENCES_VIEW_TYPE = "snap.fileChooser.viewType"; + private final ResizeHandler resizeHandler; - private final CloseHandler windowCloseHandler; private final Preferences snapPreferences; private String lastFilename; - private Rectangle dialogBounds; public SnapFileChooser() { this(null, null); @@ -81,7 +87,6 @@ public SnapFileChooser(File currentDirectory, FileSystemView fsv) { snapPreferences = Config.instance("snap").preferences(); resizeHandler = new ResizeHandler(); - windowCloseHandler = new CloseHandler(); init(); } @@ -91,13 +96,13 @@ public void setFileSystemView(FileSystemView fileSystemView) { throw new NullPointerException("fileSystemView is null"); } Path configFile = VFSRemoteFileRepositoriesController.getDefaultConfigFilePath(); - List vfsRepositories = null; + List vfsRepositories; try { vfsRepositories = VFSRemoteFileRepositoriesController.getVFSRemoteFileRepositories(configFile); } catch (IOException e) { throw new IllegalStateException(e); } - if (vfsRepositories != null && !vfsRepositories.isEmpty()) { + if (!vfsRepositories.isEmpty()) { VirtualFileSystemView fileSystemViewWrapper = new VirtualFileSystemView(fileSystemView, vfsRepositories) { @Override protected void notifyUser(String title, String message) { @@ -150,8 +155,6 @@ protected JDialog createDialog(Component parent) throws HeadlessException { dialog.setBounds(dialogBounds); } dialog.addComponentListener(resizeHandler); - dialog.addWindowListener(windowCloseHandler); - initViewType(); return dialog; } @@ -171,23 +174,13 @@ public void approveSelection() { super.approveSelection(); } - /** - * Gets the dialog bounds to be used for the next {@link #showDialog(java.awt.Component, String)} call. - * - * @return the dialog bounds - */ - public Rectangle getDialogBounds() { - return dialogBounds; - } - /** * Sets the dialog bounds to be used for the next {@link #showDialog(java.awt.Component, String)} call. * * @param rectangle the dialog bounds */ public void setDialogBounds(Rectangle rectangle) { - this.dialogBounds = rectangle; - storeDialogBounds(dialogBounds); + storeDialogBounds(rectangle); } /** @@ -256,31 +249,6 @@ public String getDefaultExtension() { } - /** - * Checks whether or not the given filename with one of the known file extensions. The known file extension of this - * file chooser are those, which are registered using a {@link SnapFileFilter}. - * - * @param filename the filename to be checked - * @return {@code true}, if the given file has a "known" extension - * @see SnapFileFilter - */ - public boolean checkExtension(String filename) { - if (filename != null) { - FileFilter[] fileFilters = getChoosableFileFilters(); - if (fileFilters != null) { - for (FileFilter filter : fileFilters) { - if (filter instanceof SnapFileFilter) { - final SnapFileFilter snapFileFilter = (SnapFileFilter) filter; - if (snapFileFilter.checkExtension(filename)) { - return true; - } - } - } - } - } - return false; - } - @Override public FileFilter[] getChoosableFileFilters() { synchronized (syncFileFiltersObject) { @@ -430,33 +398,9 @@ private Rectangle getRectangleFromPreferences(String key) { return null; } - private void initViewType() { - FilePane filePane = findFilePane(this); - if (filePane != null) { - int viewType = snapPreferences.getInt(PREFERENCES_VIEW_TYPE, FilePane.VIEWTYPE_LIST); - filePane.setViewType(viewType); - } - } - - private FilePane findFilePane(Container root) { - Component[] components = root.getComponents(); - for (Component component : components) { - if (component instanceof FilePane) { - return (FilePane) component; - } - if (component instanceof Container) { - FilePane filePane = findFilePane((Container) component); - if (filePane != null) { - return filePane; - } - } - } - return null; - } - private static class CompoundDocumentIcon implements Icon { - private static final Icon compoundDocumentIcon = new ImageIcon(CompoundDocumentIcon.class.getResource("CompoundDocument12.png")); + private static final Icon compoundDocumentIcon = new ImageIcon(Objects.requireNonNull(CompoundDocumentIcon.class.getResource("CompoundDocument12.png"))); private final Icon baseIcon; public CompoundDocumentIcon(Icon baseIcon) { @@ -467,8 +411,8 @@ public CompoundDocumentIcon(Icon baseIcon) { public void paintIcon(Component c, Graphics g, int x, int y) { baseIcon.paintIcon(c, g, x, y); compoundDocumentIcon.paintIcon(c, g, - x + baseIcon.getIconWidth() - compoundDocumentIcon.getIconWidth(), - y + baseIcon.getIconHeight() - compoundDocumentIcon.getIconHeight()); + x + baseIcon.getIconWidth() - compoundDocumentIcon.getIconWidth(), + y + baseIcon.getIconHeight() - compoundDocumentIcon.getIconHeight()); } @Override @@ -495,23 +439,4 @@ public void componentResized(ComponentEvent e) { } } - private class CloseHandler extends WindowAdapter { - - @Override - public void windowClosed(WindowEvent e) { - FilePane filePane = findFilePane(SnapFileChooser.this); - if (filePane != null) { - snapPreferences.putInt(PREFERENCES_VIEW_TYPE, filePane.getViewType()); - flushPreferences(); - } - } - - private void flushPreferences() { - try { - snapPreferences.flush(); - } catch (BackingStoreException bse) { - SystemUtils.LOG.severe("Could not store preferences: " + bse.getMessage()); - } - } - } } diff --git a/snap-ui/src/main/java/org/esa/snap/ui/crs/CrsInfo.java b/snap-ui/src/main/java/org/esa/snap/ui/crs/CrsInfo.java index d3fe3182dc..3f9d87df91 100644 --- a/snap-ui/src/main/java/org/esa/snap/ui/crs/CrsInfo.java +++ b/snap-ui/src/main/java/org/esa/snap/ui/crs/CrsInfo.java @@ -17,7 +17,7 @@ package org.esa.snap.ui.crs; import org.esa.snap.core.datamodel.GeoPos; -import org.geotools.factory.Hints; +import org.geotools.util.factory.Hints; import org.geotools.metadata.iso.citation.Citations; import org.geotools.referencing.ReferencingFactoryFinder; import org.geotools.referencing.factory.FallbackAuthorityFactory; diff --git a/snap-ui/src/main/java/org/esa/snap/ui/product/AddDirectoryAction.java b/snap-ui/src/main/java/org/esa/snap/ui/product/AddDirectoryAction.java index db175649af..5da72c8006 100644 --- a/snap-ui/src/main/java/org/esa/snap/ui/product/AddDirectoryAction.java +++ b/snap-ui/src/main/java/org/esa/snap/ui/product/AddDirectoryAction.java @@ -104,7 +104,7 @@ public void actionPerformed(ActionEvent e) { } preferences.setPropertyString(lastDirProperty, lastDir); try { - listModel.addElements(selectedDirs); + listModel.addElements((Object[]) selectedDirs); } catch (ValidationException ve) { // not expected to ever come here appContext.handleError("Invalid input path", ve); diff --git a/snap-ui/src/main/java/org/esa/snap/ui/product/ProductSceneView.java b/snap-ui/src/main/java/org/esa/snap/ui/product/ProductSceneView.java index 96f254ca4b..104e078fec 100644 --- a/snap-ui/src/main/java/org/esa/snap/ui/product/ProductSceneView.java +++ b/snap-ui/src/main/java/org/esa/snap/ui/product/ProductSceneView.java @@ -859,6 +859,7 @@ public SimpleFeatureFigure getSelectedFeatureFigure() { * @since BEAM 4.7 * @deprecated since BEAM 4.10, use {@link #getFeatureFigures(boolean)} instead */ + @Deprecated public SimpleFeatureFigure[] getSelectedFeatureFigures() { ArrayList selectedFigures = new ArrayList<>(); collectFeatureFigures(figureEditor.getFigureSelection(), selectedFigures); diff --git a/snap-ui/src/main/java/org/esa/snap/ui/product/metadata/EmptyImage.java b/snap-ui/src/main/java/org/esa/snap/ui/product/metadata/EmptyImage.java deleted file mode 100644 index 892a9f0eb7..0000000000 --- a/snap-ui/src/main/java/org/esa/snap/ui/product/metadata/EmptyImage.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.esa.snap.ui.product.metadata; - -import java.awt.Graphics; -import java.awt.Image; -import java.awt.image.ImageObserver; -import java.awt.image.ImageProducer; - -/** - * @author Tonio Fincke - */ -class EmptyImage extends Image { - - @Override - public int getWidth(ImageObserver observer) { - return 0; - } - - @Override - public int getHeight(ImageObserver observer) { - return 0; - } - - @Override - public ImageProducer getSource() { - return null; - } - - @Override - public Graphics getGraphics() { - return null; - } - - @Override - public Object getProperty(String name, ImageObserver observer) { - return null; - } -} diff --git a/snap-ui/src/main/java/org/esa/snap/ui/product/metadata/MetadataElementInnerNode.java b/snap-ui/src/main/java/org/esa/snap/ui/product/metadata/MetadataElementInnerNode.java index 50802abf59..f16b269dc1 100644 --- a/snap-ui/src/main/java/org/esa/snap/ui/product/metadata/MetadataElementInnerNode.java +++ b/snap-ui/src/main/java/org/esa/snap/ui/product/metadata/MetadataElementInnerNode.java @@ -6,8 +6,6 @@ import org.openide.util.lookup.AbstractLookup; import org.openide.util.lookup.InstanceContent; -import java.awt.Image; - /** * @author Tonio Fincke */ @@ -25,16 +23,6 @@ private MetadataElementInnerNode(MetadataTableInnerElement element, InstanceCont createSheet(); } - @Override - public Image getIcon(int type) { - return new EmptyImage(); - } - - @Override - public Image getOpenedIcon(int type) { - return getIcon(type); - } - @Override protected final Sheet createSheet() { Sheet sheet = Sheet.createDefault(); diff --git a/snap-ui/src/main/java/org/esa/snap/ui/product/metadata/MetadataElementLeafNode.java b/snap-ui/src/main/java/org/esa/snap/ui/product/metadata/MetadataElementLeafNode.java index 7fba18802d..d1f50c526e 100644 --- a/snap-ui/src/main/java/org/esa/snap/ui/product/metadata/MetadataElementLeafNode.java +++ b/snap-ui/src/main/java/org/esa/snap/ui/product/metadata/MetadataElementLeafNode.java @@ -9,7 +9,6 @@ import org.openide.util.lookup.AbstractLookup; import org.openide.util.lookup.InstanceContent; -import java.awt.Image; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; @@ -33,16 +32,6 @@ private MetadataElementLeafNode(MetadataTableLeaf leaf, InstanceContent content) createSheet(); } - @Override - public Image getIcon(int type) { - return new EmptyImage(); - } - - @Override - public Image getOpenedIcon(int type) { - return getIcon(type); - } - @Override protected final Sheet createSheet() { Sheet sheet = Sheet.createDefault(); diff --git a/snap-ui/src/main/nbm/manifest.mf b/snap-ui/src/main/nbm/manifest.mf index 0cf25f5726..d566bee0f5 100644 --- a/snap-ui/src/main/nbm/manifest.mf +++ b/snap-ui/src/main/nbm/manifest.mf @@ -3,7 +3,7 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion} OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion} AutoUpdate-Show-In-Client: false AutoUpdate-Essential-Module: true -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Long-Description:

        This module provides user interfac e components used e.g. by VISAT.

        Vendor: Brockmann Consu diff --git a/snap-virtual-file-system-preferences-ui/pom.xml b/snap-virtual-file-system-preferences-ui/pom.xml index e7baf7d5ff..4a1dc7ad5a 100644 --- a/snap-virtual-file-system-preferences-ui/pom.xml +++ b/snap-virtual-file-system-preferences-ui/pom.xml @@ -5,7 +5,7 @@ snap-desktop org.esa.snap - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT 4.0.0 diff --git a/snap-virtual-file-system-preferences-ui/src/main/java/org/esa/snap/ui/vfs/docs/package-info.java b/snap-virtual-file-system-preferences-ui/src/main/java/org/esa/snap/ui/vfs/docs/package-info.java index 231851beec..b59b84c588 100644 --- a/snap-virtual-file-system-preferences-ui/src/main/java/org/esa/snap/ui/vfs/docs/package-info.java +++ b/snap-virtual-file-system-preferences-ui/src/main/java/org/esa/snap/ui/vfs/docs/package-info.java @@ -1,4 +1,4 @@ -@HelpSetRegistration(helpSet = "help.hs", position = 2480) +@HelpSetRegistration(helpSet = "help.hs", position = 2481) package org.esa.snap.ui.vfs.docs; -import org.netbeans.api.javahelp.HelpSetRegistration; \ No newline at end of file +import eu.esa.snap.netbeans.javahelp.api.HelpSetRegistration; \ No newline at end of file diff --git a/snap-virtual-file-system-preferences-ui/src/main/nbm/manifest.mf b/snap-virtual-file-system-preferences-ui/src/main/nbm/manifest.mf index 5ae1acae21..c67aac06d3 100644 --- a/snap-virtual-file-system-preferences-ui/src/main/nbm/manifest.mf +++ b/snap-virtual-file-system-preferences-ui/src/main/nbm/manifest.mf @@ -3,6 +3,6 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion} OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion} AutoUpdate-Show-In-Client: false AutoUpdate-Essential-Module: true -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Long-Description:

        This module provides user interface for setting up Remote File Repositories used by VFS.

        Vendor: CS Romania

        Contact address: Pacii 29 Street, 200692 Craiova (Romania)

        Copyright: (C) 2019 by CS Romania

        Vendor: CS Romania

        License: http://www.gnu.org/licenses/gpl.html

        diff --git a/snap-virtual-file-system-ui/pom.xml b/snap-virtual-file-system-ui/pom.xml index e664e51797..f939ef6e55 100644 --- a/snap-virtual-file-system-ui/pom.xml +++ b/snap-virtual-file-system-ui/pom.xml @@ -6,7 +6,7 @@ org.esa.snap snap-desktop - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT snap-virtual-file-system-ui diff --git a/snap-virtual-file-system-ui/src/main/nbm/manifest.mf b/snap-virtual-file-system-ui/src/main/nbm/manifest.mf index 7a40abb988..9b63ebd9ad 100644 --- a/snap-virtual-file-system-ui/src/main/nbm/manifest.mf +++ b/snap-virtual-file-system-ui/src/main/nbm/manifest.mf @@ -3,6 +3,6 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion} OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion} AutoUpdate-Show-In-Client: false AutoUpdate-Essential-Module: true -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Long-Description:

        This module provides user interface components for integration of SNAP VFS with SNAP File Chooser.

        Vendor: CS Romania

        Contact address: Pacii 29 Street, 200692 Craiova (Romania)

        Copyright: (C) 2019 by CS Romania

        Vendor: CS Romania

        License: http://www.gnu.org/licenses/gpl.html

        diff --git a/snap-watermask-ui/pom.xml b/snap-watermask-ui/pom.xml index aaa5b98625..04c9cddd8c 100644 --- a/snap-watermask-ui/pom.xml +++ b/snap-watermask-ui/pom.xml @@ -20,7 +20,7 @@ snap-desktop org.esa.snap - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT snap-watermask-ui @@ -91,8 +91,8 @@ org-netbeans-api-annotations-common         - org.netbeans.api - org-netbeans-modules-javahelp + eu.esa.snap.netbeans + snap-help-system diff --git a/snap-watermask-ui/src/main/java/org/esa/snap/processor/watermask/docs/package-info.java b/snap-watermask-ui/src/main/java/org/esa/snap/processor/watermask/docs/package-info.java index b1c9cba07f..518294fc20 100644 --- a/snap-watermask-ui/src/main/java/org/esa/snap/processor/watermask/docs/package-info.java +++ b/snap-watermask-ui/src/main/java/org/esa/snap/processor/watermask/docs/package-info.java @@ -1,4 +1,4 @@ @HelpSetRegistration(helpSet = "help.hs", position = 4420) package org.esa.snap.processor.watermask.docs; -import org.netbeans.api.javahelp.HelpSetRegistration; +import eu.esa.snap.netbeans.javahelp.api.HelpSetRegistration; diff --git a/snap-watermask-ui/src/main/nbm/manifest.mf b/snap-watermask-ui/src/main/nbm/manifest.mf index d402685794..46d8c4c638 100644 --- a/snap-watermask-ui/src/main/nbm/manifest.mf +++ b/snap-watermask-ui/src/main/nbm/manifest.mf @@ -1,7 +1,7 @@ Manifest-Version: 1.0 AutoUpdate-Show-In-Client: false AutoUpdate-Essential-Module: true -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion} OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion} diff --git a/snap-watermask-ui/src/main/resources/org/esa/snap/processor/watermask/docs/watermask/WatermaskAlgorithmSpecification.html b/snap-watermask-ui/src/main/resources/org/esa/snap/processor/watermask/docs/watermask/WatermaskAlgorithmSpecification.html index 1f4ad41289..44db0df670 100644 --- a/snap-watermask-ui/src/main/resources/org/esa/snap/processor/watermask/docs/watermask/WatermaskAlgorithmSpecification.html +++ b/snap-watermask-ui/src/main/resources/org/esa/snap/processor/watermask/docs/watermask/WatermaskAlgorithmSpecification.html @@ -47,27 +47,28 @@

        Algorithm Specification

        High-Resolution Dataset

        The high-res dataset is based on data given by - + -shapefiles between 60° north and 58° south, and by the - + - world map above 60° north. - Below 58° south, this dataset does not contain any data, so the resulting product will contain the fill value for these parts. - This high-res dataset will be employed when the resolution parameter is set to 50m or 150m. + world map above 60° north. + Below 58° south, this dataset does not contain any data, so the resulting product will contain the fill value + for these parts. + This high-res dataset will be employed when the resolution parameter is set to 50m or 150m.

        Low-Resolution Data Set

        The second dataset is based on - + - data in a resolution of 1 km. It covers the whole earth, and will be employed - when the resolution parameter is set to 1000. + data in a resolution of 1 km. It covers the whole earth, and will be employed + when the resolution parameter is set to 1000.

        diff --git a/snap-worldwind/pom.xml b/snap-worldwind/pom.xml index cfbb90d3bb..8127ae7519 100644 --- a/snap-worldwind/pom.xml +++ b/snap-worldwind/pom.xml @@ -20,7 +20,7 @@ org.esa.snap snap-desktop - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT SNAP WorldWind @@ -69,22 +69,22 @@ gov.nasa worldwind - 2.1.0 + 2.2.1 gov.nasa worldwindx - 2.1.0 + 2.2.1 org.jogamp.gluegen gluegen-rt-main - 2.1.5-01 + 2.4.0 org.jogamp.jogl jogl-all-main - 2.1.5-01 + 2.4.0 @@ -93,50 +93,62 @@ org.jogamp.gluegen gluegen-rt natives-windows-amd64 - 2.1.5-01 + 2.4.0 org.jogamp.gluegen gluegen-rt natives-windows-i586 - 2.1.5-01 + 2.3.2 org.jogamp.gluegen gluegen-rt natives-linux-amd64 - 2.1.5-01 + 2.4.0 org.jogamp.gluegen gluegen-rt natives-linux-i586 - 2.1.5-01 + 2.3.2 + + + org.jogamp.gluegen + gluegen-rt + natives-macosx-universal + 2.4.0 org.jogamp.jogl jogl-all natives-windows-amd64 - 2.1.5-01 + 2.4.0 org.jogamp.jogl jogl-all natives-windows-i586 - 2.1.5-01 + 2.3.2 org.jogamp.jogl jogl-all natives-linux-amd64 - 2.1.5-01 + 2.4.0 org.jogamp.jogl jogl-all natives-linux-i586 - 2.1.5-01 + 2.3.2 + + + org.jogamp.jogl + jogl-all + natives-macosx-universal + 2.4.0 @@ -180,6 +192,22 @@ + + + snap-repo-public + Public Maven Repository for SNAP + https://snap-build-server.tilaa.cloud/nexus/repository/snap-maven-public/ + + true + warn + + + true + warn + + + + diff --git a/snap-worldwind/src/main/java/org/esa/snap/worldwind/docs/package-info.java b/snap-worldwind/src/main/java/org/esa/snap/worldwind/docs/package-info.java index 7495286dba..ebb9f24f67 100644 --- a/snap-worldwind/src/main/java/org/esa/snap/worldwind/docs/package-info.java +++ b/snap-worldwind/src/main/java/org/esa/snap/worldwind/docs/package-info.java @@ -1,3 +1,3 @@ @HelpSetRegistration(helpSet = "help.hs", position = 1110) package org.esa.snap.worldwind.docs; -import org.netbeans.api.javahelp.HelpSetRegistration; \ No newline at end of file +import eu.esa.snap.netbeans.javahelp.api.HelpSetRegistration; \ No newline at end of file diff --git a/snap-worldwind/src/main/nbm/manifest.mf b/snap-worldwind/src/main/nbm/manifest.mf index 82fb9c8ab6..f3c4611529 100644 --- a/snap-worldwind/src/main/nbm/manifest.mf +++ b/snap-worldwind/src/main/nbm/manifest.mf @@ -3,7 +3,7 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion} OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion} AutoUpdate-Show-In-Client: false AutoUpdate-Essential-Module: true -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Layer: org/esa/snap/worldwind/layer.xml OpenIDE-Module-Long-Description:

        WorldWind map.

        Vendor: Array Systems Computing Inc

        diff --git a/snap-znap-ui/pom.xml b/snap-znap-ui/pom.xml index 23e4207ca8..75810e5869 100644 --- a/snap-znap-ui/pom.xml +++ b/snap-znap-ui/pom.xml @@ -9,7 +9,7 @@ snap-desktop org.esa.snap - 10.0.0-SNAPSHOT + 10.0.0-JDK11SHOT ZNAP Options UI diff --git a/snap-znap-ui/src/main/javahelp/org/esa/snap/snap/znap/ui/docs/zarr/ExportZnap.html b/snap-znap-ui/src/main/javahelp/org/esa/snap/snap/znap/ui/docs/zarr/ExportZnap.html index 38893709d4..034e6f02a7 100644 --- a/snap-znap-ui/src/main/javahelp/org/esa/snap/snap/znap/ui/docs/zarr/ExportZnap.html +++ b/snap-znap-ui/src/main/javahelp/org/esa/snap/snap/znap/ui/docs/zarr/ExportZnap.html @@ -56,7 +56,7 @@

        This writer is available as beta version.

        feedback.

        To send us feedback, please use the - + @@ -86,7 +86,7 @@
        designed for use in parallel computing.

        Source reference and for detailed information, please refer to the documentation of the - + @@ -122,7 +122,7 @@

        Reference: - + All data written with JZarr can be read with Python Zarr. Conversely, not everything written with Python Zarr can currently be read by JZarr. One of the reasons for this is that not all compression algorithms supported by Zarr are yet implemented in JZarr.
        - + @@ -211,7 +211,7 @@
        Root Group

        General information about how a group is saved can be found here. - + @@ -227,7 +227,7 @@
        Raster Data

        The meaning of the zarr specific values in the .zarray file is explained in detail in the documentation of the - + @@ -238,7 +238,7 @@
        Raster Data
        See examples below.

        General information about how an array is stored can be found - + diff --git a/snap-znap-ui/src/main/nbm/manifest.mf b/snap-znap-ui/src/main/nbm/manifest.mf index a685cb664f..5156a0dfbf 100644 --- a/snap-znap-ui/src/main/nbm/manifest.mf +++ b/snap-znap-ui/src/main/nbm/manifest.mf @@ -3,7 +3,7 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion} OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion} AutoUpdate-Show-In-Client: false AutoUpdate-Essential-Module: true -OpenIDE-Module-Java-Dependencies: Java > 1.8 +OpenIDE-Module-Java-Dependencies: Java > 11 OpenIDE-Module-Display-Category: SNAP Core OpenIDE-Module-Layer: org/esa/snap/dataio/znap/layer.xml OpenIDE-Module-Long-Description:

        BETA version of a new ZARR based