[MK] changed to maven project

main
Marcus Kauffeld 5 years ago
parent b25414fccf
commit 5e37864468

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
<resourceExtensions />
<wildcardResourcePatterns>
<entry name="!?*.java" />
<entry name="!?*.form" />
@ -14,10 +12,18 @@
<entry name="!?*.clj" />
</wildcardResourcePatterns>
<annotationProcessing>
<profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" />
<profile name="Annotation profile for Genologie" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<processorPath useClasspath="false">
<entry name="$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.20/lombok-1.18.20.jar" />
</processorPath>
<module name="Genologie" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
<module name="Genologie" target="11" />
</bytecodeTargetLevel>
</component>
</project>

@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
<file url="PROJECT" charset="UTF-8" />
</component>
</project>

@ -1,16 +0,0 @@
<component name="libraryTable">
<library name="javafx-swt">
<CLASSES>
<root url="jar://$USER_HOME$/Documents/Lib/javafx-sdk-11.0.2/lib/javafx-swt.jar!/" />
<root url="jar://$USER_HOME$/Documents/Lib/javafx-sdk-11.0.2/lib/javafx.base.jar!/" />
<root url="jar://$USER_HOME$/Documents/Lib/javafx-sdk-11.0.2/lib/javafx.controls.jar!/" />
<root url="jar://$USER_HOME$/Documents/Lib/javafx-sdk-11.0.2/lib/javafx.fxml.jar!/" />
<root url="jar://$USER_HOME$/Documents/Lib/javafx-sdk-11.0.2/lib/javafx.graphics.jar!/" />
<root url="jar://$USER_HOME$/Documents/Lib/javafx-sdk-11.0.2/lib/javafx.swing.jar!/" />
<root url="jar://$USER_HOME$/Documents/Lib/javafx-sdk-11.0.2/lib/javafx.media.jar!/" />
<root url="jar://$USER_HOME$/Documents/Lib/javafx-sdk-11.0.2/lib/javafx.web.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

@ -5,10 +5,17 @@
<item index="0" class="java.lang.String" itemvalue="javafx.fxml.FXML" />
</list>
</component>
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/pom.xml" />
</list>
</option>
</component>
<component name="ProjectKey">
<option name="state" value="project://e79810c8-c5c8-43b1-b19c-90c1f4095425" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_16" default="true" project-jdk-name="openjdk-16" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

@ -1,24 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
<excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
<excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
<excludeFolder url="file://$MODULE_DIR$/target" />
<excludeFolder url="file://$MODULE_DIR$/.idea/libraries" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="javafx-swt" level="application" />
<orderEntry type="library" name="fontawesomefx-8.1" level="application" />
<orderEntry type="library" name="FX-BorderlessScene-4.0.0" level="application" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/20.1.0/annotations-20.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="jfoenix-9.0.10" level="application" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-controls:15" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-controls:win:15" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:15" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:win:15" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-base:15" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-base:win:15" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-fxml:15" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-fxml:win:15" level="project" />
<orderEntry type="library" name="Maven: org.controlsfx:controlsfx:11.1.0" level="project" />
<orderEntry type="library" name="Maven: com.dlsc.formsfx:formsfx-core:11.3.2" level="project" />
<orderEntry type="library" name="Maven: org.webjars:font-awesome:5.15.3" level="project" />
<orderEntry type="library" name="Maven: org.kordamp.ikonli:ikonli-javafx:12.2.0" level="project" />
<orderEntry type="library" name="Maven: org.kordamp.ikonli:ikonli-core:12.2.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.7.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.7.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.7.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.7.1" level="project" />
<orderEntry type="library" name="Maven: com.jfoenix:jfoenix:9.0.10" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.20" level="project" />
</component>
</module>

