#576 - result items should be ordered like step 1

src/main/java/de/deadlocker8/budgetmaster/services/ImportService.java

@@ -26,10 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class ImportService
@@ -63,33 +60,34 @@ public class ImportService
 	{
 		this.database = database;
 
-		final Map<EntityType, Integer> numberOfImportedEntitiesByType = new EnumMap<>(EntityType.class);
+		final Map<EntityType, Integer> numberOfImportedEntitiesByType = new LinkedHashMap<>();
 
 		LOGGER.debug("Importing database...");
 		numberOfImportedEntitiesByType.put(EntityType.CATEGORY, importCategories());
 		numberOfImportedEntitiesByType.put(EntityType.ACCOUNT, importAccounts(accountMatchList));
 		numberOfImportedEntitiesByType.put(EntityType.TRANSACTION, importTransactions());
 
-		if(importCharts)
+		numberOfImportedEntitiesByType.put(EntityType.IMAGE, importImages());
+
+		if(importTemplates)
 		{
-			numberOfImportedEntitiesByType.put(EntityType.CHART, importCharts());
+			numberOfImportedEntitiesByType.put(EntityType.TEMPLATE, importTemplates());
 		}
 		else
 		{
-			numberOfImportedEntitiesByType.put(EntityType.CHART, 0);
+			numberOfImportedEntitiesByType.put(EntityType.TEMPLATE, 0);
 		}
 
-		numberOfImportedEntitiesByType.put(EntityType.IMAGE, importImages());
-
-		if(importTemplates)
+		if(importCharts)
 		{
-			numberOfImportedEntitiesByType.put(EntityType.TEMPLATE, importTemplates());
+			numberOfImportedEntitiesByType.put(EntityType.CHART, importCharts());
 		}
 		else
 		{
-			numberOfImportedEntitiesByType.put(EntityType.TEMPLATE, 0);
+			numberOfImportedEntitiesByType.put(EntityType.CHART, 0);
 		}
 
+
 		LOGGER.debug("Updating repeating transactions...");
 		repeatingTransactionUpdater.updateRepeatingTransactions(DateTime.now());