Refactor param validations.

CS2103AUG2016-F11-C1 · Oct 16, 2016 · a1b33b1 · a1b33b1
1 parent 74e2c34
commit a1b33b1
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/src/main/java/seedu/todo/controllers/AddController.java b/src/main/java/seedu/todo/controllers/AddController.java
@@ -61,18 +61,16 @@ public void process(String input) {
         // Task or event?
         boolean isTask = parseIsTask(parsedResult);
 
-        // Name - Disambiguate if null.
+        // Name
         String name = parseName(parsedResult);
-        if (name == null) {
-            renderDisambiguation(parsedResult);
-            return;
-        }
 
-        // Time - Disambiguate if "to" without "from" OR "task" and two timings.
+        // Time
         String[] naturalDates = parseDates(parsedResult);
         String naturalFrom = naturalDates[0];
         String naturalTo = naturalDates[1];
-        if ((naturalFrom == null && naturalTo != null) || (isTask && naturalTo != null)) {
+
+        // Validate isTask, name and times.
+        if (!validateParams(isTask, name, naturalFrom, naturalTo)) {
             renderDisambiguation(parsedResult);
             return;
         }
@@ -102,6 +100,14 @@ public void process(String input) {
         UiManager.renderView(view);
         UiManager.updateConsoleMessage(MESSAGE_ADD_SUCCESS);
     }
+
+
+    private boolean validateParams(boolean isTask, String name, String naturalFrom, String naturalTo) {
+        // Disambiguate if name is null.
+        // Disambiguate if "to" without "from" OR "task" and two timings.
+        return (name == null ||
+                (naturalFrom == null && naturalTo != null) || (isTask && naturalTo != null));
+    }
 
     private String[] parseDates(Map<String, String[]> parsedResult) {
         String naturalFrom = null;