Skip to content

Commit

Permalink
Level-4: Duke now divide tasks into Todos, Events, and Deadlines to s…
Browse files Browse the repository at this point in the history
…erve users better
  • Loading branch information
JinYuze committed Aug 18, 2020
1 parent 582a555 commit 12c6435
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 6 deletions.
15 changes: 15 additions & 0 deletions src/main/java/Deadline.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package main.java;

public class Deadline extends Task {
protected String time;

public Deadline(String content, String time) {
super(content);
this.time = time;
}

@Override
public String toString() {
return "[D]" + (super.status ? "[√]" : "[×]") + super.content + "(" + time + ")" + " <-";
}
}
44 changes: 40 additions & 4 deletions src/main/java/Duke.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public static void main(String[] args) {
"->What can I do for you?" + "\n\n");

while (!userInput.equals("bye")) {

userInput = inputScanner.nextLine();

if (userInput.equals("bye")) {
Expand All @@ -31,21 +30,58 @@ public static void main(String[] args) {
}
System.out.println("\n");
} else {
System.out.println("\n//////There is NO order in my list now//////\n");
System.out.println("\n//////There is NO task in your list now//////\n");
}

} else if (userInput.startsWith("done")) {

int doneNo = Integer.parseInt(userInput.substring(5));
if (doneNo <= 0 || doneNo - 1 >= taskList.size()) {
System.out.println("\n-> Sorry, this task does not exist...\n");
} else {
taskList.get(doneNo - 1).done();
System.out.println("\n-> Good job! I have marked this task as done:\n" + taskList.get(doneNo - 1).toString() + "\n");
}

} else if (userInput.startsWith("todo")) {

Todo newTodo = new Todo(userInput.substring(5));
taskList.add(newTodo);
System.out.println(
"\n-> I have added a Todo:\n" +
newTodo.toString() +
"\nYou have " + taskList.size() + " tasks in your list currently.\n"
);

} else if (userInput.startsWith("deadline")) {

String[] splited = userInput.substring(9).split("/");
Deadline newDdl = new Deadline(splited[0], splited[1]);
taskList.add(newDdl);
System.out.println(
"\n-> I have added a Deadline:\n" +
newDdl.toString() +
"\nYou have " + taskList.size() + " tasks in your list currently.\n"
);

} else if (userInput.startsWith("event")) {

String[] splited = userInput.substring(9).split("/");
Deadline newEvent = new Deadline(splited[0], splited[1]);
taskList.add(newEvent);
System.out.println(
"\n-> I have added an Event:\n" +
newEvent.toString() +
"\nYou have " + taskList.size() + " tasks in your list currently.\n"
);

} else {

taskList.add(new Task(userInput));
System.out.println("\n-> Added: " + userInput + "\n");
System.out.println(
"\n-> please tap in your order correctly." +
"\n-> todo {task content}" +
"\n-> deadline {task content} {time}" +
"\n-> event {task content} {time} \n");

}
}
Expand Down
15 changes: 15 additions & 0 deletions src/main/java/Event.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package main.java;

public class Event extends Task {
protected String time;

public Event(String content, String time) {
super(content);
this.time = time;
}

@Override
public String toString() {
return "[E]" + (super.status ? "[√]" : "[×]") + super.content + "(" + time + ")" + " <-";
}
}
4 changes: 2 additions & 2 deletions src/main/java/Task.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package main.java;

public class Task {
private boolean status; //false for Not done; true for done
private String content;
protected boolean status; //false for Not done; true for done
protected String content;

public Task(String content) {
this.status = false;
Expand Down
13 changes: 13 additions & 0 deletions src/main/java/Todo.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package main.java;

public class Todo extends Task {

public Todo(String content) {
super(content);
}

@Override
public String toString() {
return "[T]" + super.toString();
}
}

0 comments on commit 12c6435

Please sign in to comment.