From 97e55775a8365df9244261ad6a643f7a8c441597 Mon Sep 17 00:00:00 2001 From: Kowshik Sundararajan Date: Mon, 11 Apr 2016 22:47:45 +0800 Subject: [PATCH] added minor change to view floating tasks --- main/Logic/Core.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/main/Logic/Core.java b/main/Logic/Core.java index 3b815e7..e2b0583 100644 --- a/main/Logic/Core.java +++ b/main/Logic/Core.java @@ -708,7 +708,8 @@ public int findTheLastDisplay(String description) { num = Integer.parseInt(description); } if (Logic.Head.getLastDisplay().equals("display") || Logic.Head.getLastDisplay().equals("d")) { - if (Logic.Head.getLastDisplayArg().equals("floating") || Logic.Head.getLastDisplayArg().equals("all")) { + if (Logic.Head.getLastDisplayArg().equals("floating") || Logic.Head.getLastDisplayArg().equals("all") + || Logic.Head.getLastDisplayArg().equals("f")) { if (description.contains("all")) { String[] tmp = description.split(" "); num = Integer.parseInt(tmp[1]); @@ -823,7 +824,8 @@ public int getCorrectIndexWelcomeView(int num) { */ public void setPriorityCommand() { if (Logic.Head.getLastDisplay().equals("display") || Logic.Head.getLastDisplay().equals("d")) { - if (Logic.Head.getLastDisplayArg().equals("all") || Logic.Head.getLastDisplayArg().equals("floating")) { + if (Logic.Head.getLastDisplayArg().equals("all") || Logic.Head.getLastDisplayArg().equals("floating") + ||Logic.Head.getLastDisplayArg().equals("f")) { setPriorityFromDisplayAllView(); } else { setPriorityFromDisplayView(); @@ -969,7 +971,8 @@ public void unmarkCommand() { public void markCommand() { String s = parserObject.getDescription(); if (Logic.Head.getLastDisplay().equals("display") || Logic.Head.getLastDisplay().equals("d")) { - if (Logic.Head.getLastDisplayArg().equals("all") || Logic.Head.getLastDisplayArg().equals("floating")) { + if (Logic.Head.getLastDisplayArg().equals("all") || Logic.Head.getLastDisplayArg().equals("floating") + || Logic.Head.getLastDisplayArg().equals("f")) { markFromDisplayAllView(s); } else { markFromDisplayView(); @@ -1093,7 +1096,8 @@ public void clearCommand() throws ClassNotFoundException, IOException { public void viewCommand() { String s = parserObject.getDescription(); if (Logic.Head.getLastDisplay().equals("display") || Logic.Head.getLastDisplay().equals("d")) { - if (Logic.Head.getLastDisplayArg().equals("all") || Logic.Head.getLastDisplayArg().equals("floating")) { + if (Logic.Head.getLastDisplayArg().equals("all") || Logic.Head.getLastDisplayArg().equals("floating") + || Logic.Head.getLastDisplayArg().equals("f")) { int num = Integer.parseInt(s); crudObject.viewIndividualTask(num - 1); } else { @@ -1218,7 +1222,8 @@ public void displayCommand() { public void deleteCommand() { String s = parserObject.getDescription(); if ((Logic.Head.getLastDisplay().equals("d") == true || Logic.Head.getLastDisplay().equals("display")) == true) { - if (Logic.Head.getLastDisplayArg().equals("all") || Logic.Head.getLastDisplayArg().equals("floating")) { + if (Logic.Head.getLastDisplayArg().equals("all") || Logic.Head.getLastDisplayArg().equals("floating") + || Logic.Head.getLastDisplayArg().equals("f")) { if (s.contains("all") != true) { deleteFromDisplayAllView(s); } else {