Skip to content

Commit 5849153

Browse files
authored
Merge pull request nus-cs2113-AY2324S1#2 from AY2324S1-CS2113-F11-3/master
Update
2 parents d9e8b60 + 1793052 commit 5849153

24 files changed

+371
-59
lines changed

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,5 @@ checkstyle {
4343

4444
run{
4545
standardInput = System.in
46+
enableAssertions = true
4647
}

docs/team/wendelinwemhoener.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# John Doe - Project Portfolio Page
1+
# Wendelin Wemhoener - Project Portfolio Page
22

33
## Overview
44

flashcard.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
dfdfdf | aaaaaaaaaaaaaaaaaaa | - | - | -
2+
flash1 | dfdfdf | - | - | -
3+
adfdf | dfdfdf | - | - | -
4+
dfdfdf | dfdfdfdfdf | - | - | -
5+
who is this | me | - | - | -
6+
dfdfdfdaaaaaaaaaaaaa | dd | - | - | -

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//@@author wendelinwemhoener
2+
13
package seedu.duke;
24

35
import seedu.duke.flashcard.Flashcard;

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

Lines changed: 0 additions & 27 deletions
This file was deleted.
Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
//@@author wendelinwemhoener
2+
13
package seedu.duke.flashcard;
24

5+
import seedu.duke.flashcard.review.FlashcardReview;
6+
37
import java.time.LocalDateTime;
48
import java.util.ArrayList;
59

@@ -8,7 +12,11 @@ public class Flashcard {
812
private String backText;
913
private ArrayList<String> tags;
1014
private ArrayList<FlashcardReview> reviews;
11-
private LocalDateTime nextReviewOn;
15+
private LocalDateTime lastReviewOn;
16+
17+
public void setLastReviewOn(LocalDateTime lastReviewOn) {
18+
this.lastReviewOn = lastReviewOn;
19+
}
1220

1321
public Flashcard(String frontText, String backText) {
1422
this.frontText = frontText;
@@ -17,15 +25,21 @@ public Flashcard(String frontText, String backText) {
1725
tags = new ArrayList<>();
1826
reviews = new ArrayList<>();
1927

20-
nextReviewOn = null;
28+
lastReviewOn = null;
29+
}
30+
31+
public String getFrontText() {
32+
return frontText;
33+
}
34+
35+
public String getBackText() {
36+
return backText;
2137
}
2238

2339
public String toString() {
24-
return "-".repeat(80) + System.lineSeparator()
25-
+ "front text: " + frontText + System.lineSeparator()
40+
return "front text: " + frontText + System.lineSeparator()
2641
+ "back text: " + backText + System.lineSeparator()
2742
+ "tags: " + tags.toString() + System.lineSeparator()
28-
+ "next review due on: " + nextReviewOn + System.lineSeparator()
29-
+ "-".repeat(80);
43+
+ "next review due on: " + lastReviewOn + System.lineSeparator();
3044
}
3145
}

src/main/java/seedu/duke/flashcard/FlashcardCommandParser.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//@@author wendelinwemhoener
2+
13
package seedu.duke.flashcard;
24

35
import seedu.duke.flashcard.command.FlashcardCommand;
@@ -8,11 +10,13 @@
810

911
public class FlashcardCommandParser {
1012
public FlashcardCommand parseInput(String input) {
13+
assert input != null : "input is null";
14+
1115
if (input.startsWith("create flashcard")) {
1216
return new CreateFlashcardCommand();
1317
} else if (input.startsWith("list flashcards")) {
1418
return new ListFlashcardsCommand();
15-
} else if (input.startsWith("start review")) {
19+
} else if (input.startsWith("review flashcards")) {
1620
return new StartReviewCommand();
1721
}
1822

src/main/java/seedu/duke/flashcard/FlashcardComponent.java

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,35 @@
1+
//@@author wendelinwemhoener
2+
13
package seedu.duke.flashcard;
24

35
import seedu.duke.flashcard.command.FlashcardCommand;
46
import seedu.duke.flashcard.command.UnknownCommand;
57

8+
import java.io.FileNotFoundException;
69
import java.util.ArrayList;
710

811
public class FlashcardComponent {
912
private FlashcardCommandParser parser;
1013
private FlashcardList flashcardList;
1114
private FlashcardUi ui;
1215

16+
private FlashcardStorage storage;
17+
18+
1319
public FlashcardComponent(ArrayList<Flashcard> flashcards) {
1420
parser = new FlashcardCommandParser();
15-
flashcardList = new FlashcardList(flashcards);
21+
22+
//@@author junhyeong0411
23+
storage = new FlashcardStorage("./flashcard.txt");
24+
try {
25+
flashcardList = storage.loadFlashcards();
26+
System.out.println("Loading existed File");
27+
} catch (FileNotFoundException e){
28+
System.out.println("Making New file");
29+
flashcardList = new FlashcardList(flashcards);
30+
}
31+
32+
//@@author wendelinwemhoener
1633
ui = new FlashcardUi(flashcardList);
1734
}
1835

@@ -28,6 +45,15 @@ public boolean isResponsible(String input) {
2845

2946
public void processInput(String input) {
3047
FlashcardCommand command = parser.parseInput(input);
48+
assert !(command instanceof UnknownCommand) : "Command cannot be " +
49+
"unknown";
50+
3151
ui.executeCommand(command);
52+
53+
//@@author junhyeong0411
54+
// save after every commands
55+
storage.saveFlashcards(flashcardList.getFlashcards());
56+
57+
//@@author wendelinwemhoener
3258
}
3359
}

src/main/java/seedu/duke/flashcard/FlashcardDifficulty.java

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/main/java/seedu/duke/flashcard/FlashcardList.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//@@author wendelinwemhoener
2+
13
package seedu.duke.flashcard;
24

35
import java.util.ArrayList;
@@ -13,6 +15,7 @@ public ArrayList<Flashcard> getFlashcards() {
1315
return flashcards;
1416
}
1517

18+
1619
public void add(Flashcard flashcard) {
1720
flashcards.add(flashcard);
1821
}

0 commit comments

Comments
 (0)