diff --git a/.gradle/6.7/executionHistory/executionHistory.bin b/.gradle/6.7/executionHistory/executionHistory.bin index 7fe2264dfc..83b1f4509c 100644 Binary files a/.gradle/6.7/executionHistory/executionHistory.bin and b/.gradle/6.7/executionHistory/executionHistory.bin differ diff --git a/.gradle/6.7/executionHistory/executionHistory.lock b/.gradle/6.7/executionHistory/executionHistory.lock index e65fa6df7f..db4823a206 100644 Binary files a/.gradle/6.7/executionHistory/executionHistory.lock and b/.gradle/6.7/executionHistory/executionHistory.lock differ diff --git a/.gradle/6.7/fileHashes/fileHashes.bin b/.gradle/6.7/fileHashes/fileHashes.bin index 76a45a978e..28a01097b5 100644 Binary files a/.gradle/6.7/fileHashes/fileHashes.bin and b/.gradle/6.7/fileHashes/fileHashes.bin differ diff --git a/.gradle/6.7/fileHashes/fileHashes.lock b/.gradle/6.7/fileHashes/fileHashes.lock index 59435d9900..aacce57664 100644 Binary files a/.gradle/6.7/fileHashes/fileHashes.lock and b/.gradle/6.7/fileHashes/fileHashes.lock differ diff --git a/.gradle/6.7/javaCompile/classAnalysis.bin b/.gradle/6.7/javaCompile/classAnalysis.bin index b557079ccd..cfe9440f4a 100644 Binary files a/.gradle/6.7/javaCompile/classAnalysis.bin and b/.gradle/6.7/javaCompile/classAnalysis.bin differ diff --git a/.gradle/6.7/javaCompile/javaCompile.lock b/.gradle/6.7/javaCompile/javaCompile.lock index 18f59cb9c5..686b1adad2 100644 Binary files a/.gradle/6.7/javaCompile/javaCompile.lock and b/.gradle/6.7/javaCompile/javaCompile.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index a324434611..a86fb29347 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/build/classes/java/main/Duke.class b/build/classes/java/main/Duke.class index 0e11049516..01ac0da2db 100644 Binary files a/build/classes/java/main/Duke.class and b/build/classes/java/main/Duke.class differ diff --git a/build/classes/java/main/Storage/DeadlineTask.class b/build/classes/java/main/Storage/DeadlineTask.class index 74e9a4170b..0b97a12dcf 100644 Binary files a/build/classes/java/main/Storage/DeadlineTask.class and b/build/classes/java/main/Storage/DeadlineTask.class differ diff --git a/build/classes/java/main/Storage/EventsTask.class b/build/classes/java/main/Storage/EventsTask.class index c07d6a6ede..4c652c77c3 100644 Binary files a/build/classes/java/main/Storage/EventsTask.class and b/build/classes/java/main/Storage/EventsTask.class differ diff --git a/build/classes/java/main/Storage/Parser.class b/build/classes/java/main/Storage/Parser.class index 1b30fec9d5..d26465889a 100644 Binary files a/build/classes/java/main/Storage/Parser.class and b/build/classes/java/main/Storage/Parser.class differ diff --git a/build/classes/java/main/Storage/Storage.class b/build/classes/java/main/Storage/Storage.class index 150a8e7b89..7f34629244 100644 Binary files a/build/classes/java/main/Storage/Storage.class and b/build/classes/java/main/Storage/Storage.class differ diff --git a/build/classes/java/main/Storage/TodoTasks.class b/build/classes/java/main/Storage/TodoTasks.class index 21ac90210d..8c39600442 100644 Binary files a/build/classes/java/main/Storage/TodoTasks.class and b/build/classes/java/main/Storage/TodoTasks.class differ diff --git a/build/classes/java/main/Ui.class b/build/classes/java/main/Ui.class index c3d3a84ae8..7bf6bd7c7c 100644 Binary files a/build/classes/java/main/Ui.class and b/build/classes/java/main/Ui.class differ diff --git a/build/libs/ip-1.0-SNAPSHOT.jar b/build/libs/ip-1.0-SNAPSHOT.jar new file mode 100644 index 0000000000..ed4c82ce73 Binary files /dev/null and b/build/libs/ip-1.0-SNAPSHOT.jar differ diff --git a/build/resources/main/META-INF/MANIFEST.MF b/build/resources/main/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..5ee19cb097 --- /dev/null +++ b/build/resources/main/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: Main + diff --git a/build/tmp/compileJava/source-classes-mapping.txt b/build/tmp/compileJava/source-classes-mapping.txt index a55ec23b95..82e000aa3f 100644 --- a/build/tmp/compileJava/source-classes-mapping.txt +++ b/build/tmp/compileJava/source-classes-mapping.txt @@ -1,29 +1,29 @@ -Duke.java - Duke - Ui +Task/DeadlineException.java + Task.DeadlineException Launcher.java Launcher Task/TaskList.java Task.TaskList -Main.java - Main -Task/EventsException.java - Task.EventsException -Task/TodoException.java - Task.TodoException Storage/Storage.java Storage.DeadlineTask Storage.EventsTask Storage.Parser Storage.Storage Storage.TodoTasks +Task/EventsException.java + Task.EventsException +Task/TodoException.java + Task.TodoException +Task/Task.java + Task.Task Task/TaskTypes.java Task.TaskTypes -MainWindow.java - MainWindow DialogBox.java DialogBox -Task/Task.java - Task.Task -Task/DeadlineException.java - Task.DeadlineException +Duke.java + Duke + Ui +Main.java + Main +MainWindow.java + MainWindow diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 963d3fe74f..0991f0302d 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -8,6 +8,7 @@ public class Duke{ private final Ui userInterface = new Ui(); + private boolean initialised = false; public static void main(String[] args) { Duke user = new Duke(); @@ -21,7 +22,13 @@ public static void main(String[] args) { } public String getResponse(String input) { - return userInterface.choiceOfAction(input); + if (initialised) { + return userInterface.choiceOfAction(input); + } else { + initialised = true; + userInterface.getDataInputList(); + return userInterface.greet(); + } } } @@ -51,7 +58,7 @@ public String greet() { * generate the end message. */ public String bye() { - store.saveListInFile("src/main/java/Duke/Duke.txt", taskList); + store.saveListInFile("src/main/java/Duke.txt", taskList); return "Bye. Hope to see you again soon!"; } /** diff --git a/src/main/java/Duke.txt b/src/main/java/Duke.txt new file mode 100644 index 0000000000..c3dcaa55ef --- /dev/null +++ b/src/main/java/Duke.txt @@ -0,0 +1 @@ +Todo r diff --git a/src/main/java/Storage/Storage.java b/src/main/java/Storage/Storage.java index dedd48f780..848f70e35e 100644 --- a/src/main/java/Storage/Storage.java +++ b/src/main/java/Storage/Storage.java @@ -17,7 +17,7 @@ public class Storage { */ public void getDataInputList(TaskList lst) { try { - File f = new File("src/main/java/Duke/Duke.txt"); + File f = new File("src/main/java/Duke.txt"); if(!f.exists()){ f.createNewFile(); } @@ -139,8 +139,10 @@ public Task createTask(String action) throws Exception{ return new TodoTasks(action); } else { if (type.equals("Deadline")) { + assert action.contains("Deadline") : "invalid format"; return new DeadlineTask(action); } else if (type.equals("Events")) { + assert action.contains("Events") : "invalid format"; return new EventsTask(action); } else { throw new Exception("Error type");