From 5f953170bad40238ad2c10058b8b024ca02ba336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Wed, 8 Dec 2021 20:32:53 +0100 Subject: [PATCH] use actual file extension to choose io strategy --- CHANGELOG.md | 1 + src/main/java/de/marhali/easyi18n/io/json/JsonIOStrategy.java | 2 +- .../de/marhali/easyi18n/io/json/ModularizedJsonIOStrategy.java | 2 +- .../de/marhali/easyi18n/io/properties/PropertiesIOStrategy.java | 2 +- src/main/java/de/marhali/easyi18n/io/yaml/YamlIOStrategy.java | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c43f4f5..8488701 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ ### Changed - Updated plugin dependencies +- Use actual file extension to choose io strategy ### Fixed - NullPointerException on key completion 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 3152f47..b6e9f0d 100644 --- a/src/main/java/de/marhali/easyi18n/io/json/JsonIOStrategy.java +++ b/src/main/java/de/marhali/easyi18n/io/json/JsonIOStrategy.java @@ -45,7 +45,7 @@ public class JsonIOStrategy implements IOStrategy { for(VirtualFile children : directory.getChildren()) { if(!children.isDirectory() && isFileRelevant(state, children)) { - if(children.getFileType().getDefaultExtension().equalsIgnoreCase(FILE_EXTENSION)) { + if(children.getExtension().equalsIgnoreCase(FILE_EXTENSION)) { return true; } } 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 e05a086..d025284 100644 --- a/src/main/java/de/marhali/easyi18n/io/json/ModularizedJsonIOStrategy.java +++ b/src/main/java/de/marhali/easyi18n/io/json/ModularizedJsonIOStrategy.java @@ -56,7 +56,7 @@ public class ModularizedJsonIOStrategy implements IOStrategy { if(children.isDirectory()) { // Contains module folders for(VirtualFile moduleFile : children.getChildren()) { if(!moduleFile.isDirectory() && isFileRelevant(state, moduleFile)) { - if(moduleFile.getFileType().getDefaultExtension().equalsIgnoreCase(FILE_EXTENSION)) { + if(moduleFile.getExtension().equalsIgnoreCase(FILE_EXTENSION)) { return true; } } 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 0d3c9d4..580bb69 100644 --- a/src/main/java/de/marhali/easyi18n/io/properties/PropertiesIOStrategy.java +++ b/src/main/java/de/marhali/easyi18n/io/properties/PropertiesIOStrategy.java @@ -37,7 +37,7 @@ public class PropertiesIOStrategy implements IOStrategy { for(VirtualFile children : directory.getChildren()) { if(!children.isDirectory() && isFileRelevant(state, children)) { - if(children.getFileType().getDefaultExtension().equalsIgnoreCase(FILE_EXTENSION)) { + if(children.getExtension().equalsIgnoreCase(FILE_EXTENSION)) { return true; } } 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 fbb0ced..d36e25a 100644 --- a/src/main/java/de/marhali/easyi18n/io/yaml/YamlIOStrategy.java +++ b/src/main/java/de/marhali/easyi18n/io/yaml/YamlIOStrategy.java @@ -44,7 +44,7 @@ public class YamlIOStrategy implements IOStrategy { for(VirtualFile children : directory.getChildren()) { if(!children.isDirectory() && isFileRelevant(state, children)) { - if(children.getFileType().getDefaultExtension().equalsIgnoreCase(FILE_EXTENSION)) { + if(children.getExtension().equalsIgnoreCase(FILE_EXTENSION)) { return true; } }