From 7e4028f03fe1e7bb3b08d9c9061eb2026f23d338 Mon Sep 17 00:00:00 2001 From: marhali Date: Thu, 3 Feb 2022 16:45:44 +0100 Subject: [PATCH] refactor ionext into io package --- src/main/java/de/marhali/easyi18n/DataStore.java | 2 +- .../java/de/marhali/easyi18n/dialog/SettingsDialog.java | 4 ++-- .../de/marhali/easyi18n/{ionext => io}/IOHandler.java | 8 ++++---- .../easyi18n/{ionext => io}/folder/FolderStrategy.java | 4 ++-- .../folder/ModularLocaleFolderStrategy.java | 4 ++-- .../folder/ModularNamespaceFolderStrategy.java | 4 ++-- .../{ionext => io}/folder/SingleFolderStrategy.java | 4 ++-- .../easyi18n/{ionext => io}/parser/ArrayMapper.java | 2 +- .../easyi18n/{ionext => io}/parser/ParserStrategy.java | 2 +- .../{ionext => io}/parser/ParserStrategyType.java | 8 ++++---- .../{ionext => io}/parser/json/JsonArrayMapper.java | 4 ++-- .../easyi18n/{ionext => io}/parser/json/JsonMapper.java | 2 +- .../{ionext => io}/parser/json/JsonParserStrategy.java | 4 ++-- .../parser/properties/PropertiesArrayMapper.java | 4 ++-- .../parser/properties/PropertiesMapper.java | 2 +- .../parser/properties/PropertiesParserStrategy.java | 4 ++-- .../parser/properties/SortableProperties.java | 2 +- .../{ionext => io}/parser/yaml/YamlArrayMapper.java | 4 ++-- .../easyi18n/{ionext => io}/parser/yaml/YamlMapper.java | 2 +- .../{ionext => io}/parser/yaml/YamlParserStrategy.java | 4 ++-- .../de/marhali/easyi18n/model/FolderStrategyType.java | 8 ++++---- .../java/de/marhali/easyi18n/model/SettingsState.java | 2 +- .../java/de/marhali/easyi18n/util/NotificationHelper.java | 2 +- .../java/de/marhali/easyi18n/mapper/JsonMapperTest.java | 4 ++-- .../de/marhali/easyi18n/mapper/PropertiesMapperTest.java | 6 +++--- .../java/de/marhali/easyi18n/mapper/YamlMapperTest.java | 4 ++-- 26 files changed, 50 insertions(+), 50 deletions(-) rename src/main/java/de/marhali/easyi18n/{ionext => io}/IOHandler.java (94%) rename src/main/java/de/marhali/easyi18n/{ionext => io}/folder/FolderStrategy.java (96%) rename src/main/java/de/marhali/easyi18n/{ionext => io}/folder/ModularLocaleFolderStrategy.java (95%) rename src/main/java/de/marhali/easyi18n/{ionext => io}/folder/ModularNamespaceFolderStrategy.java (95%) rename src/main/java/de/marhali/easyi18n/{ionext => io}/folder/SingleFolderStrategy.java (94%) rename src/main/java/de/marhali/easyi18n/{ionext => io}/parser/ArrayMapper.java (97%) rename src/main/java/de/marhali/easyi18n/{ionext => io}/parser/ParserStrategy.java (98%) rename src/main/java/de/marhali/easyi18n/{ionext => io}/parser/ParserStrategyType.java (81%) rename src/main/java/de/marhali/easyi18n/{ionext => io}/parser/json/JsonArrayMapper.java (81%) rename src/main/java/de/marhali/easyi18n/{ionext => io}/parser/json/JsonMapper.java (98%) rename src/main/java/de/marhali/easyi18n/{ionext => io}/parser/json/JsonParserStrategy.java (94%) rename src/main/java/de/marhali/easyi18n/{ionext => io}/parser/properties/PropertiesArrayMapper.java (82%) rename src/main/java/de/marhali/easyi18n/{ionext => io}/parser/properties/PropertiesMapper.java (97%) rename src/main/java/de/marhali/easyi18n/{ionext => io}/parser/properties/PropertiesParserStrategy.java (94%) rename src/main/java/de/marhali/easyi18n/{ionext => io}/parser/properties/SortableProperties.java (94%) rename src/main/java/de/marhali/easyi18n/{ionext => io}/parser/yaml/YamlArrayMapper.java (80%) rename src/main/java/de/marhali/easyi18n/{ionext => io}/parser/yaml/YamlMapper.java (98%) rename src/main/java/de/marhali/easyi18n/{ionext => io}/parser/yaml/YamlParserStrategy.java (93%) diff --git a/src/main/java/de/marhali/easyi18n/DataStore.java b/src/main/java/de/marhali/easyi18n/DataStore.java index a1e3dd3..971ebe8 100644 --- a/src/main/java/de/marhali/easyi18n/DataStore.java +++ b/src/main/java/de/marhali/easyi18n/DataStore.java @@ -5,7 +5,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.vfs.*; -import de.marhali.easyi18n.ionext.IOHandler; +import de.marhali.easyi18n.io.IOHandler; import de.marhali.easyi18n.model.SettingsState; import de.marhali.easyi18n.model.TranslationData; import de.marhali.easyi18n.service.FileChangeListener; diff --git a/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java b/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java index 46bffa1..b45ca2f 100644 --- a/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java +++ b/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java @@ -12,10 +12,10 @@ import com.intellij.ui.components.JBPanel; import com.intellij.ui.components.JBTextField; import de.marhali.easyi18n.InstanceManager; -import de.marhali.easyi18n.ionext.parser.ArrayMapper; +import de.marhali.easyi18n.io.parser.ArrayMapper; import de.marhali.easyi18n.model.FolderStrategyType; import de.marhali.easyi18n.model.SettingsState; -import de.marhali.easyi18n.ionext.parser.ParserStrategyType; +import de.marhali.easyi18n.io.parser.ParserStrategyType; import de.marhali.easyi18n.service.SettingsService; import javax.swing.*; diff --git a/src/main/java/de/marhali/easyi18n/ionext/IOHandler.java b/src/main/java/de/marhali/easyi18n/io/IOHandler.java similarity index 94% rename from src/main/java/de/marhali/easyi18n/ionext/IOHandler.java rename to src/main/java/de/marhali/easyi18n/io/IOHandler.java index d076d25..6e1a73b 100644 --- a/src/main/java/de/marhali/easyi18n/ionext/IOHandler.java +++ b/src/main/java/de/marhali/easyi18n/io/IOHandler.java @@ -1,12 +1,12 @@ -package de.marhali.easyi18n.ionext; +package de.marhali.easyi18n.io; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; -import de.marhali.easyi18n.ionext.folder.FolderStrategy; -import de.marhali.easyi18n.ionext.parser.ParserStrategy; -import de.marhali.easyi18n.ionext.parser.ParserStrategyType; +import de.marhali.easyi18n.io.folder.FolderStrategy; +import de.marhali.easyi18n.io.parser.ParserStrategy; +import de.marhali.easyi18n.io.parser.ParserStrategyType; import de.marhali.easyi18n.model.*; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/marhali/easyi18n/ionext/folder/FolderStrategy.java b/src/main/java/de/marhali/easyi18n/io/folder/FolderStrategy.java similarity index 96% rename from src/main/java/de/marhali/easyi18n/ionext/folder/FolderStrategy.java rename to src/main/java/de/marhali/easyi18n/io/folder/FolderStrategy.java index a8c1609..dbdd316 100644 --- a/src/main/java/de/marhali/easyi18n/ionext/folder/FolderStrategy.java +++ b/src/main/java/de/marhali/easyi18n/io/folder/FolderStrategy.java @@ -1,9 +1,9 @@ -package de.marhali.easyi18n.ionext.folder; +package de.marhali.easyi18n.io.folder; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; -import de.marhali.easyi18n.ionext.parser.ParserStrategyType; +import de.marhali.easyi18n.io.parser.ParserStrategyType; import de.marhali.easyi18n.model.SettingsState; import de.marhali.easyi18n.model.TranslationData; import de.marhali.easyi18n.model.TranslationFile; diff --git a/src/main/java/de/marhali/easyi18n/ionext/folder/ModularLocaleFolderStrategy.java b/src/main/java/de/marhali/easyi18n/io/folder/ModularLocaleFolderStrategy.java similarity index 95% rename from src/main/java/de/marhali/easyi18n/ionext/folder/ModularLocaleFolderStrategy.java rename to src/main/java/de/marhali/easyi18n/io/folder/ModularLocaleFolderStrategy.java index eca95b2..e626827 100644 --- a/src/main/java/de/marhali/easyi18n/ionext/folder/ModularLocaleFolderStrategy.java +++ b/src/main/java/de/marhali/easyi18n/io/folder/ModularLocaleFolderStrategy.java @@ -1,8 +1,8 @@ -package de.marhali.easyi18n.ionext.folder; +package de.marhali.easyi18n.io.folder; import com.intellij.openapi.vfs.VirtualFile; -import de.marhali.easyi18n.ionext.parser.ParserStrategyType; +import de.marhali.easyi18n.io.parser.ParserStrategyType; import de.marhali.easyi18n.model.SettingsState; import de.marhali.easyi18n.model.TranslationData; import de.marhali.easyi18n.model.TranslationFile; diff --git a/src/main/java/de/marhali/easyi18n/ionext/folder/ModularNamespaceFolderStrategy.java b/src/main/java/de/marhali/easyi18n/io/folder/ModularNamespaceFolderStrategy.java similarity index 95% rename from src/main/java/de/marhali/easyi18n/ionext/folder/ModularNamespaceFolderStrategy.java rename to src/main/java/de/marhali/easyi18n/io/folder/ModularNamespaceFolderStrategy.java index bcbc08c..95b6fcd 100644 --- a/src/main/java/de/marhali/easyi18n/ionext/folder/ModularNamespaceFolderStrategy.java +++ b/src/main/java/de/marhali/easyi18n/io/folder/ModularNamespaceFolderStrategy.java @@ -1,8 +1,8 @@ -package de.marhali.easyi18n.ionext.folder; +package de.marhali.easyi18n.io.folder; import com.intellij.openapi.vfs.VirtualFile; -import de.marhali.easyi18n.ionext.parser.ParserStrategyType; +import de.marhali.easyi18n.io.parser.ParserStrategyType; import de.marhali.easyi18n.model.SettingsState; import de.marhali.easyi18n.model.TranslationData; import de.marhali.easyi18n.model.TranslationFile; diff --git a/src/main/java/de/marhali/easyi18n/ionext/folder/SingleFolderStrategy.java b/src/main/java/de/marhali/easyi18n/io/folder/SingleFolderStrategy.java similarity index 94% rename from src/main/java/de/marhali/easyi18n/ionext/folder/SingleFolderStrategy.java rename to src/main/java/de/marhali/easyi18n/io/folder/SingleFolderStrategy.java index 757839d..42260a6 100644 --- a/src/main/java/de/marhali/easyi18n/ionext/folder/SingleFolderStrategy.java +++ b/src/main/java/de/marhali/easyi18n/io/folder/SingleFolderStrategy.java @@ -1,8 +1,8 @@ -package de.marhali.easyi18n.ionext.folder; +package de.marhali.easyi18n.io.folder; import com.intellij.openapi.vfs.VirtualFile; -import de.marhali.easyi18n.ionext.parser.ParserStrategyType; +import de.marhali.easyi18n.io.parser.ParserStrategyType; import de.marhali.easyi18n.model.SettingsState; import de.marhali.easyi18n.model.TranslationData; import de.marhali.easyi18n.model.TranslationFile; diff --git a/src/main/java/de/marhali/easyi18n/ionext/parser/ArrayMapper.java b/src/main/java/de/marhali/easyi18n/io/parser/ArrayMapper.java similarity index 97% rename from src/main/java/de/marhali/easyi18n/ionext/parser/ArrayMapper.java rename to src/main/java/de/marhali/easyi18n/io/parser/ArrayMapper.java index 5f6e632..ec164cd 100644 --- a/src/main/java/de/marhali/easyi18n/ionext/parser/ArrayMapper.java +++ b/src/main/java/de/marhali/easyi18n/io/parser/ArrayMapper.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ionext.parser; +package de.marhali.easyi18n.io.parser; import de.marhali.easyi18n.util.StringUtil; diff --git a/src/main/java/de/marhali/easyi18n/ionext/parser/ParserStrategy.java b/src/main/java/de/marhali/easyi18n/io/parser/ParserStrategy.java similarity index 98% rename from src/main/java/de/marhali/easyi18n/ionext/parser/ParserStrategy.java rename to src/main/java/de/marhali/easyi18n/io/parser/ParserStrategy.java index 5520811..87da0e4 100644 --- a/src/main/java/de/marhali/easyi18n/ionext/parser/ParserStrategy.java +++ b/src/main/java/de/marhali/easyi18n/io/parser/ParserStrategy.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ionext.parser; +package de.marhali.easyi18n.io.parser; import de.marhali.easyi18n.model.*; diff --git a/src/main/java/de/marhali/easyi18n/ionext/parser/ParserStrategyType.java b/src/main/java/de/marhali/easyi18n/io/parser/ParserStrategyType.java similarity index 81% rename from src/main/java/de/marhali/easyi18n/ionext/parser/ParserStrategyType.java rename to src/main/java/de/marhali/easyi18n/io/parser/ParserStrategyType.java index 0e6a52f..acc25ec 100644 --- a/src/main/java/de/marhali/easyi18n/ionext/parser/ParserStrategyType.java +++ b/src/main/java/de/marhali/easyi18n/io/parser/ParserStrategyType.java @@ -1,8 +1,8 @@ -package de.marhali.easyi18n.ionext.parser; +package de.marhali.easyi18n.io.parser; -import de.marhali.easyi18n.ionext.parser.json.JsonParserStrategy; -import de.marhali.easyi18n.ionext.parser.properties.PropertiesParserStrategy; -import de.marhali.easyi18n.ionext.parser.yaml.YamlParserStrategy; +import de.marhali.easyi18n.io.parser.json.JsonParserStrategy; +import de.marhali.easyi18n.io.parser.properties.PropertiesParserStrategy; +import de.marhali.easyi18n.io.parser.yaml.YamlParserStrategy; /** * Represents all supported file parser strategies. diff --git a/src/main/java/de/marhali/easyi18n/ionext/parser/json/JsonArrayMapper.java b/src/main/java/de/marhali/easyi18n/io/parser/json/JsonArrayMapper.java similarity index 81% rename from src/main/java/de/marhali/easyi18n/ionext/parser/json/JsonArrayMapper.java rename to src/main/java/de/marhali/easyi18n/io/parser/json/JsonArrayMapper.java index 96b8f2f..8da48be 100644 --- a/src/main/java/de/marhali/easyi18n/ionext/parser/json/JsonArrayMapper.java +++ b/src/main/java/de/marhali/easyi18n/io/parser/json/JsonArrayMapper.java @@ -1,8 +1,8 @@ -package de.marhali.easyi18n.ionext.parser.json; +package de.marhali.easyi18n.io.parser.json; import com.google.gson.JsonArray; import com.google.gson.JsonElement; -import de.marhali.easyi18n.ionext.parser.ArrayMapper; +import de.marhali.easyi18n.io.parser.ArrayMapper; /** * Map json array values. diff --git a/src/main/java/de/marhali/easyi18n/ionext/parser/json/JsonMapper.java b/src/main/java/de/marhali/easyi18n/io/parser/json/JsonMapper.java similarity index 98% rename from src/main/java/de/marhali/easyi18n/ionext/parser/json/JsonMapper.java rename to src/main/java/de/marhali/easyi18n/io/parser/json/JsonMapper.java index c0c4bf7..bd4c1bf 100644 --- a/src/main/java/de/marhali/easyi18n/ionext/parser/json/JsonMapper.java +++ b/src/main/java/de/marhali/easyi18n/io/parser/json/JsonMapper.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ionext.parser.json; +package de.marhali.easyi18n.io.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/io/parser/json/JsonParserStrategy.java similarity index 94% rename from src/main/java/de/marhali/easyi18n/ionext/parser/json/JsonParserStrategy.java rename to src/main/java/de/marhali/easyi18n/io/parser/json/JsonParserStrategy.java index 4879908..67366a2 100644 --- a/src/main/java/de/marhali/easyi18n/ionext/parser/json/JsonParserStrategy.java +++ b/src/main/java/de/marhali/easyi18n/io/parser/json/JsonParserStrategy.java @@ -1,11 +1,11 @@ -package de.marhali.easyi18n.ionext.parser.json; +package de.marhali.easyi18n.io.parser.json; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; import com.intellij.openapi.vfs.VirtualFile; -import de.marhali.easyi18n.ionext.parser.ParserStrategy; +import de.marhali.easyi18n.io.parser.ParserStrategy; import de.marhali.easyi18n.model.*; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/marhali/easyi18n/ionext/parser/properties/PropertiesArrayMapper.java b/src/main/java/de/marhali/easyi18n/io/parser/properties/PropertiesArrayMapper.java similarity index 82% rename from src/main/java/de/marhali/easyi18n/ionext/parser/properties/PropertiesArrayMapper.java rename to src/main/java/de/marhali/easyi18n/io/parser/properties/PropertiesArrayMapper.java index d4f22c0..8857715 100644 --- a/src/main/java/de/marhali/easyi18n/ionext/parser/properties/PropertiesArrayMapper.java +++ b/src/main/java/de/marhali/easyi18n/io/parser/properties/PropertiesArrayMapper.java @@ -1,6 +1,6 @@ -package de.marhali.easyi18n.ionext.parser.properties; +package de.marhali.easyi18n.io.parser.properties; -import de.marhali.easyi18n.ionext.parser.ArrayMapper; +import de.marhali.easyi18n.io.parser.ArrayMapper; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/de/marhali/easyi18n/ionext/parser/properties/PropertiesMapper.java b/src/main/java/de/marhali/easyi18n/io/parser/properties/PropertiesMapper.java similarity index 97% rename from src/main/java/de/marhali/easyi18n/ionext/parser/properties/PropertiesMapper.java rename to src/main/java/de/marhali/easyi18n/io/parser/properties/PropertiesMapper.java index caa206d..0ae62b2 100644 --- a/src/main/java/de/marhali/easyi18n/ionext/parser/properties/PropertiesMapper.java +++ b/src/main/java/de/marhali/easyi18n/io/parser/properties/PropertiesMapper.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ionext.parser.properties; +package de.marhali.easyi18n.io.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/io/parser/properties/PropertiesParserStrategy.java similarity index 94% rename from src/main/java/de/marhali/easyi18n/ionext/parser/properties/PropertiesParserStrategy.java rename to src/main/java/de/marhali/easyi18n/io/parser/properties/PropertiesParserStrategy.java index ec91bfe..61b0257 100644 --- a/src/main/java/de/marhali/easyi18n/ionext/parser/properties/PropertiesParserStrategy.java +++ b/src/main/java/de/marhali/easyi18n/io/parser/properties/PropertiesParserStrategy.java @@ -1,8 +1,8 @@ -package de.marhali.easyi18n.ionext.parser.properties; +package de.marhali.easyi18n.io.parser.properties; import com.intellij.openapi.vfs.VirtualFile; -import de.marhali.easyi18n.ionext.parser.ParserStrategy; +import de.marhali.easyi18n.io.parser.ParserStrategy; import de.marhali.easyi18n.model.SettingsState; import de.marhali.easyi18n.model.TranslationData; import de.marhali.easyi18n.model.TranslationFile; diff --git a/src/main/java/de/marhali/easyi18n/ionext/parser/properties/SortableProperties.java b/src/main/java/de/marhali/easyi18n/io/parser/properties/SortableProperties.java similarity index 94% rename from src/main/java/de/marhali/easyi18n/ionext/parser/properties/SortableProperties.java rename to src/main/java/de/marhali/easyi18n/io/parser/properties/SortableProperties.java index 1d958ca..7d21bb1 100644 --- a/src/main/java/de/marhali/easyi18n/ionext/parser/properties/SortableProperties.java +++ b/src/main/java/de/marhali/easyi18n/io/parser/properties/SortableProperties.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ionext.parser.properties; +package de.marhali.easyi18n.io.parser.properties; import java.util.*; diff --git a/src/main/java/de/marhali/easyi18n/ionext/parser/yaml/YamlArrayMapper.java b/src/main/java/de/marhali/easyi18n/io/parser/yaml/YamlArrayMapper.java similarity index 80% rename from src/main/java/de/marhali/easyi18n/ionext/parser/yaml/YamlArrayMapper.java rename to src/main/java/de/marhali/easyi18n/io/parser/yaml/YamlArrayMapper.java index 2d5b581..4ed9af2 100644 --- a/src/main/java/de/marhali/easyi18n/ionext/parser/yaml/YamlArrayMapper.java +++ b/src/main/java/de/marhali/easyi18n/io/parser/yaml/YamlArrayMapper.java @@ -1,6 +1,6 @@ -package de.marhali.easyi18n.ionext.parser.yaml; +package de.marhali.easyi18n.io.parser.yaml; -import de.marhali.easyi18n.ionext.parser.ArrayMapper; +import de.marhali.easyi18n.io.parser.ArrayMapper; import thito.nodeflow.config.ListSection; diff --git a/src/main/java/de/marhali/easyi18n/ionext/parser/yaml/YamlMapper.java b/src/main/java/de/marhali/easyi18n/io/parser/yaml/YamlMapper.java similarity index 98% rename from src/main/java/de/marhali/easyi18n/ionext/parser/yaml/YamlMapper.java rename to src/main/java/de/marhali/easyi18n/io/parser/yaml/YamlMapper.java index 04d1904..0ceb5ac 100644 --- a/src/main/java/de/marhali/easyi18n/ionext/parser/yaml/YamlMapper.java +++ b/src/main/java/de/marhali/easyi18n/io/parser/yaml/YamlMapper.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ionext.parser.yaml; +package de.marhali.easyi18n.io.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/io/parser/yaml/YamlParserStrategy.java similarity index 93% rename from src/main/java/de/marhali/easyi18n/ionext/parser/yaml/YamlParserStrategy.java rename to src/main/java/de/marhali/easyi18n/io/parser/yaml/YamlParserStrategy.java index a80ccce..bca8478 100644 --- a/src/main/java/de/marhali/easyi18n/ionext/parser/yaml/YamlParserStrategy.java +++ b/src/main/java/de/marhali/easyi18n/io/parser/yaml/YamlParserStrategy.java @@ -1,8 +1,8 @@ -package de.marhali.easyi18n.ionext.parser.yaml; +package de.marhali.easyi18n.io.parser.yaml; import com.intellij.openapi.vfs.VirtualFile; -import de.marhali.easyi18n.ionext.parser.ParserStrategy; +import de.marhali.easyi18n.io.parser.ParserStrategy; import de.marhali.easyi18n.model.SettingsState; import de.marhali.easyi18n.model.TranslationData; import de.marhali.easyi18n.model.TranslationFile; diff --git a/src/main/java/de/marhali/easyi18n/model/FolderStrategyType.java b/src/main/java/de/marhali/easyi18n/model/FolderStrategyType.java index 7438b07..14e81f3 100644 --- a/src/main/java/de/marhali/easyi18n/model/FolderStrategyType.java +++ b/src/main/java/de/marhali/easyi18n/model/FolderStrategyType.java @@ -1,9 +1,9 @@ package de.marhali.easyi18n.model; -import de.marhali.easyi18n.ionext.folder.FolderStrategy; -import de.marhali.easyi18n.ionext.folder.ModularLocaleFolderStrategy; -import de.marhali.easyi18n.ionext.folder.ModularNamespaceFolderStrategy; -import de.marhali.easyi18n.ionext.folder.SingleFolderStrategy; +import de.marhali.easyi18n.io.folder.FolderStrategy; +import de.marhali.easyi18n.io.folder.ModularLocaleFolderStrategy; +import de.marhali.easyi18n.io.folder.ModularNamespaceFolderStrategy; +import de.marhali.easyi18n.io.folder.SingleFolderStrategy; /** * Represents all supported folder strategies. diff --git a/src/main/java/de/marhali/easyi18n/model/SettingsState.java b/src/main/java/de/marhali/easyi18n/model/SettingsState.java index afa4003..dc6beb4 100644 --- a/src/main/java/de/marhali/easyi18n/model/SettingsState.java +++ b/src/main/java/de/marhali/easyi18n/model/SettingsState.java @@ -1,6 +1,6 @@ package de.marhali.easyi18n.model; -import de.marhali.easyi18n.ionext.parser.ParserStrategyType; +import de.marhali.easyi18n.io.parser.ParserStrategyType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/de/marhali/easyi18n/util/NotificationHelper.java b/src/main/java/de/marhali/easyi18n/util/NotificationHelper.java index 44dae30..fd8daea 100644 --- a/src/main/java/de/marhali/easyi18n/util/NotificationHelper.java +++ b/src/main/java/de/marhali/easyi18n/util/NotificationHelper.java @@ -1,7 +1,7 @@ package de.marhali.easyi18n.util; import com.intellij.openapi.diagnostic.Logger; -import de.marhali.easyi18n.ionext.IOHandler; +import de.marhali.easyi18n.io.IOHandler; import de.marhali.easyi18n.model.SettingsState; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/de/marhali/easyi18n/mapper/JsonMapperTest.java b/src/test/java/de/marhali/easyi18n/mapper/JsonMapperTest.java index 874133b..78be880 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.ionext.parser.json.JsonArrayMapper; -import de.marhali.easyi18n.ionext.parser.json.JsonMapper; +import de.marhali.easyi18n.io.parser.json.JsonArrayMapper; +import de.marhali.easyi18n.io.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 3d352c2..2643981 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.ionext.parser.properties.PropertiesArrayMapper; -import de.marhali.easyi18n.ionext.parser.properties.PropertiesMapper; -import de.marhali.easyi18n.ionext.parser.properties.SortableProperties; +import de.marhali.easyi18n.io.parser.properties.PropertiesArrayMapper; +import de.marhali.easyi18n.io.parser.properties.PropertiesMapper; +import de.marhali.easyi18n.io.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 ad4b48e..2cb9d01 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.ionext.parser.yaml.YamlArrayMapper; -import de.marhali.easyi18n.ionext.parser.yaml.YamlMapper; +import de.marhali.easyi18n.io.parser.yaml.YamlArrayMapper; +import de.marhali.easyi18n.io.parser.yaml.YamlMapper; import de.marhali.easyi18n.model.KeyPath; import de.marhali.easyi18n.model.TranslationData; import org.apache.commons.lang.StringEscapeUtils;