move mappers into new target structure

src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java

@@ -12,7 +12,7 @@ import com.intellij.ui.components.JBPanel;
 import com.intellij.ui.components.JBTextField;
 
 import de.marhali.easyi18n.InstanceManager;
-import de.marhali.easyi18n.io.ArrayMapper;
+import de.marhali.easyi18n.ionext.parser.ArrayMapper;
 import de.marhali.easyi18n.model.FolderStrategyType;
 import de.marhali.easyi18n.model.SettingsState;
 import de.marhali.easyi18n.ionext.parser.ParserStrategyType;

src/main/java/de/marhali/easyi18n/io/json/JsonIOStrategy.java

@@ -10,6 +10,7 @@ import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 
 import de.marhali.easyi18n.io.IOStrategy;
+import de.marhali.easyi18n.ionext.parser.json.JsonMapper;
 import de.marhali.easyi18n.model.SettingsState;
 import de.marhali.easyi18n.model.TranslationData;
 import de.marhali.easyi18n.util.NotificationHelper;

src/main/java/de/marhali/easyi18n/io/json/ModularizedJsonIOStrategy.java

@@ -9,6 +9,7 @@ import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 
 import de.marhali.easyi18n.io.IOStrategy;
+import de.marhali.easyi18n.ionext.parser.json.JsonMapper;
 import de.marhali.easyi18n.model.KeyPath;
 import de.marhali.easyi18n.model.SettingsState;
 import de.marhali.easyi18n.model.TranslationData;

src/main/java/de/marhali/easyi18n/io/properties/PropertiesIOStrategy.java

@@ -6,6 +6,8 @@ import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 
 import de.marhali.easyi18n.io.IOStrategy;
+import de.marhali.easyi18n.ionext.parser.properties.PropertiesMapper;
+import de.marhali.easyi18n.ionext.parser.properties.SortableProperties;
 import de.marhali.easyi18n.model.SettingsState;
 import de.marhali.easyi18n.model.TranslationData;
 import de.marhali.easyi18n.util.NotificationHelper;

src/main/java/de/marhali/easyi18n/io/yaml/YamlIOStrategy.java

@@ -6,6 +6,7 @@ import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 
 import de.marhali.easyi18n.io.IOStrategy;
+import de.marhali.easyi18n.ionext.parser.yaml.YamlMapper;
 import de.marhali.easyi18n.model.SettingsState;
 import de.marhali.easyi18n.model.TranslationData;
 import de.marhali.easyi18n.util.NotificationHelper;

src/main/java/de/marhali/easyi18n/ionext/parser/ArrayMapper.java

@@ -1,4 +1,4 @@
-package de.marhali.easyi18n.io;
+package de.marhali.easyi18n.ionext.parser;
 
 import de.marhali.easyi18n.util.StringUtil;
 

src/main/java/de/marhali/easyi18n/ionext/parser/json/JsonArrayMapper.java

