Refactor try catch

CS2103AUG2016-F11-C1 · Nov 5, 2016 · 82aafc7 · 82aafc7
1 parent 4317579
commit 82aafc7
Showing 1 changed file with 7 additions and 15 deletions.
diff --git a/src/main/java/seedu/todo/controllers/ListController.java b/src/main/java/seedu/todo/controllers/ListController.java
@@ -80,25 +80,17 @@ public void process(String input) throws ParseException {
 
         boolean isTask = tasksOrEventsBools[0];
         boolean isEvent = tasksOrEventsBools[1];
-
-        // Filter tasks.
-        if (isTask) {
-            try {
+
+        try {
+            if (isTask) {
                 filteredTasks = CalendarItemFilter.filterTasks(parsedResult);
-            } catch (InvalidNaturalDateException e) {
-                System.out.println("Disambiguate: Invalid date format");
-                return;
             }
-        }
-
-        // Filter events.
-        if (isEvent) {
-            try {
+            if (isEvent) {
                 filteredEvents = CalendarItemFilter.filterEvents(parsedResult);
-            } catch (InvalidNaturalDateException e) {
-                System.out.println("Disambiguate: Invalid date format");
-                return;
             }
+        } catch (InvalidNaturalDateException e) {
+            System.out.println("Disambiguate: Invalid date format");
+            return;
         }
 
         // Render the new view with filtered tasks.