Merge pull request #205 from Esri/john0005/UpdateAddDeleteSample

Updating edit samples

Author: john0005

src/main/java/com/esri/samples/editing/add_features/AddFeaturesSample.java

@@ -130,9 +130,8 @@ private void addFeature(Point mapPoint, ServiceFeatureTable featureTable) {
 
     // check if feature can be added to feature table
     if (featureTable.canAdd()) {
-      // add the new feature to the feature table
-      ListenableFuture<Void> addResult = featureTable.addFeatureAsync(feature);
-      addResult.addDoneListener(() -> applyEdits(featureTable));
+      // add the new feature to the feature table and to server
+      featureTable.addFeatureAsync(feature).addDoneListener(() -> applyEdits(featureTable));
     } else {
       displayMessage(null, "Cannot add a feature to this feature table");
     }
@@ -151,8 +150,12 @@ private void applyEdits(ServiceFeatureTable featureTable) {
       try {
         List<FeatureEditResult> edits = editResult.get();
         // check if the server edit was successful
-        if (edits != null && edits.size() > 0 && edits.get(0).hasCompletedWithErrors()) {
-          throw edits.get(0).getError();
+        if (edits != null && edits.size() > 0) {
+          if (!edits.get(0).hasCompletedWithErrors()) {
+            displayMessage(null, "Feature successfully added");
+          } else {
+            throw edits.get(0).getError();
+          }
         }
       } catch (InterruptedException | ExecutionException e) {
         displayMessage("Exception applying edits on server", e.getCause().getMessage());

src/main/java/com/esri/samples/editing/delete_features/DeleteFeaturesSample.java

@@ -150,12 +150,8 @@ public void start(Stage stage) throws Exception {
    */
   private void deleteFeatures(FeatureQueryResult features, ServiceFeatureTable featureTable) {
 
-    // delete feature from the feature table
-    featureTable.deleteFeaturesAsync(features).addDoneListener(() -> {
-      // apply changes to the server
-      ListenableFuture<List<FeatureEditResult>> editResult = featureTable.applyEditsAsync();
-      editResult.addDoneListener(() -> applyEdits(featureTable));
-    });
+    // delete feature from the feature table and apply edit to server
+    featureTable.deleteFeaturesAsync(features).addDoneListener(() -> applyEdits(featureTable));
   }
 
   /**
@@ -171,10 +167,12 @@ private void applyEdits(ServiceFeatureTable featureTable) {
       try {
         List<FeatureEditResult> edits = editResult.get();
         // check if the server edit was successful
-        if (edits != null && edits.size() > 0 && !edits.get(0).hasCompletedWithErrors()) {
-          displayMessage(null, "Feature successfully deleted");
-        } else if (edits != null && edits.size() > 0) {
-          throw edits.get(0).getError();
+        if (edits != null && edits.size() > 0) {
+          if (!edits.get(0).hasCompletedWithErrors()) {
+            displayMessage(null, "Feature successfully deleted");
+          } else {
+            throw edits.get(0).getError();
+          }
         }
       } catch (InterruptedException | ExecutionException e) {
         displayMessage("Exception applying edits on server", e.getCause().getMessage());

src/main/java/com/esri/samples/editing/edit_feature_attachments/EditFeatureAttachmentsSample.java

@@ -266,8 +266,12 @@ private void applyEdits(ServiceFeatureTable featureTable) {
       try {
         List<FeatureEditResult> edits = editResult.get();
         // check if the server edit was successful
-        if (edits != null && edits.size() > 0 && edits.get(0).hasCompletedWithErrors()) {
-          throw edits.get(0).getError();
+        if (edits != null && edits.size() > 0) {
+          if (!edits.get(0).hasCompletedWithErrors()) {
+            displayMessage(null, "Edited feature successfully");
+          } else {
+            throw edits.get(0).getError();
+          }
         }
         // update the displayed list of attachments
         fetchAttachments(selected);

src/main/java/com/esri/samples/editing/update_attributes/UpdateAttributesSample.java

@@ -215,8 +215,12 @@ private void applyEdits(ServiceFeatureTable featureTable) {
       try {
         List<FeatureEditResult> edits = editResult.get();
         // check if the server edit was successful
-        if (edits != null && edits.size() > 0 && edits.get(0).hasCompletedWithErrors()) {
-          throw edits.get(0).getError();
+        if (edits != null && edits.size() > 0) {
+          if (!edits.get(0).hasCompletedWithErrors()) {
+            displayMessage(null, "Attributes updated.");
+          } else {
+            throw edits.get(0).getError();
+          }
         }
       } catch (InterruptedException | ExecutionException e) {
         displayMessage("Error applying edits on server", e.getCause().getMessage());

src/main/java/com/esri/samples/editing/update_geometries/UpdateGeometriesSample.java

@@ -104,7 +104,7 @@ public void start(Stage stage) throws Exception {
               } else {
 
                 // didn't click on a feature
-                ListenableFuture<FeatureQueryResult> selectedQuery =  featureLayer.getSelectedFeaturesAsync();
+                ListenableFuture<FeatureQueryResult> selectedQuery = featureLayer.getSelectedFeaturesAsync();
                 selectedQuery.addDoneListener(() -> {
                   try {
                     // check if a feature is currently selected
@@ -161,8 +161,12 @@ private static void applyEdits() {
       try {
         List<FeatureEditResult> edits = editResult.get();
         // check if the server edit was successful
-        if (edits != null && edits.size() > 0 && edits.get(0).hasCompletedWithErrors()) {
-          throw edits.get(0).getError();
+        if (edits != null && edits.size() > 0) {
+          if (!edits.get(0).hasCompletedWithErrors()) {
+            displayMessage(null, "Geometry updated");
+          } else {
+            throw edits.get(0).getError();
+          }
         }
       } catch (InterruptedException | ExecutionException e) {
         displayMessage("Error applying edits on server", e.getCause().getMessage());