Skip to content

Commit f9a5833

Browse files
SeeSharpSoftSeeSharpSoft
authored
Merge pull request #117 from SeeSharpSoft/master
Release 2.3.1
2 parents bdaf8c8 + 9b3b9c2 commit f9a5833

File tree

9 files changed

+156
-122
lines changed

9 files changed

+156
-122
lines changed

‎.bettercodehub.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
component_depth: 10
1+
component_depth: 8
22
languages:
3-
- java
3+
- java

‎CHANGELOG

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2.3.1
2+
Mar 31, 2019
3+
4+
NEW: use default color scheme font for table editor as well
5+
FIX: ConcurrentModificationException tackled (table editor)
6+
17
2.3.0
28
Mar 04, 2019
39

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# https://www.jetbrains.com/intellij-repository/snapshots
44

55
name='CSV Plugin'
6-
pluginVersion=2.3.0
6+
pluginVersion=2.3.1
77
javaVersion=1.8
88
javaTargetVersion=1.8
99
downloadIntellijSources=false

‎src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditor.java

+7
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import com.intellij.openapi.application.ApplicationManager;
77
import com.intellij.openapi.command.CommandProcessor;
88
import com.intellij.openapi.editor.Document;
9+
import com.intellij.openapi.editor.colors.EditorColorsManager;
10+
import com.intellij.openapi.editor.colors.EditorFontType;
911
import com.intellij.openapi.fileEditor.*;
1012
import com.intellij.openapi.project.Project;
1113
import com.intellij.openapi.util.Key;
@@ -27,6 +29,7 @@
2729
import org.jetbrains.annotations.Nullable;
2830

2931
import javax.swing.*;
32+
import java.awt.*;
3033
import java.beans.PropertyChangeListener;
3134
import java.beans.PropertyChangeSupport;
3235
import java.util.Collections;
@@ -295,6 +298,10 @@ public int getRowCount() {
295298
return getDataHandler().getCurrentState().length;
296299
}
297300

