Fixed profile tab column resizing (#38)

* Fixed profile tab column resizing
* Reusing column resizer in TablePanel

Author: nikarh

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/table/ColumnResizer.java

@@ -11,10 +11,18 @@
 public class ColumnResizer implements TableModelListener {
 
     private final JTable table;
+    private final Integer maxWidth;
     private final int minMargin;
 
     public ColumnResizer(JTable table) {
         this.table = table;
+        this.maxWidth = null;
+        minMargin = strWidth("ww");
+    }
+
+    public ColumnResizer(JTable table, Integer maxWidth) {
+        this.table = table;
+        this.maxWidth = maxWidth;
         minMargin = strWidth("ww");
     }
 
@@ -29,16 +37,22 @@ public void resize() {
         for (int c = 0; c < cols; c++) {
             TableColumn col = model.getColumn(c);
             String header = String.valueOf(col.getHeaderValue());
-            int headerWidth = strWidth(header) + margin;
+            int minWidth = strWidth(header) + margin;
 
             for (int r = 0; r < rows; r++) {
                 TableCellRenderer render = table.getCellRenderer(r, c);
                 Component component = table.prepareRenderer(render, r, c);
                 int rendererWidth = component.getPreferredSize().width;
 
                 int cellWidth = Math.max(rendererWidth + margin, 1);
+                minWidth = Math.max(minWidth, cellWidth);
+
+                if (maxWidth != null && minWidth >= maxWidth) {
+                    col.setPreferredWidth(maxWidth);
+                    break;
+                }
 
-                col.setPreferredWidth(Math.max(headerWidth, cellWidth));
+                col.setPreferredWidth(minWidth);
             }
         }
     }

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/table/TablePanel.java

@@ -12,8 +12,6 @@
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.table.renderer.CompositeTableCellRenderer;
 
 import javax.swing.*;
-import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableColumn;
 import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
@@ -39,6 +37,8 @@ public void initialize(GraphConsoleView graphConsoleView, Project project) {
         table.setDefaultEditor(Object.class, new CompositeTableCellEditor());
         table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
 
+        ColumnResizer cr = new ColumnResizer(table, MAX_WIDTH);
+
         messageBus.connect().subscribe(QueryExecutionProcessEvent.QUERY_EXECUTION_PROCESS_TOPIC, new QueryExecutionProcessEvent() {
             @Override
             public void executionStarted(ExecuteQueryPayload payload) {
@@ -64,7 +64,7 @@ public void resultReceived(ExecuteQueryPayload payload, GraphQueryResult result)
 
             @Override
             public void postResultReceived(ExecuteQueryPayload payload) {
-                updateColumnWidths();
+                cr.resize();
                 updateRowHeights();
             }
 
@@ -78,28 +78,6 @@ public void executionCompleted(ExecuteQueryPayload payload) {
         });
     }
 
-    private void updateColumnWidths() {
-        for (int column = 0; column < table.getColumnCount(); column++) {
-            TableColumn tableColumn = table.getColumnModel().getColumn(column);
-            int preferredWidth = tableColumn.getMinWidth();
-            int maxWidth = MAX_WIDTH;
-
-            for (int row = 0; row < table.getRowCount(); row++) {
-                TableCellRenderer cellRenderer = table.getCellRenderer(row, column);
-                Component c = table.prepareRenderer(cellRenderer, row, column);
-                int width = c.getPreferredSize().width + table.getIntercellSpacing().width;
-                preferredWidth = Math.max(preferredWidth, width);
-
-                //  We've exceeded the maximum width, no need to check other rows
-                if (preferredWidth >= MAX_WIDTH) {
-                    preferredWidth = MAX_WIDTH;
-                    break;
-                }
-            }
-            tableColumn.setPreferredWidth(preferredWidth);
-        }
-    }
-
     public void updateRowHeights() {
         for (int row = 0; row < table.getRowCount(); row++) {
             int rowHeight = 1;