From 761b764b4b5fa286ea7ac3ddebf07dc9f1aee476 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 27 Jan 2018 16:31:53 +0100
Subject: [PATCH] refactoring
---
.../{UserInterfaceController.java => Controller.java} | 10 +++++-----
.../smarttime/controller/EditController.java | 4 ++--
.../smarttime/controller/InsertTimeController.java | 4 ++--
...ktFensterController.java => ProjectController.java} | 6 +++---
src/main/java/de/deadlocker8/smarttime/main/Main.java | 6 +++---
.../fxml/{userInterface.fxml => MainGUI.fxml} | 2 +-
.../fxml/{projektFenster.fxml => ProjectGUI.fxml} | 2 +-
7 files changed, 17 insertions(+), 17 deletions(-)
rename src/main/java/de/deadlocker8/smarttime/controller/{UserInterfaceController.java => Controller.java} (98%)
rename src/main/java/de/deadlocker8/smarttime/controller/{ProjektFensterController.java => ProjectController.java} (93%)
rename src/main/resources/de/deadlocker8/smarttime/fxml/{userInterface.fxml => MainGUI.fxml} (99%)
rename src/main/resources/de/deadlocker8/smarttime/fxml/{projektFenster.fxml => ProjectGUI.fxml} (97%)
diff --git a/src/main/java/de/deadlocker8/smarttime/controller/UserInterfaceController.java b/src/main/java/de/deadlocker8/smarttime/controller/Controller.java
similarity index 98%
rename from src/main/java/de/deadlocker8/smarttime/controller/UserInterfaceController.java
rename to src/main/java/de/deadlocker8/smarttime/controller/Controller.java
index 012d4fc..ef94bfc 100644
--- a/src/main/java/de/deadlocker8/smarttime/controller/UserInterfaceController.java
+++ b/src/main/java/de/deadlocker8/smarttime/controller/Controller.java
@@ -66,7 +66,7 @@ import tools.AlertGenerator;
import tools.ConvertTo;
import tools.PathUtils;
-public class UserInterfaceController
+public class Controller
{
@FXML private Label aktuellesProjektAusgabe;
@FXML private Label aktuellerTaskAusgabe;
@@ -184,7 +184,7 @@ public class UserInterfaceController
{
try
{
- FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/de/deadlocker8/smarttime/fxml/projektFenster.fxml"));
+ FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/de/deadlocker8/smarttime/fxml/ProjectGUI.fxml"));
Parent root = (Parent)fxmlLoader.load();
Stage newStage = new Stage();
newStage.setScene(new Scene(root, 455, 300));
@@ -193,7 +193,7 @@ public class UserInterfaceController
newStage.getIcons().add(icon);
- ProjektFensterController pfc = (ProjektFensterController)fxmlLoader.getController();
+ ProjectController pfc = (ProjectController)fxmlLoader.getController();
pfc.init(this, newStage, settings, icon);
newStage.setResizable(false);
@@ -438,7 +438,7 @@ public class UserInterfaceController
{
try
{
- FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/de/deadlocker8/smarttime/fxml/chartGUI.fxml"));
+ FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/de/deadlocker8/smarttime/fxml/ChartGUI.fxml"));
Parent root = (Parent)fxmlLoader.load();
Scene scene = new Scene(root, 800, 600);
scene.getStylesheets().add("/de/deadlocker8/smarttime/css/Chart.css");
@@ -718,7 +718,7 @@ public class UserInterfaceController
{
try
{
- FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/de/deadlocker8/smarttime/fxml/editGUI.fxml"));
+ FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/de/deadlocker8/smarttime/fxml/EditGUI.fxml"));
Parent root = (Parent)fxmlLoader.load();
Stage newStage = new Stage();
newStage.setScene(new Scene(root, 455, 280));
diff --git a/src/main/java/de/deadlocker8/smarttime/controller/EditController.java b/src/main/java/de/deadlocker8/smarttime/controller/EditController.java
index 032d0cc..3d8ddda 100644
--- a/src/main/java/de/deadlocker8/smarttime/controller/EditController.java
+++ b/src/main/java/de/deadlocker8/smarttime/controller/EditController.java
@@ -28,11 +28,11 @@ public class EditController
@FXML private ComboBox<String> dropdown;
@FXML private ComboBox<String> dropdownTasks;
private Stage stage;
- private UserInterfaceController controller;
+ private Controller controller;
private Image icon;
private LogObject object;
- public void init(UserInterfaceController controller, Stage stage, Settings settings, Image icon, LogObject object)
+ public void init(Controller controller, Stage stage, Settings settings, Image icon, LogObject object)
{
this.controller = controller;
this.stage = stage;
diff --git a/src/main/java/de/deadlocker8/smarttime/controller/InsertTimeController.java b/src/main/java/de/deadlocker8/smarttime/controller/InsertTimeController.java
index 08be286..266a1f9 100644
--- a/src/main/java/de/deadlocker8/smarttime/controller/InsertTimeController.java
+++ b/src/main/java/de/deadlocker8/smarttime/controller/InsertTimeController.java
@@ -52,11 +52,11 @@ public class InsertTimeController
@FXML private ComboBox<String> comboBoxTask;
private Stage stage;
- private UserInterfaceController controller;
+ private Controller controller;
private String savePath;
private Image icon;
- public void init(Stage stage, UserInterfaceController controller, Settings settings, Image icon)
+ public void init(Stage stage, Controller controller, Settings settings, Image icon)
{
this.savePath = settings.getSavePath() + "/" + Utils.DATABASE_NAME;
this.stage = stage;
diff --git a/src/main/java/de/deadlocker8/smarttime/controller/ProjektFensterController.java b/src/main/java/de/deadlocker8/smarttime/controller/ProjectController.java
similarity index 93%
rename from src/main/java/de/deadlocker8/smarttime/controller/ProjektFensterController.java
rename to src/main/java/de/deadlocker8/smarttime/controller/ProjectController.java
index a38c4f6..eeb6259 100644
--- a/src/main/java/de/deadlocker8/smarttime/controller/ProjektFensterController.java
+++ b/src/main/java/de/deadlocker8/smarttime/controller/ProjectController.java
@@ -24,16 +24,16 @@ import tools.AlertGenerator;
*
*/
-public class ProjektFensterController
+public class ProjectController
{
@FXML private Button abbrechenButton;
@FXML private ComboBox<String> dropdown;
@FXML private ComboBox<String> dropdownTasks;
private Stage stage;
- private UserInterfaceController controller;
+ private Controller controller;
private Image icon;
- public void init(UserInterfaceController controller, Stage stage, Settings settings, Image icon)
+ public void init(Controller controller, Stage stage, Settings settings, Image icon)
{
this.controller = controller;
this.stage = stage;
diff --git a/src/main/java/de/deadlocker8/smarttime/main/Main.java b/src/main/java/de/deadlocker8/smarttime/main/Main.java
index d4f01ba..9afe373 100644
--- a/src/main/java/de/deadlocker8/smarttime/main/Main.java
+++ b/src/main/java/de/deadlocker8/smarttime/main/Main.java
@@ -4,7 +4,7 @@ import java.io.File;
import java.util.Locale;
import java.util.ResourceBundle;
-import de.deadlocker8.smarttime.controller.UserInterfaceController;
+import de.deadlocker8.smarttime.controller.Controller;
import javafx.application.Application;
import javafx.event.EventHandler;
import javafx.fxml.FXMLLoader;
@@ -27,7 +27,7 @@ public class Main extends Application
{
try
{
- FXMLLoader loader = new FXMLLoader(getClass().getResource("/de/deadlocker8/smarttime/fxml/userInterface.fxml"));
+ FXMLLoader loader = new FXMLLoader(getClass().getResource("/de/deadlocker8/smarttime/fxml/MainGUI.fxml"));
Parent root = (Parent)loader.load();
Scene scene = new Scene(root, 800, 800);
@@ -38,7 +38,7 @@ public class Main extends Application
stage.setTitle("SmartTime");
stage.setScene(scene);
- UserInterfaceController controller = (UserInterfaceController)loader.getController();
+ Controller controller = (Controller)loader.getController();
controller.init(stage);
stage.getIcons().add(new Image("/de/deadlocker8/smarttime/icon.png"));
diff --git a/src/main/resources/de/deadlocker8/smarttime/fxml/userInterface.fxml b/src/main/resources/de/deadlocker8/smarttime/fxml/MainGUI.fxml
similarity index 99%
rename from src/main/resources/de/deadlocker8/smarttime/fxml/userInterface.fxml
rename to src/main/resources/de/deadlocker8/smarttime/fxml/MainGUI.fxml
index 873b4d6..942a20f 100644
--- a/src/main/resources/de/deadlocker8/smarttime/fxml/userInterface.fxml
+++ b/src/main/resources/de/deadlocker8/smarttime/fxml/MainGUI.fxml
@@ -16,7 +16,7 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
-<AnchorPane prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.deadlocker8.smarttime.controller.UserInterfaceController">
+<AnchorPane prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.deadlocker8.smarttime.controller.Controller">
<children>
<VBox alignment="TOP_CENTER" layoutX="143.0" layoutY="69.0" prefHeight="800.0" prefWidth="650.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children>
diff --git a/src/main/resources/de/deadlocker8/smarttime/fxml/projektFenster.fxml b/src/main/resources/de/deadlocker8/smarttime/fxml/ProjectGUI.fxml
similarity index 97%
rename from src/main/resources/de/deadlocker8/smarttime/fxml/projektFenster.fxml
rename to src/main/resources/de/deadlocker8/smarttime/fxml/ProjectGUI.fxml
index c9c1b55..f640b8c 100644
--- a/src/main/resources/de/deadlocker8/smarttime/fxml/projektFenster.fxml
+++ b/src/main/resources/de/deadlocker8/smarttime/fxml/ProjectGUI.fxml
@@ -6,7 +6,7 @@
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.text.Font?>
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="300.0" prefWidth="455.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.deadlocker8.smarttime.controller.ProjektFensterController">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="300.0" prefWidth="455.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.deadlocker8.smarttime.controller.ProjectController">
<children>
<Button layoutX="109.0" layoutY="223.0" mnemonicParsing="false" onAction="#okButton" prefWidth="100.0" text="OK">
<font>
--
GitLab