Skip to content

Commit

Permalink
Add JAR file
Browse files Browse the repository at this point in the history
  • Loading branch information
pongzers committed Sep 15, 2020
1 parent d9d94ea commit 8e30851
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 19 deletions.
8 changes: 7 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ test {
}

application {
mainClassName = "seedu.duke.Duke"
mainClassName = "Launcher"
}

shadowJar {
Expand All @@ -59,3 +59,9 @@ checkstyle {
run{
standardInput = System.in
}

jar {
manifest {
attributes "Main-Class": "Launcher"
}
}
8 changes: 5 additions & 3 deletions src/main/java/Deadline.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* A deadline has a attribute "dueDateAsString" or "dueDateAsDate", which is the time the deadline is due.
* The attribute dueDate can be represented by a String, or a date object.
*/
public class Deadline extends Task{
public class Deadline extends Task {
protected String dueDateAsString;
protected LocalDate dueDateAsDate;

Expand Down Expand Up @@ -55,9 +55,11 @@ public String getType() {
@Override
public String toString() {
if (dueDateAsDate != null) {
return "[D]" + super.toString() + " (by: " + dueDateAsDate.format(DateTimeFormatter.ofPattern("MMM d yyyy")) + ")";
return "[D]" + super.toString() + " (by: "
+ dueDateAsDate.format(DateTimeFormatter.ofPattern("MMM d yyyy")) + ")";
} else {
return "[D]" + super.toString() + " (by: " + dueDateAsString + ")";
return "[D]" + super.toString() + " (by: "
+ dueDateAsString + ")";
}
}
}
5 changes: 2 additions & 3 deletions src/main/java/DialogBox.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import java.io.IOException;
import java.util.Collections;

import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.geometry.Pos;
import javafx.scene.Node;
import javafx.scene.control.Label;
import javafx.scene.text.Text;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
Expand All @@ -18,7 +18,6 @@
* containing text from the speaker.
*/
public class DialogBox extends HBox {

@FXML
private Text dialog;
@FXML
Expand Down Expand Up @@ -60,4 +59,4 @@ public static DialogBox getDukeDialog(String text, Image img) {
db.flip();
return db;
}
}
}
3 changes: 0 additions & 3 deletions src/main/java/META-INF/MANIFEST.MF

This file was deleted.

3 changes: 1 addition & 2 deletions src/main/java/Main.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import java.io.IOException;

import javafx.application.Application;
import javafx.fxml.FXMLLoader;
import javafx.scene.Scene;
Expand All @@ -16,7 +15,7 @@ public class Main extends Application {
@Override
public void start(Stage stage) {
try {
FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource("/view/MainWindow.fxml"));
FXMLLoader fxmlLoader = new FXMLLoader(Launcher.class.getResource("/view/MainWindow.fxml"));
AnchorPane ap = fxmlLoader.load();
Scene scene = new Scene(ap);
stage.setScene(scene);
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Manifest-Version: 1.0
Main-Class: Launcher

10 changes: 3 additions & 7 deletions src/test/java/DukeTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,30 +27,26 @@ public void DeadlineTest() {
}

@Test
public void ParserDeadlineTest() {
public void ParserDeadlineTest() throws DukeException {
assertEquals(Parser.Command.DEADLINE, parser.parse("deadline eat food /by tomorrow"));
}

@Test
public void ParserEventTest() {
public void ParserEventTest() throws DukeException {
assertEquals(Parser.Command.EVENT, parser.parse("event eat food /at tomorrow night"));
}

@Test
public void ParserTodoTest() {
public void ParserTodoTest() throws DukeException {
assertEquals(Parser.Command.TODO, parser.parse("todo eat food"));
}

@Test
public void ParserEmptyTaskTest() {
assertEquals(Parser.Command.EMPTY_TASK_EVENT_DEADLINE, parser.parse("event /at tomorrow"));
assertEquals(Parser.Command.EMPTY_TASK_EVENT_DEADLINE, parser.parse("event /at "));
}

@Test
public void ParserEmptyDateTest() {
assertEquals(Parser.Command.EMPTY_DATE, parser.parse("event eat food"));
assertEquals(Parser.Command.EMPTY_DATE, parser.parse("event eat food /at"));
}

@Test
Expand Down

0 comments on commit 8e30851

Please sign in to comment.