Chore Resolved merge conflicts

bnjm2000 · Sep 19, 2023 · 683271c · 683271c
1 parent 5e6c2e3
commit 683271c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 25 deletions.
diff --git a/src/main/java/Chatty/Chatty.java b/src/main/java/Chatty/Chatty.java
@@ -13,10 +13,10 @@ public class Chatty {
     public static final String LINE = "____________________________________________________________";
 
     public static void main(String[] args) {
-        printWelcomeMessage();
         ArrayList<Task> tasks = new ArrayList<>();
         int taskCount = 0;
         taskCount = loadTasks(tasks, taskCount);
+        printWelcomeMessage();
         Scanner scanner = new Scanner(System.in);
         String input = scanner.nextLine();
         int index;
@@ -92,11 +92,11 @@ private static int loadTasks(ArrayList<Task> tasks, int taskCount) {
 
                 switch (type) {
                 case "T":
-                    tasks.set(taskCount, new Todo(description));
+                    tasks.add(new Todo(description));
                     break;
                 case "D":
                     String by = parts[3].trim();
-                    tasks.set(taskCount, new Deadline(description, by));
+                    tasks.add(new Deadline(description, by));
                     break;
                 case "E":
                     String fromTo = parts[3].trim();

diff --git a/src/main/java/Chatty/tasks/Task.java b/src/main/java/Chatty/tasks/Task.java
@@ -31,26 +31,4 @@ public boolean getIsDone(){
     public String saveFormat() {
         return "";
     }
-}
-
-
-
-    public Event(String description, String from, String to) {
-        super(description);
-        this.from = from;
-        this.to = to;
-    }
-
-    public String getFrom() {
-        return from;
-    }
-
-    public String getTo() {
-        return to;
-    }
-
-    @Override
-    public String getDescription() {
-        return "[E][" + getStatusIcon() + "] " + super.getDescription() + " (from: " + from + " to: " + to + ")";
-    }
 }