diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..4f4a3f9 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 97626ba..78bf31c 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,6 +1,8 @@ + + \ No newline at end of file diff --git a/.idea/libraries/javafx_swt.xml b/.idea/libraries/javafx_swt.xml deleted file mode 100644 index b1d7195..0000000 --- a/.idea/libraries/javafx_swt.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d63cf1..99042d5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,10 +5,17 @@ + + + - + \ No newline at end of file diff --git a/Genologie.iml b/Genologie.iml index 9c19759..bcf9038 100644 --- a/Genologie.iml +++ b/Genologie.iml @@ -1,24 +1,40 @@ - - - + + + + - + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..8a6bec6 --- /dev/null +++ b/pom.xml @@ -0,0 +1,119 @@ + + + 4.0.0 + + eu.lukasmartin + Genologie + 1.0-SNAPSHOT + + + UTF-8 + 5.7.1 + 11 + 15 + 0.0.6 + + + + + org.openjfx + javafx-controls + ${javafx.version} + + + org.openjfx + javafx-fxml + ${javafx.version} + + + org.controlsfx + controlsfx + 11.1.0 + + + com.dlsc.formsfx + formsfx-core + 11.3.2 + + + org.openjfx + * + + + + + + org.webjars + font-awesome + 5.15.3 + + + org.kordamp.ikonli + ikonli-javafx + 12.2.0 + + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit.version} + test + + + com.jfoenix + jfoenix + 9.0.10 + + + org.projectlombok + lombok + 1.18.20 + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + ${maven.compiler.release} + + + org.projectlombok + lombok + 1.18.20 + + + + + + org.openjfx + javafx-maven-plugin + ${javafx.maven.plugin.version} + + + + default-cli + + ${maven.compiler.release} + launcher + eu.lukasmartin.genealogie_app.Main + + + + + + + + + \ No newline at end of file diff --git a/src/eu/lukasmartin/genealogie_app/Main.java b/src/eu/lukasmartin/genealogie_app/Main.java deleted file mode 100644 index 5a4ba4b..0000000 --- a/src/eu/lukasmartin/genealogie_app/Main.java +++ /dev/null @@ -1,33 +0,0 @@ -package eu.lukasmartin.genealogie_app; - -import javafx.application.Application; -import javafx.fxml.FXMLLoader; -import javafx.scene.Parent; -import javafx.scene.Scene; -import javafx.stage.Stage; -import javafx.stage.StageStyle; - -/** - * @author Lukas Martin - */ - -public class Main extends Application { - public static void main(String[] args) { //Main function - launch(args); //Starts the program - } - - @Override - public void start(Stage primaryStage) { //Start function - try { //Try (check for runtime errors) - Parent root = FXMLLoader.load(getClass().getResource("/eu/lukasmartin/resources/fxml/home.fxml")); //Gets the start FXML - primaryStage.setTitle("Genologie"); //Sets the title of the start FXML - primaryStage.initStyle(StageStyle.UNDECORATED); //Sets the style of the window to "UNDECORATED" - primaryStage.setScene(new Scene(root, 1280, 680)); //Sets the scene for the start and sets the size - eu.lukasmartin.helper.ResizeHelper.addResizeListener(primaryStage); //Test - primaryStage.setResizable(true); //Sets the resizability to true - primaryStage.show(); //Starts the window (therefore the program) - } catch (Exception e) { //Catches the error - e.printStackTrace(); //Prints out the error into the console - } - } -} \ No newline at end of file diff --git a/src/eu/lukasmartin/controller/homeController.java b/src/main/java/eu/lukasmartin/controller/homeController.java similarity index 99% rename from src/eu/lukasmartin/controller/homeController.java rename to src/main/java/eu/lukasmartin/controller/homeController.java index 7f8d145..ef68d56 100644 --- a/src/eu/lukasmartin/controller/homeController.java +++ b/src/main/java/eu/lukasmartin/controller/homeController.java @@ -173,7 +173,7 @@ public class homeController { //Options Menu Opened Prefrence Button Clicked public void optionsTopMenuPrefrenceButton(MouseEvent mouseEvent) throws IOException { // - FXMLLoader loader = new FXMLLoader(getClass().getResource("/eu/lukasmartin/resources/fxml/preference.fxml")); // + FXMLLoader loader = new FXMLLoader(getClass().getResource("/eu/lukasmartin/fxml/preference.fxml")); // Parent root = loader.load(); // preferenceController prfcont = loader.getController(); // prfcont.setPreferenceLabels(pref0.get("username", "Entre a username"), pref0.get("name", "Entre a name")); // diff --git a/src/eu/lukasmartin/controller/preferenceController.java b/src/main/java/eu/lukasmartin/controller/preferenceController.java similarity index 98% rename from src/eu/lukasmartin/controller/preferenceController.java rename to src/main/java/eu/lukasmartin/controller/preferenceController.java index 60b7bf8..c06de21 100644 --- a/src/eu/lukasmartin/controller/preferenceController.java +++ b/src/main/java/eu/lukasmartin/controller/preferenceController.java @@ -63,7 +63,7 @@ public class preferenceController { //Close Button public void closeButtonClicked(MouseEvent mouseEvent) throws IOException { Stage stage = new Stage(); //Stage - Parent root = FXMLLoader.load(getClass().getResource("/eu/lukasmartin/resources/fxml/saveChanges.fxml")); //Gets Scene + Parent root = FXMLLoader.load(getClass().getResource("/eu/lukasmartin/fxml/saveChanges.fxml")); //Gets Scene stage.setTitle("save changes"); //Sets Scene Title stage.initStyle(StageStyle.TRANSPARENT); //Sets StageStyle Scene scene = new Scene(root, 350 , 200); //Sets the Scene + dimensions diff --git a/src/eu/lukasmartin/controller/saveChangesController.java b/src/main/java/eu/lukasmartin/controller/saveChangesController.java similarity index 100% rename from src/eu/lukasmartin/controller/saveChangesController.java rename to src/main/java/eu/lukasmartin/controller/saveChangesController.java diff --git a/src/eu/lukasmartin/exceptions/FileNotGEDCOMException.java b/src/main/java/eu/lukasmartin/exceptions/FileNotGEDCOMException.java similarity index 100% rename from src/eu/lukasmartin/exceptions/FileNotGEDCOMException.java rename to src/main/java/eu/lukasmartin/exceptions/FileNotGEDCOMException.java diff --git a/src/eu/lukasmartin/files/gedcom/gedcomReader.java b/src/main/java/eu/lukasmartin/files/gedcom/gedcomReader.java similarity index 100% rename from src/eu/lukasmartin/files/gedcom/gedcomReader.java rename to src/main/java/eu/lukasmartin/files/gedcom/gedcomReader.java diff --git a/src/main/java/eu/lukasmartin/genealogie_app/Main.java b/src/main/java/eu/lukasmartin/genealogie_app/Main.java new file mode 100644 index 0000000..8b4dd08 --- /dev/null +++ b/src/main/java/eu/lukasmartin/genealogie_app/Main.java @@ -0,0 +1,30 @@ +package eu.lukasmartin.genealogie_app; + +import javafx.application.Application; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.stage.Stage; +import javafx.stage.StageStyle; + +import java.io.IOException; + +/** + * @author Lukas Martin + */ + +public class Main extends Application { + public static void main(String[] args) { //Main function + launch(args); //Starts the program + } + + @Override + public void start(Stage primaryStage) throws IOException { //Start function + FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource("/eu/lukasmartin/fxml/home.fxml")); //Gets the start FXML + primaryStage.setTitle("Genologie"); //Sets the title of the start FXML + primaryStage.initStyle(StageStyle.UNDECORATED); //Sets the style of the window to "UNDECORATED" + primaryStage.setScene(new Scene(fxmlLoader.load(), 1280, 680)); //Sets the scene for the start and sets the size + eu.lukasmartin.helper.ResizeHelper.addResizeListener(primaryStage); //Test + primaryStage.setResizable(true); //Sets the resizability to true + primaryStage.show(); //Starts the window (therefore the program) + } +} \ No newline at end of file diff --git a/src/eu/lukasmartin/helper/ResizeHelper.java b/src/main/java/eu/lukasmartin/helper/ResizeHelper.java similarity index 100% rename from src/eu/lukasmartin/helper/ResizeHelper.java rename to src/main/java/eu/lukasmartin/helper/ResizeHelper.java diff --git a/src/eu/lukasmartin/helper/menuCloser.java b/src/main/java/eu/lukasmartin/helper/menuCloser.java similarity index 100% rename from src/eu/lukasmartin/helper/menuCloser.java rename to src/main/java/eu/lukasmartin/helper/menuCloser.java diff --git a/src/eu/lukasmartin/helper/windowOpener.java b/src/main/java/eu/lukasmartin/helper/windowOpener.java similarity index 100% rename from src/eu/lukasmartin/helper/windowOpener.java rename to src/main/java/eu/lukasmartin/helper/windowOpener.java diff --git a/src/module-info.java b/src/main/java/module-info.java similarity index 59% rename from src/module-info.java rename to src/main/java/module-info.java index e75278d..f0ee9c0 100644 --- a/src/module-info.java +++ b/src/main/java/module-info.java @@ -3,15 +3,11 @@ module Genologie { requires javafx.controls; requires javafx.base; requires javafx.graphics; - requires javafx.media; - requires javafx.swing; - requires javafx.web; - requires javafx.swt; - requires FX.BorderlessScene; - requires com.jfoenix; requires java.prefs; - requires org.jetbrains.annotations; + requires com.jfoenix; + opens eu.lukasmartin.genealogie_app; opens eu.lukasmartin.controller; + exports eu.lukasmartin.genealogie_app; } \ No newline at end of file diff --git a/src/eu/lukasmartin/resources/css/home.css b/src/main/resources/eu/lukasmartin/css/home.css similarity index 100% rename from src/eu/lukasmartin/resources/css/home.css rename to src/main/resources/eu/lukasmartin/css/home.css diff --git a/src/eu/lukasmartin/resources/css/prefrence.css b/src/main/resources/eu/lukasmartin/css/prefrence.css similarity index 100% rename from src/eu/lukasmartin/resources/css/prefrence.css rename to src/main/resources/eu/lukasmartin/css/prefrence.css diff --git a/src/eu/lukasmartin/resources/css/saveChanges.css b/src/main/resources/eu/lukasmartin/css/saveChanges.css similarity index 100% rename from src/eu/lukasmartin/resources/css/saveChanges.css rename to src/main/resources/eu/lukasmartin/css/saveChanges.css diff --git a/src/eu/lukasmartin/resources/data/Martin-Familienstammbaum.ged b/src/main/resources/eu/lukasmartin/data/Martin-Familienstammbaum.ged similarity index 100% rename from src/eu/lukasmartin/resources/data/Martin-Familienstammbaum.ged rename to src/main/resources/eu/lukasmartin/data/Martin-Familienstammbaum.ged diff --git a/src/eu/lukasmartin/resources/data/Martin-Familienstammbaum.txt b/src/main/resources/eu/lukasmartin/data/Martin-Familienstammbaum.txt similarity index 100% rename from src/eu/lukasmartin/resources/data/Martin-Familienstammbaum.txt rename to src/main/resources/eu/lukasmartin/data/Martin-Familienstammbaum.txt diff --git a/src/eu/lukasmartin/resources/fxml/home.fxml b/src/main/resources/eu/lukasmartin/fxml/home.fxml similarity index 90% rename from src/eu/lukasmartin/resources/fxml/home.fxml rename to src/main/resources/eu/lukasmartin/fxml/home.fxml index c59ed8d..6e7bd00 100644 --- a/src/eu/lukasmartin/resources/fxml/home.fxml +++ b/src/main/resources/eu/lukasmartin/fxml/home.fxml @@ -33,7 +33,6 @@ --> - @@ -79,21 +78,6 @@ - - - - - - - - - - - - - - - diff --git a/src/eu/lukasmartin/resources/fxml/preference.fxml b/src/main/resources/eu/lukasmartin/fxml/preference.fxml similarity index 90% rename from src/eu/lukasmartin/resources/fxml/preference.fxml rename to src/main/resources/eu/lukasmartin/fxml/preference.fxml index 1b64af2..8f93b9e 100644 --- a/src/eu/lukasmartin/resources/fxml/preference.fxml +++ b/src/main/resources/eu/lukasmartin/fxml/preference.fxml @@ -1,6 +1,6 @@ - + @@ -36,12 +36,6 @@ - - - - - - diff --git a/src/eu/lukasmartin/resources/fxml/saveChanges.fxml b/src/main/resources/eu/lukasmartin/fxml/saveChanges.fxml similarity index 100% rename from src/eu/lukasmartin/resources/fxml/saveChanges.fxml rename to src/main/resources/eu/lukasmartin/fxml/saveChanges.fxml