@@ -1,8 +1,8 @@
-package de.marhali.easyi18n.io.json;
+package de.marhali.easyi18n.ionext.parser.json;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
-import de.marhali.easyi18n.io.ArrayMapper;
+import de.marhali.easyi18n.ionext.parser.ArrayMapper;
 
 /**
  * Map json array values.

src/main/java/de/marhali/easyi18n/ionext/parser/json/JsonMapper.java

@@ -1,4 +1,4 @@
-package de.marhali.easyi18n.io.json;
+package de.marhali.easyi18n.ionext.parser.json;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;

src/main/java/de/marhali/easyi18n/ionext/parser/json/JsonParserStrategy.java

@@ -5,7 +5,6 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import com.intellij.openapi.vfs.VirtualFile;
 
-import de.marhali.easyi18n.io.json.JsonMapper;
 import de.marhali.easyi18n.ionext.parser.ParserStrategy;
 import de.marhali.easyi18n.model.*;
 

src/main/java/de/marhali/easyi18n/ionext/parser/properties/PropertiesArrayMapper.java

@@ -1,6 +1,6 @@
-package de.marhali.easyi18n.io.properties;
+package de.marhali.easyi18n.ionext.parser.properties;
 
-import de.marhali.easyi18n.io.ArrayMapper;
+import de.marhali.easyi18n.ionext.parser.ArrayMapper;
 
 import java.util.ArrayList;
 import java.util.Arrays;

src/main/java/de/marhali/easyi18n/ionext/parser/properties/PropertiesMapper.java

@@ -1,4 +1,4 @@
-package de.marhali.easyi18n.io.properties;
+package de.marhali.easyi18n.ionext.parser.properties;
 
 import de.marhali.easyi18n.model.KeyPath;
 import de.marhali.easyi18n.model.Translation;

src/main/java/de/marhali/easyi18n/ionext/parser/properties/PropertiesParserStrategy.java

@@ -2,8 +2,6 @@ package de.marhali.easyi18n.ionext.parser.properties;
 
 import com.intellij.openapi.vfs.VirtualFile;
 
-import de.marhali.easyi18n.io.properties.PropertiesMapper;
-import de.marhali.easyi18n.io.properties.SortableProperties;
 import de.marhali.easyi18n.ionext.parser.ParserStrategy;
 import de.marhali.easyi18n.model.SettingsState;
 import de.marhali.easyi18n.model.TranslationData;

src/main/java/de/marhali/easyi18n/ionext/parser/properties/SortableProperties.java

@@ -1,4 +1,4 @@
-package de.marhali.easyi18n.io.properties;
+package de.marhali.easyi18n.ionext.parser.properties;
 
 import java.util.*;
 

src/main/java/de/marhali/easyi18n/ionext/parser/yaml/YamlArrayMapper.java

@@ -1,6 +1,6 @@
-package de.marhali.easyi18n.io.yaml;
+package de.marhali.easyi18n.ionext.parser.yaml;
 
-import de.marhali.easyi18n.io.ArrayMapper;
+import de.marhali.easyi18n.ionext.parser.ArrayMapper;
 
 import thito.nodeflow.config.ListSection;
 

src/main/java/de/marhali/easyi18n/ionext/parser/yaml/YamlMapper.java

@@ -1,4 +1,4 @@
-package de.marhali.easyi18n.io.yaml;
+package de.marhali.easyi18n.ionext.parser.yaml;
 
 import de.marhali.easyi18n.model.Translation;
 import de.marhali.easyi18n.model.TranslationNode;

src/main/java/de/marhali/easyi18n/ionext/parser/yaml/YamlParserStrategy.java

@@ -2,7 +2,6 @@ package de.marhali.easyi18n.ionext.parser.yaml;
 
 import com.intellij.openapi.vfs.VirtualFile;
 
-import de.marhali.easyi18n.io.yaml.YamlMapper;
 import de.marhali.easyi18n.ionext.parser.ParserStrategy;
 import de.marhali.easyi18n.model.SettingsState;
 import de.marhali.easyi18n.model.TranslationData;

src/test/java/de/marhali/easyi18n/mapper/JsonMapperTest.java

@@ -4,8 +4,8 @@ import com.google.gson.JsonObject;
 
 import com.google.gson.JsonPrimitive;
 
-import de.marhali.easyi18n.io.json.JsonArrayMapper;
+import de.marhali.easyi18n.ionext.parser.json.JsonArrayMapper;
-import de.marhali.easyi18n.io.json.JsonMapper;
+import de.marhali.easyi18n.ionext.parser.json.JsonMapper;
 import de.marhali.easyi18n.model.KeyPath;
 import de.marhali.easyi18n.model.TranslationData;
 

src/test/java/de/marhali/easyi18n/mapper/PropertiesMapperTest.java

@@ -1,8 +1,8 @@
 package de.marhali.easyi18n.mapper;
 
-import de.marhali.easyi18n.io.properties.PropertiesArrayMapper;
+import de.marhali.easyi18n.ionext.parser.properties.PropertiesArrayMapper;
-import de.marhali.easyi18n.io.properties.PropertiesMapper;
+import de.marhali.easyi18n.ionext.parser.properties.PropertiesMapper;
-import de.marhali.easyi18n.io.properties.SortableProperties;
+import de.marhali.easyi18n.ionext.parser.properties.SortableProperties;
 import de.marhali.easyi18n.model.KeyPath;
 import de.marhali.easyi18n.model.TranslationData;
 

src/test/java/de/marhali/easyi18n/mapper/YamlMapperTest.java

@@ -1,7 +1,7 @@
 package de.marhali.easyi18n.mapper;
 
-import de.marhali.easyi18n.io.yaml.YamlArrayMapper;
+import de.marhali.easyi18n.ionext.parser.yaml.YamlArrayMapper;
-import de.marhali.easyi18n.io.yaml.YamlMapper;
+import de.marhali.easyi18n.ionext.parser.yaml.YamlMapper;
 import de.marhali.easyi18n.model.KeyPath;
 import de.marhali.easyi18n.model.TranslationData;
 import org.apache.commons.lang.StringEscapeUtils;