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 09cbdd827fac380aaf4c460cfc12c4d221c5aac7..e0fccca42657d82b41ef3a868f7db016d7f6afdc 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
@@ -1,16 +1,9 @@
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.InternalDatabase;
import de.deadlocker8.budgetmaster.database.JSONIdentifier;
import de.deadlocker8.budgetmaster.database.model.BackupDatabase;
-import de.deadlocker8.budgetmaster.database.model.v5.converter.*;
import de.deadlocker8.budgetmaster.database.model.v6.BackupDatabase_v6;
-import de.deadlocker8.budgetmaster.images.Image;
-import de.deadlocker8.budgetmaster.templates.Template;
-import de.deadlocker8.budgetmaster.transactions.Transaction;
import java.util.List;
@@ -129,18 +122,4 @@ public class BackupDatabase_v5 implements BackupDatabase
return upgradedDatabase;
}
-
- public static BackupDatabase_v5 createFromInternalEntities(InternalDatabase database)
- {
- final BackupDatabase_v5 externalDatabase = new BackupDatabase_v5();
-
- externalDatabase.setCategories(externalDatabase.convertItemsToExternal(database.getCategories(), new CategoryConverter_v5()));
- externalDatabase.setAccounts(externalDatabase.convertItemsToExternal(database.getAccounts(), new AccountConverter_v5()));
- externalDatabase.setTransactions(externalDatabase.convertItemsToExternal(database.getTransactions(), new TransactionConverter_v5()));
- externalDatabase.setTemplates(externalDatabase.convertItemsToExternal(database.getTemplates(), new TemplateConverter_v5()));
- externalDatabase.setCharts(externalDatabase.convertItemsToExternal(database.getCharts(), new ChartConverter_v5()));
- externalDatabase.setImages(externalDatabase.convertItemsToExternal(database.getImages(), new ImageConverter_v5()));
-
- return externalDatabase;
- }
}
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
deleted file mode 100644
index dcd0f41aa3de438994635e267719d132a878b5f4..0000000000000000000000000000000000000000
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/AccountConverter_v5.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package de.deadlocker8.budgetmaster.database.model.v5.converter;
-
-import de.deadlocker8.budgetmaster.accounts.Account;
-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>
-{
- public Account convertToInternalForm(BackupAccount_v5 backupAccount)
- {
- if(backupAccount == null)
- {
- return null;
- }
-
- final Account account = new Account();
- account.setID(backupAccount.getID());
- account.setName(backupAccount.getName());
- account.setDefault(false);
- account.setSelected(false);
- account.setAccountState(backupAccount.getAccountState());
- account.setType(backupAccount.getType());
- account.setIcon(new ImageConverter_v5().convertToInternalForm(backupAccount.getIcon()));
- return account;
- }
-
- @Override
- public BackupAccount_v5 convertToExternalForm(Account internalAccount)
- {
- if(internalAccount == null)
- {
- return null;
- }
-
- final BackupAccount_v5 account = new BackupAccount_v5();
- account.setID(internalAccount.getID());
- account.setName(internalAccount.getName());
- account.setAccountState(internalAccount.getAccountState());
- account.setType(internalAccount.getType());
- account.setIcon(new ImageConverter_v5().convertToExternalForm(internalAccount.getIcon()));
- return account;
- }
-}
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
deleted file mode 100644
index 0c99b91ace4c0a4b5e111ccfd6baa7fcbd984c36..0000000000000000000000000000000000000000
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/CategoryConverter_v5.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package de.deadlocker8.budgetmaster.database.model.v5.converter;
-
-import de.deadlocker8.budgetmaster.categories.Category;
-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>
-{
- public Category convertToInternalForm(BackupCategory_v5 backupCategory)
- {
- if(backupCategory == null)
- {
- return null;
- }
-
- final Category category = new Category();
- category.setID(backupCategory.getID());
- category.setName(backupCategory.getName());
- category.setColor(backupCategory.getColor());
- category.setType(backupCategory.getType());
- category.setIcon(backupCategory.getIcon());
- return category;
- }
-
- @Override
- public BackupCategory_v5 convertToExternalForm(Category internalItem)
- {
- if(internalItem == null)
- {
- return null;
- }
-
- final BackupCategory_v5 category = new BackupCategory_v5();
- category.setID(internalItem.getID());
- category.setName(internalItem.getName());
- category.setColor(internalItem.getColor());
- category.setType(internalItem.getType());
- category.setIcon(internalItem.getIcon());
- return category;
- }
-}
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
deleted file mode 100644
index 72b253e639e1602ab25e3520832c62fd8bd32b08..0000000000000000000000000000000000000000
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/ChartConverter_v5.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package de.deadlocker8.budgetmaster.database.model.v5.converter;
-
-import de.deadlocker8.budgetmaster.charts.Chart;
-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>
-{
- public Chart convertToInternalForm(BackupChart_v5 backupChart)
- {
- if(backupChart == null)
- {
- return null;
- }
-
- final Chart chart = new Chart();
- chart.setID(backupChart.getID());
- chart.setName(backupChart.getName());
- chart.setType(backupChart.getType());
- chart.setVersion(backupChart.getVersion());
- chart.setScript(backupChart.getScript());
- return chart;
- }
-
- @Override
- public BackupChart_v5 convertToExternalForm(Chart internalItem)
- {
- if(internalItem == null)
- {
- return null;
- }
-
- final BackupChart_v5 chart = new BackupChart_v5();
- chart.setID(internalItem.getID());
- chart.setName(internalItem.getName());
- chart.setType(internalItem.getType());
- chart.setVersion(internalItem.getVersion());
- chart.setScript(internalItem.getScript());
- return chart;
- }
-}
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
deleted file mode 100644
index fcec9bd24a1028a0c092831ae57902adf93d3294..0000000000000000000000000000000000000000
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/ImageConverter_v5.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package de.deadlocker8.budgetmaster.database.model.v5.converter;
-
-import de.deadlocker8.budgetmaster.database.model.Converter;
-import de.deadlocker8.budgetmaster.database.model.v5.BackupImage_v5;
-import de.deadlocker8.budgetmaster.images.Image;
-
-public class ImageConverter_v5 implements Converter<Image, BackupImage_v5>
-{
- public Image convertToInternalForm(BackupImage_v5 backupImage)
- {
- if(backupImage == null)
- {
- return null;
- }
-
- final Image image = new Image();
- image.setID(backupImage.getID());
- image.setFileName(backupImage.getFileName());
- image.setFileExtension(backupImage.getFileExtension());
- image.setImage(backupImage.getImage());
- return image;
- }
-
- @Override
- public BackupImage_v5 convertToExternalForm(Image internalItem)
- {
- if(internalItem == null)
- {
- return null;
- }
-
- final BackupImage_v5 image = new BackupImage_v5();
- image.setID(internalItem.getID());
- image.setFileName(internalItem.getFileName());
- image.setFileExtension(internalItem.getFileExtension());
- image.setImage(internalItem.getImage());
- return image;
- }
-}
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
deleted file mode 100644
index 2e8f10059dded7a6e31b53b66b6adca22268acb5..0000000000000000000000000000000000000000
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/TemplateConverter_v5.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package de.deadlocker8.budgetmaster.database.model.v5.converter;
-
-import de.deadlocker8.budgetmaster.database.model.Converter;
-import de.deadlocker8.budgetmaster.database.model.v4.BackupTag_v4;
-import de.deadlocker8.budgetmaster.database.model.v5.BackupTemplate_v5;
-import de.deadlocker8.budgetmaster.tags.Tag;
-import de.deadlocker8.budgetmaster.templates.Template;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class TemplateConverter_v5 implements Converter<Template, BackupTemplate_v5>
-{
- public Template convertToInternalForm(BackupTemplate_v5 backupTemplate)
- {
- if(backupTemplate == null)
- {
- return null;
- }
-
- final Template template = new Template();
- template.setAmount(backupTemplate.getAmount());
- template.setName(backupTemplate.getName());
- template.setCategory(new CategoryConverter_v5().convertToInternalForm(backupTemplate.getCategory()));
- template.setDescription(backupTemplate.getDescription());
-
- if(backupTemplate.getExpenditure() == null)
- {
- template.setIsExpenditure(true);
- }
- else
- {
- template.setIsExpenditure(backupTemplate.getExpenditure());
- }
-
- template.setAccount(new AccountConverter_v5().convertToInternalForm(backupTemplate.getAccount()));
- template.setTransferAccount(new AccountConverter_v5().convertToInternalForm(backupTemplate.getTransferAccount()));
-
- List<Tag> convertedTags = new ArrayList<>();
- TagConverter_v5 tagConverter = new TagConverter_v5();
- for(BackupTag_v4 tag : backupTemplate.getTags())
- {
- convertedTags.add(tagConverter.convertToInternalForm(tag));
- }
- template.setTags(convertedTags);
-
- template.setTemplateName(backupTemplate.getTemplateName());
- template.setIcon(new ImageConverter_v5().convertToInternalForm(backupTemplate.getIcon()));
- return template;
- }
-
- @Override
- public BackupTemplate_v5 convertToExternalForm(Template internalItem)
- {
- if(internalItem == null)
- {
- return null;
- }
-
- final BackupTemplate_v5 template = new BackupTemplate_v5();
- template.setAmount(internalItem.getAmount());
- template.setName(internalItem.getName());
- template.setCategory(new CategoryConverter_v5().convertToExternalForm(internalItem.getCategory()));
- template.setDescription(internalItem.getDescription());
- template.setExpenditure(internalItem.getExpenditure());
- template.setAccount(new AccountConverter_v5().convertToExternalForm(internalItem.getAccount()));
- template.setTransferAccount(new AccountConverter_v5().convertToExternalForm(internalItem.getTransferAccount()));
-
- List<BackupTag_v4> convertedTags = new ArrayList<>();
- TagConverter_v5 tagConverter = new TagConverter_v5();
- for(Tag tag : internalItem.getTags())
- {
- convertedTags.add(tagConverter.convertToExternalForm(tag));
- }
- template.setTags(convertedTags);
-
- template.setTemplateName(internalItem.getTemplateName());
- template.setIcon(new ImageConverter_v5().convertToExternalForm(internalItem.getIcon()));
- return 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
deleted file mode 100644
index 333931d4e69ae5730b51607a7b63d0900a72e46b..0000000000000000000000000000000000000000
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/TransactionConverter_v5.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package de.deadlocker8.budgetmaster.database.model.v5.converter;
-
-import de.deadlocker8.budgetmaster.database.model.Converter;
-import de.deadlocker8.budgetmaster.database.model.v4.BackupTag_v4;
-import de.deadlocker8.budgetmaster.database.model.v5.BackupTransaction_v5;
-import de.deadlocker8.budgetmaster.tags.Tag;
-import de.deadlocker8.budgetmaster.transactions.Transaction;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class TransactionConverter_v5 implements Converter<Transaction, BackupTransaction_v5>
-{
- public Transaction convertToInternalForm(BackupTransaction_v5 backupTransaction)
- {
- if(backupTransaction == null)
- {
- return null;
- }
-
- final Transaction transaction = new Transaction();
- transaction.setAmount(backupTransaction.getAmount());
- transaction.setName(backupTransaction.getName());
- transaction.setCategory(new CategoryConverter_v5().convertToInternalForm(backupTransaction.getCategory()));
- transaction.setDescription(backupTransaction.getDescription());
- transaction.setIsExpenditure(backupTransaction.getExpenditure());
- transaction.setAccount(new AccountConverter_v5().convertToInternalForm(backupTransaction.getAccount()));
- transaction.setTransferAccount(new AccountConverter_v5().convertToInternalForm(backupTransaction.getTransferAccount()));
-
- DateTime date = DateTime.parse(backupTransaction.getDate(), DateTimeFormat.forPattern("yyyy-MM-dd"));
- date = date.withHourOfDay(12).withMinuteOfHour(0).withSecondOfMinute(0);
- transaction.setDate(date);
-
- List<Tag> convertedTags = new ArrayList<>();
- TagConverter_v5 tagConverter = new TagConverter_v5();
- for(BackupTag_v4 tag : backupTransaction.getTags())
- {
- convertedTags.add(tagConverter.convertToInternalForm(tag));
- }
- transaction.setTags(convertedTags);
-
- transaction.setRepeatingOption(new RepeatingOptionConverter_v5().convertToInternalForm(backupTransaction.getRepeatingOption()));
- return transaction;
- }
-
- @Override
- public BackupTransaction_v5 convertToExternalForm(Transaction internalItem)
- {
- if(internalItem == null)
- {
- return null;
- }
-
- final BackupTransaction_v5 transaction = new BackupTransaction_v5();
- transaction.setAmount(internalItem.getAmount());
- transaction.setName(internalItem.getName());
- transaction.setCategory(new CategoryConverter_v5().convertToExternalForm(internalItem.getCategory()));
- transaction.setDescription(internalItem.getDescription());
- transaction.setExpenditure(internalItem.getExpenditure());
- transaction.setAccount(new AccountConverter_v5().convertToExternalForm(internalItem.getAccount()));
- transaction.setTransferAccount(new AccountConverter_v5().convertToExternalForm(internalItem.getTransferAccount()));
- transaction.setDate(internalItem.getDate().toString(DateTimeFormat.forPattern("yyyy-MM-dd")));
-
- List<BackupTag_v4> convertedTags = new ArrayList<>();
- TagConverter_v5 tagConverter = new TagConverter_v5();
- for(Tag tag : internalItem.getTags())
- {
- convertedTags.add(tagConverter.convertToExternalForm(tag));
- }
- transaction.setTags(convertedTags);
-
- transaction.setRepeatingOption(new RepeatingOptionConverter_v5().convertToExternalForm(internalItem.getRepeatingOption()));
- return transaction;
- }
-}
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/v6/converter/RepeatingEndOptionConverter.java
similarity index 92%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingEndOptionConverter_v5.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingEndOptionConverter.java
index e55dae9ec9dd24192dd60ffb0d96284513ec50b6..6a816cdb9b7f519bcb34444e1fa0e6bbb9c90050 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingEndOptionConverter_v5.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingEndOptionConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v5.converter;
+package de.deadlocker8.budgetmaster.database.model.v6.converter;
import de.deadlocker8.budgetmaster.database.model.Converter;
import de.deadlocker8.budgetmaster.database.model.v4.BackupRepeatingEndOption_v4;
@@ -7,7 +7,7 @@ import de.thecodelabs.utils.util.Localization;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
-public class RepeatingEndOptionConverter_v5 implements Converter<RepeatingEnd, BackupRepeatingEndOption_v4>
+public class RepeatingEndOptionConverter implements Converter<RepeatingEnd, BackupRepeatingEndOption_v4>
{
@Override
public RepeatingEnd convertToInternalForm(BackupRepeatingEndOption_v4 backupItem)
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/v6/converter/RepeatingModifierConverter.java
similarity index 84%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingModifierConverter_v5.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingModifierConverter.java
index a52a186442655136739945c6ca294791693bb959..46cc40856888582c8e7a453ebfc0220b02770075 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingModifierConverter_v5.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingModifierConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v5.converter;
+package de.deadlocker8.budgetmaster.database.model.v6.converter;
import de.deadlocker8.budgetmaster.database.model.Converter;
import de.deadlocker8.budgetmaster.database.model.v4.BackupRepeatingModifier_v4;
@@ -6,7 +6,7 @@ import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifier;
import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifierType;
import de.thecodelabs.utils.util.Localization;
-public class RepeatingModifierConverter_v5 implements Converter<RepeatingModifier, BackupRepeatingModifier_v4>
+public class RepeatingModifierConverter implements Converter<RepeatingModifier, BackupRepeatingModifier_v4>
{
@Override
public RepeatingModifier convertToInternalForm(BackupRepeatingModifier_v4 backupItem)
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/v6/converter/RepeatingOptionConverter.java
similarity index 63%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingOptionConverter_v5.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingOptionConverter.java
index 88df673cb252558abd1d5ba693304c08da7b4368..9a88a97e7c6e7502eb1ef12a546b53882abfb650 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingOptionConverter_v5.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingOptionConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v5.converter;
+package de.deadlocker8.budgetmaster.database.model.v6.converter;
import de.deadlocker8.budgetmaster.database.model.Converter;
import de.deadlocker8.budgetmaster.database.model.v4.BackupRepeatingOption_v4;
@@ -6,7 +6,7 @@ import de.deadlocker8.budgetmaster.repeating.RepeatingOption;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
-public class RepeatingOptionConverter_v5 implements Converter<RepeatingOption, BackupRepeatingOption_v4>
+public class RepeatingOptionConverter implements Converter<RepeatingOption, BackupRepeatingOption_v4>
{
@Override
public RepeatingOption convertToInternalForm(BackupRepeatingOption_v4 backupItem)
@@ -22,8 +22,8 @@ public class RepeatingOptionConverter_v5 implements Converter<RepeatingOption, B
startDate = startDate.withHourOfDay(12).withMinuteOfHour(0).withSecondOfMinute(0);
repeatingOption.setStartDate(startDate);
- repeatingOption.setModifier(new RepeatingModifierConverter_v5().convertToInternalForm(backupItem.getModifier()));
- repeatingOption.setEndOption(new RepeatingEndOptionConverter_v5().convertToInternalForm(backupItem.getEndOption()));
+ repeatingOption.setModifier(new RepeatingModifierConverter().convertToInternalForm(backupItem.getModifier()));
+ repeatingOption.setEndOption(new RepeatingEndOptionConverter().convertToInternalForm(backupItem.getEndOption()));
return repeatingOption;
}
@@ -37,8 +37,8 @@ public class RepeatingOptionConverter_v5 implements Converter<RepeatingOption, B
final BackupRepeatingOption_v4 repeatingOption = new BackupRepeatingOption_v4();
repeatingOption.setStartDate(internalItem.getStartDate().toString(DateTimeFormat.forPattern("yyyy-MM-dd")));
- repeatingOption.setModifier(new RepeatingModifierConverter_v5().convertToExternalForm(internalItem.getModifier()));
- repeatingOption.setEndOption(new RepeatingEndOptionConverter_v5().convertToExternalForm(internalItem.getEndOption()));
+ repeatingOption.setModifier(new RepeatingModifierConverter().convertToExternalForm(internalItem.getModifier()));
+ repeatingOption.setEndOption(new RepeatingEndOptionConverter().convertToExternalForm(internalItem.getEndOption()));
return repeatingOption;
}
}
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/TagConverter_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TagConverter.java
similarity index 79%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/TagConverter_v5.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TagConverter.java
index 68e62a3f7e4fa5ac32e251616cf13cb75cff30e7..4f58d16acb17bba3b16a6313f73b22f3f4639bc7 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/TagConverter_v5.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TagConverter.java
@@ -1,10 +1,10 @@
-package de.deadlocker8.budgetmaster.database.model.v5.converter;
+package de.deadlocker8.budgetmaster.database.model.v6.converter;
import de.deadlocker8.budgetmaster.database.model.Converter;
import de.deadlocker8.budgetmaster.database.model.v4.BackupTag_v4;
import de.deadlocker8.budgetmaster.tags.Tag;
-public class TagConverter_v5 implements Converter<Tag, BackupTag_v4>
+public class TagConverter implements Converter<Tag, BackupTag_v4>
{
public Tag convertToInternalForm(BackupTag_v4 backupTag)
{
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TemplateConverter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TemplateConverter.java
index 1611f4ca871276fbddf12044caa1e2d11aab3b90..2ffc20ebb706ea63a3fd346a54cfe7d2f0bbac01 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TemplateConverter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TemplateConverter.java
@@ -4,7 +4,6 @@ import de.deadlocker8.budgetmaster.accounts.Account;
import de.deadlocker8.budgetmaster.categories.Category;
import de.deadlocker8.budgetmaster.database.model.Converter;
import de.deadlocker8.budgetmaster.database.model.v4.BackupTag_v4;
-import de.deadlocker8.budgetmaster.database.model.v5.converter.TagConverter_v5;
import de.deadlocker8.budgetmaster.database.model.v6.BackupTemplate_v6;
import de.deadlocker8.budgetmaster.images.Image;
import de.deadlocker8.budgetmaster.tags.Tag;
@@ -52,7 +51,7 @@ public class TemplateConverter implements Converter<Template, BackupTemplate_v6>
template.setTransferAccount(getItemById(availableAccounts, backupTemplate.getTransferAccountID()));
List<Tag> convertedTags = new ArrayList<>();
- TagConverter_v5 tagConverter = new TagConverter_v5();
+ TagConverter tagConverter = new TagConverter();
for(BackupTag_v4 tag : backupTemplate.getTags())
{
convertedTags.add(tagConverter.convertToInternalForm(tag));
@@ -95,7 +94,7 @@ public class TemplateConverter implements Converter<Template, BackupTemplate_v6>
}
List<BackupTag_v4> convertedTags = new ArrayList<>();
- TagConverter_v5 tagConverter = new TagConverter_v5();
+ TagConverter tagConverter = new TagConverter();
for(Tag tag : internalItem.getTags())
{
convertedTags.add(tagConverter.convertToExternalForm(tag));
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TransactionConverter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TransactionConverter.java
index 19416cc06a6e483b960e0c678dd36edd11103f19..dcd06f5396b999cdc32bce07cdeb100ebaf103a6 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TransactionConverter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TransactionConverter.java
@@ -4,8 +4,6 @@ import de.deadlocker8.budgetmaster.accounts.Account;
import de.deadlocker8.budgetmaster.categories.Category;
import de.deadlocker8.budgetmaster.database.model.Converter;
import de.deadlocker8.budgetmaster.database.model.v4.BackupTag_v4;
-import de.deadlocker8.budgetmaster.database.model.v5.converter.RepeatingOptionConverter_v5;
-import de.deadlocker8.budgetmaster.database.model.v5.converter.TagConverter_v5;
import de.deadlocker8.budgetmaster.database.model.v6.BackupTransaction_v6;
import de.deadlocker8.budgetmaster.tags.Tag;
import de.deadlocker8.budgetmaster.transactions.Transaction;
@@ -47,14 +45,14 @@ public class TransactionConverter implements Converter<Transaction, BackupTransa
transaction.setDate(date);
List<Tag> convertedTags = new ArrayList<>();
- TagConverter_v5 tagConverter = new TagConverter_v5();
+ TagConverter tagConverter = new TagConverter();
for(BackupTag_v4 tag : backupTransaction.getTags())
{
convertedTags.add(tagConverter.convertToInternalForm(tag));
}
transaction.setTags(convertedTags);
- transaction.setRepeatingOption(new RepeatingOptionConverter_v5().convertToInternalForm(backupTransaction.getRepeatingOption()));
+ transaction.setRepeatingOption(new RepeatingOptionConverter().convertToInternalForm(backupTransaction.getRepeatingOption()));
return transaction;
}
@@ -82,14 +80,14 @@ public class TransactionConverter implements Converter<Transaction, BackupTransa
transaction.setDate(internalItem.getDate().toString(DateTimeFormat.forPattern("yyyy-MM-dd")));
List<BackupTag_v4> convertedTags = new ArrayList<>();
- TagConverter_v5 tagConverter = new TagConverter_v5();
+ TagConverter tagConverter = new TagConverter();
for(Tag tag : internalItem.getTags())
{
convertedTags.add(tagConverter.convertToExternalForm(tag));
}
transaction.setTags(convertedTags);
- transaction.setRepeatingOption(new RepeatingOptionConverter_v5().convertToExternalForm(internalItem.getRepeatingOption()));
+ transaction.setRepeatingOption(new RepeatingOptionConverter().convertToExternalForm(internalItem.getRepeatingOption()));
return transaction;
}
}