diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/DatabaseService.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java similarity index 98% rename from src/main/java/de/deadlocker8/budgetmaster/services/DatabaseService.java rename to src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java index 602d18ee7b014ab0fcf2cee75cfadbfcbbe3207d..a9d11fcb1d03dedab84be6858356b58a5f61809c 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/services/DatabaseService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java @@ -1,4 +1,4 @@ -package de.deadlocker8.budgetmaster.services; +package de.deadlocker8.budgetmaster.database; import com.google.gson.*; import de.deadlocker8.budgetmaster.accounts.AccountService; diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/FilterController.java b/src/main/java/de/deadlocker8/budgetmaster/filter/FilterController.java similarity index 90% rename from src/main/java/de/deadlocker8/budgetmaster/controller/FilterController.java rename to src/main/java/de/deadlocker8/budgetmaster/filter/FilterController.java index 2a9a9a12564a8896bfdb501375f16fb89bdc2ae3..8c76044341e31740f51c57023af196805bd0a989 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/controller/FilterController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/filter/FilterController.java @@ -1,8 +1,7 @@ -package de.deadlocker8.budgetmaster.controller; +package de.deadlocker8.budgetmaster.filter; -import de.deadlocker8.budgetmaster.filter.FilterConfiguration; +import de.deadlocker8.budgetmaster.controller.BaseController; import de.deadlocker8.budgetmaster.categories.CategoryService; -import de.deadlocker8.budgetmaster.services.FilterHelpersService; import de.deadlocker8.budgetmaster.services.HelpersService; import de.deadlocker8.budgetmaster.transactions.TransactionService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/FilterHelpersService.java b/src/main/java/de/deadlocker8/budgetmaster/filter/FilterHelpersService.java similarity index 98% rename from src/main/java/de/deadlocker8/budgetmaster/services/FilterHelpersService.java rename to src/main/java/de/deadlocker8/budgetmaster/filter/FilterHelpersService.java index 90ff0776b1a52aaa72de0de17c188aaaea729f1a..7f1069c78b59ad05076fc55269d3eef978bfdf88 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/services/FilterHelpersService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/filter/FilterHelpersService.java @@ -1,4 +1,4 @@ -package de.deadlocker8.budgetmaster.services; +package de.deadlocker8.budgetmaster.filter; import de.deadlocker8.budgetmaster.categories.Category; import de.deadlocker8.budgetmaster.categories.CategoryService; diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java b/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java index efe0f220af205b6a80cc39fbc6fbc07d9bc335d3..8d6fc848100314999bb566540880fedbdb52595d 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java @@ -3,6 +3,7 @@ package de.deadlocker8.budgetmaster.reports; import com.itextpdf.text.DocumentException; import de.deadlocker8.budgetmaster.categories.CategoryService; import de.deadlocker8.budgetmaster.controller.BaseController; +import de.deadlocker8.budgetmaster.filter.FilterHelpersService; import de.deadlocker8.budgetmaster.settings.SettingsService; import de.deadlocker8.budgetmaster.transactions.Transaction; import de.deadlocker8.budgetmaster.accounts.Account; diff --git a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java index 37b54eeb999776710a71f2867c8dadc62cc45c9f..17083fab92344775d9e402d6b62e655110d0ab1a 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java @@ -8,10 +8,9 @@ import de.deadlocker8.budgetmaster.categories.CategoryService; import de.deadlocker8.budgetmaster.controller.BaseController; import de.deadlocker8.budgetmaster.database.Database; import de.deadlocker8.budgetmaster.database.DatabaseParser; +import de.deadlocker8.budgetmaster.database.DatabaseService; import de.deadlocker8.budgetmaster.database.accountmatches.AccountMatchList; import de.deadlocker8.budgetmaster.categories.CategoryType; -import de.deadlocker8.budgetmaster.settings.Settings; -import de.deadlocker8.budgetmaster.settings.SettingsRepository; import de.deadlocker8.budgetmaster.services.*; import de.deadlocker8.budgetmaster.update.BudgetMasterUpdateService; import de.deadlocker8.budgetmaster.utils.LanguageType; diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java index 8494dc9add271262df74164c07b99f9ccd9d638f..5510bbee6c4848bf9b1d5c42ec4a8a4250fa7523 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java @@ -13,7 +13,7 @@ import de.deadlocker8.budgetmaster.repeating.endoption.*; import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifier; import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifierType; import de.deadlocker8.budgetmaster.accounts.AccountService; -import de.deadlocker8.budgetmaster.services.FilterHelpersService; +import de.deadlocker8.budgetmaster.filter.FilterHelpersService; import de.deadlocker8.budgetmaster.services.HelpersService; import de.deadlocker8.budgetmaster.tags.TagRepository; import de.deadlocker8.budgetmaster.utils.ResourceNotFoundException;