Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 4.0.2 #892

Merged
merged 4 commits into from
Dec 29, 2024
Merged

Release 4.0.2 #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f0fed73
Release 4.0.2
SeeSharpSoft Dec 29, 2024
19989e8
Update pluginVersion
SeeSharpSoft Dec 29, 2024
bc4e708
Merge pull request #891 from SeeSharpSoft/feat_402
SeeSharpSoft Dec 29, 2024
d99e4e5
Chore: Remove unused code
SeeSharpSoft Dec 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

pluginName=CSV Editor
pluginId=net.seesharpsoft.intellij.plugins.csv
pluginVersion=4.0.1
pluginVersion=4.0.2

pluginSinceBuild=242

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableModelBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions ...in/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorSwing.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</constraints>
<properties>
<horizontalTextPosition value="10"/>
<text resource-bundle="i18n/CSVEditorResources" key="open.file.in.text.editor"/>
<text resource-bundle="localization/CsvEditorResources" key="open.file.in.text.editor"/>
</properties>
</component>
<component id="157b0" class="javax.swing.JLabel" binding="lblErrorText">
Expand All @@ -37,7 +37,7 @@
<properties>
<font size="12" style="1"/>
<foreground color="-65536"/>
<text resource-bundle="i18n/CSVEditorResources" key="error.while.parsing.content.please.fix.issues.in.text.editor"/>
<text resource-bundle="localization/CsvEditorResources" key="error.while.parsing.content.please.fix.issues.in.text.editor"/>
</properties>
</component>
<component id="d8426" class="javax.swing.JToolBar$Separator">
Expand Down
46 changes: 23 additions & 23 deletions src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvEditorSettingsProvider.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="line" title-resource-bundle="i18n/CSVEditorResources" title-key="text.editor"/>
<border type="line" title-resource-bundle="localization/CsvEditorResources" title-key="text.editor"/>
<children>
<grid id="d2422" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="10" left="10" bottom="10" right="10"/>
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="etched" title-resource-bundle="i18n/CSVEditorResources" title-key="highlighting"/>
<border type="etched" title-resource-bundle="localization/CsvEditorResources" title-key="highlighting"/>
<children>
<component id="a9e55" class="javax.swing.JCheckBox" binding="cbCaretRowShown">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="i18n/CSVEditorResources" key="highlight.caret.row"/>
<text resource-bundle="localization/CsvEditorResources" key="highlight.caret.row"/>
</properties>
</component>
<component id="57ffb" class="com.intellij.ui.CheckBoxWithColorChooser" binding="cbTabHighlightColor" custom-create="true">
Expand All @@ -51,14 +51,14 @@
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="etched" title-resource-bundle="i18n/CSVEditorResources" title-key="others"/>
<border type="etched" title-resource-bundle="localization/CsvEditorResources" title-key="others"/>
<children>
<component id="6fb36" class="javax.swing.JCheckBox" binding="cbUseSoftWraps">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="i18n/CSVEditorResources" key="use.soft.wraps"/>
<text resource-bundle="localization/CsvEditorResources" key="use.soft.wraps"/>
</properties>
</component>
<hspacer id="d39ae">
Expand All @@ -71,15 +71,15 @@
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="i18n/CSVEditorResources" key="show.info.balloon"/>
<text resource-bundle="localization/CsvEditorResources" key="show.info.balloon"/>
</properties>
</component>
<component id="8ed01" class="javax.swing.JCheckBox" binding="cbKeepTrailingWhitespaces">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="i18n/CSVEditorResources" key="keep.trailing.whitespaces.if.unchecked.general.editor.setting.apply"/>
<text resource-bundle="localization/CsvEditorResources" key="keep.trailing.whitespaces.if.unchecked.general.editor.setting.apply"/>
</properties>
</component>
</children>
Expand All @@ -92,14 +92,14 @@
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="line" title-resource-bundle="i18n/CSVEditorResources" title-key="table.editor"/>
<border type="line" title-resource-bundle="localization/CsvEditorResources" title-key="table.editor"/>
<children>
<component id="d6a8e" class="javax.swing.JCheckBox" binding="cbQuotingEnforced">
<constraints>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="i18n/CSVEditorResources" key="enforce.value.quoting"/>
<text resource-bundle="localization/CsvEditorResources" key="enforce.value.quoting"/>
</properties>
</component>
<grid id="8ebb6" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
Expand All @@ -116,7 +116,7 @@
</constraints>
<properties>
<labelFor value="c75c8"/>
<text resource-bundle="i18n/CSVEditorResources" key="default.row.height.in.px"/>
<text resource-bundle="localization/CsvEditorResources" key="default.row.height.in.px"/>
</properties>
</component>
<hspacer id="48a70">
Expand Down Expand Up @@ -148,7 +148,7 @@
</constraints>
<properties>
<labelFor value="15921"/>
<text resource-bundle="i18n/CSVEditorResources" key="default.column.width.in.px"/>
<text resource-bundle="localization/CsvEditorResources" key="default.column.width.in.px"/>
</properties>
</component>
<component id="15921" class="javax.swing.JFormattedTextField" binding="tfDefaultColumnWidth" custom-create="true">
Expand Down Expand Up @@ -180,7 +180,7 @@
</constraints>
<properties>
<labelFor value="8554c"/>
<text resource-bundle="i18n/CSVEditorResources" key="maximum.column.width.in.px"/>
<text resource-bundle="localization/CsvEditorResources" key="maximum.column.width.in.px"/>
</properties>
</component>
<component id="8554c" class="javax.swing.JFormattedTextField" binding="tfMaxColumnWidth" custom-create="true">
Expand Down Expand Up @@ -211,7 +211,7 @@
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="line" title-resource-bundle="i18n/CSVEditorResources" title-key="general"/>
<border type="line" title-resource-bundle="localization/CsvEditorResources" title-key="general"/>
<children>
<grid id="95245" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
Expand All @@ -227,7 +227,7 @@
</constraints>
<properties>
<labelFor value="a6cd2"/>
<text resource-bundle="i18n/CSVEditorResources" key="editor.usage"/>
<text resource-bundle="localization/CsvEditorResources" key="editor.usage"/>
</properties>
</component>
<hspacer id="7d495">
Expand All @@ -249,7 +249,7 @@
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<toolTipText resource-bundle="i18n/CSVEditorResources" key="can.be.adjusted.per.file.in.editor.context.menu"/>
<toolTipText resource-bundle="localization/CsvEditorResources" key="can.be.adjusted.per.file.in.editor.context.menu"/>
</properties>
<border type="none"/>
<children>
Expand All @@ -259,7 +259,7 @@
</constraints>
<properties>
<labelFor value="65f7"/>
<text resource-bundle="i18n/CSVEditorResources" key="default.value.separator.csv.only"/>
<text resource-bundle="localization/CsvEditorResources" key="default.value.separator.csv.only"/>
</properties>
</component>
<hspacer id="f2aa1">
Expand All @@ -280,7 +280,7 @@
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="i18n/CSVEditorResources" key="auto.detect.initially"/>
<text resource-bundle="localization/CsvEditorResources" key="auto.detect.initially"/>
</properties>
</component>
</children>
Expand All @@ -291,7 +291,7 @@
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<toolTipText resource-bundle="i18n/CSVEditorResources" key="can.be.adjusted.per.file.in.editor.context.menu"/>
<toolTipText resource-bundle="localization/CsvEditorResources" key="can.be.adjusted.per.file.in.editor.context.menu"/>
</properties>
<border type="none"/>
<children>
Expand All @@ -301,7 +301,7 @@
</constraints>
<properties>
<labelFor value="667ea"/>
<text resource-bundle="i18n/CSVEditorResources" key="default.escape.character"/>
<text resource-bundle="localization/CsvEditorResources" key="default.escape.character"/>
</properties>
</component>
<hspacer id="e381f">
Expand Down Expand Up @@ -331,7 +331,7 @@
</constraints>
<properties>
<labelFor value="a30e"/>
<text resource-bundle="i18n/CSVEditorResources" key="line.comment.indicator"/>
<text resource-bundle="localization/CsvEditorResources" key="line.comment.indicator"/>
</properties>
</component>
<component id="a30e" class="javax.swing.JTextField" binding="tfCommentIndicator">
Expand Down Expand Up @@ -362,7 +362,7 @@
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="i18n/CSVEditorResources" key="column.numbering"/>
<text resource-bundle="localization/CsvEditorResources" key="column.numbering"/>
</properties>
</component>
<hspacer id="c1561">
Expand All @@ -375,7 +375,7 @@
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="i18n/CSVEditorResources" key="zero.based"/>
<text resource-bundle="localization/CsvEditorResources" key="zero.based"/>
</properties>
</component>
</children>
Expand All @@ -394,7 +394,7 @@
</constraints>
<properties>
<labelFor value="2e9e9"/>
<text resource-bundle="i18n/CSVEditorResources" key="value.coloring"/>
<text resource-bundle="localization/CsvEditorResources" key="value.coloring"/>
</properties>
</component>
<component id="2e9e9" class="javax.swing.JComboBox" binding="comboValueColoring" custom-create="true">
Expand Down
Loading
Loading