Skip to content

Commit 01c8382

Browse files
Merge pull request nus-cs2113-AY2324S1#26 from wendelinwemhoener/clean-up-before-v1-release
Clean up before v1 release
2 parents 8bfd0e8 + 2dec26d commit 01c8382

13 files changed

+35
-31
lines changed

data/flashcard.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
d | a | - | - | -
2+
dfdf | dfdf | - | - | -
3+
dfdf | asdfdf | - | - | -
4+
ddf | dfdf | - | - | -

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import seedu.duke.flashcard.Flashcard;
66
import seedu.duke.flashcard.FlashcardComponent;
7-
import seedu.duke.flashcard.FlashcardDirectory;
87

98
import java.util.ArrayList;
109
import java.util.Scanner;
@@ -28,6 +27,8 @@ private void run() {
2827

2928
if (fc.isResponsible(input)) {
3029
fc.processInput(input);
30+
} else {
31+
System.out.println(" Invalid command! Sorry; please try again.");
3132
}
3233
}
3334

src/main/java/seedu/duke/calendar/Calendar.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
package seedu.duke.calendar;
44

5-
import java.time.LocalDateTime;
5+
66

77
public class Calendar {
88
EventList eventList;

src/main/java/seedu/duke/calendar/EventList.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package seedu.duke.calendar;
22

3-
import seedu.duke.flashcard.Flashcard;
43

5-
import java.time.LocalDate;
64
import java.util.ArrayList;
75

86
public class EventList {

src/main/java/seedu/duke/calendar/command/DeleteEventCommand.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import seedu.duke.calendar.EventList;
66

7-
import java.time.LocalDateTime;
87
import java.util.Scanner;
98

109
public class DeleteEventCommand extends EventCommand{

src/main/java/seedu/duke/calendar/command/EventCommand.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
package seedu.duke.calendar.command;
44

5-
import seedu.duke.calendar.EventList;
65

7-
import java.util.Scanner;
86

97
public abstract class EventCommand {
108
public abstract void execute(Scanner scanner, EventList eventList);

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ public class Flashcard {
1414
private ArrayList<FlashcardReview> reviews;
1515
private LocalDateTime lastReviewOn;
1616

17-
public void setLastReviewOn(LocalDateTime lastReviewOn) {
18-
this.lastReviewOn = lastReviewOn;
19-
}
17+
2018

2119
public Flashcard(String frontText, String backText) {
2220
this.frontText = frontText;
@@ -28,6 +26,10 @@ public Flashcard(String frontText, String backText) {
2826
lastReviewOn = null;
2927
}
3028

29+
public void setLastReviewOn(LocalDateTime lastReviewOn) {
30+
this.lastReviewOn = lastReviewOn;
31+
}
32+
3133
public String getFrontText() {
3234
return frontText;
3335
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ public void listFlashcardFiles(){
3939
System.out.println("Failed to find files");
4040
} else if(flashcardFiles.length == 0){
4141
System.out.println("No files exist");
42-
}
43-
else{
42+
} else{
4443
for(String flashcardFile : flashcardFiles){
4544
System.out.println(flashcardFile);
4645
}

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package seedu.duke.flashcard;
22

3-
import seedu.duke.flashcard.Flashcard;
4-
import seedu.duke.flashcard.FlashcardList;
5-
63
import java.io.File;
74
import java.io.FileNotFoundException;
85
import java.io.FileWriter;
@@ -46,15 +43,17 @@ private Flashcard loadFlashcard(String[] tokens){
4643
Flashcard flashcard = new Flashcard(frontText, backText);
4744

4845
for(String tag:tags){
49-
if(tag.trim().equals("-")) break;
50-
else{
46+
if (tag.trim().equals("-")) {
47+
break;
48+
} else{
5149
System.out.println("tags are not for v1");
5250
}
5351
}
5452

5553
for(String review: reviews){
56-
if(review.trim().equals("-")) break;
57-
else{
54+
if (review.trim().equals("-")) {
55+
break;
56+
} else{
5857
System.out.println("reviews are not for v1");
5958
}
6059
}

src/main/java/seedu/duke/flashcard/command/CreateFlashcardCommand.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@
99

1010
public class CreateFlashcardCommand extends FlashcardCommand {
1111
public void execute(Scanner scanner, FlashcardList flashcardList) {
12-
System.out.print("Enter the front page text: ");
12+
System.out.print(" Enter the front page text: ");
1313
String frontPageText = scanner.nextLine();
14-
System.out.print("Enter the back page text: ");
14+
System.out.print(" Enter the back page text: ");
1515
String backPageText = scanner.nextLine();
1616

1717
Flashcard flashcard = new Flashcard(frontPageText, backPageText);
1818

1919
flashcardList.add(flashcard);
2020

21+
System.out.println();
2122
System.out.println(" Success! Flashcard has been added to your " +
2223
"collection.");
2324
}

0 commit comments

Comments
 (0)