Skip to content

Commit

Permalink
added minor change to view floating tasks
Browse files Browse the repository at this point in the history
  • Loading branch information
kowshik-sundararajan committed Apr 11, 2016
1 parent 838b25d commit 97e5577
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions main/Logic/Core.java
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 97e5577

Please sign in to comment.