From 852dc75ea62026028e337cfb67d407209d6f223e Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 23 May 2021 15:58:27 +0200
Subject: [PATCH] #598 - moved converters to top level package
---
.../database/model/{v6 => }/converter/AccountConverter.java | 2 +-
.../database/model/{v6 => }/converter/CategoryConverter.java | 2 +-
.../database/model/{v6 => }/converter/ChartConverter.java | 2 +-
.../database/model/{v6 => }/converter/ImageConverter.java | 2 +-
.../model/{v6 => }/converter/RepeatingEndOptionConverter.java | 2 +-
.../model/{v6 => }/converter/RepeatingModifierConverter.java | 2 +-
.../model/{v6 => }/converter/RepeatingOptionConverter.java | 2 +-
.../database/model/{v6 => }/converter/TagConverter.java | 2 +-
.../database/model/{v6 => }/converter/TemplateConverter.java | 2 +-
.../database/model/{v6 => }/converter/TransactionConverter.java | 2 +-
.../budgetmaster/database/model/v6/BackupDatabase_v6.java | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
rename src/main/java/de/deadlocker8/budgetmaster/database/model/{v6 => }/converter/AccountConverter.java (96%)
rename src/main/java/de/deadlocker8/budgetmaster/database/model/{v6 => }/converter/CategoryConverter.java (94%)
rename src/main/java/de/deadlocker8/budgetmaster/database/model/{v6 => }/converter/ChartConverter.java (94%)
rename src/main/java/de/deadlocker8/budgetmaster/database/model/{v6 => }/converter/ImageConverter.java (93%)
rename src/main/java/de/deadlocker8/budgetmaster/database/model/{v6 => }/converter/RepeatingEndOptionConverter.java (96%)
rename src/main/java/de/deadlocker8/budgetmaster/database/model/{v6 => }/converter/RepeatingModifierConverter.java (94%)
rename src/main/java/de/deadlocker8/budgetmaster/database/model/{v6 => }/converter/RepeatingOptionConverter.java (96%)
rename src/main/java/de/deadlocker8/budgetmaster/database/model/{v6 => }/converter/TagConverter.java (89%)
rename src/main/java/de/deadlocker8/budgetmaster/database/model/{v6 => }/converter/TemplateConverter.java (98%)
rename src/main/java/de/deadlocker8/budgetmaster/database/model/{v6 => }/converter/TransactionConverter.java (98%)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/AccountConverter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/AccountConverter.java
similarity index 96%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/AccountConverter.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/converter/AccountConverter.java
index 0310f11c6..0c1d1c851 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/AccountConverter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/AccountConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v6.converter;
+package de.deadlocker8.budgetmaster.database.model.converter;
import de.deadlocker8.budgetmaster.accounts.Account;
import de.deadlocker8.budgetmaster.database.model.Converter;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/CategoryConverter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/CategoryConverter.java
similarity index 94%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/CategoryConverter.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/converter/CategoryConverter.java
index d7050d215..51c40bc03 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/CategoryConverter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/CategoryConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v6.converter;
+package de.deadlocker8.budgetmaster.database.model.converter;
import de.deadlocker8.budgetmaster.categories.Category;
import de.deadlocker8.budgetmaster.database.model.Converter;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/ChartConverter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/ChartConverter.java
similarity index 94%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/ChartConverter.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/converter/ChartConverter.java
index ba1dbcfcc..77525beb6 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/ChartConverter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/ChartConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v6.converter;
+package de.deadlocker8.budgetmaster.database.model.converter;
import de.deadlocker8.budgetmaster.charts.Chart;
import de.deadlocker8.budgetmaster.database.model.Converter;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/ImageConverter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/ImageConverter.java
similarity index 93%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/ImageConverter.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/converter/ImageConverter.java
index 78d5ba28f..22ce5df09 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/ImageConverter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/ImageConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v6.converter;
+package de.deadlocker8.budgetmaster.database.model.converter;
import de.deadlocker8.budgetmaster.database.model.Converter;
import de.deadlocker8.budgetmaster.database.model.v5.BackupImage_v5;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingEndOptionConverter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingEndOptionConverter.java
similarity index 96%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingEndOptionConverter.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingEndOptionConverter.java
index 6a816cdb9..d4190ccfd 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingEndOptionConverter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingEndOptionConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v6.converter;
+package de.deadlocker8.budgetmaster.database.model.converter;
import de.deadlocker8.budgetmaster.database.model.Converter;
import de.deadlocker8.budgetmaster.database.model.v4.BackupRepeatingEndOption_v4;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingModifierConverter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingModifierConverter.java
similarity index 94%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingModifierConverter.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingModifierConverter.java
index 46cc40856..189a67ea7 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingModifierConverter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingModifierConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v6.converter;
+package de.deadlocker8.budgetmaster.database.model.converter;
import de.deadlocker8.budgetmaster.database.model.Converter;
import de.deadlocker8.budgetmaster.database.model.v4.BackupRepeatingModifier_v4;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingOptionConverter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingOptionConverter.java
similarity index 96%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingOptionConverter.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingOptionConverter.java
index 9a88a97e7..06ab54dea 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingOptionConverter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingOptionConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v6.converter;
+package de.deadlocker8.budgetmaster.database.model.converter;
import de.deadlocker8.budgetmaster.database.model.Converter;
import de.deadlocker8.budgetmaster.database.model.v4.BackupRepeatingOption_v4;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TagConverter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TagConverter.java
similarity index 89%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TagConverter.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TagConverter.java
index 4f58d16ac..caf5a0599 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TagConverter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TagConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v6.converter;
+package de.deadlocker8.budgetmaster.database.model.converter;
import de.deadlocker8.budgetmaster.database.model.Converter;
import de.deadlocker8.budgetmaster.database.model.v4.BackupTag_v4;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TemplateConverter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TemplateConverter.java
similarity index 98%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TemplateConverter.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TemplateConverter.java
index 2ffc20ebb..f1374ae3d 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TemplateConverter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TemplateConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v6.converter;
+package de.deadlocker8.budgetmaster.database.model.converter;
import de.deadlocker8.budgetmaster.accounts.Account;
import de.deadlocker8.budgetmaster.categories.Category;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TransactionConverter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TransactionConverter.java
similarity index 98%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TransactionConverter.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TransactionConverter.java
index dcd06f539..d923ce5fe 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TransactionConverter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TransactionConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v6.converter;
+package de.deadlocker8.budgetmaster.database.model.converter;
import de.deadlocker8.budgetmaster.accounts.Account;
import de.deadlocker8.budgetmaster.categories.Category;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupDatabase_v6.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupDatabase_v6.java
index 07ecdbeaa..30dcf3b65 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupDatabase_v6.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupDatabase_v6.java
@@ -9,7 +9,7 @@ import de.deadlocker8.budgetmaster.database.model.BackupDatabase;
import de.deadlocker8.budgetmaster.database.model.v5.BackupCategory_v5;
import de.deadlocker8.budgetmaster.database.model.v5.BackupChart_v5;
import de.deadlocker8.budgetmaster.database.model.v5.BackupImage_v5;
-import de.deadlocker8.budgetmaster.database.model.v6.converter.*;
+import de.deadlocker8.budgetmaster.database.model.converter.*;
import de.deadlocker8.budgetmaster.images.Image;
import de.deadlocker8.budgetmaster.templates.Template;
import de.deadlocker8.budgetmaster.transactions.Transaction;
--
GitLab