Implement A-Jar

data/task.txt

@@ -1,4 +1,2 @@
-T | 1 | one thing
-E | 0 |  | 11/11/11 11:11
-D | 0 | asd | 22/22/22 33:33
-T | 0 | someting
+T | 0 | something
+D | 0 | asd | 11/11/11 11:11

src/main/java/Duke.java

@@ -7,9 +7,9 @@ public class Duke {
     private TaskList tasks;
     private Ui ui;
 
-    private Duke(String filePath) {
+    private Duke() {
         ui = new Ui();
-        storage = new Storage(filePath);
+        storage = new Storage();
         try {
             tasks = new TaskList(storage.load());
         } catch (DukeException e) {
@@ -39,6 +39,6 @@ private void run() {
     }
 
     public static void main(String[] args) {
-        new Duke("data/task.txt").run();
+        new Duke().run();
     }
 }

src/main/java/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: Duke
+

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

@@ -6,17 +6,24 @@
 import java.io.FileNotFoundException;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Scanner;
 
 public class Storage {
     private Scanner sc;
     private ArrayList<String> contentList = new ArrayList<String>();
+    private static final String DUKE_DATA_DIR = System.getProperty("user.home") + File.separator + "data";
+    private static final String DUKE_DATA_PATH = DUKE_DATA_DIR + File.separator + "task.txt";
 
-    public Storage(String filePath) {
+    public Storage() {
         try {
-            File f = new File(filePath);
-            f.createNewFile();
+            if (!Paths.get(DUKE_DATA_PATH).toFile().exists()) {
+                Files.createDirectory(Paths.get(DUKE_DATA_DIR));
+                Files.createFile(Paths.get(DUKE_DATA_PATH));
+            }
+            File f = new File(DUKE_DATA_PATH);
             sc = new Scanner(f);
         } catch (FileNotFoundException e) {
             System.out.println("You have no task.");
@@ -27,16 +34,22 @@ public Storage(String filePath) {
     }
 
     public ArrayList<String> load() {
-        while (sc.hasNext()) {
-            String s = sc.nextLine();
-            contentList.add(s);
+        try {
+            while (sc.hasNext()) {
+                String s = sc.nextLine();
+                contentList.add(s);
+            }
+            return contentList;
+        } catch (Exception e) {
+            System.out.println("No task were detected");
+        } finally {
+            return contentList;
         }
-        return contentList;
     }
 
     public void save(ArrayList<Task> list) {
         try {
-            FileWriter fw = new FileWriter("data/task.txt");
+            FileWriter fw = new FileWriter(DUKE_DATA_PATH);
             String fileContent = "";
             for (Task t : list) {
                 fileContent += t.toWriteFile() + "\n";

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

@@ -7,7 +7,7 @@
 
 public class Ui {
     private Scanner sc = new Scanner(System.in);
-    private String LINES = "____________________________________________________________\n";
+    private static final String LINES = "____________________________________________________________\n";
 
     public Ui() {
     }