Ticket #14666: Add_TableHelper_computeColumnsWidth_helper_and_use_it_for_tags_and_membership_tables.patch

src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -95 +95 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType;
 import org.openstreetmap.josm.gui.util.HighlightHelper;
+import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.gui.widgets.CompileSearchTextDecorator;
 import org.openstreetmap.josm.gui.widgets.DisableShortcutsOnFocusGainedTextField;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
@@ -308 +309 @@
         // setting up the tags table
         tagData.setColumnIdentifiers(new String[]{tr("Key"), tr("Value")});
         tagTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+        tagTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
         tagTable.getTableHeader().setReorderingAllowed(false);
 
         tagTable.getColumnModel().getColumn(0).setCellRenderer(cellRenderer);
@@ -332 +334 @@
     private void buildMembershipTable() {
         membershipData.setColumnIdentifiers(new String[]{tr("Member Of"), tr("Role"), tr("Position")});
         membershipTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+        membershipTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
 
         TableColumnModel mod = membershipTable.getColumnModel();
         membershipTable.getTableHeader().setReorderingAllowed(false);
@@ -669 +672 @@
         selectSth.setVisible(!hasSelection);
         pluginHook.setVisible(hasSelection);
 
+        // resize tables to fit content
+        TableHelper.computeColumnsWidth(tagTable);
+        TableHelper.computeColumnsWidth(membershipTable);
+
         int selectedIndex;
         if (selectedTag != null && (selectedIndex = findViewRow(tagTable, tagData, selectedTag)) != -1) {
             tagTable.changeSelection(selectedIndex, 0, false, false);

src/org/openstreetmap/josm/gui/util/TableHelper.java

@@ -33 +33 @@
         }
         tbl.getColumnModel().getColumn(col).setPreferredWidth(Math.min(maxwidth+10, maxColumnWidth));
     }
+
+    /**
+     * adjust the table's columns to fit their content best
+     * requires JTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+     * @param tbl table
+     */
+    public static void computeColumnsWidth(JTable tbl) {
+        for (int column = 0; column < tbl.getColumnCount(); column++) {
+            adjustColumnWidth(tbl, column, Integer.MAX_VALUE);
+        }
+    }
 }