diff --git a/CHANGELOG.md b/CHANGELOG.md index b18c1f78..64725b18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,18 @@ ### Fixed -## [4.0.1] - Dec 08, 2024 +## [4.0.2] - Dec 29, 2024 + +### Added + +- Localization support for actions + +### Fixed + +- Usage of correct resource bundle +- NotNull parameter 'parent' of getFirstChildOfType #886 + +## 4.0.1 - Dec 08, 2024 ### Added diff --git a/gradle.properties b/gradle.properties index cbc2835f..442acf8f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ pluginName=CSV Editor pluginId=net.seesharpsoft.intellij.plugins.csv -pluginVersion=4.0.1 +pluginVersion=4.0.2 pluginSinceBuild=242 diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvPlugin.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvPlugin.java index ed27a98c..f4bcb690 100644 --- a/src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvPlugin.java +++ b/src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvPlugin.java @@ -1,5 +1,6 @@ package net.seesharpsoft.intellij.plugins.csv; +import com.intellij.DynamicBundle; import com.intellij.ide.BrowserUtil; import com.intellij.ide.actions.ShowSettingsUtilImpl; import com.intellij.ide.plugins.IdeaPluginDescriptor; @@ -114,7 +115,7 @@ public void run(@NotNull ProgressIndicator progressIndicator) { public static ResourceBundle getResourceBundle() { if (_resourceBundle == null) { - _resourceBundle = ResourceBundle.getBundle("i18n/CSVEditorResources"); + _resourceBundle = DynamicBundle.getPluginBundle(getPluginDescriptor()); } return _resourceBundle; } diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableModelBase.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableModelBase.java index 7e7c3de6..76bd38c7 100644 --- a/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableModelBase.java +++ b/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableModelBase.java @@ -92,7 +92,8 @@ private void resetCachedValues() { } private void resetPointer() { - myPointedRecord = PsiHelper.getFirstChildOfType(getPsiFile(), CsvRecord.class); + PsiFile psiFile = getPsiFile(); + myPointedRecord = psiFile == null ? null : PsiHelper.getFirstChildOfType(psiFile, CsvRecord.class); myPointedRow = 0; } diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorSwing.form b/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorSwing.form index 08f17a4b..13395840 100644 --- a/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorSwing.form +++ b/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorSwing.form @@ -26,7 +26,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvEditorSettingsProvider.form b/src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvEditorSettingsProvider.form index 825a04f3..11fe4d5b 100644 --- a/src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvEditorSettingsProvider.form +++ b/src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvEditorSettingsProvider.form @@ -19,7 +19,7 @@ - + @@ -27,14 +27,14 @@ - + - + @@ -51,14 +51,14 @@ - + - + @@ -71,7 +71,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -92,14 +92,14 @@ - + - + @@ -116,7 +116,7 @@ - + @@ -148,7 +148,7 @@ - + @@ -180,7 +180,7 @@ - + @@ -211,7 +211,7 @@ - + @@ -227,7 +227,7 @@ - + @@ -249,7 +249,7 @@ - + @@ -259,7 +259,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -291,7 +291,7 @@ - + @@ -301,7 +301,7 @@ - + @@ -331,7 +331,7 @@ - + @@ -362,7 +362,7 @@ - + @@ -375,7 +375,7 @@ - + @@ -394,7 +394,7 @@ - + diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 8789c454..47b3b07e 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -4,6 +4,7 @@ Martin Sommer + localization.CsvEditorResources Plugin for editing CSV files with a rainbow colored table- & text-editor. It provides syntax-validation, highlighting, customization, and plenty more besides.

@@ -145,7 +146,7 @@ - + @@ -158,21 +159,18 @@ @@ -180,21 +178,18 @@ @@ -202,7 +197,6 @@ @@ -210,7 +204,6 @@ @@ -219,8 +212,6 @@