301+
public Font getFont() {
302+
return EditorColorsManager.getInstance().getGlobalScheme().getFont(EditorFontType.PLAIN);
303+
}
304+
298305
public int getColumnCount() {
299306
Object[][] currentData = getDataHandler().getCurrentState();
300307
return currentData.length > 0 ? currentData[0].length : 0;

‎src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorActions.java

-13
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import java.awt.event.ActionListener;
1515
import java.io.IOException;
1616
import java.net.URI;
17-
import java.util.Vector;
1817

1918
public class CsvTableEditorActions extends CsvTableEditorUtilBase {
2019

@@ -145,18 +144,6 @@ public void actionPerformed(ActionEvent e) {
145144
}
146145
}
147146

148-
private void removeColumn(DefaultTableModel tableModel, int column) {
149-
int prevColumnCount = tableModel.getColumnCount();
150-
151-
Vector rows = tableModel.getDataVector();
152-
for (Object row : rows) {
153-
((Vector) row).remove(column);
154-
}
155-
156-
tableModel.setColumnCount(prevColumnCount - 1);
157-
tableModel.fireTableStructureChanged();
158-
}
159-
160147
private final class DeleteColumnAction implements ActionListener {
161148
@Override
162149
public void actionPerformed(ActionEvent e) {

‎src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorSwing.form

+120-92
Original file line numberDiff line numberDiff line change
@@ -15,88 +15,28 @@
1515
<properties/>
1616
<border type="none"/>
1717
<children>
18-
<toolbar id="92f32">
18+
<grid id="911ca" layout-manager="GridBagLayout">
1919
<constraints/>
20-
<properties>
21-
<floatable value="false"/>
22-
</properties>
20+
<properties/>
2321
<border type="none"/>
2422
<children>
25-
<component id="157b0" class="javax.swing.JLabel" binding="lblErrorText">
26-
<constraints/>
27-
<properties>
28-
<font size="12" style="1"/>
29-
<foreground color="-65536"/>
30-
<text value=" ATTENTION: Error while parsing content - please fix issues in text editor!"/>
31-
</properties>
32-
</component>
33-
<component id="c77c9" class="javax.swing.JToolBar$Separator">
34-
<constraints/>
35-
<properties/>
36-
</component>
37-
<component id="8e338" class="com.intellij.ui.components.labels.LinkLabel" binding="lnkTextEditor" custom-create="true">
38-
<constraints/>
39-
<properties>
40-
<horizontalTextPosition value="10"/>
41-
<text value="Open file in text editor"/>
42-
</properties>
43-
</component>
44-
<hspacer id="30d08">
45-
<constraints/>
46-
</hspacer>
4723
<component id="58f74" class="javax.swing.JButton" binding="btnAddRowBefore">
48-
<constraints/>
24+
<constraints>
25+
<grid row="0" column="4" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
26+
<gridbag weightx="1.0" weighty="0.0"/>
27+
</constraints>
4928
<properties>
5029
<icon value="media/icons/add-row-before.png"/>
5130
<text value=""/>
5231
<toolTipText value="Add row before"/>
5332
<visible value="false"/>
5433
</properties>
5534
</component>
56-
<component id="83d80" class="javax.swing.JCheckBox" binding="cbFixedHeaders">
57-
<constraints/>
58-
<properties>
59-
<contentAreaFilled value="false"/>
60-
<horizontalTextPosition value="10"/>
61-
<label value="Header row fixed:"/>
62-
<text value="Header row fixed:"/>
63-
</properties>
64-
</component>
65-
<component id="af7be" class="javax.swing.JToolBar$Separator">
66-
<constraints/>
67-
<properties/>
68-
</component>
69-
<component id="9bf69" class="javax.swing.JLabel" binding="lblTextlines">
70-
<constraints/>
71-
<properties>
72-
<text value="Text-lines per row: "/>
73-
</properties>
74-
</component>
75-
<component id="65e44" class="javax.swing.JComboBox" binding="comboRowHeight">
76-
<constraints/>
77-
<properties>
78-
<maximumSize width="100" height="32767"/>
79-
<model>
80-
<item value="Auto"/>
81-
<item value="1"/>
82-
<item value="2"/>
83-
<item value="3"/>
84-
<item value="4"/>
85-
<item value="5"/>
86-
<item value="6"/>
87-
<item value="7"/>
88-
<item value="8"/>
89-
<item value="9"/>
90-
<item value="10"/>
91-
</model>
92-
</properties>
93-
</component>
94-
<component id="fb7e0" class="javax.swing.JToolBar$Separator">
95-
<constraints/>
96-
<properties/>
97-
</component>
9835
<component id="bcbc6" class="javax.swing.JButton" binding="btnAddRow">
99-
<constraints/>
36+
<constraints>
37+
<grid row="0" column="5" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
38+
<gridbag weightx="1.0" weighty="0.0"/>
39+
</constraints>
10040
<properties>
10141
<icon value="media/icons/add-row.png"/>
10242
<maximumSize width="56" height="28"/>
@@ -107,7 +47,10 @@
10747
</properties>
10848
</component>
10949
<component id="294f4" class="javax.swing.JButton" binding="btnRemoveRow">
110-
<constraints/>
50+
<constraints>
51+
<grid row="0" column="6" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
52+
<gridbag weightx="1.0" weighty="0.0"/>
53+
</constraints>
11154
<properties>
11255
<icon value="media/icons/remove-row.png"/>
11356
<text value=""/>
@@ -116,7 +59,10 @@
11659
</properties>
11760
</component>
11861
<component id="cc28c" class="javax.swing.JButton" binding="btnAddColumnBefore">
119-
<constraints/>
62+
<constraints>
63+
<grid row="0" column="7" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
64+
<gridbag weightx="1.0" weighty="0.0"/>
65+
</constraints>
12066
<properties>
12167
<icon value="media/icons/add-column-before.png"/>
12268
<text value=""/>
@@ -125,7 +71,10 @@
12571
</properties>
12672
</component>
12773
<component id="7de12" class="javax.swing.JButton" binding="btnAddColumn">
128-
<constraints/>
74+
<constraints>
75+
<grid row="0" column="8" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
76+
<gridbag weightx="1.0" weighty="0.0"/>
77+
</constraints>
12978
<properties>
13079
<icon value="media/icons/add-column.png"/>
13180
<maximumSize width="56" height="28"/>
@@ -136,40 +85,119 @@
13685
</properties>
13786
</component>
13887
<component id="a0fe5" class="javax.swing.JButton" binding="btnRemoveColumn">
139-
<constraints/>
88+
<constraints>
89+
<grid row="0" column="9" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
90+
<gridbag weightx="1.0" weighty="0.0"/>
91+
</constraints>
14092
<properties>
14193
<icon value="media/icons/remove-column.png"/>
14294
<text value=""/>
14395
<toolTipText value="Remove column"/>
14496
<visible value="false"/>
14597
</properties>
14698
</component>
147-
<component id="846c8" class="javax.swing.JToolBar$Separator">
148-
<constraints/>
99+
<grid id="46b01" layout-manager="FlowLayout" hgap="5" vgap="5" flow-align="1">
100+
<constraints>
101+
<grid row="0" column="3" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
102+
<gridbag weightx="1.0" weighty="0.0"/>
103+
</constraints>
149104
<properties/>
150-
</component>
151-
<component id="484e4" class="javax.swing.JButton" binding="btnUndo">
152-
<constraints/>
105+
<border type="none"/>
106+
<children>
107+
<component id="83d80" class="javax.swing.JCheckBox" binding="cbFixedHeaders">
108+
<constraints/>
109+
<properties>
110+
<contentAreaFilled value="false"/>
111+
<horizontalTextPosition value="10"/>
112+
<label value="Header row fixed:"/>
113+
<text value="Header row fixed:"/>
114+
</properties>
115+
</component>
116+
<component id="b81ce" class="javax.swing.JToolBar$Separator">
117+
<constraints/>
118+
<properties/>
119+
</component>
120+
<component id="9bf69" class="javax.swing.JLabel" binding="lblTextlines">
121+
<constraints/>
122+
<properties>
123+
<text value="Text-lines per row: "/>
124+
</properties>
125+
</component>
126+
<component id="65e44" class="javax.swing.JComboBox" binding="comboRowHeight">
127+
<constraints/>
128+
<properties>
129+
<maximumSize width="100" height="32767"/>
130+
<model>
131+
<item value="Auto"/>
132+
<item value="1"/>
133+
<item value="2"/>
134+
<item value="3"/>
135+
<item value="4"/>
136+
<item value="5"/>
137+
<item value="6"/>
138+
<item value="7"/>
139+
<item value="8"/>
140+
<item value="9"/>
141+
<item value="10"/>
142+
</model>
143+
</properties>
144+
</component>
145+
<component id="8daaf" class="javax.swing.JToolBar$Separator">
146+
<constraints/>
147+
<properties/>
148+
</component>
149+
<component id="484e4" class="javax.swing.JButton" binding="btnUndo">
150+
<constraints/>
151+
<properties>
152+
<icon value="actions/undo.png"/>
153+
<maximumSize width="56" height="28"/>
154+
<minimumSize width="56" height="28"/>
155+
<preferredSize width="56" height="28"/>
156+
<toolTipText value="Undo"/>
157+
</properties>
158+
</component>
159+
<component id="e3fa2" class="javax.swing.JButton" binding="btnRedo">
160+
<constraints/>
161+
<properties>
162+
<icon value="actions/redo.png"/>
163+
<maximumSize width="56" height="28"/>
164+
<minimumSize width="56" height="28"/>
165+
<preferredSize width="56" height="28"/>
166+
<toolTipText value="Redo"/>
167+
</properties>
168+
</component>
169+
</children>
170+
</grid>
171+
<component id="8e338" class="com.intellij.ui.components.labels.LinkLabel" binding="lnkTextEditor" custom-create="true">
172+
<constraints>
173+
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
174+
<gridbag weightx="0.0" weighty="0.0"/>
175+
</constraints>
153176
<properties>
154-
<icon value="actions/undo.png"/>
155-
<maximumSize width="56" height="28"/>
156-
<minimumSize width="56" height="28"/>
157-
<preferredSize width="56" height="28"/>
158-
<toolTipText value="Undo"/>
177+
<horizontalTextPosition value="10"/>
178+
<text value="Open file in text editor"/>
159179
</properties>
160180
</component>
161-
<component id="e3fa2" class="javax.swing.JButton" binding="btnRedo">
162-
<constraints/>
181+
<component id="157b0" class="javax.swing.JLabel" binding="lblErrorText">
182+
<constraints>
183+
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
184+
<gridbag weightx="0.0" weighty="0.0"/>
185+
</constraints>
163186
<properties>
164-
<icon value="actions/redo.png"/>
165-
<maximumSize width="56" height="28"/>
166-
<minimumSize width="56" height="28"/>
167-
<preferredSize width="56" height="28"/>
168-
<toolTipText value="Redo"/>
187+
<font size="12" style="1"/>
188+
<foreground color="-65536"/>
189+
<text value=" ATTENTION: Error while parsing content - please fix issues in text editor!"/>
169190
</properties>
170191
</component>
192+
<component id="d8426" class="javax.swing.JToolBar$Separator">
193+
<constraints>
194+
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
195+
<gridbag weightx="0.0" weighty="0.0"/>
196+
</constraints>
197+
<properties/>
198+
</component>
171199
</children>
172-
</toolbar>
200+
</grid>
173201
</children>
174202
</scrollpane>
175203
<scrollpane id="6b9c5">

0 commit comments

Comments
 (0)