Esri
diff --git a/‎README.md‎
Lines changed: 7 additions & 1 deletion b/‎README.md‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎build.gradle‎
Lines changed: 83 additions & 67 deletions b/‎build.gradle‎
Lines changed: 83 additions & 67 deletions
diff --git a/‎gradle/wrapper/gradle-wrapper.properties‎
Lines changed: 1 addition & 1 deletion b/‎gradle/wrapper/gradle-wrapper.properties‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/java/com/esri/samples/grouplayers/group_layers/GroupLayers.png‎
428 KB b/‎src/main/java/com/esri/samples/grouplayers/group_layers/GroupLayers.png‎
428 KB
diff --git a/‎src/main/java/com/esri/samples/grouplayers/group_layers/GroupLayersSample.java‎
Lines changed: 170 additions & 0 deletions b/‎src/main/java/com/esri/samples/grouplayers/group_layers/GroupLayersSample.java‎
Lines changed: 170 additions & 0 deletions
@@ -1,5 +1,5 @@
 # ArcGIS Runtime Java SDK Samples
-### 100.4.0
+### 100.5.0
 This project includes a set of samples demonstrating how to accomplish various mapping and GIS tasks with the ArcGIS Runtime SDK for Java.
 
 Be sure to also check out our [toolkit on GitHub](https://github.com/Esri/arcgis-runtime-toolkit-java).
@@ -32,6 +32,12 @@ The plugin provides the project with everything an ArcGIS runtime project needs
 arcgis api as a dependency and downloads the native libraries into `$USER_HOME/.arcgis`. This download occurs 
 automatically the first time you build the project and is only performed once.
 
+## 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"
+```
+
 ## Offline sample data
 Some samples require offline data. A `samples-data` directory will automatically download to the project root the 
 first time you call the `run` task.
 
@@ -1,26 +1,38 @@
-apply plugin: 'application'
-apply plugin: 'idea'
-apply plugin: 'eclipse'
-apply plugin: 'com.esri.arcgisruntime.java'
-
 buildscript {
     repositories {
         maven {
-            url = 'https://esri.bintray.com/arcgis'
+            url 'https://esri.bintray.com/arcgis'
         }
     }
     dependencies {
         classpath 'com.esri.arcgisruntime:gradle-arcgis-java-plugin:1.0.0'
     }
 }
 
-arcgis.version = '100.4.0'
+plugins {
+    id 'application'
+    id 'org.openjfx.javafxplugin' version '0.0.5'
+}
+
+apply plugin: 'com.esri.arcgisruntime.java'
+
+group = 'com.esri.samples'
 
-idea.module.downloadJavadoc = true
-eclipse.classpath.downloadJavadoc = true
+arcgis.version = '100.5.0'
+
+javafx {
+    version = "11.0.1"
+    modules = [ 'javafx.controls', 'javafx.web', 'javafx.fxml', 'javafx.swing' ]
+}
 
 compileJava.options.encoding = 'UTF-8'
-compileJava.sourceCompatibility = '1.8'
+
+repositories {
+    jcenter()
+    maven {
+        url 'https://esri.bintray.com/arcgis'
+    }
+}
 
 dependencies {
     compile 'com.esri.arcgisruntime:arcgis-java-toolkit:100.2.1'
@@ -30,55 +42,44 @@ dependencies {
 
 task downloadData {
     description = "Downloads data from AGOL for samples with offline data"
-    
+
     def samplesData = './samples-data'
     if (!file(samplesData).exists()) {
         mkdir(samplesData)
     }
-    
-    downloadSampleData(["9d2987a825c646468b3ce7512fb76e2d"], 'enc')
-    
-    downloadSampleData(['cd61610c030446689991cc159d354e25', 
-                        '98092369c4ae4d549bbbd45dba993ebc'], 'monterey_elevation')
-    
-    downloadSampleData(['296269901180442a88a3351640ff2262'], 'bristol')
-    
-    downloadSampleData(['3af5cfec0fd24dac8d88aea679027cb9'], 'dolmus_3ds')
-    
-    downloadSampleData(['78847654fbe042e6af617ebbfbf985c7'], 'bradley_low_3ds')
-    
-    downloadSampleData(['9ebd467801244ad79920be3c27f774da',
-                        '3b279365273043ae90f09cb0b112d40d'], 'mmpk')
-
-    downloadSampleData(['793a4620fbba443a931ac1fa52ad7f45', 
-                        '1455c3dbfc43497983572117c7d6064c'], 'sanfrancisco')
-
-    downloadSampleData(['f3fd11e862694698bccec206bde3c934',
-                        'fef6001edc7a44f9932310d14682f1bc',
-                        'f31ea54e460e4439848557ab722baa0b'], 'shapefiles')
-
-    downloadSampleData(['80b43ba48f524a8eb0cb54f0f1ee9a5f',
-                        '00113a41bea0401290635f8503bb4acf',
-                        'df6f7fb0bf714e128cc3f919c126dd22'], 'raster')
-
-    downloadSampleData(['d98b3e5293834c5f852f13c569930caa',
-                        '68ec42517cdd439e81b036210483e8e7'], 'auroraCO')
-
-    downloadSampleData(['cdb15cd7cb624c2e9acb4af6c83d1fdd',
-                        '7a6c8309562149348d0e72b724c9eb4e'], 'kml')
-
-    downloadSampleData(['40e0d95e515745ee93b9d06cb75697bc',
-                        'b6f669b3b5b941fc8a3f7ac03efbd1a9',
-                        '9053a46b205142f0864682d5152642b5',
-                        'a9788a0e8ef241ec89182f87f6967ec9',
-                        '91087f8d3e6e46b7a0c5987eac379452',
-                        '5c10e6c0b8974d16b74d557568105b96'], 'local_server')
-
-    downloadSampleData(['cb1b20748a9f4d128dad8a87244e3e37'], 'los_angeles')
-    
-    downloadSampleData(['567e14f3420d40c5a206e5c0284cf8fc'], 'san_diego')
-
-    downloadSampleData(['5491f01d92554751902ecad85cc5d6ca'], 'dictionary')
+    downloadSampleData([new Download(id: "9d2987a825c646468b3ce7512fb76e2d")], 'enc')
+    downloadSampleData([new Download(id: 'cd61610c030446689991cc159d354e25'),
+                        new Download(id: '98092369c4ae4d549bbbd45dba993ebc')], 'monterey_elevation')
+    downloadSampleData([new Download(id: '296269901180442a88a3351640ff2262')], 'bristol')
+    downloadSampleData([new Download(id: '3af5cfec0fd24dac8d88aea679027cb9')], 'dolmus_3ds')
+    downloadSampleData([new Download(id: '78847654fbe042e6af617ebbfbf985c7')], 'bradley_low_3ds')
+    downloadSampleData([new Download(id: '9ebd467801244ad79920be3c27f774da'),
+                        new Download(id: '3b279365273043ae90f09cb0b112d40d')], 'mmpk')
+    downloadSampleData([new Download(id: '793a4620fbba443a931ac1fa52ad7f45'),
+                        new Download(id: '1455c3dbfc43497983572117c7d6064c')], 'sanfrancisco')
+    downloadSampleData([new Download(id: 'f3fd11e862694698bccec206bde3c934'),
+                        new Download(id: 'fef6001edc7a44f9932310d14682f1bc'),
+                        new Download(id: 'f31ea54e460e4439848557ab722baa0b')], 'shapefiles')
+    downloadSampleData([new Download(id: '80b43ba48f524a8eb0cb54f0f1ee9a5f'),
+                        new Download(id: '00113a41bea0401290635f8503bb4acf'),
+                        new Download(id: 'df6f7fb0bf714e128cc3f919c126dd22')], 'raster')
+    downloadSampleData([new Download(id: 'd98b3e5293834c5f852f13c569930caa'),
+                        new Download(id: '68ec42517cdd439e81b036210483e8e7')], 'auroraCO')
+    downloadSampleData([new Download(id: 'cdb15cd7cb624c2e9acb4af6c83d1fdd'),
+                        new Download(id: '7a6c8309562149348d0e72b724c9eb4e'),
+                        new Download(id: 'f10b1d37fdd645c9bc9b189fb546307c', name: 'Esri_tour', ext: 'kmz')], 'kml')
+    downloadSampleData([new Download(id: '40e0d95e515745ee93b9d06cb75697bc'),
+                        new Download(id: 'b6f669b3b5b941fc8a3f7ac03efbd1a9'),
+                        new Download(id: '9053a46b205142f0864682d5152642b5'),
+                        new Download(id: 'a9788a0e8ef241ec89182f87f6967ec9'),
+                        new Download(id: '91087f8d3e6e46b7a0c5987eac379452'),
+                        new Download(id: '5c10e6c0b8974d16b74d557568105b96')], 'local_server')
+    downloadSampleData([new Download(id: 'cb1b20748a9f4d128dad8a87244e3e37')], 'los_angeles')
+    downloadSampleData([new Download(id: '567e14f3420d40c5a206e5c0284cf8fc')], 'san_diego')
+    downloadSampleData([new Download(id: '5491f01d92554751902ecad85cc5d6ca')], 'dictionary')
+    downloadSampleData([new Download(id: '943285c21a8e4e1582f0af1101f87bdf')], 'slpks')
+    downloadSampleData([new Download(id: 'c0f7b0466b9c492dbab408620af6d28f')], 'mspk')
+    downloadSampleData([new Download(id: '628e8e3521cf45e9a28a12fe10c02c4d', name: 'naperville_imagery', ext: 'tpk')], 'naperville')
 }
 
 run {
@@ -89,18 +90,33 @@ task wrapper(type: Wrapper) {
     gradleVersion = '4.10.2'
 }
 
-// downloads a list of portal item zips to a folder in samples-data
-void downloadSampleData(List<String> remotePaths, String copyPath) {
-    def zipFile = './data.zip'
-    if (!file('./samples-data/' + copyPath).exists()) {
-        remotePaths.forEach { path ->
-            ant.get(src: "https://arcgisruntime.maps.arcgis.com/sharing/rest/content/items/${path}/data",
-                    dest: zipFile)
-            copy {
-                from zipTree(zipFile)
-                into('./samples-data/' + copyPath)
+// downloads a portal item's contents to a folder in samples-data
+void downloadSampleData(List<Download> downloads, folderName) {
+    def downloadFolder = "./samples-data/$folderName"
+    if (!file(downloadFolder).exists()) {
+        downloads.each { download ->
+            def downloadFileName = "${download.name}.${download.ext}"
+            ant.get(src: "https://arcgisruntime.maps.arcgis" +
+                    ".com/sharing/rest/content/items/${download.id}/data",
+                    dest: downloadFileName)
+            if (download.ext == "zip") {
+                copy {
+                    from zipTree(downloadFileName)
+                    into(downloadFolder)
+                }
+            } else {
+                copy {
+                    from downloadFileName
+                    into downloadFolder
+                }
             }
-            delete(zipFile)
+            delete(downloadFileName)
         }
     }
-}
+}
+
+class Download {
+    String id
+    String name = "data"
+    String ext = "zip"
+}
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2019 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 of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.esri.samples.grouplayers.group_layers;
+
+import java.util.Arrays;
+import java.util.List;
+
+import javafx.application.Application;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Scene;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeView;
+import javafx.scene.layout.StackPane;
+import javafx.stage.Stage;
+
+import com.esri.arcgisruntime.data.ServiceFeatureTable;
+import com.esri.arcgisruntime.layers.ArcGISSceneLayer;
+import com.esri.arcgisruntime.layers.FeatureLayer;
+import com.esri.arcgisruntime.layers.GroupLayer;
+import com.esri.arcgisruntime.layers.Layer;
+import com.esri.arcgisruntime.loadable.LoadStatus;
+import com.esri.arcgisruntime.mapping.ArcGISScene;
+import com.esri.arcgisruntime.mapping.ArcGISTiledElevationSource;
+import com.esri.arcgisruntime.mapping.Basemap;
+import com.esri.arcgisruntime.mapping.Surface;
+import com.esri.arcgisruntime.mapping.view.Camera;
+import com.esri.arcgisruntime.mapping.view.SceneView;
+
+public class GroupLayersSample extends Application {
+
+  private SceneView sceneView;
+
+  @Override
+  public void start(Stage stage) {
+
+    try {
+
+      // set the title and size of the stage and show it
+      StackPane stackPane = new StackPane();
+      Scene fxScene = new Scene(stackPane);
+      stage.setTitle("Group Layers Sample");
+      stage.setWidth(800);
+      stage.setHeight(700);
+
+      // create a JavaFX scene with a stackpane and set it to the stage
+      stage.setScene(fxScene);
+      stage.show();
+
+      // create a scene view and add it to the stack pane
+      sceneView = new SceneView();
+      stackPane.getChildren().add(sceneView);
+
+      // create a scene with a basemap and add it to the scene view
+      ArcGISScene scene = new ArcGISScene();
+      scene.setBasemap(Basemap.createImagery());
+      sceneView.setArcGISScene(scene);
+
+      // set the base surface with world elevation
+      Surface surface = new Surface();
+      surface.getElevationSources().add(new ArcGISTiledElevationSource("http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer"));
+      scene.setBaseSurface(surface);
+
+      // create different types of layers
+      ArcGISSceneLayer devOne = new ArcGISSceneLayer("https://scenesampleserverdev.arcgis.com/arcgis/rest/services/Hosted/DevA_Trees/SceneServer/layers/0");
+      ArcGISSceneLayer devTwo = new ArcGISSceneLayer("https://scenesampleserverdev.arcgis.com/arcgis/rest/services/Hosted/DevA_Pathways/SceneServer/layers/0");
+      ArcGISSceneLayer devThree = new ArcGISSceneLayer("https://scenesampleserverdev.arcgis.com/arcgis/rest/services/Hosted/DevA_BuildingShell_Textured/SceneServer/layers/0");
+      ArcGISSceneLayer nonDevOne = new ArcGISSceneLayer("https://scenesampleserverdev.arcgis.com/arcgis/rest/services/Hosted/PlannedDemo_BuildingShell/SceneServer/layers/0");
+      FeatureLayer nonDevTwo = new FeatureLayer(new ServiceFeatureTable("https://services.arcgis.com/P3ePLMYs2RVChkJx/arcgis/rest/services/DevelopmentProjectArea/FeatureServer/0"));
+
+      // create a group layer from scratch by adding the layers as children
+      GroupLayer groupLayer = new GroupLayer();
+      groupLayer.setName("Group: Dev A");
+      groupLayer.getLayers().addAll(Arrays.asList(devOne, devTwo, devThree));
+
+      // add the group layer and other layers to the scene as operational layers
+      scene.getOperationalLayers().addAll(Arrays.asList(groupLayer, nonDevOne, nonDevTwo));
+
+      // zoom to the extent of the group layer when the child layers are loaded
+      groupLayer.getLayers().forEach(childLayer ->
+        childLayer.addDoneLoadingListener(() -> {
+          if (childLayer.getLoadStatus() == LoadStatus.LOADED) {
+            sceneView.setViewpointCamera(new Camera(groupLayer.getFullExtent().getCenter(), 700, 0, 60, 0));
+          }
+        })
+      );
+
+      // create a JavaFX tree view to show the layers in the scene
+      TreeView<Layer> layerTreeView = new TreeView<>();
+      layerTreeView.setMaxSize(250, 200);
+      TreeItem<Layer> rootTreeItem = new TreeItem<>();
+      layerTreeView.setRoot(rootTreeItem);
+      layerTreeView.setShowRoot(false);
+      StackPane.setAlignment(layerTreeView, Pos.TOP_RIGHT);
+      StackPane.setMargin(layerTreeView, new Insets(10));
+      stackPane.getChildren().add(layerTreeView);
+
+      // display each layer with a custom tree cell
+      layerTreeView.setCellFactory(p -> new LayerTreeCell());
+
+      // recursively build the table of contents from the scene's operational layers
+      buildLayersView(rootTreeItem, scene.getOperationalLayers());
+
+    } catch (Exception e) {
+      // on any error, display the stack trace.
+      e.printStackTrace();
+    }
+  }
+
+  /**
+   * Recursively builds a tree from a parent tree item using a list of operational layers (including group layers).
+   *
+   * @param parentItem tree item to build tree from
+   * @param operationalLayers a list of operational layers
+   */
+  private void buildLayersView(TreeItem<Layer> parentItem, List<Layer> operationalLayers) {
+    for (Layer layer : operationalLayers) {
+      // load each layer before adding to ensure all metadata is ready for display
+      layer.loadAsync();
+      layer.addDoneLoadingListener(() -> {
+        // add a tree item for the layer to the parent tree item
+        if (layer.canShowInLegend()) {
+          TreeItem<Layer> layerItem = new TreeItem<>(layer);
+          layerItem.setExpanded(true);
+          parentItem.getChildren().add(layerItem);
+          // if the layer is a group layer, continue building with its children
+          if (layer instanceof GroupLayer && ((GroupLayer) layer).isShowChildrenInLegend()) {
+            buildLayersView(layerItem, ((GroupLayer) layer).getLayers());
+          }
+        }
+      });
+    }
+  }
+
+  /**
+   * Stops and releases all resources used in application.
+   */
+  @Override
+  public void stop() {
+
+    if (sceneView != null) {
+      sceneView.dispose();
+    }
+  }
+
+  /**
+   * Opens and runs application.
+   *
+   * @param args arguments passed to this application
+   */
+  public static void main(String[] args) {
+
+    Application.launch(args);
+  }
+
+}