Changeset 28857 in osm for applications/editors/josm/plugins/reltoolbox

Timestamp:

2012-10-25T18:00:24+02:00 (12 years ago)

Author:

larry0ua

Message:

'RelToolbox: make natural sort for relation and find relation lists'

Location:

applications/editors/josm/plugins/reltoolbox

Files:

• build.xml (modified) (1 diff)
• src/relcontext/RelContextDialog.java (modified) (3 diffs)
• src/relcontext/actions/FindRelationAction.java (modified) (2 diffs)

applications/editors/josm/plugins/reltoolbox/build.xml

@@ -30 +30 @@
 <project name="reltoolbox" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="RelToolbox: update validations for boundary fixer - label role"/>
+    <property name="commit.message" value="RelToolbox: make natural sort for relation and find relation lists"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="5018"/>

applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java

@@ -2 +2 @@
 
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.command.Command;
@@ -13 +12 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
-import org.openstreetmap.josm.data.osm.NameFormatter;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.table.TableColumnModel;
@@ -313 +311 @@
             return;
 
-        final NameFormatter formatter = DefaultNameFormatter.getInstance();
-        Set<Relation> relations = new TreeSet<Relation>(new Comparator<Relation>() {
-            public int compare( Relation r1, Relation r2 ) {
-                int diff = r1.getDisplayName(formatter).compareTo(r2.getDisplayName(formatter));
-                return diff != 0 ? diff : r1.compareTo(r2);
-            }
-        });
+        Set<Relation> relations = new TreeSet<Relation>(
+                DefaultNameFormatter.getInstance().getRelationComparator());
         for( OsmPrimitive element : newSelection ) {
             for( OsmPrimitive ref : element.getReferrers() ) {

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java

@@ -11 +11 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.data.osm.NameFormatter;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
@@ -161 +160 @@
         }
 
-        final NameFormatter formatter = DefaultNameFormatter.getInstance();
-        Collections.sort(relations, new Comparator<Relation>() {
-            public int compare( Relation r1, Relation r2 ) {
-                return r1.getDisplayName(formatter).compareTo(r2.getDisplayName(formatter));
-            }
-        });
+        Collections.sort(relations, DefaultNameFormatter.getInstance().getRelationComparator());
         data.setRelations(relations);
     }