From 3f4edc85f0a67d469274c15838ae71e33bc599c6 Mon Sep 17 00:00:00 2001 From: localhorst Date: Mon, 3 Dec 2018 20:39:51 +0100 Subject: [PATCH] added dir com --- pom.xml | 16 +++------------- .../jFxKasse/application/JavaFX11Main.java | 4 ++-- .../{ => com}/jFxKasse/application/Main.java | 14 ++++++++------ .../jFxKasse/controller/DBController.java | 8 ++++---- .../controller/MainWindowController.java | 12 ++++++------ .../java/{ => com}/jFxKasse/datatypes/Job.java | 2 +- .../datatypes/tableDataCurrentOrder.java | 2 +- .../jFxKasse/datatypes/tableDataJob.java | 2 +- .../jFxKasse/datatypes/tableDataPositionen.java | 2 +- 9 files changed, 27 insertions(+), 35 deletions(-) rename src/main/java/{ => com}/jFxKasse/application/JavaFX11Main.java (52%) rename src/main/java/{ => com}/jFxKasse/application/Main.java (85%) rename src/main/java/{ => com}/jFxKasse/controller/DBController.java (95%) rename src/main/java/{ => com}/jFxKasse/controller/MainWindowController.java (94%) rename src/main/java/{ => com}/jFxKasse/datatypes/Job.java (99%) rename src/main/java/{ => com}/jFxKasse/datatypes/tableDataCurrentOrder.java (91%) rename src/main/java/{ => com}/jFxKasse/datatypes/tableDataJob.java (92%) rename src/main/java/{ => com}/jFxKasse/datatypes/tableDataPositionen.java (92%) diff --git a/pom.xml b/pom.xml index 0090adf..816091d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 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"> 4.0.0 - main.java.jFxKasse + com jFxKasse 0.1.0 - without Printer jFxKasse @@ -68,7 +68,7 @@ - main.java.jFxKasse.application.Main + com.jFxKasse.application.Main @@ -82,7 +82,7 @@ - main.java.jFxKasse.application.JavaFX11Main + com.jFxKasse.application.JavaFX11Main @@ -96,16 +96,6 @@ - - - - - - - - - - diff --git a/src/main/java/jFxKasse/application/JavaFX11Main.java b/src/main/java/com/jFxKasse/application/JavaFX11Main.java similarity index 52% rename from src/main/java/jFxKasse/application/JavaFX11Main.java rename to src/main/java/com/jFxKasse/application/JavaFX11Main.java index 96163df..0fe1454 100644 --- a/src/main/java/jFxKasse/application/JavaFX11Main.java +++ b/src/main/java/com/jFxKasse/application/JavaFX11Main.java @@ -1,6 +1,6 @@ -package main.java.jFxKasse.application; +package main.java.com.jFxKasse.application; -import main.java.jFxKasse.application.Main; +import main.java.com.jFxKasse.application.Main; public class JavaFX11Main { diff --git a/src/main/java/jFxKasse/application/Main.java b/src/main/java/com/jFxKasse/application/Main.java similarity index 85% rename from src/main/java/jFxKasse/application/Main.java rename to src/main/java/com/jFxKasse/application/Main.java index d7bcca4..78d64d0 100644 --- a/src/main/java/jFxKasse/application/Main.java +++ b/src/main/java/com/jFxKasse/application/Main.java @@ -1,4 +1,4 @@ -package main.java.jFxKasse.application; +package main.java.com.jFxKasse.application; import javafx.application.Application; @@ -10,12 +10,12 @@ import javafx.animation.Timeline; import javafx.fxml.FXMLLoader; import javafx.stage.Stage; import javafx.util.Duration; -import main.java.jFxKasse.controller.MainWindowController; -import main.java.jFxKasse.controller.DBController; +import main.java.com.jFxKasse.controller.MainWindowController; +import main.java.com.jFxKasse.controller.DBController; import javafx.scene.Scene; import javafx.scene.layout.AnchorPane; -public class Main extends Application +public class Main extends Application { private MainWindowController mwc; @@ -35,8 +35,10 @@ public class Main extends Application private void mainWindow() { try { + FXMLLoader loader = new FXMLLoader( getClass().getResource("/fxml/MainWindow.fxml")); + AnchorPane pane = loader.load(); primaryStage.setTitle("jFxKasse"); // Title of window @@ -46,8 +48,8 @@ public class Main extends Application firstStart(); Scene scene = new Scene(pane); - scene.getStylesheets() - .add(Main.class.getResource("/css/application.css").toExternalForm()); + scene.getStylesheets().add( + Main.class.getResource("/css/application.css").toExternalForm()); primaryStage.setScene(scene); primaryStage.show(); // shows the stage diff --git a/src/main/java/jFxKasse/controller/DBController.java b/src/main/java/com/jFxKasse/controller/DBController.java similarity index 95% rename from src/main/java/jFxKasse/controller/DBController.java rename to src/main/java/com/jFxKasse/controller/DBController.java index 8471e51..7d83317 100644 --- a/src/main/java/jFxKasse/controller/DBController.java +++ b/src/main/java/com/jFxKasse/controller/DBController.java @@ -1,4 +1,4 @@ -package main.java.jFxKasse.controller; +package main.java.com.jFxKasse.controller; import java.sql.Connection; import java.sql.DriverManager; @@ -8,9 +8,9 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.ArrayList; -import main.java.jFxKasse.application.Main; -import main.java.jFxKasse.datatypes.tableDataJob; -import main.java.jFxKasse.datatypes.tableDataPositionen; +import main.java.com.jFxKasse.application.Main; +import main.java.com.jFxKasse.datatypes.tableDataJob; +import main.java.com.jFxKasse.datatypes.tableDataPositionen; import java.io.File; diff --git a/src/main/java/jFxKasse/controller/MainWindowController.java b/src/main/java/com/jFxKasse/controller/MainWindowController.java similarity index 94% rename from src/main/java/jFxKasse/controller/MainWindowController.java rename to src/main/java/com/jFxKasse/controller/MainWindowController.java index f80614e..e55eade 100644 --- a/src/main/java/jFxKasse/controller/MainWindowController.java +++ b/src/main/java/com/jFxKasse/controller/MainWindowController.java @@ -1,4 +1,4 @@ -package main.java.jFxKasse.controller; +package main.java.com.jFxKasse.controller; import javafx.fxml.FXML; import javafx.geometry.Insets; @@ -38,11 +38,11 @@ import javafx.scene.control.Tab; import javafx.scene.layout.AnchorPane; import javafx.scene.layout.GridPane; import javafx.util.Pair; -import main.java.jFxKasse.application.Main; -import main.java.jFxKasse.datatypes.Job; -import main.java.jFxKasse.datatypes.tableDataCurrentOrder; -import main.java.jFxKasse.datatypes.tableDataJob; -import main.java.jFxKasse.datatypes.tableDataPositionen; +import main.java.com.jFxKasse.application.Main; +import main.java.com.jFxKasse.datatypes.Job; +import main.java.com.jFxKasse.datatypes.tableDataCurrentOrder; +import main.java.com.jFxKasse.datatypes.tableDataJob; +import main.java.com.jFxKasse.datatypes.tableDataPositionen; public class MainWindowController diff --git a/src/main/java/jFxKasse/datatypes/Job.java b/src/main/java/com/jFxKasse/datatypes/Job.java similarity index 99% rename from src/main/java/jFxKasse/datatypes/Job.java rename to src/main/java/com/jFxKasse/datatypes/Job.java index cbc5556..91192d5 100644 --- a/src/main/java/jFxKasse/datatypes/Job.java +++ b/src/main/java/com/jFxKasse/datatypes/Job.java @@ -1,4 +1,4 @@ -package main.java.jFxKasse.datatypes; +package main.java.com.jFxKasse.datatypes; import java.util.ArrayList; diff --git a/src/main/java/jFxKasse/datatypes/tableDataCurrentOrder.java b/src/main/java/com/jFxKasse/datatypes/tableDataCurrentOrder.java similarity index 91% rename from src/main/java/jFxKasse/datatypes/tableDataCurrentOrder.java rename to src/main/java/com/jFxKasse/datatypes/tableDataCurrentOrder.java index d62b5ce..867e2cf 100644 --- a/src/main/java/jFxKasse/datatypes/tableDataCurrentOrder.java +++ b/src/main/java/com/jFxKasse/datatypes/tableDataCurrentOrder.java @@ -1,4 +1,4 @@ -package main.java.jFxKasse.datatypes; +package main.java.com.jFxKasse.datatypes; import javafx.beans.property.IntegerProperty; import javafx.beans.property.SimpleIntegerProperty; diff --git a/src/main/java/jFxKasse/datatypes/tableDataJob.java b/src/main/java/com/jFxKasse/datatypes/tableDataJob.java similarity index 92% rename from src/main/java/jFxKasse/datatypes/tableDataJob.java rename to src/main/java/com/jFxKasse/datatypes/tableDataJob.java index a3a1072..ca110fb 100644 --- a/src/main/java/jFxKasse/datatypes/tableDataJob.java +++ b/src/main/java/com/jFxKasse/datatypes/tableDataJob.java @@ -1,4 +1,4 @@ -package main.java.jFxKasse.datatypes; +package main.java.com.jFxKasse.datatypes; import javafx.beans.property.IntegerProperty; import javafx.beans.property.SimpleIntegerProperty; diff --git a/src/main/java/jFxKasse/datatypes/tableDataPositionen.java b/src/main/java/com/jFxKasse/datatypes/tableDataPositionen.java similarity index 92% rename from src/main/java/jFxKasse/datatypes/tableDataPositionen.java rename to src/main/java/com/jFxKasse/datatypes/tableDataPositionen.java index 33227bf..263b370 100644 --- a/src/main/java/jFxKasse/datatypes/tableDataPositionen.java +++ b/src/main/java/com/jFxKasse/datatypes/tableDataPositionen.java @@ -1,4 +1,4 @@ -package main.java.jFxKasse.datatypes; +package main.java.com.jFxKasse.datatypes; import javafx.beans.property.IntegerProperty; import javafx.beans.property.SimpleIntegerProperty;