[Zheng Shijie] iP

src/main/java/Duke.java

@@ -20,8 +20,8 @@ public static void main(String[] args) {
         ArrayList<Task> tasks = new ArrayList<>();
 
         while (true) {
-            String input = scanner.nextLine();
-            String[] cmd = input.split("\\s+");
+            String userInput = scanner.nextLine();
+            String[] cmd = userInput.split("\\s+");
 
             if (cmd[0].equalsIgnoreCase("bye")) {
                 break;
@@ -39,7 +39,7 @@ public static void main(String[] args) {
                         break;
                     case "done":
                         try {
-                            int index = Integer.parseInt(input.split(" ")[1]);
+                            int index = Integer.parseInt(userInput.split(" ")[1]);
                             tasks.get(index - 1).setDone(true);
                             System.out.println("Nice! I've marked this task as done: ");
                             System.out.println(tasks.get(index - 1).toString());
@@ -51,7 +51,7 @@ public static void main(String[] args) {
                         break;
                     case "todo":
                         try {
-                            ToDos t = new ToDos(input.substring(5, input.length()));
+                            ToDos t = new ToDos(userInput.substring(5, userInput.length()));
                             tasks.add(t);
                             printTask(t, tasks);
                         }catch(StringIndexOutOfBoundsException e){
@@ -60,7 +60,7 @@ public static void main(String[] args) {
                         break;
                     case "deadline":
                         try {
-                            String[] deadlineContent = input.split(" /by ");
+                            String[] deadlineContent = userInput.split(" /by ");
                             Deadlines d = new Deadlines(deadlineContent[0].substring(9, deadlineContent[0].length()), deadlineContent[1]);
                             tasks.add(d);
                             printTask(d, tasks);
@@ -72,7 +72,7 @@ public static void main(String[] args) {
                         break;
                     case "event":
                         try {
-                            String[] eventContent = input.split(" /at ");
+                            String[] eventContent = userInput.split(" /at ");
                             Events e = new Events(eventContent[0].substring(6, eventContent[0].length()), eventContent[1]);
                             tasks.add(e);
                             printTask(e, tasks);
@@ -94,6 +94,7 @@ public static void main(String[] args) {
             }
             System.out.println("________________________________________________________");
         }
+
         System.out.println(bye);
         System.out.println("________________________________________________________");
 

src/main/java/Tasks/Deadlines.java

@@ -5,7 +5,7 @@ public class Deadlines extends Task {
 
     public Deadlines(String taskDescription, String deadline) {
         super(taskDescription);
-        super.type = "[D]";
+        super.taskType = "[D]";
         this.deadline = deadline;
     }
 

src/main/java/Tasks/Events.java

@@ -5,7 +5,7 @@ public class Events extends Task {
 
     public Events(String taskDescription, String eventTime) {
         super(taskDescription);
-        super.type = "[E]";
+        super.taskType = "[E]";
         this.eventTime = eventTime;
     }
 

src/main/java/Tasks/Task.java

@@ -1,30 +1,30 @@
 package Tasks;
 
 public abstract class Task {
-    protected String type;
-    protected boolean done = false;
+    protected String taskType;
+    protected boolean isDone = false;
     protected String taskDescription;
-    protected String symbol = "[✗]";
+    protected String taskSymbol = "[✗]";
 
     public Task(String taskDescription) {
         this.taskDescription = taskDescription;
     }
 
     @Override
     public String toString() {
-        return type + symbol + " " + taskDescription;
+        return taskType + taskSymbol + " " + taskDescription;
     }
 
     public void setDone(boolean done) {
-        this.done = done;
+        this.isDone = done;
         setSymbol();
     }
 
     private void setSymbol() {
-        if (done) {
-            this.symbol = "[✓]";
+        if (isDone) {
+            this.taskSymbol = "[✓]";
         } else {
-            this.symbol = "[✗]";
+            this.taskSymbol = "[✗]";
         }
     }
 }

src/main/java/Tasks/ToDos.java

@@ -4,7 +4,7 @@ public class ToDos extends Task {
 
     public ToDos(String taskDescription) {
         super(taskDescription);
-        super.type = "[T]";
+        super.taskType = "[T]";
     }
 
 }