From 8f4cc4bea6de415f6d46784081b351f820981d77 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 22 May 2021 20:55:09 +0200
Subject: [PATCH] #598 - moved Converter to parent package
---
.../deadlocker8/budgetmaster/database/Converter.java | 6 ++++++
.../budgetmaster/database/DatabaseParser_v5.java | 11 -----------
.../database/model/v5/BackupDatabase_v5.java | 1 +
.../model/v5/converter/AccountConverter_v5.java | 1 +
.../model/v5/converter/CategoryConverter_v5.java | 1 +
.../model/v5/converter/ChartConverter_v5.java | 1 +
.../database/model/v5/converter/Converter.java | 6 ------
.../model/v5/converter/ImageConverter_v5.java | 1 +
.../v5/converter/RepeatingEndOptionConverter_v5.java | 1 +
.../v5/converter/RepeatingModifierConverter_v5.java | 1 +
.../v5/converter/RepeatingOptionConverter_v5.java | 1 +
.../model/v5/converter/TemplateConverter_v5.java | 1 +
.../model/v5/converter/TransactionConverter_v5.java | 1 +
13 files changed, 16 insertions(+), 17 deletions(-)
create mode 100644 src/main/java/de/deadlocker8/budgetmaster/database/Converter.java
delete mode 100644 src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/Converter.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/Converter.java b/src/main/java/de/deadlocker8/budgetmaster/database/Converter.java
new file mode 100644
index 000000000..2674807cc
--- /dev/null
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/Converter.java
@@ -0,0 +1,6 @@
+package de.deadlocker8.budgetmaster.database;
+
+public interface Converter<T, S>
+{
+ T convert(S backupItem);
+}
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v5.java
index 7e2ba2b50..e796b16f9 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v5.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v5.java
@@ -1,23 +1,12 @@
package de.deadlocker8.budgetmaster.database;
import com.google.gson.*;
-import de.deadlocker8.budgetmaster.accounts.AccountState;
-import de.deadlocker8.budgetmaster.accounts.AccountType;
import de.deadlocker8.budgetmaster.database.model.v5.*;
-import de.deadlocker8.budgetmaster.repeating.RepeatingOption;
-import de.deadlocker8.budgetmaster.repeating.endoption.*;
-import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifier;
-import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifierType;
-import de.deadlocker8.budgetmaster.tags.Tag;
-import de.thecodelabs.utils.util.Localization;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
-import java.util.Optional;
public class DatabaseParser_v5
{
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 052bb4a37..fb021d62b 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,6 +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.Database;
import de.deadlocker8.budgetmaster.database.model.v5.converter.*;
import de.deadlocker8.budgetmaster.images.Image;
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 50318cff3..5895f4bc9 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,6 +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.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 b11cc2571..ebb5cf048 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,6 +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.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 cc8954cee..4e616eedc 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,6 +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.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/Converter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/Converter.java
deleted file mode 100644
index 55b387749..000000000
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/Converter.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package de.deadlocker8.budgetmaster.database.model.v5.converter;
-
-public interface Converter<T, S>
-{
- T convert(S backupItem);
-}
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 1a2cb60fb..8cefe6a24 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,5 +1,6 @@
package de.deadlocker8.budgetmaster.database.model.v5.converter;
+import de.deadlocker8.budgetmaster.database.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 013502f73..69302b449 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,5 +1,6 @@
package de.deadlocker8.budgetmaster.database.model.v5.converter;
+import de.deadlocker8.budgetmaster.database.Converter;
import de.deadlocker8.budgetmaster.database.model.v5.BackupRepeatingEndOption_v5;
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 0d20e28af..a02b433cc 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,5 +1,6 @@
package de.deadlocker8.budgetmaster.database.model.v5.converter;
+import de.deadlocker8.budgetmaster.database.Converter;
import de.deadlocker8.budgetmaster.database.model.v5.BackupRepeatingModifier_v5;
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 9a494e3d4..1e39e775b 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,5 +1,6 @@
package de.deadlocker8.budgetmaster.database.model.v5.converter;
+import de.deadlocker8.budgetmaster.database.Converter;
import de.deadlocker8.budgetmaster.database.model.v5.BackupRepeatingOption_v5;
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 df8179fee..e08d59575 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,5 +1,6 @@
package de.deadlocker8.budgetmaster.database.model.v5.converter;
+import de.deadlocker8.budgetmaster.database.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 5949722a4..6de4af3cb 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,5 +1,6 @@
package de.deadlocker8.budgetmaster.database.model.v5.converter;
+import de.deadlocker8.budgetmaster.database.Converter;
import de.deadlocker8.budgetmaster.database.model.v5.BackupTransaction_v5;
import de.deadlocker8.budgetmaster.transactions.Transaction;
import org.joda.time.DateTime;
--
GitLab