Merge pull request #155 from SeeSharpSoft/master

Release 2.6.4

Author: SeeSharpSoft

CHANGELOG

@@ -1,3 +1,9 @@
+2.6.4
+Aug 30, 2019
+
+FIX: scrollable table cells
+FIX: auto cell height computation
+
 2.6.3
 Aug 25, 2019
 

gradle.properties

@@ -3,7 +3,7 @@
 # https://www.jetbrains.com/intellij-repository/snapshots
 
 name='CSV Plugin'
-pluginVersion=2.6.3
+pluginVersion=2.6.4
 javaVersion=1.8
 javaTargetVersion=1.8
 downloadIntellijSources=false

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

@@ -251,9 +251,10 @@ private void updateRowHeights(int first, int last) {
             int columnCount = table.getColumnCount();
             int actualFirst = Math.min(first, table.getRowCount());
             int actualLast = Math.min(last, table.getRowCount());
+            boolean isCalculated = getFileEditorState().getRowLines() == 0;
             for (int row = actualFirst; row < actualLast; row++) {
                 int rowHeight = getPreferredRowHeight();
-                if (rowHeight == 0) {
+                if (isCalculated) {
                     for (int column = 0; column < columnCount; column++) {
                         Component comp = table.prepareRenderer(table.getCellRenderer(row, column), row, column);
                         rowHeight = Math.max(rowHeight, comp.getPreferredSize().height);
@@ -500,7 +501,6 @@ public void changeFontSize(int changeAmount) {
         int oldSize = getTable().getFont().getSize();
         int newSize = oldSize + changeAmount;
         setFontSize(newSize);
-        setTableRowHeight(getPreferredRowHeight());
         updateEditorLayout();
     }
 

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

@@ -2,6 +2,7 @@
 
 import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.util.UserDataHolder;
+import com.intellij.ui.components.JBScrollPane;
 import net.seesharpsoft.intellij.plugins.csv.editor.CsvEditorSettingsExternalizable;
 import net.seesharpsoft.intellij.plugins.csv.settings.CsvColorSettings;
 
@@ -18,22 +19,28 @@
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-public class MultiLineCellRenderer extends JTextArea implements TableCellRenderer, TableCellEditor {
+public class MultiLineCellRenderer extends JBScrollPane implements TableCellRenderer, TableCellEditor {
 
     private Set<CellEditorListener> cellEditorListenerSet = new CopyOnWriteArraySet<>();
-    private final UserDataHolder userDataHolder;
+    private final UserDataHolder myUserDataHolder;
+
+    private JTextArea myTextArea;
 
     public MultiLineCellRenderer(CsvTableEditorKeyListener keyListener, UserDataHolder userDataHolderParam) {
-        setLineWrap(true);
-        setWrapStyleWord(true);
-        setOpaque(true);
-        addKeyListener(keyListener);
-        this.userDataHolder = userDataHolderParam;
+        this.myUserDataHolder = userDataHolderParam;
+        myTextArea = new JTextArea();
+        myTextArea.setLineWrap(true);
+        myTextArea.setWrapStyleWord(true);
+        myTextArea.setOpaque(true);
+        myTextArea.setBorder(null);
+        myTextArea.addKeyListener(keyListener);
+        this.setOpaque(true);
+        this.setViewportView(myTextArea);
     }
 
     private TextAttributes getColumnTextAttributes(int column) {
         if (CsvEditorSettingsExternalizable.getInstance().isTableColumnHighlightingEnabled()) {
-            return CsvColorSettings.getTextAttributesOfColumn(column, userDataHolder);
+            return CsvColorSettings.getTextAttributesOfColumn(column, myUserDataHolder);
         }
         return null;
     }
@@ -48,6 +55,7 @@ private Color getColumnBackgroundColor(int column, Color fallback) {
         return textAttributes == null || textAttributes.getBackgroundColor() == null ? fallback : textAttributes.getBackgroundColor();
     }
 
+    @Override
     public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
         if (isSelected) {
             setForeground(table.getSelectionForeground());
@@ -56,7 +64,6 @@ public Component getTableCellRendererComponent(JTable table, Object value, boole
             setForeground(getColumnForegroundColor(column, table.getForeground()));
             setBackground(getColumnBackgroundColor(column, table.getBackground()));
         }
-        setFont(table.getFont());
         if (hasFocus) {
             setBorder(UIManager.getBorder("Table.focusCellHighlightBorder"));
             if (table.isCellEditable(row, column)) {
@@ -66,24 +73,27 @@ public Component getTableCellRendererComponent(JTable table, Object value, boole
         } else {
             setBorder(new EmptyBorder(1, 2, 1, 2));
         }
-        setText((value == null) ? "" : value.toString());
 
         final int columnWidth = table.getColumnModel().getColumn(column).getWidth();
         final int rowHeight = table.getRowHeight(row);
+        this.setFont(table.getFont());
         this.setSize(columnWidth, rowHeight);
         this.validate();
+        myTextArea.setText((value == null) ? "" : value.toString());
+        myTextArea.setFont(table.getFont());
+        myTextArea.setSize(columnWidth, rowHeight);
+        myTextArea.validate();
 
         return this;
     }
 
     @Override
     public Dimension getPreferredSize() {
         try {
-            final Rectangle rectangle = this.modelToView(getDocument().getLength());
+            final Rectangle rectangle = myTextArea.modelToView(myTextArea.getDocument().getLength());
             if (rectangle != null) {
                 return new Dimension(this.getWidth(),
-                        this.getInsets().top + rectangle.y + rectangle.height +
-                                this.getInsets().bottom);
+                        this.getInsets().top + rectangle.y + rectangle.height + this.getInsets().bottom);
             }
         } catch (BadLocationException e) {
             e.printStackTrace();
@@ -99,7 +109,7 @@ public Component getTableCellEditorComponent(JTable table, Object value, boolean
 
     @Override
     public Object getCellEditorValue() {
-        return this.getText();
+        return myTextArea.getText();
     }
 
     @Override

src/main/resources/META-INF/plugin.xml

@@ -46,7 +46,8 @@
 
     <change-notes><![CDATA[
         <pre style="font-family: sans-serif">
-FIX: Index out of bound error on multi line clear cells #151
+FIX: scrollable table cells
+FIX: auto cell height computation
       </pre>
     ]]>
     </change-notes>

src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/MultiLineCellRendererTest.java

@@ -14,7 +14,7 @@ public void testCellRendererUsage() {
     }
 
     public void testPreferredSize() {
-        JTextArea jTextArea = (JTextArea)fileEditor.getTable().getCellRenderer(0, 0);
+        JScrollPane jTextArea = (JScrollPane)fileEditor.getTable().getCellRenderer(0, 0);
 
         assertNotNull(jTextArea.getPreferredSize());
     }