@ -0,0 +1,119 @@
<?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>eu.lukasmartin</groupId>
<artifactId>Genologie</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<junit.version>5.7.1</junit.version>
<maven.compiler.release>11</maven.compiler.release>
<javafx.version>15</javafx.version>
<javafx.maven.plugin.version>0.0.6</javafx.maven.plugin.version>
</properties>
<dependencies>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>${javafx.version}</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
<version>${javafx.version}</version>
</dependency>
<dependency>
<groupId>org.controlsfx</groupId>
<artifactId>controlsfx</artifactId>
<version>11.1.0</version>
</dependency>
<dependency>
<groupId>com.dlsc.formsfx</groupId>
<artifactId>formsfx-core</artifactId>
<version>11.3.2</version>
<exclusions>
<exclusion>
<groupId>org.openjfx</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/org.webjars/font-awesome -->
<dependency>
<groupId>org.webjars</groupId>
<artifactId>font-awesome</artifactId>
<version>5.15.3</version>
</dependency>
<dependency>
<groupId>org.kordamp.ikonli</groupId>
<artifactId>ikonli-javafx</artifactId>
<version>12.2.0</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.jfoenix</groupId>
<artifactId>jfoenix</artifactId>
<version>9.0.10</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.20</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<release>${maven.compiler.release}</release>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.20</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<version>${javafx.maven.plugin.version}</version>
<executions>
<execution>
<!-- Default configuration for running with: mvn clean javafx:run -->
<id>default-cli</id>
<configuration>
<release>${maven.compiler.release}</release>
<launcher>launcher</launcher>
<mainClass>eu.lukasmartin.genealogie_app.Main</mainClass>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

@ -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 <a href="http://lukasmartin.eu">Lukas Martin</a>
*/
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
}
}
}

@ -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")); //

@ -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

@ -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 <a href="http://lukasmartin.eu">Lukas Martin</a>
*/
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)
}
}

@ -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;
}

@ -33,7 +33,6 @@
-->
<?import com.jfoenix.controls.JFXListCell?>
<?import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TextField?>
@ -79,21 +78,6 @@
<BorderPane id="topbar" fx:id="hboxmen" onMouseDragged="#dragged" onMouseEntered="#topBarEntered" onMousePressed="#pressed" prefHeight="25.0" prefWidth="1280.0" stylesheets="@../css/home.css" BorderPane.alignment="CENTER">
<right>
<HBox id="topbar" alignment="TOP_RIGHT" prefHeight="25.0" prefWidth="678.0" stylesheets="@../css/home.css" BorderPane.alignment="CENTER">
<FontAwesomeIcon fill="WHITE" iconName="MINUS" onMouseClicked="#min" textAlignment="CENTER" translateY="2.0">
<HBox.margin>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</HBox.margin>
</FontAwesomeIcon>
<FontAwesomeIcon fill="#86ff6b" iconName="CIRCLE" onMouseClicked="#max" textAlignment="CENTER" translateY="1.0">
<HBox.margin>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</HBox.margin>
</FontAwesomeIcon>
<FontAwesomeIcon fill="RED" iconName="CLOSE" onMouseClicked="#close" scaleX="1.2" scaleY="1.2" scaleZ="1.2" selectionFill="#f20000" size="1.1em" textAlignment="CENTER">
<HBox.margin>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</HBox.margin>
</FontAwesomeIcon>
<padding>
<Insets bottom="2.0" left="5.0" right="5.0" top="2.0" />
</padding>

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon?>
<?import java.lang.String?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
@ -36,12 +36,6 @@
<padding>
<Insets bottom="2.0" left="5.0" right="5.0" top="2.0" />
</padding>
<FontAwesomeIcon fill="#bf9728" iconName="SAVE" onMouseClicked="#saveButtonClicked" scaleX="0.8" scaleY="0.8" selectionFill="#b09515" text="">
<HBox.margin>
<Insets bottom="2.0" left="2.0" right="6.0" top="3.0" />
</HBox.margin>
</FontAwesomeIcon>
<FontAwesomeIcon fill="#f20000" iconName="CLOSE" onMousePressed="#closeButtonClicked" scaleX="1.2" scaleY="1.2" scaleZ="1.2" selectionEnd="0" selectionFill="#f20000" />
</HBox>
</right>
</BorderPane>
Loading…
Cancel
Save