Skip to content
This repository has been archived by the owner on Jan 10, 2021. It is now read-only.

Commit

Permalink
remove wildcard import
Browse files Browse the repository at this point in the history
  • Loading branch information
Clouddoggo committed Feb 5, 2020
1 parent c725fe1 commit 71197c4
Show file tree
Hide file tree
Showing 19 changed files with 56 additions and 24 deletions.
14 changes: 14 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,20 @@ run {

dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter:5.5.0'
String javaFxVersion = '11'

implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac'
implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'linux'
implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'mac'
implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'linux'
implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'mac'
implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'linux'
implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac'
implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'linux'
}

test {
Expand Down
3 changes: 1 addition & 2 deletions data/duke.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
E | 0 | meeting | 2019-12-10
D | 0 | project | 2020-01-11
T | 0 | todo | null
T | 0 | testtest | null
T | 0 | todo | null
4 changes: 2 additions & 2 deletions src/main/java/Duke.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import duke.util.TaskList;
import duke.util.Ui;

import java.io.*;
import java.io.IOException;

/**
* Duke
Expand Down Expand Up @@ -52,6 +52,6 @@ private static void run() {
* @param args The arguments from the command line.
*/
public static void main(String[] args) {
new Duke("../../../data/duke.txt");
new Duke("data/duke.txt");
}
}
2 changes: 1 addition & 1 deletion src/main/java/duke/exception/DukeException.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* DukeException
*
* CS2103T AY19/20 Semester 2
* <p>CS2103T AY19/20 Semester 2
* Individual project
* Duke project
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/duke/exception/InvalidCommandException.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* InvalidCommandException
*
* CS2103T AY19/20 Semester 2
* <p>CS2103T AY19/20 Semester 2
* Individual project
* Duke project
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/duke/exception/InvalidDateException.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* InvalidDateException
*
* CS2103T AY19/20 Semester 2
* <p>CS2103T AY19/20 Semester 2
* Individual project
* Duke project
*
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/duke/exception/InvalidIndexException.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* InvalidIndexException
*
* CS2103T AY19/20 Semester 2
* <p>CS2103T AY19/20 Semester 2
* Individual project
* Duke project
*
Expand Down Expand Up @@ -32,7 +32,8 @@ public InvalidIndexException(int num, int size) {
*/
@Override
public String toString() {
String back = "You currently have " + size + (size < 2 ? " task." : " tasks.") + "\nPlease enter a number in the range 1 to " + size;
String back = "You currently have " + size + (size < 2 ? " task." : " tasks.")
+ "\nPlease enter a number in the range 1 to " + size;
if (num < 1) {
return "Index supplied is too small. " + back;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/duke/exception/NoDateProvidedException.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* NoDateProvidedException
*
* CS2103T AY19/20 Semester 2
* <p>CS2103T AY19/20 Semester 2
* Individual project
* Duke project
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/duke/exception/NoDescriptionException.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* NoDescriptionException
*
* CS2103T AY19/20 Semester 2
* <p>CS2103T AY19/20 Semester 2
* Individual project
* Duke project
*
Expand Down
11 changes: 11 additions & 0 deletions src/main/java/duke/exception/NoKeywordProvidedException.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
package duke.exception;

/**
* NoKeywordProvided Exception
*
* <p>CS2103T AY19/20 Semester 2
* Individual project
* Duke project
*
* 29 Jan 2020
*
* @author Jel
*/
public class NoKeywordProvidedException extends DukeException {
/**
* Overrides the Object's toString method
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/duke/exception/NoTaskNumberException.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* NoTaskNumberException
*
* CS2103T AY19/20 Semester 2
* <p>CS2103T AY19/20 Semester 2
* Individual project
* Duke project
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/duke/util/Deadline.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/**
* Deadline
*
* CS2103T AY19/20 Semester 2
* <p>CS2103T AY19/20 Semester 2
* Individual project
* Duke project
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/duke/util/Event.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/**
* Event
*
* CS2103T AY19/20 Semester 2
* <p>CS2103T AY19/20 Semester 2
* Individual project
* Duke project
*
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/duke/util/Parser.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/**
* Parser
*
* CS2103T AY19/20 Semester 2
* <p>CS2103T AY19/20 Semester 2
* Individual project
* Duke project
*
Expand Down Expand Up @@ -42,7 +42,7 @@ public void parseInput(String line) {
String descAndDate;

try {
switch(cmd) {
switch (cmd) {
case "bye":
ui.bye();
return;
Expand Down
15 changes: 11 additions & 4 deletions src/main/java/duke/util/Storage.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
package duke.util;

import java.io.*;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.io.IOException;
import java.io.File;
import java.io.FileOutputStream;
import java.io.BufferedWriter;
import java.io.OutputStreamWriter;
import java.io.FileInputStream;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.time.LocalDate;

/**
* Storage
*
* CS2103T AY19/20 Semester 2
* <p>CS2103T AY19/20 Semester 2
* Individual project
* Duke project
*
Expand Down Expand Up @@ -73,7 +80,7 @@ public void loadTasks() throws IOException {
String details = arr[2];
Task getFromDisk;

switch(arr[0]) {
switch (arr[0]) {
case "T":
getFromDisk = new Todo(details);
break;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/duke/util/Task.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Task
*
* CS2103T AY19/20 Semester 2
* <p>CS2103T AY19/20 Semester 2
* Individual project
* Duke project
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/duke/util/TaskList.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/**
* TaskList
*
* CS2103T AY19/20 Semester 2
* <p>CS2103T AY19/20 Semester 2
* Individual project
* Duke project
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/duke/util/Todo.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Todo
*
* CS2103T AY19/20 Semester 2
* <p>CS2103T AY19/20 Semester 2
* Individual project
* Duke project
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/duke/util/Ui.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/**
* Ui
*
* CS2103T AY19/20 Semester 2
* <p>CS2103T AY19/20 Semester 2
* Individual project
* Duke project
*
Expand Down

0 comments on commit 71197c4

Please sign in to comment.