From b2100e246db16d248d6536d951ed549c551fd86c Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Thu, 25 May 2017 12:14:50 +0200 Subject: [PATCH] moved server logic to own package --- src/de/deadlocker8/budgetmaster/logic/ServerConnection.java | 2 +- src/de/deadlocker8/budgetmaster/logic/Utils.java | 2 +- src/de/deadlocker8/budgetmaster/main/_de.properties | 6 +++--- src/de/deadlocker8/budgetmaster/ui/SettingsController.java | 2 +- .../budgetmasterserver/{main => logic}/Database.java | 2 +- .../budgetmasterserver/{main => logic}/DatabaseCreator.java | 2 +- .../{main => logic}/DatabaseExporter.java | 2 +- .../budgetmasterserver/{main => logic}/DatabaseHandler.java | 2 +- .../{main => logic}/DatabaseImporter.java | 2 +- .../budgetmasterserver/{main => logic}/Settings.java | 2 +- .../budgetmasterserver/{main => logic}/Utils.java | 2 +- src/de/deadlocker8/budgetmasterserver/main/Main.java | 2 ++ src/de/deadlocker8/budgetmasterserver/main/_de.properties | 6 +++--- .../deadlocker8/budgetmasterserver/server/SparkServer.java | 4 ++-- .../budgetmasterserver/server/category/CategoryAdd.java | 2 +- .../budgetmasterserver/server/category/CategoryDelete.java | 2 +- .../budgetmasterserver/server/category/CategoryGet.java | 2 +- .../budgetmasterserver/server/category/CategoryGetAll.java | 2 +- .../budgetmasterserver/server/category/CategoryUpdate.java | 2 +- .../server/categorybudget/CategoryBudgetGet.java | 2 +- .../server/charts/CategoryInOutSumForMonth.java | 2 +- .../budgetmasterserver/server/charts/MonthInOutSum.java | 2 +- .../budgetmasterserver/server/database/DatabaseDelete.java | 4 ++-- .../budgetmasterserver/server/database/DatabaseExport.java | 4 ++-- .../budgetmasterserver/server/database/DatabaseImport.java | 6 +++--- .../server/payment/normal/PaymentAdd.java | 2 +- .../server/payment/normal/PaymentDelete.java | 2 +- .../server/payment/normal/PaymentGet.java | 2 +- .../server/payment/normal/PaymentUpdate.java | 2 +- .../server/payment/repeating/RepeatingPaymentAdd.java | 2 +- .../server/payment/repeating/RepeatingPaymentDelete.java | 2 +- .../server/payment/repeating/RepeatingPaymentGet.java | 2 +- .../server/payment/repeating/RepeatingPaymentGetAll.java | 2 +- .../deadlocker8/budgetmasterserver/server/rest/RestGet.java | 2 +- .../server/updater/RepeatingPaymentUpdater.java | 2 +- 35 files changed, 45 insertions(+), 43 deletions(-) rename src/de/deadlocker8/budgetmasterserver/{main => logic}/Database.java (95%) rename src/de/deadlocker8/budgetmasterserver/{main => logic}/DatabaseCreator.java (99%) rename src/de/deadlocker8/budgetmasterserver/{main => logic}/DatabaseExporter.java (99%) rename src/de/deadlocker8/budgetmasterserver/{main => logic}/DatabaseHandler.java (99%) rename src/de/deadlocker8/budgetmasterserver/{main => logic}/DatabaseImporter.java (98%) rename src/de/deadlocker8/budgetmasterserver/{main => logic}/Settings.java (96%) rename src/de/deadlocker8/budgetmasterserver/{main => logic}/Utils.java (92%) diff --git a/src/de/deadlocker8/budgetmaster/logic/ServerConnection.java b/src/de/deadlocker8/budgetmaster/logic/ServerConnection.java index 45d03440d..8443d3fe8 100644 --- a/src/de/deadlocker8/budgetmaster/logic/ServerConnection.java +++ b/src/de/deadlocker8/budgetmaster/logic/ServerConnection.java @@ -19,7 +19,7 @@ import org.joda.time.DateTime; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import de.deadlocker8.budgetmasterserver.main.Database; +import de.deadlocker8.budgetmasterserver.logic.Database; import tools.ConvertTo; import tools.Read; diff --git a/src/de/deadlocker8/budgetmaster/logic/Utils.java b/src/de/deadlocker8/budgetmaster/logic/Utils.java index e50e6b350..c9af40da5 100644 --- a/src/de/deadlocker8/budgetmaster/logic/Utils.java +++ b/src/de/deadlocker8/budgetmaster/logic/Utils.java @@ -12,7 +12,7 @@ import java.util.ResourceBundle; import com.google.gson.Gson; -import de.deadlocker8.budgetmasterserver.main.Database; +import de.deadlocker8.budgetmasterserver.logic.Database; import tools.PathUtils; public class Utils diff --git a/src/de/deadlocker8/budgetmaster/main/_de.properties b/src/de/deadlocker8/budgetmaster/main/_de.properties index 4e7b83cea..888ab9545 100644 --- a/src/de/deadlocker8/budgetmaster/main/_de.properties +++ b/src/de/deadlocker8/budgetmaster/main/_de.properties @@ -1,7 +1,7 @@ app.name=BudgetMaster -version.code=2 -version.name=1.1.0 -version.date=12.04.17 +version.code=3 +version.name=1.2.0 +version.date=25.05.17 author=Robert Goldmann folder=Deadlocker/BudgetMaster diff --git a/src/de/deadlocker8/budgetmaster/ui/SettingsController.java b/src/de/deadlocker8/budgetmaster/ui/SettingsController.java index c96a8494d..76e98b078 100644 --- a/src/de/deadlocker8/budgetmaster/ui/SettingsController.java +++ b/src/de/deadlocker8/budgetmaster/ui/SettingsController.java @@ -10,7 +10,7 @@ import de.deadlocker8.budgetmaster.logic.Helpers; import de.deadlocker8.budgetmaster.logic.ServerConnection; import de.deadlocker8.budgetmaster.logic.Settings; import de.deadlocker8.budgetmaster.logic.Utils; -import de.deadlocker8.budgetmasterserver.main.Database; +import de.deadlocker8.budgetmasterserver.logic.Database; import javafx.application.Platform; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; diff --git a/src/de/deadlocker8/budgetmasterserver/main/Database.java b/src/de/deadlocker8/budgetmasterserver/logic/Database.java similarity index 95% rename from src/de/deadlocker8/budgetmasterserver/main/Database.java rename to src/de/deadlocker8/budgetmasterserver/logic/Database.java index e4d927792..05740dae2 100644 --- a/src/de/deadlocker8/budgetmasterserver/main/Database.java +++ b/src/de/deadlocker8/budgetmasterserver/logic/Database.java @@ -1,4 +1,4 @@ -package de.deadlocker8.budgetmasterserver.main; +package de.deadlocker8.budgetmasterserver.logic; import java.util.ArrayList; diff --git a/src/de/deadlocker8/budgetmasterserver/main/DatabaseCreator.java b/src/de/deadlocker8/budgetmasterserver/logic/DatabaseCreator.java similarity index 99% rename from src/de/deadlocker8/budgetmasterserver/main/DatabaseCreator.java rename to src/de/deadlocker8/budgetmasterserver/logic/DatabaseCreator.java index 90fc9452b..398629d7b 100644 --- a/src/de/deadlocker8/budgetmasterserver/main/DatabaseCreator.java +++ b/src/de/deadlocker8/budgetmasterserver/logic/DatabaseCreator.java @@ -1,4 +1,4 @@ -package de.deadlocker8.budgetmasterserver.main; +package de.deadlocker8.budgetmasterserver.logic; import java.sql.Connection; import java.sql.DatabaseMetaData; diff --git a/src/de/deadlocker8/budgetmasterserver/main/DatabaseExporter.java b/src/de/deadlocker8/budgetmasterserver/logic/DatabaseExporter.java similarity index 99% rename from src/de/deadlocker8/budgetmasterserver/main/DatabaseExporter.java rename to src/de/deadlocker8/budgetmasterserver/logic/DatabaseExporter.java index c89d0ba1e..eeda5e959 100644 --- a/src/de/deadlocker8/budgetmasterserver/main/DatabaseExporter.java +++ b/src/de/deadlocker8/budgetmasterserver/logic/DatabaseExporter.java @@ -1,4 +1,4 @@ -package de.deadlocker8.budgetmasterserver.main; +package de.deadlocker8.budgetmasterserver.logic; import java.sql.Connection; import java.sql.DriverManager; diff --git a/src/de/deadlocker8/budgetmasterserver/main/DatabaseHandler.java b/src/de/deadlocker8/budgetmasterserver/logic/DatabaseHandler.java similarity index 99% rename from src/de/deadlocker8/budgetmasterserver/main/DatabaseHandler.java rename to src/de/deadlocker8/budgetmasterserver/logic/DatabaseHandler.java index 2d605d766..328d6ee82 100644 --- a/src/de/deadlocker8/budgetmasterserver/main/DatabaseHandler.java +++ b/src/de/deadlocker8/budgetmasterserver/logic/DatabaseHandler.java @@ -1,4 +1,4 @@ -package de.deadlocker8.budgetmasterserver.main; +package de.deadlocker8.budgetmasterserver.logic; import java.sql.Connection; import java.sql.DriverManager; diff --git a/src/de/deadlocker8/budgetmasterserver/main/DatabaseImporter.java b/src/de/deadlocker8/budgetmasterserver/logic/DatabaseImporter.java similarity index 98% rename from src/de/deadlocker8/budgetmasterserver/main/DatabaseImporter.java rename to src/de/deadlocker8/budgetmasterserver/logic/DatabaseImporter.java index 9b719f965..7880c9c2d 100644 --- a/src/de/deadlocker8/budgetmasterserver/main/DatabaseImporter.java +++ b/src/de/deadlocker8/budgetmasterserver/logic/DatabaseImporter.java @@ -1,4 +1,4 @@ -package de.deadlocker8.budgetmasterserver.main; +package de.deadlocker8.budgetmasterserver.logic; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/de/deadlocker8/budgetmasterserver/main/Settings.java b/src/de/deadlocker8/budgetmasterserver/logic/Settings.java similarity index 96% rename from src/de/deadlocker8/budgetmasterserver/main/Settings.java rename to src/de/deadlocker8/budgetmasterserver/logic/Settings.java index 1dbc26be8..121ba938b 100644 --- a/src/de/deadlocker8/budgetmasterserver/main/Settings.java +++ b/src/de/deadlocker8/budgetmasterserver/logic/Settings.java @@ -1,4 +1,4 @@ -package de.deadlocker8.budgetmasterserver.main; +package de.deadlocker8.budgetmasterserver.logic; public class Settings { diff --git a/src/de/deadlocker8/budgetmasterserver/main/Utils.java b/src/de/deadlocker8/budgetmasterserver/logic/Utils.java similarity index 92% rename from src/de/deadlocker8/budgetmasterserver/main/Utils.java rename to src/de/deadlocker8/budgetmasterserver/logic/Utils.java index c7880cbdd..265ab169d 100644 --- a/src/de/deadlocker8/budgetmasterserver/main/Utils.java +++ b/src/de/deadlocker8/budgetmasterserver/logic/Utils.java @@ -1,4 +1,4 @@ -package de.deadlocker8.budgetmasterserver.main; +package de.deadlocker8.budgetmasterserver.logic; import java.io.IOException; import java.net.URISyntaxException; diff --git a/src/de/deadlocker8/budgetmasterserver/main/Main.java b/src/de/deadlocker8/budgetmasterserver/main/Main.java index 644d5367e..38a523850 100644 --- a/src/de/deadlocker8/budgetmasterserver/main/Main.java +++ b/src/de/deadlocker8/budgetmasterserver/main/Main.java @@ -9,6 +9,8 @@ import java.nio.file.Paths; import java.util.Locale; import java.util.ResourceBundle; +import de.deadlocker8.budgetmasterserver.logic.Settings; +import de.deadlocker8.budgetmasterserver.logic.Utils; import de.deadlocker8.budgetmasterserver.server.SparkServer; import logger.FileOutputMode; import logger.LogLevel; diff --git a/src/de/deadlocker8/budgetmasterserver/main/_de.properties b/src/de/deadlocker8/budgetmasterserver/main/_de.properties index b231f1d78..a3d846700 100644 --- a/src/de/deadlocker8/budgetmasterserver/main/_de.properties +++ b/src/de/deadlocker8/budgetmasterserver/main/_de.properties @@ -1,5 +1,5 @@ app.name=BudgetMasterServer -version.code=2 -version.name=1.1.0 -version.date=12.04.17 +version.code=3 +version.name=1.2.0 +version.date=25.05.17 author=Robert Goldmann \ No newline at end of file diff --git a/src/de/deadlocker8/budgetmasterserver/server/SparkServer.java b/src/de/deadlocker8/budgetmasterserver/server/SparkServer.java index 506e12159..b2389dd93 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/SparkServer.java +++ b/src/de/deadlocker8/budgetmasterserver/server/SparkServer.java @@ -18,8 +18,8 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import de.deadlocker8.budgetmaster.logic.Helpers; -import de.deadlocker8.budgetmasterserver.main.DatabaseHandler; -import de.deadlocker8.budgetmasterserver.main.Settings; +import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler; +import de.deadlocker8.budgetmasterserver.logic.Settings; import de.deadlocker8.budgetmasterserver.server.category.CategoryAdd; import de.deadlocker8.budgetmasterserver.server.category.CategoryDelete; import de.deadlocker8.budgetmasterserver.server.category.CategoryGet; diff --git a/src/de/deadlocker8/budgetmasterserver/server/category/CategoryAdd.java b/src/de/deadlocker8/budgetmasterserver/server/category/CategoryAdd.java index c20739e61..71e5dcac4 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/category/CategoryAdd.java +++ b/src/de/deadlocker8/budgetmasterserver/server/category/CategoryAdd.java @@ -2,7 +2,7 @@ package de.deadlocker8.budgetmasterserver.server.category; import static spark.Spark.halt; -import de.deadlocker8.budgetmasterserver.main.DatabaseHandler; +import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler; import javafx.scene.paint.Color; import spark.Request; import spark.Response; diff --git a/src/de/deadlocker8/budgetmasterserver/server/category/CategoryDelete.java b/src/de/deadlocker8/budgetmasterserver/server/category/CategoryDelete.java index 3a0088e2a..5e4ad5a69 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/category/CategoryDelete.java +++ b/src/de/deadlocker8/budgetmasterserver/server/category/CategoryDelete.java @@ -2,7 +2,7 @@ package de.deadlocker8.budgetmasterserver.server.category; import static spark.Spark.halt; -import de.deadlocker8.budgetmasterserver.main.DatabaseHandler; +import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler; import spark.Request; import spark.Response; import spark.Route; diff --git a/src/de/deadlocker8/budgetmasterserver/server/category/CategoryGet.java b/src/de/deadlocker8/budgetmasterserver/server/category/CategoryGet.java index 55953ad73..bf4eb9c41 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/category/CategoryGet.java +++ b/src/de/deadlocker8/budgetmasterserver/server/category/CategoryGet.java @@ -5,7 +5,7 @@ import static spark.Spark.halt; import com.google.gson.Gson; import de.deadlocker8.budgetmaster.logic.Category; -import de.deadlocker8.budgetmasterserver.main.DatabaseHandler; +import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler; import spark.Request; import spark.Response; import spark.Route; diff --git a/src/de/deadlocker8/budgetmasterserver/server/category/CategoryGetAll.java b/src/de/deadlocker8/budgetmasterserver/server/category/CategoryGetAll.java index 75a921947..8bb67cab6 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/category/CategoryGetAll.java +++ b/src/de/deadlocker8/budgetmasterserver/server/category/CategoryGetAll.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import com.google.gson.Gson; import de.deadlocker8.budgetmaster.logic.Category; -import de.deadlocker8.budgetmasterserver.main.DatabaseHandler; +import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler; import spark.Request; import spark.Response; import spark.Route; diff --git a/src/de/deadlocker8/budgetmasterserver/server/category/CategoryUpdate.java b/src/de/deadlocker8/budgetmasterserver/server/category/CategoryUpdate.java index 315199436..a8f4d65dd 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/category/CategoryUpdate.java +++ b/src/de/deadlocker8/budgetmasterserver/server/category/CategoryUpdate.java @@ -2,7 +2,7 @@ package de.deadlocker8.budgetmasterserver.server.category; import static spark.Spark.halt; -import de.deadlocker8.budgetmasterserver.main.DatabaseHandler; +import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler; import javafx.scene.paint.Color; import spark.Request; import spark.Response; diff --git a/src/de/deadlocker8/budgetmasterserver/server/categorybudget/CategoryBudgetGet.java b/src/de/deadlocker8/budgetmasterserver/server/categorybudget/CategoryBudgetGet.java index 367526afd..26504559b 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/categorybudget/CategoryBudgetGet.java +++ b/src/de/deadlocker8/budgetmasterserver/server/categorybudget/CategoryBudgetGet.java @@ -12,7 +12,7 @@ import com.google.gson.Gson; import de.deadlocker8.budgetmaster.logic.Category; import de.deadlocker8.budgetmaster.logic.CategoryBudget; import de.deadlocker8.budgetmaster.logic.Payment; -import de.deadlocker8.budgetmasterserver.main.DatabaseHandler; +import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler; import spark.Request; import spark.Response; import spark.Route; diff --git a/src/de/deadlocker8/budgetmasterserver/server/charts/CategoryInOutSumForMonth.java b/src/de/deadlocker8/budgetmasterserver/server/charts/CategoryInOutSumForMonth.java index b1b2c6159..067567b4a 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/charts/CategoryInOutSumForMonth.java +++ b/src/de/deadlocker8/budgetmasterserver/server/charts/CategoryInOutSumForMonth.java @@ -9,7 +9,7 @@ import com.google.gson.Gson; import de.deadlocker8.budgetmaster.logic.Category; import de.deadlocker8.budgetmaster.logic.CategoryInOutSum; import de.deadlocker8.budgetmaster.logic.Payment; -import de.deadlocker8.budgetmasterserver.main.DatabaseHandler; +import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler; import spark.Request; import spark.Response; import spark.Route; diff --git a/src/de/deadlocker8/budgetmasterserver/server/charts/MonthInOutSum.java b/src/de/deadlocker8/budgetmasterserver/server/charts/MonthInOutSum.java index cf770b2b9..452e9acdf 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/charts/MonthInOutSum.java +++ b/src/de/deadlocker8/budgetmasterserver/server/charts/MonthInOutSum.java @@ -11,7 +11,7 @@ import com.google.gson.Gson; import de.deadlocker8.budgetmaster.logic.Category; import de.deadlocker8.budgetmaster.logic.CategoryInOutSum; import de.deadlocker8.budgetmaster.logic.Payment; -import de.deadlocker8.budgetmasterserver.main.DatabaseHandler; +import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler; import spark.Request; import spark.Response; import spark.Route; diff --git a/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseDelete.java b/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseDelete.java index 7fb2e8496..373a788ad 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseDelete.java +++ b/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseDelete.java @@ -2,8 +2,8 @@ package de.deadlocker8.budgetmasterserver.server.database; import static spark.Spark.halt; -import de.deadlocker8.budgetmasterserver.main.DatabaseHandler; -import de.deadlocker8.budgetmasterserver.main.Settings; +import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler; +import de.deadlocker8.budgetmasterserver.logic.Settings; import spark.Request; import spark.Response; import spark.Route; diff --git a/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseExport.java b/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseExport.java index 7c5c2ad8a..5205de6f6 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseExport.java +++ b/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseExport.java @@ -4,8 +4,8 @@ import static spark.Spark.halt; import com.google.gson.Gson; -import de.deadlocker8.budgetmasterserver.main.DatabaseExporter; -import de.deadlocker8.budgetmasterserver.main.Settings; +import de.deadlocker8.budgetmasterserver.logic.DatabaseExporter; +import de.deadlocker8.budgetmasterserver.logic.Settings; import logger.Logger; import spark.Request; import spark.Response; diff --git a/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseImport.java b/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseImport.java index 20907d3c3..082e938ae 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseImport.java +++ b/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseImport.java @@ -4,9 +4,9 @@ import static spark.Spark.halt; import com.google.gson.Gson; -import de.deadlocker8.budgetmasterserver.main.Database; -import de.deadlocker8.budgetmasterserver.main.DatabaseHandler; -import de.deadlocker8.budgetmasterserver.main.DatabaseImporter; +import de.deadlocker8.budgetmasterserver.logic.Database; +import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler; +import de.deadlocker8.budgetmasterserver.logic.DatabaseImporter; import logger.Logger; import spark.Request; import spark.Response; diff --git a/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentAdd.java b/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentAdd.java index 7a6bd99a6..9d016915d 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentAdd.java +++ b/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentAdd.java @@ -2,7 +2,7 @@ package de.deadlocker8.budgetmasterserver.server.payment.normal; import static spark.Spark.halt; -import de.deadlocker8.budgetmasterserver.main.DatabaseHandler; +import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler; import spark.Request; import spark.Response; import spark.Route; diff --git a/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentDelete.java b/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentDelete.java index 0933a3ba5..f5ff92858 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentDelete.java +++ b/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentDelete.java @@ -2,7 +2,7 @@ package de.deadlocker8.budgetmasterserver.server.payment.normal; import static spark.Spark.halt; -import de.deadlocker8.budgetmasterserver.main.DatabaseHandler; +import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler; import spark.Request; import spark.Response; import spark.Route; diff --git a/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentGet.java b/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentGet.java index 967cbae9f..b13dba89e 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentGet.java +++ b/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentGet.java @@ -9,7 +9,7 @@ import org.joda.time.DateTime; import com.google.gson.Gson; import de.deadlocker8.budgetmaster.logic.NormalPayment; -import de.deadlocker8.budgetmasterserver.main.DatabaseHandler; +import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler; import de.deadlocker8.budgetmasterserver.server.updater.RepeatingPaymentUpdater; import spark.Request; import spark.Response; diff --git a/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentUpdate.java b/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentUpdate.java index 6eb56285f..3c58aa12c 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentUpdate.java +++ b/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentUpdate.java @@ -2,7 +2,7 @@ package de.deadlocker8.budgetmasterserver.server.payment.normal; import static spark.Spark.halt; -import de.deadlocker8.budgetmasterserver.main.DatabaseHandler; +import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler; import spark.Request; import spark.Response; import spark.Route; diff --git a/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentAdd.java b/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentAdd.java index e55598dcf..4d622ffb1 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentAdd.java +++ b/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentAdd.java @@ -2,7 +2,7 @@ package de.deadlocker8.budgetmasterserver.server.payment.repeating; import static spark.Spark.halt; -import de.deadlocker8.budgetmasterserver.main.DatabaseHandler; +import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler; import spark.Request; import spark.Response; import spark.Route; diff --git a/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentDelete.java b/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentDelete.java index b2b480c5d..a88de42bf 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentDelete.java +++ b/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentDelete.java @@ -2,7 +2,7 @@ package de.deadlocker8.budgetmasterserver.server.payment.repeating; import static spark.Spark.halt; -import de.deadlocker8.budgetmasterserver.main.DatabaseHandler; +import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler; import spark.Request; import spark.Response; import spark.Route; diff --git a/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentGet.java b/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentGet.java index fc6e13d84..0a8fd5af5 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentGet.java +++ b/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentGet.java @@ -5,7 +5,7 @@ import static spark.Spark.halt; import com.google.gson.Gson; import de.deadlocker8.budgetmaster.logic.RepeatingPayment; -import de.deadlocker8.budgetmasterserver.main.DatabaseHandler; +import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler; import spark.Request; import spark.Response; import spark.Route; diff --git a/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentGetAll.java b/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentGetAll.java index 3c053d114..573a3c011 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentGetAll.java +++ b/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentGetAll.java @@ -9,7 +9,7 @@ import org.joda.time.DateTime; import com.google.gson.Gson; import de.deadlocker8.budgetmaster.logic.RepeatingPaymentEntry; -import de.deadlocker8.budgetmasterserver.main.DatabaseHandler; +import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler; import de.deadlocker8.budgetmasterserver.server.updater.RepeatingPaymentUpdater; import spark.Request; import spark.Response; diff --git a/src/de/deadlocker8/budgetmasterserver/server/rest/RestGet.java b/src/de/deadlocker8/budgetmasterserver/server/rest/RestGet.java index 0962749b5..2dd749311 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/rest/RestGet.java +++ b/src/de/deadlocker8/budgetmasterserver/server/rest/RestGet.java @@ -4,7 +4,7 @@ import static spark.Spark.halt; import com.google.gson.Gson; -import de.deadlocker8.budgetmasterserver.main.DatabaseHandler; +import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler; import spark.Request; import spark.Response; import spark.Route; diff --git a/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java b/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java index 0b7246a91..652994386 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java +++ b/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java @@ -8,7 +8,7 @@ import org.joda.time.Months; import de.deadlocker8.budgetmaster.logic.LatestRepeatingPayment; import de.deadlocker8.budgetmaster.logic.RepeatingPayment; -import de.deadlocker8.budgetmasterserver.main.DatabaseHandler; +import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler; import logger.Logger; public class RepeatingPaymentUpdater -- GitLab