From 2a4f3253057330cd28215a3e28f1c39d65e43d38 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <mateusz.kowalczyk24@gmail.com>
Date: Sun, 5 Jan 2020 01:21:43 +0100
Subject: [PATCH] reorganize structure

---
 .gitignore                                    |  3 +-
 pom.xml                                       | 66 +++++++++++++++++++
 readme.md                                     |  1 +
 .../java/dev/mateuszkowalczyk/ffm}/Main.java  |  6 +-
 .../controller/WelcomePageController.java     |  2 +-
 .../resources}/welcomePage.fxml               |  2 +-
 6 files changed, 74 insertions(+), 6 deletions(-)
 create mode 100644 pom.xml
 create mode 100644 readme.md
 rename src/{application => main/java/dev/mateuszkowalczyk/ffm}/Main.java (79%)
 rename src/{application => main/java/dev/mateuszkowalczyk/ffm}/controller/WelcomePageController.java (84%)
 rename src/{resource => main/resources}/welcomePage.fxml (93%)

diff --git a/.gitignore b/.gitignore
index fca352e..aa03912 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .idea
-out
\ No newline at end of file
+out
+target
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..f149371
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>dev.mateuszkowalczyk.ffm</groupId>
+    <artifactId>dev.mateuszkowalczyk.ffm</artifactId>
+    <name>FFM-Friend_Face_Matching</name>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <junit.jupiter.version>5.5.2</junit.jupiter.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx</artifactId>
+            <version>11</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-controls</artifactId>
+            <version>11</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-fxml</artifactId>
+            <version>11</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit.jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.2</version>
+            </plugin>
+            <plugin>
+                <groupId>org.openjfx</groupId>
+                <artifactId>javafx-maven-plugin</artifactId>
+                <version>0.0.3</version>
+                <configuration>
+                    <mainClass>dev.mateuszkowalczyk.ffm.Main</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/readme.md b/readme.md
new file mode 100644
index 0000000..d1def56
--- /dev/null
+++ b/readme.md
@@ -0,0 +1 @@
+--module-path PATH_TO_PROJECT/libs --add-modules javafx.controls,javafx.fxml
\ No newline at end of file
diff --git a/src/application/Main.java b/src/main/java/dev/mateuszkowalczyk/ffm/Main.java
similarity index 79%
rename from src/application/Main.java
rename to src/main/java/dev/mateuszkowalczyk/ffm/Main.java
index a893d51..bf85337 100644
--- a/src/application/Main.java
+++ b/src/main/java/dev/mateuszkowalczyk/ffm/Main.java
@@ -1,4 +1,4 @@
-package application;
+package dev.mateuszkowalczyk.ffm;
 
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
@@ -12,8 +12,8 @@ public class Main extends Application {
 
     @Override
     public void start(Stage primaryStage) throws Exception{
-        URL welcomePageUrl = ClassLoader.getSystemClassLoader().
-                getResource("resource/welcomePage.fxml");
+        URL welcomePageUrl = getClass().getClassLoader().
+                getResource("welcomePage.fxml");
 
         Parent welcomePage = FXMLLoader.load(welcomePageUrl);
         primaryStage.setTitle("Friend Face Matcher");
diff --git a/src/application/controller/WelcomePageController.java b/src/main/java/dev/mateuszkowalczyk/ffm/controller/WelcomePageController.java
similarity index 84%
rename from src/application/controller/WelcomePageController.java
rename to src/main/java/dev/mateuszkowalczyk/ffm/controller/WelcomePageController.java
index 71a4b8c..bbf89e2 100644
--- a/src/application/controller/WelcomePageController.java
+++ b/src/main/java/dev/mateuszkowalczyk/ffm/controller/WelcomePageController.java
@@ -1,4 +1,4 @@
-package application.controller;
+package dev.mateuszkowalczyk.ffm.controller;
 
 import javafx.fxml.FXML;
 
diff --git a/src/resource/welcomePage.fxml b/src/main/resources/welcomePage.fxml
similarity index 93%
rename from src/resource/welcomePage.fxml
rename to src/main/resources/welcomePage.fxml
index 5f72764..310c074 100644
--- a/src/resource/welcomePage.fxml
+++ b/src/main/resources/welcomePage.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<VBox prefHeight="400.0" prefWidth="640.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.controller.WelcomePageController">
+<VBox prefHeight="400.0" prefWidth="640.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="dev.mateuszkowalczyk.ffm.controller.WelcomePageController">
   <children>
     <AnchorPane maxHeight="-1.0" maxWidth="-1.0" prefHeight="-1.0" prefWidth="-1.0" VBox.vgrow="ALWAYS">
       <children>