diff --git a/src/de/deadlocker8/budgetmaster/logic/ServerConnection.java b/src/de/deadlocker8/budgetmaster/logic/ServerConnection.java index 45d03440d3b12775e2c67388d29416235b2318cb..8443d3fe84ee30432e7aa18f0aef4b840e1e7cd6 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 e50e6b35045c06865a81d446037a2a0dad8e5fac..c9af40da56e4e6360256674d42ee8d139343969e 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 4e7b83ceadac1175fddd4a734c5008a4c550d4d2..888ab9545116e080a8d428638a00977aa0605ebd 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 c96a8494d388876dc1e6ce10551dbf9e44ca23c4..76e98b0784ff7d04fcf25ccf4e5e9b44328b4803 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 e4d927792ff3c9377a634e99735ca18f82da0cf6..05740dae2752cab71a041f93dcfd08911e4d5088 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 90fc9452b4e7008e66cb493e3da72b35f35a4654..398629d7b146d0aee5a4b3d3bbac5451b2b39f05 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 c89d0ba1e058dd8357f915d9b8667b2599eb710f..eeda5e9593b00b74b71a76672598123af4467320 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 2d605d76694cc2ba49d568876b4d56f2304fb656..328d6ee8226b84f57f3d758d0b2c929262960b51 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 9b719f965fb2daf3d6d4fe759740d4f0639e5b9d..7880c9c2dd7d0e1c3e61989d371114f79458b713 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 1dbc26be8a1cacc8e1ecedba6a2216ec604b3d8b..121ba938b3b45f8ab641e1b267e2b896a5777491 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 c7880cbdd343c704ed5749b8b07b66c5672f90e2..265ab169df0cec23bb18cc16c6ebd9e87a9fa639 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 644d5367e32511d793340a4010acfa94239ea144..38a523850192a9d3ca547d8d454c82aa69c1ba55 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 b231f1d78f4e46819869a44ca52fbc7a2efe6b88..a3d8467008e914df260865c3283be6d831e09e01 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 506e12159c182251820fe1bd6d1b40629873f12d..b2389dd932e79e399f09272e5140ae9d2b87e3e3 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 c20739e619a6090aacd41e94d79ef9178600cbca..71e5dcac445853179abdf3aa35ed2cff6c1ae875 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 3a0088e2a9205c1d5b786d0b6e9782b3a3d1edca..5e4ad5a6958cf02678651d6e06a0e25e08311980 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 55953ad73dd19db8f21cc266fc44908d3b4d6041..bf4eb9c41614aff11d4b2173893822656b86a3e3 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 75a921947320ca5ff99c070aeabaf8441a89cd08..8bb67cab65a1a3fb7346ef9cc3e9139ef099f18e 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 315199436e410d4d7c8bfd114fa030ae6d033e33..a8f4d65dddc92caae6953173d6b0c6a367799a0f 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 367526afdbfb61f16c73bed92fd7f9fa5b49baa1..26504559b0cd744843a9c32b574bb039cdfe1c9d 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 b1b2c6159f839b6e94c360eb2157a52ca22fb660..067567b4a9658742dc33d19a70c0840a5d0b9d58 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 cf770b2b9100989dc463e5f5e6a11a82cc2205e2..452e9acdffb3c820c9dff64d7600796659edb1ce 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 7fb2e8496cc75220de6f4859b3b7f119f403821e..373a788ade424ea1cbb62c35632a58a82efbcc6a 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 7c5c2ad8a7758b1af56a40b34c3cb3604626e0e9..5205de6f69fdc68ff3988e23ab85e2502fe18422 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 20907d3c3d79b8ec76cc198bbbc7bf7c49480ab5..082e938ae41446f8814edddfb8c825f55f0af685 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 7a6bd99a68ba75c9e2a2f1f9d63ee63724359c7d..9d016915dc8eeb91a1575b480fc3549a7bd5b66b 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 0933a3ba5a32f45ea6f1edc0cbaf577efe2f9083..f5ff9285872dff0339bd02a6c15c787d0cb8f4d6 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 967cbae9fd99ba3e79197632bbb03a1fb4fe052d..b13dba89e08a7832ea8c0b152b2a5042899ea260 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 6eb56285f87f075493cb671996ad1b5f9a54de4c..3c58aa12cfe1c8a16a41b0b32ce2ccbe8599c5fa 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 e55598dcfccac3b03bde656273124e49fca3fbf1..4d622ffb1179f671b11cc1534602838dcc77f029 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 b2b480c5d81f263a27b4340cf4f1616449d72df0..a88de42bffad9293f85214a4c0975ecda7fbb208 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 fc6e13d84f23a612fbf0cc3c05fd9d66add7c6b4..0a8fd5af5c87a92b58205a771eeebb2e6d13ca07 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 3c053d1142b95a5e2dadadafaafac1f817100e2c..573a3c0114fc94c3a366d5d1ea3a0f4435e8fbc9 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 0962749b594c2111f93c633685446494585704b7..2dd749311af34963b22d1d4a4149028a9ea40994 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 0b7246a911ffcb06200b782759ce1c01eb3482d9..65299438637232fdaf169cf2d3fe9679016fa564 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