Skip to content

Commit

Permalink
Level 4
Browse files Browse the repository at this point in the history
Completed Level 4: ToDos, Events, Deadlines
  • Loading branch information
gachia committed Aug 21, 2019
1 parent b73aaee commit ac597c4
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 4 deletions.
13 changes: 13 additions & 0 deletions src/main/java/Deadline.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
public class Deadline extends Task {
protected String by;

public Deadline(String desc, String by) {
super(desc);
this.by = by;
}

@Override
public String toString(){
return "[D]" + super.getTask() + " (by: " + by + ")";
}
}
26 changes: 23 additions & 3 deletions src/main/java/Duke.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ public static void main(String[] args) {
System.out.println(startMessage);
Scanner sc = new Scanner(System.in);
ArrayList<Task> list = new ArrayList();
String taskName;
Task task;
while(sc.hasNext()){
String userCmd = sc.next();
if(userCmd.equals("bye")){
Expand All @@ -29,10 +31,28 @@ public static void main(String[] args) {
System.out.print(lineSpace);
break;
case "todo":
String taskName = sc.nextLine();
taskName = sc.nextLine();
taskName = taskName.trim();
list.add(new Task(taskName));
System.out.println(lineSpace + "added: " + taskName + "\n" + lineSpace);
task = new Task(taskName);
list.add(task);
System.out.println(lineSpace + "Got it. I've added this task:\n" + task
+ "\nNow you have " + list.size() + " tasks in the list.\n" + lineSpace);
break;
case "deadline":
taskName = sc.nextLine();
String[] userWords = taskName.trim().split("/by");
task = new Deadline(userWords[0].trim(), userWords[1].trim());
list.add(task);
System.out.println(lineSpace + "Got it. I've added this task:\n" + task
+ "\nNow you have " + list.size() + " tasks in the list.\n" + lineSpace);
break;
case "event":
taskName = sc.nextLine();
userWords = taskName.trim().split("/at");
task = new Event(userWords[0].trim(), userWords[1].trim());
list.add(task);
System.out.println(lineSpace + "Got it. I've added this task:\n" + task
+ "\nNow you have " + list.size() + " tasks in the list.\n" + lineSpace);
break;
case "done":
int taskNo = sc.nextInt();
Expand Down
14 changes: 14 additions & 0 deletions src/main/java/Event.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
public class Event extends Task {

protected String at;

public Event(String desc, String at) {
super(desc);
this.at = at;
}

@Override
public String toString(){
return "[E]" + super.getTask() + " (at: " + at + ")";
}
}
2 changes: 1 addition & 1 deletion src/main/java/Task.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ public String getTask(){

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

0 comments on commit ac597c4

Please sign in to comment.