200.2.0 (#800)

New samples: 
- Add custom dynamic entity data source
- Create and edit geometries
- Display route layer
Enhancements:
- Map image layer sublayer visibility and Manage bookmarks samples have been updated to utilize ObservableLists.
- Edit feature attachments, Generate offline map overrides, Mobile map search and route, Search symbol dictionary and Perform valve isolation trace samples have been updated to utilize CompletableFutures.

Author: jenmerritt

README.md

@@ -14,82 +14,83 @@
 
 ![Gradle build](https://github.com/Esri/arcgis-runtime-samples-java/workflows/Java%20CI%20with%20Gradle/badge.svg)
 
-Welcome to the home of the ArcGIS Maps SDK for Java samples! The ArcGIS Maps SDK for Java is used to build mapping, location, and GIS applications for desktop applications running on Windows, Mac, or Linux. This repo contains a set of sample projects demonstrating how to accomplish various mapping and geospatial tasks with the ArcGIS Maps SDK for Java.
+Welcome to the ArcGIS Maps SDK for Java Samples repository.
 
-![Choose Camera Controller sample preview](https://user-images.githubusercontent.com/36415565/185649571-7d6feb6f-f0c2-42cb-9139-9d4541dd1da8.png)
+The ArcGIS Maps SDK for Java is used to build mapping, location, and GIS applications for desktop applications running on Windows, Mac, or Linux. This repo contains a set of sample projects demonstrating how to accomplish various mapping and geospatial tasks with the ArcGIS Maps SDK for Java.
 
-Browse the category directories to explore the samples. Each sample is an individual [Gradle](https://docs.gradle.org/current/userguide/userguide.html) project that can be run standalone. The Gradle buildscripts have tasks for running the application, building a jar, and distributing the app as a zip.
+### Sections
+* [Sample Viewer](#sample-viewer)
+* [Running the samples locally via this project](#running-the-samples-locally-via-this-project)
+* [Setup an API Key](#setup-an-api-key)
+* [Offline sample data](#offline-sample-data)
+* [System requirements for ArcGIS Maps SDK for Java](#system-requirements-for-arcgis-maps-sdk-for-java)
+* [Issues](#issues)
+* [Contributing](#contributing)
 
-Installing Gradle is not necessary since each sample includes the Gradle wrapper.
+### Sample viewer
+You can browse our samples by downloading our [Sample Viewer Application](https://arcgisruntime.maps.arcgis.com/home/item.html?id=d34b33f673134862bdb414814d9fbd0a).
 
-Accessing Esri location services, including basemaps, routing, and geocoding, requires authentication using either an ArcGIS identity or an API Key:
- 1. ArcGIS identity: An ArcGIS named user account that is a member of an organization in ArcGIS Online or ArcGIS Enterprise.
- 2. API key: A permanent key that gives your application access to Esri location services. Visit your [ArcGIS Developers Dashboard](https://developers.arcgis.com/dashboard) to create a new API key or access an existing API key.
+![Java Sample Viewer](sample-viewer.png)
+
+### Running the samples locally via this project
+Each sample is an individual [Gradle](https://docs.gradle.org/current/userguide/userguide.html) project that can be run standalone. Installing Gradle is not necessary since each sample includes the Gradle wrapper.
 
-Note: *in the following instructions for setting the API key, if a `gradle.properties` file does not already exist in the `/.gradle` folder within your home directory, a Gradle task in the samples build.gradle file will generate one for you.*
+#### Pre-requisites:
 
-## Instructions
+* [System Requirements for ArcGIS Maps SDK for Java](#system-requirements-for-arcgis-maps-sdk-for-java)
+* An API Key. [More details](#setup-an-api-key)
+* [IntelliJ IDEA](https://www.jetbrains.com/idea/)
+* Fork and clone this repo. [More details](WorkingWithGit.md).
 
-### IntelliJ IDEA
+#### Manually via the IDE:
 
 1. Open IntelliJ IDEA and select _File > Open..._.
-2. Choose one of the sample project directories (not the category folder) and click _OK_.
-3. Select _File > Project Structure..._ and ensure that the Project SDK and language level are set to use Java 11 or Java 17.
+2. Choose one of the sample project directories (e.g. `display-map`) and click _OK_.
+3. Select _File > Project Structure..._ and ensure that the Project SDK and language level are set to use Java 17.
 4. Store your API key in the `gradle.properties` file located in the `/.gradle` folder within your home directory. The API key will be set as a Java system property when the sample is run.
+
+Note: if a `gradle.properties` file does not already exist in the `/.gradle` folder within your home directory, a Gradle task in the samples `build.gradle` file will generate one for you to populate with your API key.
    ```
    apiKey = yourApiKey
    ```
+
 5. Open the Gradle view with _View > Tool Windows > Gradle_.
 6. In the Gradle view, double-click the `run` task under _Tasks > application_ to run the app.
 
 Note: *if you encounter the error `Could not get unknown property 'apiKey' for task ':run' of type org.gradle.api.tasks.JavaExec.` you may have to set the Gradle user home in the IntelliJ Gradle settings to the `/.gradle` folder in your home directory.*
 
-### Eclipse
-
-1. Open Eclipse and select _File > Import_.
-2. In the import wizard, choose _Gradle > Existing Gradle Project_, then click _Next_.
-3. Choose one of the sample project directories (not the category folder) as the project root directory.
-4. Click _Finish_ to complete the import.
-5. Store your API key in the `gradle.properties` file located in the `/.gradle` folder within your home directory. The API key will be set as a Java system property when the sample is run.
-   ```
-   apiKey = yourApiKey
-   ```
-6. Open the Gradle Tasks view with _Window > Show View > Other... > Gradle > Gradle Tasks_.
-7. In the Gradle Tasks view, double-click the `run` task under _{project_name} > application_ to run the app.
+#### Via the terminal:
 
-### Terminal
-
-1. `cd` into one of the sample project directories (not the category folder).
+1. `cd` into one of the sample project directories (e.g. `display-map`).
 2. Run `gradle wrapper` to create the Gradle Wrapper
 3. Store your API key in the `gradle.properties` file located in the `/.gradle` folder within your home directory. The API key will be set as a Java system property when the sample is run.
 4. Run `./gradlew run` on Linux/Mac or `gradlew.bat run` on Windows to run the app.
 
-### Java 11
-Java 11 users may find exceptions when running the project if their library path is still set for Oracle JDK 1.8 (see the [OpenJavaFX docs](https://openjfx.io/openjfx-docs/) for more information). A workaround for this is to add the following argument in the `run` task of the Gradle buildscript:
-```
-systemProperty "java.library.path", "C:\tmp"
-```
+### Setup an API key
+Accessing Esri location services, including basemaps, routing, and geocoding, requires authentication using either an ArcGIS identity or an API Key:
+1. ArcGIS identity: An ArcGIS named user account that is a member of an organization in ArcGIS Online or ArcGIS Enterprise.
+2. API key: A permanent key that gives your application access to Esri location services. Visit your [ArcGIS Developers Dashboard](https://developers.arcgis.com/dashboard) to create a new API key or access an existing API key.
 
 ### Offline sample data
 Some samples require offline data. A `samples-data` directory will automatically download to the project root when the Gradle project is configured/imported.
 
-## Requirements
+### System requirements for ArcGIS Maps SDK for Java
 
 See the ArcGIS Maps SDK for Java's [system requirements](https://developers.arcgis.com/java/reference/system-requirements/).
 
-## Issues
+### Issues
 
 Find a bug or want to request a new feature?  Please let us know by submitting an issue.
 
-## Contributing
+### Contributing
 
 Esri welcomes contributions from anyone and everyone. Please see our [guidelines for contributing](https://github.com/esri/contributing).
 
-New to Git? Check out our [Working with Git](https://github.com/Esri/arcgis-runtime-samples-java/blob/master/WorkingWithGit.md) guide.
+New to Git? Check out our [Working with Git](WorkingWithGit.md) guide.
 
-## Licensing
+### Licensing
 
-Copyright 2022 Esri
+Copyright 2023 Esri
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not
 use this file except in compliance with the License. You may obtain a copy

WorkingWithGit.md

@@ -1,28 +1,28 @@
 ### Fork the repository
-To view and make changes to your own copy of the repository, [fork the repo](https://github.com/Esri/arcgis-runtime-samples-java/fork).
+To view and make changes to your own copy of the repository, [fork the repo](https://github.com/Esri/arcgis-maps-sdk-java-samples/fork).
 
 ### Clone your fork
 
 Open your terminal and navigate to the directory you want to put the repository directory in. Then [clone your fork](https://help.github.com/articles/fork-a-repo#step-2-clone-your-fork):
 ```
-$ git clone https://github.com/YOUR-USERNAME/arcgis-runtime-samples-java.git
+$ git clone https://github.com/YOUR-USERNAME/arcgis-maps-sdk-java-samples.git
 ```
 
 ### Configure your fork for syncing
 To sync changes you make in a fork with this repository, you must configure a remote that points to the upstream repository in Git. Go into the project directory you just cloned. Run the following to add the upstream remote:
 ```
-$ git remote add upstream https://github.com/Esri/arcgis-runtime-samples-java.git
+$ git remote add upstream https://github.com/Esri/arcgis-maps-sdk-java-samples.git
 ```
 Verify the changes by running
 ```
 $ git remote -v
 ```
 You should see something like the following:
 ```
-origin	https://github.com/YOUR_USERNAME/arcgis-runtime-samples-java.git (fetch)
-origin	https://github.com/YOUR_USERNAME/arcgis-runtime-samples-java.git (push)
-upstream https://github.com/Esri/arcgis-runtime-samples-java.git (fetch)
-upstream https://github.com/Esri/arcgis-runtime-samples-java.git (push)
+origin	https://github.com/YOUR_USERNAME/arcgis-maps-sdk-java-samples.git (fetch)
+origin	https://github.com/YOUR_USERNAME/arcgis-maps-sdk-java-samples.git (push)
+upstream https://github.com/Esri/arcgis-maps-sdk-java-samples.git (fetch)
+upstream https://github.com/Esri/arcgis-maps-sdk-java-samples.git (push)
 ```
 
 ### Sync your fork
@@ -35,11 +35,11 @@ $ git fetch upstream
 
 Make sure to checkout whatever local branch you want the remote changes to be added to:
 ```
-$ git checkout master
+$ git checkout main
 ```
 
 Finally, merge the upstream changes into your branch with
 ```
-$ git merge upstream/master
+$ git merge upstream/main
 ```
 

analysis/analyze-hotspots/build.gradle

@@ -6,11 +6,11 @@ plugins {
 group = 'com.esri.samples'
 
 ext {
-    arcgisVersion = '200.1.0'
+    arcgisVersion = '200.2.0'
 }
 
 javafx {
-    version = "17.0.2"
+    version = "17.0.7"
     modules = [ 'javafx.controls', 'javafx.graphics', 'javafx.fxml', 'javafx.web', 'javafx.media' ]
 }
 
@@ -40,7 +40,7 @@ dependencies {
     natives "com.esri.arcgisruntime:arcgis-java-jnilibs:$arcgisVersion"
     natives "com.esri.arcgisruntime:arcgis-java-resources:$arcgisVersion"
     // handle SLF4J http://www.slf4j.org/codes.html#StaticLoggerBinder
-    runtimeOnly 'org.slf4j:slf4j-nop:1.7.32'
+    implementation 'org.slf4j:slf4j-nop:2.0.7'
 }
 
 task createGradlePropertiesAndWriteApiKey {
@@ -83,6 +83,6 @@ task productionZip(type: Zip) {
 if (rootProject == project) {
     // the wrapper task is only used if this project is the root project i.e. not a subproject
     wrapper {
-        gradleVersion = '7.5.1'
+        gradleVersion = '8.1.1'
     }
 }

analysis/analyze-hotspots/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

analysis/analyze-hotspots/settings.gradle

@@ -1,7 +1,7 @@
 pluginManagement {
     plugins {
         // version defined in settings.gradle to avoid version error when this sample is used in a multi-project build
-        id 'org.openjfx.javafxplugin' version "0.0.13"
+        id 'org.openjfx.javafxplugin' version "0.0.14"
     }
 }
 

analysis/analyze-hotspots/src/main/java/module-info.java

@@ -18,6 +18,9 @@
   // require ArcGIS Maps SDK for Java module
   requires com.esri.arcgisruntime;
 
+  // handle SLF4J http://www.slf4j.org/codes.html#StaticLoggerBinder
+  requires org.slf4j.nop;
+
   // require JavaFX modules that the application uses
   requires javafx.graphics;
   requires javafx.controls;

analysis/distance-measurement-analysis/build.gradle

@@ -6,11 +6,11 @@ plugins {
 group = 'com.esri.samples'
 
 ext {
-    arcgisVersion = '200.1.0'
+    arcgisVersion = '200.2.0'
 }
 
 javafx {
-    version = "17.0.2"
+    version = "17.0.7"
     modules = [ 'javafx.controls', 'javafx.graphics', 'javafx.fxml', 'javafx.web', 'javafx.media' ]
 }
 
@@ -40,7 +40,7 @@ dependencies {
     natives "com.esri.arcgisruntime:arcgis-java-jnilibs:$arcgisVersion"
     natives "com.esri.arcgisruntime:arcgis-java-resources:$arcgisVersion"
     // handle SLF4J http://www.slf4j.org/codes.html#StaticLoggerBinder
-    runtimeOnly 'org.slf4j:slf4j-nop:1.7.32'
+    implementation 'org.slf4j:slf4j-nop:2.0.7'
 }
 
 task createGradlePropertiesAndWriteApiKey {
@@ -83,6 +83,6 @@ task productionZip(type: Zip) {
 if (rootProject == project) {
     // the wrapper task is only used if this project is the root project i.e. not a subproject
     wrapper {
-        gradleVersion = '7.5.1'
+        gradleVersion = '8.1.1'
     }
 }

analysis/distance-measurement-analysis/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

analysis/distance-measurement-analysis/settings.gradle

@@ -1,7 +1,7 @@
 pluginManagement {
     plugins {
         // version defined in settings.gradle to avoid version error when this sample is used in a multiproject build
-        id 'org.openjfx.javafxplugin' version "0.0.13"
+        id 'org.openjfx.javafxplugin' version "0.0.14"
     }
 }
 

analysis/distance-measurement-analysis/src/main/java/module-info.java

@@ -18,6 +18,9 @@
   // require ArcGIS Maps SDK for Java module
   requires com.esri.arcgisruntime;
 
+  // handle SLF4J http://www.slf4j.org/codes.html#StaticLoggerBinder
+  requires org.slf4j.nop;
+
   // require JavaFX modules that the application uses
   requires javafx.graphics;
   requires javafx.controls;