diff --git a/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java b/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java index 5278f96..46bffa1 100644 --- a/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java +++ b/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; diff --git a/src/main/java/de/marhali/easyi18n/io/json/JsonIOStrategy.java b/src/main/java/de/marhali/easyi18n/io/json/JsonIOStrategy.java index 3d45ffa..8e265c1 100644 --- a/src/main/java/de/marhali/easyi18n/io/json/JsonIOStrategy.java +++ b/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; diff --git a/src/main/java/de/marhali/easyi18n/io/json/ModularizedJsonIOStrategy.java b/src/main/java/de/marhali/easyi18n/io/json/ModularizedJsonIOStrategy.java index ce90a71..e0c3ea3 100644 --- a/src/main/java/de/marhali/easyi18n/io/json/ModularizedJsonIOStrategy.java +++ b/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; diff --git a/src/main/java/de/marhali/easyi18n/io/properties/PropertiesIOStrategy.java b/src/main/java/de/marhali/easyi18n/io/properties/PropertiesIOStrategy.java index 74236a4..4b78674 100644 --- a/src/main/java/de/marhali/easyi18n/io/properties/PropertiesIOStrategy.java +++ b/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; diff --git a/src/main/java/de/marhali/easyi18n/io/yaml/YamlIOStrategy.java b/src/main/java/de/marhali/easyi18n/io/yaml/YamlIOStrategy.java index 4caf7b2..38c1eb4 100644 --- a/src/main/java/de/marhali/easyi18n/io/yaml/YamlIOStrategy.java +++ b/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; diff --git a/src/main/java/de/marhali/easyi18n/io/ArrayMapper.java b/src/main/java/de/marhali/easyi18n/ionext/parser/ArrayMapper.java similarity index 97% rename from src/main/java/de/marhali/easyi18n/io/ArrayMapper.java rename to src/main/java/de/marhali/easyi18n/ionext/parser/ArrayMapper.java index fa0ad2a..5f6e632 100644 --- a/src/main/java/de/marhali/easyi18n/io/ArrayMapper.java +++ b/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; diff --git a/src/main/java/de/marhali/easyi18n/io/json/JsonArrayMapper.java b/src/main/java/de/marhali/easyi18n/ionext/parser/json/JsonArrayMapper.java similarity index 81% rename from src/main/java/de/marhali/easyi18n/io/json/JsonArrayMapper.java rename to src/main/java/de/marhali/easyi18n/ionext/parser/json/JsonArrayMapper.java index aac41ed..96b8f2f 100644 --- a/src/main/java/de/marhali/easyi18n/io/json/JsonArrayMapper.java +++ b/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. diff --git a/src/main/java/de/marhali/easyi18n/io/json/JsonMapper.java b/src/main/java/de/marhali/easyi18n/ionext/parser/json/JsonMapper.java similarity index 98% rename from src/main/java/de/marhali/easyi18n/io/json/JsonMapper.java rename to src/main/java/de/marhali/easyi18n/ionext/parser/json/JsonMapper.java index 55f5c43..c0c4bf7 100644 --- a/src/main/java/de/marhali/easyi18n/io/json/JsonMapper.java +++ b/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; diff --git a/src/main/java/de/marhali/easyi18n/ionext/parser/json/JsonParserStrategy.java b/src/main/java/de/marhali/easyi18n/ionext/parser/json/JsonParserStrategy.java index 4c244f0..4879908 100644 --- a/src/main/java/de/marhali/easyi18n/ionext/parser/json/JsonParserStrategy.java +++ b/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.*; diff --git a/src/main/java/de/marhali/easyi18n/io/properties/PropertiesArrayMapper.java b/src/main/java/de/marhali/easyi18n/ionext/parser/properties/PropertiesArrayMapper.java similarity index 82% rename from src/main/java/de/marhali/easyi18n/io/properties/PropertiesArrayMapper.java rename to src/main/java/de/marhali/easyi18n/ionext/parser/properties/PropertiesArrayMapper.java index 71741ba..d4f22c0 100644 --- a/src/main/java/de/marhali/easyi18n/io/properties/PropertiesArrayMapper.java +++ b/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; diff --git a/src/main/java/de/marhali/easyi18n/io/properties/PropertiesMapper.java b/src/main/java/de/marhali/easyi18n/ionext/parser/properties/PropertiesMapper.java similarity index 97% rename from src/main/java/de/marhali/easyi18n/io/properties/PropertiesMapper.java rename to src/main/java/de/marhali/easyi18n/ionext/parser/properties/PropertiesMapper.java index 957cd67..caa206d 100644 --- a/src/main/java/de/marhali/easyi18n/io/properties/PropertiesMapper.java +++ b/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; diff --git a/src/main/java/de/marhali/easyi18n/ionext/parser/properties/PropertiesParserStrategy.java b/src/main/java/de/marhali/easyi18n/ionext/parser/properties/PropertiesParserStrategy.java index 5dbed68..ec91bfe 100644 --- a/src/main/java/de/marhali/easyi18n/ionext/parser/properties/PropertiesParserStrategy.java +++ b/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; diff --git a/src/main/java/de/marhali/easyi18n/io/properties/SortableProperties.java b/src/main/java/de/marhali/easyi18n/ionext/parser/properties/SortableProperties.java similarity index 94% rename from src/main/java/de/marhali/easyi18n/io/properties/SortableProperties.java rename to src/main/java/de/marhali/easyi18n/ionext/parser/properties/SortableProperties.java index 3b51db0..1d958ca 100644 --- a/src/main/java/de/marhali/easyi18n/io/properties/SortableProperties.java +++ b/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.*; diff --git a/src/main/java/de/marhali/easyi18n/io/yaml/YamlArrayMapper.java b/src/main/java/de/marhali/easyi18n/ionext/parser/yaml/YamlArrayMapper.java similarity index 80% rename from src/main/java/de/marhali/easyi18n/io/yaml/YamlArrayMapper.java rename to src/main/java/de/marhali/easyi18n/ionext/parser/yaml/YamlArrayMapper.java index fb2b340..2d5b581 100644 --- a/src/main/java/de/marhali/easyi18n/io/yaml/YamlArrayMapper.java +++ b/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; diff --git a/src/main/java/de/marhali/easyi18n/io/yaml/YamlMapper.java b/src/main/java/de/marhali/easyi18n/ionext/parser/yaml/YamlMapper.java similarity index 98% rename from src/main/java/de/marhali/easyi18n/io/yaml/YamlMapper.java rename to src/main/java/de/marhali/easyi18n/ionext/parser/yaml/YamlMapper.java index 55da295..04d1904 100644 --- a/src/main/java/de/marhali/easyi18n/io/yaml/YamlMapper.java +++ b/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; diff --git a/src/main/java/de/marhali/easyi18n/ionext/parser/yaml/YamlParserStrategy.java b/src/main/java/de/marhali/easyi18n/ionext/parser/yaml/YamlParserStrategy.java index d8c7e97..a80ccce 100644 --- a/src/main/java/de/marhali/easyi18n/ionext/parser/yaml/YamlParserStrategy.java +++ b/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; diff --git a/src/test/java/de/marhali/easyi18n/mapper/JsonMapperTest.java b/src/test/java/de/marhali/easyi18n/mapper/JsonMapperTest.java index 087a688..874133b 100644 --- a/src/test/java/de/marhali/easyi18n/mapper/JsonMapperTest.java +++ b/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.io.json.JsonMapper; +import de.marhali.easyi18n.ionext.parser.json.JsonArrayMapper; +import de.marhali.easyi18n.ionext.parser.json.JsonMapper; import de.marhali.easyi18n.model.KeyPath; import de.marhali.easyi18n.model.TranslationData; diff --git a/src/test/java/de/marhali/easyi18n/mapper/PropertiesMapperTest.java b/src/test/java/de/marhali/easyi18n/mapper/PropertiesMapperTest.java index a17e6fd..3d352c2 100644 --- a/src/test/java/de/marhali/easyi18n/mapper/PropertiesMapperTest.java +++ b/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.io.properties.PropertiesMapper; -import de.marhali.easyi18n.io.properties.SortableProperties; +import de.marhali.easyi18n.ionext.parser.properties.PropertiesArrayMapper; +import de.marhali.easyi18n.ionext.parser.properties.PropertiesMapper; +import de.marhali.easyi18n.ionext.parser.properties.SortableProperties; import de.marhali.easyi18n.model.KeyPath; import de.marhali.easyi18n.model.TranslationData; diff --git a/src/test/java/de/marhali/easyi18n/mapper/YamlMapperTest.java b/src/test/java/de/marhali/easyi18n/mapper/YamlMapperTest.java index ca3cf7b..ad4b48e 100644 --- a/src/test/java/de/marhali/easyi18n/mapper/YamlMapperTest.java +++ b/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.io.yaml.YamlMapper; +import de.marhali.easyi18n.ionext.parser.yaml.YamlArrayMapper; +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;