Skip to content

Commit

Permalink
Implemented A-Packages
Browse files Browse the repository at this point in the history
  • Loading branch information
xinmingzh committed Aug 25, 2019
1 parent cbd9816 commit ea1dfc0
Show file tree
Hide file tree
Showing 12 changed files with 63 additions and 17 deletions.
7 changes: 1 addition & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ src/main/resources/docs/
*.iml
bin/
text-ui-test/
src/main/java/Todo.class
src/main/java/Task.class
src/main/java/Event.class
src/main/java/Duke.class
src/main/java/Deadline.class
src/main/java/DukeException.class

*.class
*.txt
9 changes: 8 additions & 1 deletion src/main/java/Duke.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
import duke.DukeException;
import duke.command.Command;
import duke.storage.Storage;
import duke.task.TaskList;
import duke.text.Parser;
import duke.ui.Ui;

public class Duke {
protected TaskList tasks;
protected Storage storage;
Expand All @@ -17,7 +24,7 @@ public Duke(String filePath) {
}

public static void main(String[] args) {
Duke newDuke = new Duke("../data/duke.txt");
Duke newDuke = new Duke("data/duke.txt");
newDuke.run();
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
package duke;

public class DukeException extends Exception {

public DukeException() {};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
package duke.command;

import duke.DukeException;
import duke.storage.Storage;
import duke.task.*;
import duke.ui.Ui;

import java.time.LocalDateTime;

public class Command {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
package duke.storage;

import duke.DukeException;
import duke.task.*;
import duke.ui.Ui;

import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileWriter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
package duke.task;

import duke.task.Task;

import java.time.LocalDateTime;

public class Deadline extends Task {
protected LocalDateTime by;

Deadline(String desc) {
public Deadline(String desc) {
super(desc);
}
Deadline(String desc, boolean done) {
public Deadline(String desc, boolean done) {
super(desc, done);
}
Deadline(String desc, LocalDateTime by) {
public Deadline(String desc, LocalDateTime by) {
super(desc);
this.by = by;
}
Deadline(String desc, LocalDateTime by, boolean done) {
public Deadline(String desc, LocalDateTime by, boolean done) {
super(desc, done);
this.by = by;
}
Expand Down
10 changes: 6 additions & 4 deletions src/main/java/Event.java → src/main/java/duke/task/Event.java
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
package duke.task;

import java.time.LocalDateTime;

public class Event extends Task {
protected LocalDateTime startDate;
protected LocalDateTime endDate;

Event(String desc) {
public Event(String desc) {
super(desc);
}
Event(String desc, boolean done) {
public Event(String desc, boolean done) {
super(desc, done);
}
Event(String desc, LocalDateTime startDate, LocalDateTime endDate) {
public Event(String desc, LocalDateTime startDate, LocalDateTime endDate) {
super(desc);
this.startDate = startDate;
this.endDate = endDate;
}
Event(String desc, LocalDateTime startDate, LocalDateTime endDate, boolean done) {
public Event(String desc, LocalDateTime startDate, LocalDateTime endDate, boolean done) {
super(desc, done);
this.startDate = startDate;
this.endDate = endDate;
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/Task.java → src/main/java/duke/task/Task.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
package duke.task;

import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileWriter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
package duke.task;

import duke.DukeException;

import java.util.ArrayList;
import java.util.List;

Expand Down
10 changes: 8 additions & 2 deletions src/main/java/Todo.java → src/main/java/duke/task/Todo.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
package duke.task;

import duke.task.Task;

public class Todo extends Task {
Todo(String desc) {

public Todo(String desc) {
super(desc);
}
Todo(String desc, boolean done) {

public Todo(String desc, boolean done) {
super(desc, done);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
package duke.text;

import duke.DukeException;
import duke.command.Command;

import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/Ui.java → src/main/java/duke/ui/Ui.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
package duke.ui;

import duke.DukeException;
import duke.task.Task;
import duke.task.TaskList;

import java.util.Scanner;

public class Ui {
Expand Down

0 comments on commit ea1dfc0

Please sign in to comment.