Refactored to Launcher and MainGUI

pom.xml

@@ -96,7 +96,7 @@
  <!-- Default configuration for running with: mvn clean javafx:run -->
  <id>default-cli</id>
  <configuration>
- <mainClass>com.siemieniuk.animals/siemieniuk.animals.MainApplication</mainClass>
+ <mainClass>com.siemieniuk.animals/siemieniuk.animals.Launcher</mainClass>
  <launcher>app</launcher>
  <jlinkZipName>app</jlinkZipName>
  <jlinkImageName>app</jlinkImageName>

src/main/java/module-info.java

@@ -5,7 +5,7 @@
  requires org.kordamp.ikonli.javafx;
 
  opens siemieniuk.animals to javafx.fxml;
- exports siemieniuk.animals;
+ exports siemieniuk.animals to javafx.graphics;
  exports siemieniuk.animals.hobhw_parser;
  opens siemieniuk.animals.hobhw_parser to javafx.fxml;
  exports siemieniuk.animals.math;

src/main/java/siemieniuk/animals/Launcher.java

@@ -0,0 +1,7 @@
+package siemieniuk.animals;
+
+public class Launcher {
+ public static void main(String[] args) {
+ MainGUI.main(args);
+ }
+}

src/main/java/siemieniuk/animals/MainApplication.java → src/main/java/siemieniuk/animals/MainGUI.java

@@ -14,7 +14,7 @@
  * This class contains the main body of JavaFX application
  * @author Szymon Siemieniuk
  */
-public class MainApplication extends Application {
+public class MainGUI extends Application {
  @Override
  public void start(Stage stage) throws IOException {
  stage.setOnCloseRequest((evt) -> {
@@ -26,7 +26,7 @@ public void start(Stage stage) throws IOException {
 
  Parent root;
 // try (InputStream sceneStream = MainApplication.class.getResourceAsStream("scenes/MainView.fxml")) {
- try (InputStream sceneStream = MainApplication.class.getResourceAsStream("scenes/MainViewNew.fxml")) {
+ try (InputStream sceneStream = MainGUI.class.getResourceAsStream("scenes/MainViewNew.fxml")) {
  root = parentLoader.load(sceneStream);
  }
 

src/main/java/siemieniuk/animals/controllers/MainController.java

@@ -19,7 +19,7 @@
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
-import siemieniuk.animals.MainApplication;
+import siemieniuk.animals.MainGUI;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -41,7 +41,7 @@ public final class MainController {
  */
  public MainController() {
  try {
- URL path = MainApplication.class.getResource("conf/release.hobhw");
+ URL path = MainGUI.class.getResource("conf/release.hobhw");
  world = WorldBuilder.create(path);
  ImageLoader.init();
  Thread threadWorld = new Thread(world);
@@ -56,7 +56,7 @@ public MainController() {
 
  @FXML
  private void initialize() {
- String path = Objects.requireNonNull(MainApplication.class.getResource("images/logo_big.png")).toExternalForm();
+ String path = Objects.requireNonNull(MainGUI.class.getResource("images/logo_big.png")).toExternalForm();
  Image img = new Image(path, 100.0, 100.0, true, false);
  bigLogo.setImage(img);
 
@@ -89,12 +89,12 @@ private void showInformationWindow(MouseEvent event) {
  Location loc = world.getLocation(pos);
 
  if (objectsToPrint.size() > 0) {
- URL url = MainApplication.class.getResource("scenes/InformationWindow.fxml");
+ URL url = MainGUI.class.getResource("scenes/InformationWindow.fxml");
  FXMLLoader fxmlLoader = new FXMLLoader(url);
  Parent root = fxmlLoader.load();
  Scene scene = new Scene(root);
 
- String css = Objects.requireNonNull(MainApplication.class.getResource("style/InformationWindow.css"))
+ String css = Objects.requireNonNull(MainGUI.class.getResource("style/InformationWindow.css"))
  .toExternalForm();
  scene.getStylesheets().add(css);
 

src/main/java/siemieniuk/animals/gui/ParametrizedAnimalCreationView.java

@@ -1,6 +1,6 @@
 package siemieniuk.animals.gui;
 
-import siemieniuk.animals.MainApplication;
+import siemieniuk.animals.MainGUI;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.layout.GridPane;
 
@@ -12,7 +12,7 @@ public class ParametrizedAnimalCreationView extends GridPane {
  public ParametrizedAnimalCreationView() {
  super();
  try {
- URL path = Objects.requireNonNull(MainApplication.class.getResource("scenes/ParametrizedAnimalCreation.fxml"));
+ URL path = Objects.requireNonNull(MainGUI.class.getResource("scenes/ParametrizedAnimalCreation.fxml"));
  FXMLLoader fxmlLoader = new FXMLLoader(path);
 // fxmlLoader.setRoot(this);
  fxmlLoader.load();

src/main/java/siemieniuk/animals/gui/PredatorView.java

@@ -1,6 +1,6 @@
 package siemieniuk.animals.gui;
 
-import siemieniuk.animals.MainApplication;
+import siemieniuk.animals.MainGUI;
 import siemieniuk.animals.controllers.PredatorController;
 import siemieniuk.animals.core.animals.Predator;
 import javafx.fxml.FXMLLoader;
@@ -12,7 +12,7 @@ public class PredatorView extends AnimalView {
  PredatorView(Predator predator) {
  super();
  try {
- FXMLLoader fxmlLoader = new FXMLLoader(Objects.requireNonNull(MainApplication.class.getResource("scenes/Predator.fxml")));
+ FXMLLoader fxmlLoader = new FXMLLoader(Objects.requireNonNull(MainGUI.class.getResource("scenes/Predator.fxml")));
  fxmlLoader.setRoot(this);
  PredatorController animalController = new PredatorController(predator, this);
  fxmlLoader.setController(animalController);

src/main/java/siemieniuk/animals/gui/PreyView.java

@@ -1,6 +1,6 @@
 package siemieniuk.animals.gui;
 
-import siemieniuk.animals.MainApplication;
+import siemieniuk.animals.MainGUI;
 import siemieniuk.animals.controllers.PreyController;
 import siemieniuk.animals.core.animals.Prey;
 import javafx.fxml.FXMLLoader;
@@ -12,7 +12,7 @@ public class PreyView extends AnimalView {
  PreyView(Prey prey) {
  super();
  try {
- FXMLLoader fxmlLoader = new FXMLLoader(Objects.requireNonNull(MainApplication.class.getResource("scenes/Prey.fxml")));
+ FXMLLoader fxmlLoader = new FXMLLoader(Objects.requireNonNull(MainGUI.class.getResource("scenes/Prey.fxml")));
  fxmlLoader.setRoot(this);
  PreyController animalController = new PreyController(prey, this);
  fxmlLoader.setController(animalController);

src/main/resources/META-INF/MANIFEST.MF

@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
-Main-Class: siemieniuk.animals.MainApplication
+Main-Class: siemieniuk.animals.Launcher