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

Timestamp:

2014-04-05T17:37:26+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #9827 - Sort track length by value instead of string representation (patch by Balaitous)

File:

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

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

@@ -14 +14 @@
 import java.awt.event.MouseListener;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.Map;
 
@@ -26 +27 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
+import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableCellRenderer;
+import javax.swing.table.TableRowSorter;
 
 import org.openstreetmap.josm.Main;
@@ -56 +59 @@
         this.layer = layer;
         putValue("help", ht("/Action/ChooseTrackVisibility"));
+    }
+
+    /**
+     * Class to format a length according to SystemOfMesurement.
+     */
+    private final class TrackLength {
+        private 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 NavigatableComponent.getSystemOfMeasurement().getDistText(value);
+        }
+    }
+
+    /**
+     * Comparator for TrackLength objects
+     */
+    private final class LengthContentComparator implements Comparator<TrackLength> {
+
+        /**
+         * Compare 2 TrackLength objects relative to the real length
+         */
+        @Override
+        public int compare(TrackLength l0, TrackLength l1) {
+            if(l0.value < l1.value)
+                return -1;
+            else if(l0.value > l1.value)
+                return 1;
+            return 0;
+        }
     }
 
@@ -69 +114 @@
             String desc = (String) (attr.containsKey("desc") ? attr.get("desc") : "");
             String time = GpxLayer.getTimespanForTrack(trk);
-            String length = NavigatableComponent.getSystemOfMeasurement().getDistText(trk.length());
+            TrackLength length = new TrackLength(trk.length());
             String url = (String) (attr.containsKey("url") ? attr.get("url") : "");
-            tracks[i] = new String[]{name, desc, time, length, url};
+            tracks[i] = new Object[]{name, desc, time, length, url};
             i++;
         }
@@ -82 +127 @@
     private JTable buildTable(Object[][] content) {
         final String[] headers = {tr("Name"), tr("Description"), tr("Timespan"), tr("Length"), tr("URL")};
-        final JTable t = new JTable(content, headers) {
+        DefaultTableModel model = new DefaultTableModel(content, headers);
+        final JTable t = new JTable(model) {
             @Override
             public Component prepareRenderer(TableCellRenderer renderer, int row, int col) {
@@ -88 +134 @@
                 if (c instanceof JComponent) {
                     JComponent jc = (JComponent) c;
-                    jc.setToolTipText((String) getValueAt(row, col));
+                    jc.setToolTipText(getValueAt(row, col).toString());
                 }
                 return c;
@@ -98 +144 @@
             }
         };
+        // define how to sort row
+        TableRowSorter<DefaultTableModel> rowSorter = new TableRowSorter<DefaultTableModel>();
+        t.setRowSorter(rowSorter);
+        rowSorter.setModel(model);
+        rowSorter.setComparator(3, new LengthContentComparator());
         // default column widths
         t.getColumnModel().getColumn(0).setPreferredWidth(220);
@@ -124 +175 @@
             }
         };
-        t.setAutoCreateRowSorter(true);
         t.addMouseListener(urlOpener);
         t.setFillsViewportHeight(true);