Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Song Bingxi] iP #581

Open
wants to merge 155 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
155 commits
Select commit Hold shift + click to select a range
28ad2b8
Add Gradle support
May 24, 2020
ed6d4d2
Bump gradle and lib version
Eclipse-Dominator Aug 5, 2023
d70a89c
add level-0
Propene-Dan Sep 2, 2023
fb563f9
added Level 1
Propene-Dan Sep 2, 2023
73ab967
add MyList.java
Propene-Dan Sep 2, 2023
6fabf95
added level 2
Propene-Dan Sep 2, 2023
ab634e9
add Task.java
Propene-Dan Sep 3, 2023
0443851
changing MyList to a Task List
Propene-Dan Sep 3, 2023
03e576d
added level 3
Propene-Dan Sep 3, 2023
2dddc56
add Deadline.java
Propene-Dan Sep 3, 2023
da7ab38
add Event.java
Propene-Dan Sep 3, 2023
0d3fb8f
add toDo.java
Propene-Dan Sep 3, 2023
71a526c
add some comments to Task.java
Propene-Dan Sep 3, 2023
32d61ff
modified MyList.java
Propene-Dan Sep 3, 2023
c2dd4b6
added level 4
Propene-Dan Sep 3, 2023
7bb853f
bug fixed
Propene-Dan Sep 8, 2023
946a420
added DanException
Propene-Dan Sep 8, 2023
f3c38a1
add level 5
Propene-Dan Sep 8, 2023
af19be1
added level 6
Propene-Dan Sep 8, 2023
6e02da2
used enums
Propene-Dan Sep 8, 2023
83987f8
bug fixed after using enums
Propene-Dan Sep 9, 2023
6940826
input.txt modified
Propene-Dan Sep 9, 2023
fe6a5b7
updated deadline.java with functions
Propene-Dan Sep 10, 2023
9de4371
updated event.java with funcs
Propene-Dan Sep 10, 2023
610f3fe
updated task.java with funcs
Propene-Dan Sep 10, 2023
31194bf
updated todo.java with functions
Propene-Dan Sep 10, 2023
12dd515
updated test-ui-test
Propene-Dan Sep 10, 2023
886b3f9
add level 7
Propene-Dan Sep 10, 2023
a2d3388
Merge branch 'branch-Level-7'
Propene-Dan Sep 10, 2023
41fec5f
change field deadline into type "LocalDate"
Propene-Dan Sep 10, 2023
5e9ba09
change field "start", "end" into type "LocalDate"
Propene-Dan Sep 10, 2023
9f6fd76
added level-8
Propene-Dan Sep 10, 2023
cf1d3ca
bugs fixed
Propene-Dan Sep 10, 2023
27ad786
updated input.txt
Propene-Dan Sep 10, 2023
1006fc6
Merge branch 'branch-Level-8'
Propene-Dan Sep 10, 2023
d31bda6
added AddCommand.java
Propene-Dan Sep 12, 2023
7758e65
renamed MyTask.java -> TaskList.java
Propene-Dan Sep 12, 2023
f898eca
added ListCommand
Propene-Dan Sep 12, 2023
4cb7eeb
added ExitCommand
Propene-Dan Sep 12, 2023
39bad21
added Command.java as abstract class
Propene-Dan Sep 12, 2023
e244086
make package dan/task
Propene-Dan Sep 12, 2023
4b37e32
mk package dan.exception
Propene-Dan Sep 12, 2023
972ffc3
added toString() to AddCommand
Propene-Dan Sep 12, 2023
a0857e9
added toString to DeleteCommand
Propene-Dan Sep 12, 2023
353e7fa
added MarkCommand.java
Propene-Dan Sep 12, 2023
2df0253
fixed bugs after packaging DanException
Propene-Dan Sep 12, 2023
61f1ef8
added Storage.java
Propene-Dan Sep 12, 2023
491f621
replaced DanException.java
Propene-Dan Sep 12, 2023
e76b225
added Ui.java
Propene-Dan Sep 12, 2023
7bc4e60
added Parser.java
Propene-Dan Sep 12, 2023
e13c035
added A-OOP
Propene-Dan Sep 12, 2023
1036641
created DanOperateException
Propene-Dan Sep 13, 2023
6a3d9e0
created DanStorageException
Propene-Dan Sep 13, 2023
3eca81e
Fixed Bugs after adding more Exceptions
Propene-Dan Sep 13, 2023
40de3b0
fixed bugs in task.java after added more Exceptions
Propene-Dan Sep 13, 2023
a75bed8
modified showError()
Propene-Dan Sep 13, 2023
a8b6457
fixed bugs in Add command
Propene-Dan Sep 13, 2023
43420cb
added A-OOP
Propene-Dan Sep 13, 2023
e49cf6a
Merge tag 'A-MoreOOP'
Propene-Dan Sep 13, 2023
67e4213
added A-Packages
Propene-Dan Sep 13, 2023
86da9bb
Merge tag 'A-Packages'
Propene-Dan Sep 13, 2023
959ecd6
Added Parser.java
Propene-Dan Sep 13, 2023
4910fd1
apply parser in ui
Propene-Dan Sep 13, 2023
d146702
modified AddCommand to apply Parser
Propene-Dan Sep 13, 2023
5675ef8
modified Command
Propene-Dan Sep 13, 2023
fedbd57
modified Delete
Propene-Dan Sep 13, 2023
8abb331
modified Exit
Propene-Dan Sep 13, 2023
cd198b9
Modified List
Propene-Dan Sep 13, 2023
467d521
Modified Mark
Propene-Dan Sep 13, 2023
22c6628
added to package
Propene-Dan Sep 13, 2023
4311adb
bugs fixed After added packages
Propene-Dan Sep 13, 2023
b38037f
Merge commit 'ed6d4d25bd4e34461919ffe785a6f10f4c087552'
Propene-Dan Sep 13, 2023
89fb8e7
renamed to Veneto
Propene-Dan Sep 14, 2023
c57515b
Further renamed to Veneto
Propene-Dan Sep 14, 2023
8e017d7
change showError static
Propene-Dan Sep 15, 2023
e86be9c
added ToDOTest
Propene-Dan Sep 15, 2023
ee5e6c4
Added EventTest
Propene-Dan Sep 15, 2023
6de1fc4
added UiTest
Propene-Dan Sep 15, 2023
6b974b9
Added AddCommandTest(Will be filled later)
Propene-Dan Sep 15, 2023
c7aa0b6
Added MarkCommandTest(Will be filled later)
Propene-Dan Sep 15, 2023
ffc71e8
Added VenetoTest(Will be filled later)
Propene-Dan Sep 15, 2023
34a9d61
Merge tag 'A-JUnit'
Propene-Dan Sep 15, 2023
d4ddaba
put Veneto.java to package veneto
Propene-Dan Sep 16, 2023
c89265c
rename constants to ALL_CAPITAL
Propene-Dan Sep 16, 2023
e220b59
Merge tag 'A-Jar'
Propene-Dan Sep 16, 2023
327b91a
renamed DanException to VenetoException
Propene-Dan Sep 18, 2023
b49ec01
add JavaDoc to Veneto.java
Propene-Dan Sep 18, 2023
b3cbbe2
add JavaDoc to AddCommand
Propene-Dan Sep 18, 2023
58e2c30
add JavaDoc to Command
Propene-Dan Sep 18, 2023
8275eb4
add JavaDoc to DeleteCommand
Propene-Dan Sep 18, 2023
ff53235
add JavaDoc to ExitCommand
Propene-Dan Sep 18, 2023
0e728ce
add JavaDoc to ListCommand
Propene-Dan Sep 18, 2023
70b6d00
add JavaDoc to MarkCommand
Propene-Dan Sep 18, 2023
f97962d
add JavaDoc to Parser
Propene-Dan Sep 18, 2023
528051b
add JavaDoc to Storage
Propene-Dan Sep 18, 2023
235bcb6
add JavaDoc to Deadline
Propene-Dan Sep 18, 2023
2788070
add JavaDoc to Event
Propene-Dan Sep 18, 2023
7ba81c4
add JavaDoc to Task
Propene-Dan Sep 18, 2023
2028dcc
add JavaDoc to TaskList
Propene-Dan Sep 18, 2023
211d3cc
add JavaDoc to ToDo
Propene-Dan Sep 18, 2023
7a7758e
add JavaDoc to Ui
Propene-Dan Sep 18, 2023
39eb73a
Modified UiTest
Propene-Dan Sep 18, 2023
1de9d95
fixed bugs after renameing DanExceptions to VenetoExceptions
Propene-Dan Sep 18, 2023
17deebc
added FindCommand
Propene-Dan Sep 18, 2023
a961434
modified Task to support FindCommand
Propene-Dan Sep 18, 2023
b423a97
modified Parser to support FindCommand
Propene-Dan Sep 18, 2023
f3d5e2c
modified Ui to support FindCommand
Propene-Dan Sep 18, 2023
45c937e
added test file(will be filled later)
Propene-Dan Sep 18, 2023
83c7fc7
changed naming
Propene-Dan Sep 18, 2023
c73b593
Merge branch 'branch-A-JavaDoc'
Propene-Dan Sep 18, 2023
320f1cc
Merge branch 'A-CodingStandard'
Propene-Dan Sep 18, 2023
51de6f6
Merge tag 'level-9'
Propene-Dan Sep 18, 2023
e9ab221
further resolved merge conflicts
Propene-Dan Sep 18, 2023
194213f
add Constants to avoid magic numbers
Propene-Dan Sep 18, 2023
838daa4
make getType() non-static
Propene-Dan Sep 18, 2023
81d83fc
modified Ui
Propene-Dan Sep 18, 2023
157b849
added tests
Propene-Dan Sep 18, 2023
7481b12
added JavaFX dependencies
Propene-Dan Sep 25, 2023
358f337
added Launcher.java
Propene-Dan Sep 25, 2023
9dfde0e
replace storage file
Propene-Dan Sep 28, 2023
c0d5fa0
added MainWindow.fxml
Propene-Dan Sep 28, 2023
0b9286a
added DialogBox.fxml
Propene-Dan Sep 28, 2023
be95480
added MainWindow.java
Propene-Dan Sep 28, 2023
e205416
added DialogBox.java
Propene-Dan Sep 28, 2023
e040f5c
added images
Propene-Dan Sep 28, 2023
52a9a05
added Main.java
Propene-Dan Sep 28, 2023
2e83549
added Launcher
Propene-Dan Sep 28, 2023
0805e76
changed Veneto: chat() -> getResponse()
Propene-Dan Sep 28, 2023
4ae78e2
modified Ui
Propene-Dan Sep 28, 2023
3768770
Merge branch 'level-10'
Propene-Dan Sep 28, 2023
6e0c6ee
added a new jar file
Propene-Dan Sep 29, 2023
78e06a8
Renaming fields to improve code quality.
Propene-Dan Sep 29, 2023
effae22
removed redundant try-catch to improve readability
Propene-Dan Sep 29, 2023
85b5fe1
modified mark() in Task.java
Propene-Dan Sep 29, 2023
d632419
added constants to avoid magic numbers
Propene-Dan Sep 29, 2023
e9d938d
fixed bugs in MainWindow.java
Propene-Dan Sep 29, 2023
d0b01b6
Merge pull request #2 from Propene-Dan/A-CodeQuality
Propene-Dan Sep 30, 2023
b3d12f6
enable assertions
Propene-Dan Sep 30, 2023
7c31503
added constants STORAGE_DIR and STORAGE_PATH in Storage.java
Propene-Dan Sep 30, 2023
f5ceeda
added assertion for invariants in Parser
Propene-Dan Sep 30, 2023
a3a41f8
added assertion for invariants in Storage
Propene-Dan Sep 30, 2023
45a6206
added assertion for invariants in Ui
Propene-Dan Sep 30, 2023
a5029d5
Merge branch 'A-Assertions'
Propene-Dan Sep 30, 2023
f0d90f6
modified type of VenetoStorageException when no storage found
Propene-Dan Sep 30, 2023
abbd6f3
added isDuplicated() to check duplicate task when adding newTask to T…
Propene-Dan Sep 30, 2023
3cbd8d8
added javaDoc to AddCommand.java
Propene-Dan Sep 30, 2023
7d35804
added equals() to Task.java
Propene-Dan Sep 30, 2023
75c053e
added equals() to ToDo.java
Propene-Dan Sep 30, 2023
84f331d
added equals() and detect DateTimeParseException to Deadline.java
Propene-Dan Sep 30, 2023
f4321f0
added equals() and detect DateTimeParseException to Event.java
Propene-Dan Sep 30, 2023
8b9f254
catch DateTimeParseException in Parser.java
Propene-Dan Sep 30, 2023
b31387c
add response when found duplicates
Propene-Dan Sep 30, 2023
82e28de
Merge branch 'C-DetectDuplicates'
Propene-Dan Sep 30, 2023
0ad66b8
Add files via upload
Propene-Dan Sep 30, 2023
e0e610e
Update README.md
Propene-Dan Sep 30, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Duke project template
# Dan project template

