Duke commits

data/tasks.txt

@@ -0,0 +1 @@
+T|O|hi

src/main/java/duke/duke/AddCommand.java

@@ -1,4 +1,4 @@
-package duke;
+package duke.duke;
 
 import java.time.LocalDate;
 

src/main/java/duke/duke/ByeCommand.java

@@ -1,4 +1,4 @@
-package duke;
+package duke.duke;
 
 /**
  * Follows command to exit programme.

src/main/java/duke/duke/Command.java

@@ -1,4 +1,4 @@
-package duke;
+package duke.duke;
 
 public abstract class Command {
     String str;

src/main/java/duke/duke/Deadline.java

@@ -1,4 +1,4 @@
-package duke;
+package duke.duke;
 
 import java.time.LocalDate;
 import java.text.SimpleDateFormat;

src/main/java/duke/duke/DeleteCommand.java

@@ -1,4 +1,4 @@
-package duke;
+package duke.duke;
 
 /**
  * Deletes task from tasklist from Duke.

src/main/java/duke/duke/DoneCommand.java

@@ -1,4 +1,4 @@
-package duke;
+package duke.duke;
 
 /**
  * Changes status of Task inside tasklist from Duke.

src/main/java/duke/duke/Duke.java

@@ -1,4 +1,4 @@
-package duke;
+package duke.duke;
 
 /**
  * Creates Duke Object with filepath.

src/main/java/duke/duke/DukeException.java

@@ -1,4 +1,4 @@
-package duke;
+package duke.duke;
 
 /**
  * Handles Exceptions.

src/main/java/duke/duke/Event.java

@@ -1,4 +1,4 @@
-package duke;
+package duke.duke;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;

src/main/java/duke/duke/FindCommand.java

@@ -1,4 +1,4 @@
-package duke;
+package duke.duke;
 
 public class FindCommand extends Command {
 

src/main/java/duke/duke/ListCommand.java

@@ -1,4 +1,4 @@
-package duke;
+package duke.duke;
 
 /**
  * Lists the tasks from tasklist from Duke.
@@ -18,10 +18,11 @@ public class ListCommand extends Command {
      * @return empty string
      */
     String execute(TaskList lst,Storage storage,Ui ui,TasksNum tasks) {
+        String result = "";
         for (int i = 0; i < lst.getSize(); i++) {
-            str += lst.getTask(i) + "\n";
+            result += lst.getTask(i) + "\n";
         }
-        return str;
+        return result;
     }
 
 }

src/main/java/duke/duke/Parser.java

@@ -1,4 +1,4 @@
-package duke;
+package duke.duke;
 
 /**
  * Parses through user input to execute command.
@@ -27,7 +27,6 @@ public static Command parse(String str) throws DukeException {
         String[] temp = str.split(" ");
         switch (temp[0]) {
         case "todo":
-            //System.out.println("Hi2");
             return new AddCommand(str);
         case "deadline":
             return new AddCommand(str);

src/main/java/duke/duke/Storage.java

@@ -1,7 +1,8 @@
-package duke;
+package duke.duke;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -13,7 +14,7 @@
  * Creates Storage object.
  */
 public class Storage {
-    private String directory = System.getProperty("user.dir");
+    private String directory = System.getProperty("user.home");
     private String fileName = "tasks.txt";
     private Path path = Paths.get(directory, "data", fileName);
     private ArrayList<Task> lst = new ArrayList<Task>();
@@ -29,29 +30,24 @@ public ArrayList<Task> readFile() { //returns tasklist + task number (appended t
         int tasks = 0;
         if (!Files.exists(path)) {
             try {
-                Files.createFile(path);
+                Files.createDirectories(path.getParent());
+                Files.write(path, new ArrayList<String>(), StandardCharsets.UTF_8);
             } catch (IOException e) {
                 e.printStackTrace();
             }
         }
         try {
             List<String> input = Files.readAllLines(path);
-            //System.out.println(input.size());
             for (int i = 0; i < input.size(); i++) {
                 //System.out.println(i);
                 tasks++;
                 String[] temp = input.get(i).split("\\|");
                 //is there a way to add different child class instances without 3 diff if-else statement
                 if (temp[0].equals("T")) {
-                    //System.out.println("YO");
                     Todo todo = new Todo(temp[2]);
                     addtask(todo, temp[1], tasks);
                     lst.add(todo);
-                    //System.out.println(lst.get(0));
                 } else {
-                    //System.out.println(temp[0] + "HHEY");
-                    //System.out.println(temp[1]);
-                    //System.out.println(temp[2]);
                     LocalDate localdate = setDate(temp[3]);
                     if (temp[0].equals("D")) {
                         Deadline deadline = new Deadline(temp[2], localdate);
@@ -69,11 +65,9 @@ public ArrayList<Task> readFile() { //returns tasklist + task number (appended t
             Todo todo = new Todo(Integer.toString(tasks)); //dummy Todo for tasksnum
             todo.doAct();
             lst.add(todo);//add in tasknum
-            System.out.println("Added");
         } catch (IOException e) {
             e.printStackTrace();
         }
-        //System.out.println(lst.get(0));
         return lst;
     }
 
@@ -82,15 +76,12 @@ public ArrayList<Task> readFile() { //returns tasklist + task number (appended t
      * @param lst from Tasklist from ByeCommand
      */
     public void writeToFile(TaskList lst) {
-        //System.out.println("HEYY");
         try {
             BufferedWriter writer = Files.newBufferedWriter(path);;
             for (int i = 0; i < lst.getSize(); i++) {
-                //System.out.println("HEYY");
                 Task task = lst.getTask(i);
                 if (task instanceof Todo) {
                     writer.write("T" + "|" + task.getStatusIcon() + "|" + task.getD());
-                    //System.out.println("HEYY");
                     writer.newLine();
                 } else {
                     writer.write(task.getType() + "|" + task.getStatusIcon() + "|"
@@ -100,7 +91,6 @@ public void writeToFile(TaskList lst) {
             }
             writer.flush();
             writer.close();
-            //System.out.println("HEYY");
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -128,10 +118,8 @@ private LocalDate setDate(String date) {
      */
     private void addtask(Task task, String status, int tasks) {
         if (status.equals("O")) {
-            System.out.println("Done");
             task.doAct();
             tasks--;
-            System.out.println(tasks + "fuck");
         }
     }
 }

src/main/java/duke/duke/Task.java

@@ -1,4 +1,4 @@
-package duke;
+package duke.duke;
 
 public class Task {
     protected String description;

src/main/java/duke/duke/TaskList.java

@@ -1,4 +1,4 @@
-package duke;
+package duke.duke;
 
 import java.util.ArrayList;
 

src/main/java/duke/duke/TasksNum.java

@@ -1,4 +1,4 @@
-package duke;
+package duke.duke;
 
 /**
  * Stores number of tasks remaining for users.

src/main/java/duke/duke/Todo.java

@@ -1,4 +1,4 @@
-package duke;
+package duke.duke;
 
 public class Todo extends Task {
 

src/main/java/duke/duke/Ui.java

@@ -1,4 +1,4 @@
-package duke;
+package duke.duke;
 
 import java.util.Scanner;