From 97ec60cfaa97617843372b5682e9f240381c4595 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Sat, 22 May 2021 22:44:43 +0200 Subject: [PATCH] #598 - moved Converter --- .../budgetmaster/database/{ => model}/Converter.java | 2 +- .../budgetmaster/database/model/v5/BackupDatabase_v5.java | 2 +- .../database/model/v5/converter/AccountConverter_v5.java | 2 +- .../database/model/v5/converter/CategoryConverter_v5.java | 2 +- .../database/model/v5/converter/ChartConverter_v5.java | 2 +- .../database/model/v5/converter/ImageConverter_v5.java | 2 +- .../model/v5/converter/RepeatingEndOptionConverter_v5.java | 2 +- .../model/v5/converter/RepeatingModifierConverter_v5.java | 2 +- .../model/v5/converter/RepeatingOptionConverter_v5.java | 2 +- .../database/model/v5/converter/TemplateConverter_v5.java | 2 +- .../database/model/v5/converter/TransactionConverter_v5.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) rename src/main/java/de/deadlocker8/budgetmaster/database/{ => model}/Converter.java (55%) diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/Converter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/Converter.java similarity index 55% rename from src/main/java/de/deadlocker8/budgetmaster/database/Converter.java rename to src/main/java/de/deadlocker8/budgetmaster/database/model/Converter.java index 2674807cc..7f3f95f5a 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/Converter.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/Converter.java @@ -1,4 +1,4 @@ -package de.deadlocker8.budgetmaster.database; +package de.deadlocker8.budgetmaster.database.model; public interface Converter<T, S> { diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupDatabase_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupDatabase_v5.java index 5190cf1c7..7990eecc2 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupDatabase_v5.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupDatabase_v5.java @@ -3,7 +3,7 @@ package de.deadlocker8.budgetmaster.database.model.v5; import de.deadlocker8.budgetmaster.accounts.Account; import de.deadlocker8.budgetmaster.categories.Category; import de.deadlocker8.budgetmaster.charts.Chart; -import de.deadlocker8.budgetmaster.database.Converter; +import de.deadlocker8.budgetmaster.database.model.Converter; import de.deadlocker8.budgetmaster.database.Database; import de.deadlocker8.budgetmaster.database.model.BackupDatabase; import de.deadlocker8.budgetmaster.database.model.v5.converter.*; diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/AccountConverter_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/AccountConverter_v5.java index 5895f4bc9..c6d186fb1 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/AccountConverter_v5.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/AccountConverter_v5.java @@ -1,7 +1,7 @@ package de.deadlocker8.budgetmaster.database.model.v5.converter; import de.deadlocker8.budgetmaster.accounts.Account; -import de.deadlocker8.budgetmaster.database.Converter; +import de.deadlocker8.budgetmaster.database.model.Converter; import de.deadlocker8.budgetmaster.database.model.v5.BackupAccount_v5; public class AccountConverter_v5 implements Converter<Account, BackupAccount_v5> diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/CategoryConverter_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/CategoryConverter_v5.java index ebb5cf048..9bafb1a99 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/CategoryConverter_v5.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/CategoryConverter_v5.java @@ -1,7 +1,7 @@ package de.deadlocker8.budgetmaster.database.model.v5.converter; import de.deadlocker8.budgetmaster.categories.Category; -import de.deadlocker8.budgetmaster.database.Converter; +import de.deadlocker8.budgetmaster.database.model.Converter; import de.deadlocker8.budgetmaster.database.model.v5.BackupCategory_v5; public class CategoryConverter_v5 implements Converter<Category, BackupCategory_v5> diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/ChartConverter_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/ChartConverter_v5.java index 4e616eedc..ace95af05 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/ChartConverter_v5.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/ChartConverter_v5.java @@ -1,7 +1,7 @@ package de.deadlocker8.budgetmaster.database.model.v5.converter; import de.deadlocker8.budgetmaster.charts.Chart; -import de.deadlocker8.budgetmaster.database.Converter; +import de.deadlocker8.budgetmaster.database.model.Converter; import de.deadlocker8.budgetmaster.database.model.v5.BackupChart_v5; public class ChartConverter_v5 implements Converter<Chart, BackupChart_v5> diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/ImageConverter_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/ImageConverter_v5.java index 8cefe6a24..3c12b486c 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/ImageConverter_v5.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/ImageConverter_v5.java @@ -1,6 +1,6 @@ package de.deadlocker8.budgetmaster.database.model.v5.converter; -import de.deadlocker8.budgetmaster.database.Converter; +import de.deadlocker8.budgetmaster.database.model.Converter; import de.deadlocker8.budgetmaster.database.model.v5.BackupImage_v5; import de.deadlocker8.budgetmaster.images.Image; diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingEndOptionConverter_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingEndOptionConverter_v5.java index 6056b212d..d9aa740a4 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingEndOptionConverter_v5.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingEndOptionConverter_v5.java @@ -1,6 +1,6 @@ package de.deadlocker8.budgetmaster.database.model.v5.converter; -import de.deadlocker8.budgetmaster.database.Converter; +import de.deadlocker8.budgetmaster.database.model.Converter; import de.deadlocker8.budgetmaster.database.model.v4.BackupRepeatingEndOption_v4; import de.deadlocker8.budgetmaster.repeating.endoption.*; import de.thecodelabs.utils.util.Localization; diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingModifierConverter_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingModifierConverter_v5.java index e7e33f490..df92e20d6 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingModifierConverter_v5.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingModifierConverter_v5.java @@ -1,6 +1,6 @@ package de.deadlocker8.budgetmaster.database.model.v5.converter; -import de.deadlocker8.budgetmaster.database.Converter; +import de.deadlocker8.budgetmaster.database.model.Converter; import de.deadlocker8.budgetmaster.database.model.v4.BackupRepeatingModifier_v4; import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifier; import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifierType; diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingOptionConverter_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingOptionConverter_v5.java index 0afbeac72..54574286e 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingOptionConverter_v5.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingOptionConverter_v5.java @@ -1,6 +1,6 @@ package de.deadlocker8.budgetmaster.database.model.v5.converter; -import de.deadlocker8.budgetmaster.database.Converter; +import de.deadlocker8.budgetmaster.database.model.Converter; import de.deadlocker8.budgetmaster.database.model.v4.BackupRepeatingOption_v4; import de.deadlocker8.budgetmaster.repeating.RepeatingOption; import org.joda.time.DateTime; diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/TemplateConverter_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/TemplateConverter_v5.java index e08d59575..59cb66e76 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/TemplateConverter_v5.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/TemplateConverter_v5.java @@ -1,6 +1,6 @@ package de.deadlocker8.budgetmaster.database.model.v5.converter; -import de.deadlocker8.budgetmaster.database.Converter; +import de.deadlocker8.budgetmaster.database.model.Converter; import de.deadlocker8.budgetmaster.database.model.v5.BackupTemplate_v5; import de.deadlocker8.budgetmaster.templates.Template; diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/TransactionConverter_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/TransactionConverter_v5.java index 6de4af3cb..fc65eeea9 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/TransactionConverter_v5.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/TransactionConverter_v5.java @@ -1,6 +1,6 @@ package de.deadlocker8.budgetmaster.database.model.v5.converter; -import de.deadlocker8.budgetmaster.database.Converter; +import de.deadlocker8.budgetmaster.database.model.Converter; import de.deadlocker8.budgetmaster.database.model.v5.BackupTransaction_v5; import de.deadlocker8.budgetmaster.transactions.Transaction; import org.joda.time.DateTime; -- GitLab