Merge pull request #162 from Esri/dev

Merge dev to master

Author: doneill

.gitignore

@@ -31,7 +31,6 @@ local.properties
 ._*
 .Spotlight-V100
 .Trashes
-Icon?
 ehthumbs.db
 Thumbs.db
 /samples-data/

README.md

@@ -1,5 +1,5 @@
 # ArcGIS Runtime Java SDK Samples
-### 100.0.0
+### 100.1.0
 This project includes a set of samples demonstrating how to accomplish various mapping and GIS tasks with the ArcGIS Runtime SDK for Java.
 
 These samples are built with Gradle. If you want to learn more about Gradle, learn more from [Gradle's guide](https://docs.gradle.org/current/userguide/userguide.html).

build.gradle

@@ -1,7 +1,7 @@
-apply plugin: 'com.esri.arcgisruntime.java'
 apply plugin: 'application'
 apply plugin: 'idea'
 apply plugin: 'eclipse'
+apply plugin: 'com.esri.arcgisruntime.java'
 
 buildscript {
     repositories {
@@ -14,7 +14,7 @@ buildscript {
     }
 }
 
-arcgis.version = '100.0.0'
+arcgis.version = '100.1.0'
 
 idea.module.downloadJavadoc = true
 eclipse.classpath.downloadJavadoc = true

src/main/java/com/esri/samples/displayinformation/add_graphics_with_renderer/AddGraphicsWithRendererSample.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Esri.
+ * Copyright 2017 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
@@ -16,6 +16,11 @@
 
 package com.esri.samples.displayinformation.add_graphics_with_renderer;
 
+import javafx.application.Application;
+import javafx.scene.Scene;
+import javafx.scene.layout.StackPane;
+import javafx.stage.Stage;
+
 import com.esri.arcgisruntime.geometry.Point;
 import com.esri.arcgisruntime.geometry.PolygonBuilder;
 import com.esri.arcgisruntime.geometry.PolylineBuilder;
@@ -30,11 +35,6 @@
 import com.esri.arcgisruntime.symbology.SimpleMarkerSymbol;
 import com.esri.arcgisruntime.symbology.SimpleRenderer;
 
-import javafx.application.Application;
-import javafx.scene.Scene;
-import javafx.scene.layout.StackPane;
-import javafx.stage.Stage;
-
 public class AddGraphicsWithRendererSample extends Application {
 
   private MapView mapView;

src/main/java/com/esri/samples/displayinformation/add_graphics_with_symbols/AddGraphicsWithSymbolsSample.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Esri.
+ * Copyright 2017 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
@@ -16,7 +16,17 @@
 
 package com.esri.samples.displayinformation.add_graphics_with_symbols;
 
-import com.esri.arcgisruntime.geometry.*;
+import javafx.application.Application;
+import javafx.scene.Scene;
+import javafx.scene.layout.StackPane;
+import javafx.stage.Stage;
+
+import com.esri.arcgisruntime.geometry.Point;
+import com.esri.arcgisruntime.geometry.PointCollection;
+import com.esri.arcgisruntime.geometry.Polygon;
+import com.esri.arcgisruntime.geometry.Polyline;
+import com.esri.arcgisruntime.geometry.SpatialReference;
+import com.esri.arcgisruntime.geometry.SpatialReferences;
 import com.esri.arcgisruntime.mapping.ArcGISMap;
 import com.esri.arcgisruntime.mapping.Basemap;
 import com.esri.arcgisruntime.mapping.view.Graphic;
@@ -29,11 +39,6 @@
 import com.esri.arcgisruntime.symbology.TextSymbol.HorizontalAlignment;
 import com.esri.arcgisruntime.symbology.TextSymbol.VerticalAlignment;
 
-import javafx.application.Application;
-import javafx.scene.Scene;
-import javafx.scene.layout.StackPane;
-import javafx.stage.Stage;
-
 public class AddGraphicsWithSymbolsSample extends Application {
 
   private MapView mapView;

src/main/java/com/esri/samples/displayinformation/dictionary_renderer_graphics_overlay/DictionaryRendererGraphicsOverlaySample.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Esri.
+ * Copyright 2017 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
@@ -25,7 +25,15 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.esri.arcgisruntime.geometry.*;
+import javafx.application.Application;
+import javafx.scene.Scene;
+import javafx.scene.layout.StackPane;
+import javafx.stage.Stage;
+
+import com.esri.arcgisruntime.geometry.Multipoint;
+import com.esri.arcgisruntime.geometry.Point;
+import com.esri.arcgisruntime.geometry.PointCollection;
+import com.esri.arcgisruntime.geometry.SpatialReference;
 import com.esri.arcgisruntime.mapping.ArcGISMap;
 import com.esri.arcgisruntime.mapping.Basemap;
 import com.esri.arcgisruntime.mapping.view.Graphic;
@@ -34,11 +42,6 @@
 import com.esri.arcgisruntime.symbology.DictionaryRenderer;
 import com.esri.arcgisruntime.symbology.DictionarySymbolStyle;
 
-import javafx.application.Application;
-import javafx.scene.Scene;
-import javafx.scene.layout.StackPane;
-import javafx.stage.Stage;
-
 public class DictionaryRendererGraphicsOverlaySample extends Application {
 
   private MapView mapView;
@@ -77,8 +80,8 @@ public void start(Stage stage) throws Exception {
 
     // create graphics with attributes and add to graphics overlay
     messages.stream()
-      .map(DictionaryRendererGraphicsOverlaySample::createGraphic)
-      .collect(Collectors.toCollection(() -> graphicsOverlay.getGraphics()));
+        .map(DictionaryRendererGraphicsOverlaySample::createGraphic)
+        .collect(Collectors.toCollection(() -> graphicsOverlay.getGraphics()));
 
     // once view has loaded
     mapView.addSpatialReferenceChangedListener(e -> {
@@ -93,13 +96,13 @@ public void start(Stage stage) throws Exception {
   private List<Map<String, Object>> parseMessages() throws Exception {
     final List<Map<String, Object>> messages = new ArrayList<>();
     $(getClass().getResourceAsStream("/symbols/Mil2525DMessages.xml")) // $ reads the file
-      .find("message")
-      .each()
-      .forEach(message -> {
-        Map<String, Object> attributes = new HashMap<>();
-        message.children().forEach(attr -> attributes.put(attr.getNodeName(), attr.getTextContent()));
-        messages.add(attributes);
-      });
+        .find("message")
+        .each()
+        .forEach(message -> {
+          Map<String, Object> attributes = new HashMap<>();
+          message.children().forEach(attr -> attributes.put(attr.getNodeName(), attr.getTextContent()));
+          messages.add(attributes);
+        });
 
     return messages;
   }
@@ -119,9 +122,9 @@ private static Graphic createGraphic(Map<String, Object> attributes) {
     PointCollection points = new PointCollection(sr);
     String[] coordinates = ((String) attributes.get("_control_points")).split(";");
     Stream.of(coordinates)
-      .map(cs -> cs.split(","))
-      .map(c -> new Point(Double.valueOf(c[0]), Double.valueOf(c[1]), sr))
-      .collect(Collectors.toCollection(() -> points));
+        .map(cs -> cs.split(","))
+        .map(c -> new Point(Double.valueOf(c[0]), Double.valueOf(c[1]), sr))
+        .collect(Collectors.toCollection(() -> points));
 
     // return a graphic with multipoint geometry
     return new Graphic(new Multipoint(points), attributes);

src/main/java/com/esri/samples/displayinformation/identify_graphics/IdentifyGraphicsSample.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Esri.
+ * Copyright 2017 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
@@ -18,6 +18,16 @@
 
 import java.util.List;
 
+import javafx.application.Application;
+import javafx.application.Platform;
+import javafx.geometry.Point2D;
+import javafx.scene.Scene;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Alert.AlertType;
+import javafx.scene.input.MouseButton;
+import javafx.scene.layout.StackPane;
+import javafx.stage.Stage;
+
 import com.esri.arcgisruntime.concurrent.ListenableFuture;
 import com.esri.arcgisruntime.geometry.Point;
 import com.esri.arcgisruntime.geometry.PointCollection;
@@ -30,16 +40,6 @@
 import com.esri.arcgisruntime.mapping.view.MapView;
 import com.esri.arcgisruntime.symbology.SimpleFillSymbol;
 
-import javafx.application.Application;
-import javafx.application.Platform;
-import javafx.geometry.Point2D;
-import javafx.scene.Scene;
-import javafx.scene.control.Alert;
-import javafx.scene.control.Alert.AlertType;
-import javafx.scene.input.MouseButton;
-import javafx.scene.layout.StackPane;
-import javafx.stage.Stage;
-
 public class IdentifyGraphicsSample extends Application {
 
   private MapView mapView;

src/main/java/com/esri/samples/displayinformation/show_callout/ShowCallout.png

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Esri.
+ * Copyright 2017 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
@@ -16,12 +16,6 @@
 
 package com.esri.samples.displayinformation.show_callout;
 
-import com.esri.arcgisruntime.geometry.Point;
-import com.esri.arcgisruntime.mapping.ArcGISMap;
-import com.esri.arcgisruntime.mapping.Basemap;
-import com.esri.arcgisruntime.mapping.view.Callout;
-import com.esri.arcgisruntime.mapping.view.MapView;
-
 import javafx.application.Application;
 import javafx.geometry.Point2D;
 import javafx.scene.Scene;
@@ -30,6 +24,12 @@
 import javafx.stage.Stage;
 import javafx.util.Duration;
 
+import com.esri.arcgisruntime.geometry.Point;
+import com.esri.arcgisruntime.mapping.ArcGISMap;
+import com.esri.arcgisruntime.mapping.Basemap;
+import com.esri.arcgisruntime.mapping.view.Callout;
+import com.esri.arcgisruntime.mapping.view.MapView;
+
 public class ShowCalloutSample extends Application {
 
   private MapView mapView;
@@ -53,7 +53,7 @@ public void start(Stage stage) throws Exception {
       stage.show();
 
       // create ArcGISMap with imagery basemap
-      ArcGISMap map = new ArcGISMap(Basemap.createImageryWithLabels());
+      ArcGISMap map = new ArcGISMap(Basemap.createStreets());
 
       // create a view and set map to it
       mapView = new MapView();
@@ -75,7 +75,7 @@ public void start(Stage stage) throws Exception {
 
           if (!callout.isVisible()) {
             // set the callout's details
-            callout.setTitle("Callout");
+            callout.setTitle("Location");
             callout.setDetail(String.format("x: %.2f, y: %.2f", mapPoint.getX(), mapPoint.getY()));
 
             // show the callout where the user clicked

src/main/java/com/esri/samples/displayinformation/show_callout/ShowCalloutSample.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Esri.
+ * Copyright 2017 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
@@ -20,17 +20,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import com.esri.arcgisruntime.concurrent.ListenableFuture;
-import com.esri.arcgisruntime.geometry.Point;
-import com.esri.arcgisruntime.geometry.SpatialReference;
-import com.esri.arcgisruntime.mapping.ArcGISMap;
-import com.esri.arcgisruntime.mapping.Basemap;
-import com.esri.arcgisruntime.mapping.view.Graphic;
-import com.esri.arcgisruntime.mapping.view.GraphicsOverlay;
-import com.esri.arcgisruntime.mapping.view.IdentifyGraphicsOverlayResult;
-import com.esri.arcgisruntime.mapping.view.MapView;
-import com.esri.arcgisruntime.symbology.SimpleMarkerSymbol;
-
 import javafx.application.Application;
 import javafx.geometry.Insets;
 import javafx.geometry.Point2D;
@@ -45,6 +34,17 @@
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 
+import com.esri.arcgisruntime.concurrent.ListenableFuture;
+import com.esri.arcgisruntime.geometry.Point;
+import com.esri.arcgisruntime.geometry.SpatialReference;
+import com.esri.arcgisruntime.mapping.ArcGISMap;
+import com.esri.arcgisruntime.mapping.Basemap;
+import com.esri.arcgisruntime.mapping.view.Graphic;
+import com.esri.arcgisruntime.mapping.view.GraphicsOverlay;
+import com.esri.arcgisruntime.mapping.view.IdentifyGraphicsOverlayResult;
+import com.esri.arcgisruntime.mapping.view.MapView;
+import com.esri.arcgisruntime.symbology.SimpleMarkerSymbol;
+
 public class UpdateGraphicsSample extends Application {
 
   private boolean isUpdateLocationActive;