Changeset 19013 in josm for trunk/src

Timestamp:

2024-03-08T10:02:48+01:00 (9 months ago)

Author:

GerdP

Message:

see #23482: optimize the space in the history view (column width) and consider adding line wrapping

• use TableHelper.adjustColumnWidth to adjust column widths each time when the displayed tag data changes
• set maximum width for the "Since" column

Location:

trunk/src/org/openstreetmap/josm/gui/history

Files:

• HistoryBrowser.java (modified) (5 diffs)
• HistoryBrowserDialogManager.java (modified) (2 diffs)
• TagInfoViewer.java (modified) (3 diffs)
• TagTableColumnModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java

@@ -12 +12 @@
 import javax.swing.JSplitPane;
 import javax.swing.JTabbedPane;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -23 +25 @@
  * @since 1709
  */
-public class HistoryBrowser extends JPanel implements Destroyable {
+public class HistoryBrowser extends JPanel implements Destroyable, ChangeListener {
 
     /** the model */
@@ -116 +118 @@
         boolean samePrimitive = model.isSamePrimitive(history); // needs to be before setHistory
         model.setHistory(history);
+        model.addChangeListener(this);
         if (samePrimitive) {
             // no need to rebuild the UI
@@ -160 +163 @@
         if (model != null) {
             model.unlinkAsListener();
+            model.removeChangeListener(this);
             model = null;
         }
@@ -169 +173 @@
         coordinateInfoViewer = null;
     }
+
+    @Override
+    public void stateChanged(ChangeEvent e) {
+        tagInfoViewer.adjustWidths();
+    }
 }

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java

@@ -19 +19 @@
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
+import javax.swing.event.ChangeEvent;
 
 import org.openstreetmap.josm.data.osm.PrimitiveId;
@@ -148 +149 @@
             placeOnScreen(dialog);
             dialog.setVisible(true);
+            dialog.getHistoryBrowser().stateChanged(new ChangeEvent(this));
             dialogs.put(h.getId(), dialog);
         }

trunk/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java

@@ -36 +36 @@
  */
 public class TagInfoViewer extends HistoryViewerPanel {
+    private JTable reference;
+    private JTable current;
     private static final class RepaintOnFocusChange implements FocusListener {
         @Override
@@ -63 +65 @@
     @Override
     protected JTable buildReferenceTable() {
-        return buildTable(PointInTimeType.REFERENCE_POINT_IN_TIME);
+        reference = buildTable(PointInTimeType.REFERENCE_POINT_IN_TIME);
+        return reference;
     }
 
     @Override
     protected JTable buildCurrentTable() {
-        return buildTable(PointInTimeType.CURRENT_POINT_IN_TIME);
+        current = buildTable(PointInTimeType.CURRENT_POINT_IN_TIME);
+        return current;
     }
 
@@ -106 +110 @@
         return table;
     }
+
+    /**
+     * Use current data to adjust preferredWidth for both tables.
+     * @since 19013
+     */
+    public void adjustWidths() {
+        // We have two tables with 3 columns each. no column should get more than 1/4 of the size
+        int maxWidth = this.getWidth() / 4;
+        if (maxWidth == 0)
+            maxWidth = Integer.MAX_VALUE;
+        adjustWidths(reference, maxWidth);
+        adjustWidths(current, maxWidth);
+    }
+
+    private static void adjustWidths(JTable table, int maxWidth) {
+        for (int column = 0; column < table.getColumnCount(); column++) {
+            TableHelper.adjustColumnWidth(table, column, maxWidth);
+        }
+    }
 }

trunk/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import javax.swing.JLabel;
 import javax.swing.table.DefaultTableColumnModel;
 import javax.swing.table.TableColumn;
@@ -42 +43 @@
         col.setCellRenderer(renderer);
         col.setPreferredWidth(10);
+        col.setMaxWidth(new JLabel("v" + Long.MAX_VALUE).getMinimumSize().width); // See #23482
         addColumn(col);
     }