Changeset 5784 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-03-19T11:59:21+01:00 (12 years ago)

Author:

akks

Message:

Auto adjust column width in remote control add_tags table.
(noticed by CupIvan) Method TableHelper.adjustColumnWidth(table, column, maxColumnWidth) can also be used in any other place of code

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/preferences/SourceEditor.java (modified) (3 diffs)
• io/remotecontrol/AddTagsDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -83 +83 @@
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.util.FileFilterAllFiles;
+import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.gui.widgets.JFileChooserManager;
 import org.openstreetmap.josm.io.MirroredInputStream;
@@ -154 +155 @@
             @Override
             public void tableChanged(TableModelEvent e) {
-                adjustColumnWidth(tblActiveSources, isMapPaint ? 1 : 0);
+                TableHelper.adjustColumnWidth(tblActiveSources, isMapPaint ? 1 : 0, 800);
             }
         });
@@ -387 +388 @@
         LOADING_SOURCES_FROM, FAILED_TO_LOAD_SOURCES_FROM, FAILED_TO_LOAD_SOURCES_FROM_HELP_TOPIC,
         ILLEGAL_FORMAT_OF_ENTRY }
-
-    /**
-     * adjust the preferred width of column col to the maximum preferred width of the cells
-     * requires JTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
-     */
-    private static void adjustColumnWidth(JTable tbl, int col) {
-        int maxwidth = 0;
-        for (int row=0; row<tbl.getRowCount(); row++) {
-            TableCellRenderer tcr = tbl.getCellRenderer(row, col);
-            Object val = tbl.getValueAt(row, col);
-            Component comp = tcr.getTableCellRendererComponent(tbl, val, false, false, row, col);
-            maxwidth = Math.max(comp.getPreferredSize().width, maxwidth);
-        }
-        tbl.getColumnModel().getColumn(col).setPreferredWidth(maxwidth);
-    }
 
     public boolean hasActiveSourcesChanged() {

trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java

@@ -27 +27 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -110 +111 @@
         };
         
+        propertyTable.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
         // a checkbox has a size of 15 px
         propertyTable.getColumnModel().getColumn(0).setMaxWidth(15);
+        TableHelper.adjustColumnWidth(propertyTable, 1, 200);
+        TableHelper.adjustColumnWidth(propertyTable, 2, 700);
         // get edit results if the table looses the focus, for example if a user clicks "add tags"
         propertyTable.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
@@ -128 +132 @@
         setContent(tablePanel);
         setDefaultButton(2);
-        // set the default Dimensions and show the dialog
-        setPreferredSize(new Dimension(400,tablePanel.getPreferredSize().height+100));
     }