This is a project template for a greenfield Java project. It's named after the Java mascot _Duke_. Given below are instructions on how to use it.

Expand All @@ -13,7 +13,7 @@ Prerequisites: JDK 11, update Intellij to the most recent version.
1. If there are any further prompts, accept the defaults.
1. Configure the project to use **JDK 11** (not other versions) as explained in [here](https://www.jetbrains.com/help/idea/sdk.html#set-up-jdk).<br>
In the same dialog, set the **Project language level** field to the `SDK default` option.
3. After that, locate the `src/main/java/Duke.java` file, right-click it, and choose `Run Duke.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output:
3. After that, locate the `src/main/java/Dan.java` file, right-click it, and choose `Run Dan.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output:
```
Hello from
____ _
Expand Down
172 changes: 172 additions & 0 deletions src/main/java/Dan.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
import java.util.Arrays;
import java.util.Scanner;

enum TASK_TYPE {TODO, DEADLINE, EVENT}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job on setting your ToDos as enums!

public class Dan {

private final static String greets = "\nDan: \n";
private static MyList tasks = new MyList(100);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perhaps a class name like TaskList would be more intuitive than MyList?

private final static String[] commands = new String[] {
"toDo [TASK]",
"deadline [TASK] /by [DEADLINE]",
"event [TASK] /from [START_TIME] /to [END_TIME]",
"list", "bye",
"mark [TASK_ID]", "unmark [TASK_ID]"
};


public static void main(String[] args) {
hello();
chat();
goodbye();
}



private static void chat() {
String text;
String[] texts;
String command;
a: while (true) {
try {
text = new Scanner(System.in).nextLine();
texts = text.split(" ");
command = texts[0].toLowerCase();

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can consider extracting the commands to a Parser or Command class

switch (command) {
case "bye":
break a;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perhaps it would be better if you can extract these 'instructions' out to a Ui class

case "list":
list();
break;
case "mark":
if (!mark(texts[1]))
continue;
break;
case "unmark":
if (!unmark(texts[1]))
continue;
break;
case "todo":
addTask(text, TASK_TYPE.TODO);
break;
case "deadline":
addTask(text, TASK_TYPE.DEADLINE);
break;
case "event":
addTask(text, TASK_TYPE.EVENT);
break;
case "delete":
deleteTask(Integer.parseInt(texts[1]));
break;
default:
throw new DanException("Incorrect command");
}
} catch (Exception e) {
if (e instanceof DanException ) {
System.out.println(greets + " 你输入的东西不太对哦!");
} else if (e instanceof IndexOutOfBoundsException) {
System.out.println(greets + " 输入格式不对!");
} else if (e instanceof IllegalArgumentException) {
System.out.println(greets + " 输入格式不对!");
}
System.out.println(" 你可以跟我说:\n" + Arrays.toString(commands) + "\n");
}
}
}

private static void deleteTask(int i) {
Task removedTask = tasks.remove(i);
System.out.println(
greets +
" 好啦,帮你擦掉了一条任务哦:\n " + removedTask +
"\n 现在还剩下" + tasks.size() + "项任务哦!\n"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only english is recommended for coding!

);
}

public static void addTask(String text, TASK_TYPE id) throws IndexOutOfBoundsException {
String[] texts = text.split("/");
for (int i = 0; i < texts.length; i++) {
texts[i] = texts[i].trim();
}
Task newTask = null;
String description;
switch (id) {
case 1 :
description = texts[0].substring(5);
newTask = new ToDo(description);
break;
case 2 :
description = texts[0].substring(9);
String deadline = texts[1].substring(3);
newTask = new Deadline(description, deadline);
break;
case 3 :
description = texts[0].substring(5);
String start = texts[1].substring(5);
String end = texts[2].substring(3);
newTask = new Event(description, start, end);
break;
}
tasks.add(newTask);
System.out.println(
greets + " 新任务:\n " + newTask +
"!\n 现在有" + tasks.size() + "项任务哦!\n"
);
}

private static boolean mark(String taskId) {
Task currTask = markTask(taskId, 0);
if (currTask == null) {
System.out.println(greets + " 这个已经做完了哦!\n");
return false;
}
System.out.println(
greets + " 哟 做完啦?帮你标记好了!\n " +
currTask + "\n"
);
return true;
}

private static boolean unmark(String taskId) {
Task currTask = markTask(taskId, 1);
if (currTask == null) {
System.out.println(greets + " 这个没标记过哦!\n");
return false;
}
System.out.println(
greets + " 啊?没做完啊 是不小心手滑了么?\n " +
currTask + "\n"
);
return true;
}

private static Task markTask(String taskId, int funcId) {
Task currTask = tasks.get(Integer.parseInt(taskId) - 1);
boolean succ = currTask.mark(funcId);
if (!succ) {
return null;
}
return currTask;
}

private static void list() {
System.out.println(
greets + " 你还有些要做的事情呢 我看看有什么吧!\n" +
tasks.toString() + "\n"
);
}

public static void hello() {
System.out.println(
greets +
" 我是小丹!\n" +
" 有什么可以要帮忙可以跟我说!\n"
);
}
public static void goodbye() {
System.out.println(
greets +
" 拜拜啦!下次见!\n"
);
}
}
8 changes: 8 additions & 0 deletions src/main/java/DanException.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import java.util.InputMismatchException;

public class DanException extends InputMismatchException {

public DanException(String s) {
super(s);
}
}
20 changes: 20 additions & 0 deletions src/main/java/Deadline.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import java.util.Date;

public class Deadline extends Task {
// fields
protected String deadline;

// toString

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delete empty lines


@Override
public String toString() {
return "[D]" + super.toString() + " (by: " + deadline + ")";
}

// Constructor
public Deadline(String description, String deadline) {
super(description);
this.deadline = deadline;
}
}
10 changes: 0 additions & 10 deletions src/main/java/Duke.java

This file was deleted.

22 changes: 22 additions & 0 deletions src/main/java/Event.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import java.util.Date;

public class Event extends Task {
// fields
protected String start;
protected String end;

// toString


@Override
public String toString() {
return "[E]" + super.toString() + " (from: " + start + " to: " + end + ")";
}

// Constructor
public Event(String description, String start, String end) {
super(description);
this.start = start;
this.end = end;
}
}
18 changes: 18 additions & 0 deletions src/main/java/MyList.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import java.util.ArrayList;

public class MyList extends ArrayList<Task> {
public MyList() {}

public MyList(int initialCapacity) {
super(initialCapacity);
}

@Override
public String toString() {
StringBuffer rt = new StringBuffer();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

name should be clearer for the reader

for (int i = 0; i < this.size(); i++) {
rt.append(" " + (i+1) + ". " + this.get(i).toString() + "\n");
}
return rt.toString();
}
}
40 changes: 40 additions & 0 deletions src/main/java/Task.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
public class Task {
// fields
protected String description;
protected boolean isDone;

//Methods
public String getStatusIcon() {
return (isDone ? "[V] " : "[ ] "); // mark done task with V
}

public boolean mark(int id) {
if (id == 0) { /* to mark unmarked task */
if (isDone == false) {
isDone = true;
return true;
} else { /* if the task is already marked */
return false;
}
} else { /* to unmark marked task */
if (isDone == true) {
isDone = false;
return true;
} else { /* if the task is already unmarked */
return false;
}
}
}

// toString
@Override
public String toString() {
return getStatusIcon() + this.description;
}

// Constructor
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Place constructor on top

public Task(String description) {
this.description = description;
this.isDone = false;
}
}
16 changes: 16 additions & 0 deletions src/main/java/ToDo.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
public class ToDo extends Task {

// Methods


// toString
@Override
public String toString() {
return "[T]" + super.toString();
}

// Constructor
public ToDo(String description) {
super(description);
}
}
59 changes: 53 additions & 6 deletions text-ui-test/EXPECTED.TXT
Original file line number Diff line number Diff line change
@@ -1,7 +1,54 @@
Hello from
____ _
| _ \ _ _| | _____
| | | | | | | |/ / _ \
| |_| | |_| | < __/
|____/ \__,_|_|\_\___|

Dan:
我是小丹!
有什么可以要帮忙可以跟我说!

Dan:
新任务:
[T][ ] borrow book!
现在有1项任务哦!

Dan:
新任务:
[D][ ] return book (by: sunday)!
现在有2项任务哦!

Dan:
新任务:
[E][ ] project meeting (from: mon 2pm to: 4pm)!
现在有3项任务哦!

Dan:
你还有些要做的事情呢 我看看有什么吧!
1. [T][ ] borrow book
2. [D][ ] return book (by: sunday)
3. [E][ ] project meeting (from: mon 2pm to: 4pm)

Dan:
哟 做完啦?帮你标记好了!
[T][V] borrow book

Dan:
哟 做完啦?帮你标记好了!
[E][V] project meeting (from: mon 2pm to: 4pm)

Dan:
啊?没做完啊 是不小心手滑了么?
[E][ ] project meeting (from: mon 2pm to: 4pm)

Dan:
这个没标记过哦!

Dan:
你还有些要做的事情呢 我看看有什么吧!
1. [T][V] borrow book
2. [D][ ] return book (by: sunday)
3. [E][ ] project meeting (from: mon 2pm to: 4pm)

Dan:
新任务:
[D][ ] do homework (by: no idea :-p)!
现在有4项任务哦!

Dan:
拜拜啦!下次见!
Loading