Changeset 16940 in josm

Timestamp:

2020-08-26T23:18:46+02:00 (4 years ago)

Author:

simon04

Message:

see #19716 - ChooseTrackVisibilityAction: replace TrackLength with custom renderer

File:

• trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java

@@ -13 +13 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -34 +33 @@
 import javax.swing.ListSelectionModel;
 import javax.swing.event.TableModelEvent;
+import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableCellRenderer;
@@ -75 +75 @@
 
     /**
-     * Class to format a length according to SystemOfMesurement.
-     */
-    private static final class TrackLength {
-        private final double value;
-
-        /**
-         * Constructs a new {@code TrackLength} object with a given length.
-         * @param value length of the track
-         */
-        TrackLength(double value) {
-            this.value = value;
-        }
-
-        /**
-         * Provides string representation.
-         * @return String representation depending of SystemOfMeasurement
-         */
-        @Override
-        public String toString() {
-            return SystemOfMeasurement.getSystemOfMeasurement().getDistText(value);
-        }
-    }
-
-    /**
-     * Comparator for TrackLength objects
-     */
-    private static final class LengthContentComparator implements Comparator<TrackLength>, Serializable {
-
-        private static final long serialVersionUID = 1L;
-
-        /**
-         * Compare 2 TrackLength objects relative to the real length
-         */
-        @Override
-        public int compare(TrackLength l0, TrackLength l1) {
-            return Double.compare(l0.value, l1.value);
-        }
-    }
-
-    /**
      * Gathers all available data for the tracks and returns them as array of arrays
      * in the expected column order.
@@ -127 +87 @@
             String desc = (String) Optional.ofNullable(attr.get(GpxConstants.GPX_DESC)).orElse("");
             String time = GpxLayer.getTimespanForTrack(trk);
-            TrackLength length = new TrackLength(trk.length());
             String url = (String) Optional.ofNullable(attr.get("url")).orElse("");
-            tracks[i] = new Object[]{name, desc, time, length, url, trk};
+            tracks[i] = new Object[]{name, desc, time, trk.length(), url, trk};
             i++;
         }
@@ -179 +138 @@
         t.setRowSorter(rowSorter);
         rowSorter.setModel(model);
-        rowSorter.setComparator(3, new LengthContentComparator());
+        rowSorter.setComparator(3, Comparator.comparingDouble(length -> (double) length));
         // default column widths
         t.getColumnModel().getColumn(0).setPreferredWidth(220);
@@ -185 +144 @@
         t.getColumnModel().getColumn(2).setPreferredWidth(200);
         t.getColumnModel().getColumn(3).setPreferredWidth(50);
+        t.getColumnModel().getColumn(3).setCellRenderer(new DefaultTableCellRenderer() {
+            @Override
+            public Component getTableCellRendererComponent(
+                    JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+                value = SystemOfMeasurement.getSystemOfMeasurement().getDistText((Double) value);
+                return super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+            }
+        });
         t.getColumnModel().getColumn(4).setPreferredWidth(100);
         // make the link clickable