refactoring codes to methods. and use stream instead of normal for loops

HubTurbo · Jun 29, 2016 · ada15a0 · ada15a0
1 parent c20cb8f
commit ada15a0
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/src/main/java/address/controller/PersonOverviewController.java b/src/main/java/address/controller/PersonOverviewController.java
@@ -29,7 +29,9 @@
 import javafx.scene.control.*;
 import javafx.scene.control.Alert.AlertType;
 
+import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 /**
@@ -118,8 +120,8 @@ private void initialize() {
     private void handleDeletePersons() {
         final List<ReadOnlyViewablePerson> selected = personListView.getSelectionModel().getSelectedItems();
 
-        if (selected.isEmpty() || isListContainingNullObject(selected)) {
-            showNoSelectionAlert();
+        if (isSelectionValid()) {
+            showInvalidSelectionAlert();
         } else {
             selected.stream()
                     .forEach(target -> {
@@ -129,13 +131,9 @@ private void handleDeletePersons() {
         }
     }
 
-    private boolean isListContainingNullObject(List<ReadOnlyViewablePerson> selected) {
-        for (Object obj : selected) {
-            if (obj == null){
-                return true;
-            }
-        }
-        return false;
+    private boolean isSelectionValid() {
+        final List<?> selected = personListView.getSelectionModel().getSelectedItems();
+        return selected.isEmpty() || selected.stream().anyMatch(Objects::isNull);
     }
 
     /**
@@ -154,8 +152,8 @@ private void handleNewPerson() {
     private void handleRetagPersons() {
         List<ReadOnlyViewablePerson> selectedPersons = personListView.getSelectionModel().getSelectedItems();
 
-        if (selectedPersons.isEmpty() || isListContainingNullObject(selectedPersons)) {
-            showNoSelectionAlert();
+        if (isSelectionValid()) {
+            showInvalidSelectionAlert();
             return;
         }
 
@@ -179,7 +177,7 @@ private void handleRetagPersons() {
     private void handleEditPerson() {
         final ReadOnlyPerson editTarget = personListView.getSelectionModel().getSelectedItem();
         if (editTarget == null) { // no selection
-            showNoSelectionAlert();
+            showInvalidSelectionAlert();
             return;
         }
         modelManager.editPersonThroughUI(editTarget,
@@ -188,8 +186,8 @@ private void handleEditPerson() {
 
     private void handleCancelPersonOperations() {
         final List<ReadOnlyViewablePerson> selectedPersons = personListView.getSelectionModel().getSelectedItems();
-        if (selectedPersons.isEmpty() || isListContainingNullObject(selectedPersons)) {
-            showNoSelectionAlert();
+        if (isSelectionValid()) {
+            showInvalidSelectionAlert();
             return;
         }
         selectedPersons.stream().forEach(selectedPerson -> {
@@ -271,9 +269,9 @@ private void jumpToListItem(int targetIndex) {
         selectItem(indexOfItem);
     }
 
-    private void showNoSelectionAlert() {
+    private void showInvalidSelectionAlert() {
         mainController.showAlertDialogAndWait(AlertType.WARNING,
-                "No Selection", "No Person Selected", "Please select a person in the list.");
+                "Invalid Selection", "No Person Selected", "Please select a person in the list.");
     }
 
     /**