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

Timestamp:

2025-10-15T16:18:24+02:00 (6 days ago)

Author:

GerdP

Message:

fix #24507: automatic tag corrections not always sorted alphabetically

• sort tags by key and List of roles by relation (similar to the properties dialog)

File:

• trunk/src/org/openstreetmap/josm/actions/corrector/TagCorrector.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/corrector/TagCorrector.java

@@ -14 +14 @@
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import javax.swing.JLabel;
@@ -32 +33 @@
 import org.openstreetmap.josm.gui.correction.TagCorrectionTable;
 import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
+import org.openstreetmap.josm.tools.AlphanumComparator;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -95 +97 @@
 
             for (Entry<OsmPrimitive, List<TagCorrection>> entry : tagCorrectionsMap.entrySet()) {
+                if (entry.getValue().isEmpty())
+                    continue;
+
                 final OsmPrimitive primitive = entry.getKey();
-                final List<TagCorrection> tagCorrections = entry.getValue();
-
-                if (tagCorrections.isEmpty()) {
-                    continue;
-                }
+                final List<TagCorrection> tagCorrections = entry.getValue().stream()
+                        .sorted((o1, o2) -> AlphanumComparator.getInstance().compare(o1.oldKey, o2.oldKey))
+                        .collect(Collectors.toList());
 
                 final JLabel propertiesLabel = new JLabel(tr("Tags of "));
@@ -112 +115 @@
                 p.add(primitiveLabel, GBC.eol());
 
-                final TagCorrectionTable table = new TagCorrectionTable(
-                        tagCorrections);
+                final TagCorrectionTable table = new TagCorrectionTable(tagCorrections);
                 final JScrollPane scrollPane = new JScrollPane(table);
                 p.add(scrollPane, GBC.eop().fill(GBC.BOTH));
@@ -121 +123 @@
 
             for (Entry<OsmPrimitive, List<RoleCorrection>> entry : roleCorrectionMap.entrySet()) {
+                if (entry.getValue().isEmpty())
+                    continue;
+
                 final OsmPrimitive primitive = entry.getKey();
-                final List<RoleCorrection> roleCorrections = entry.getValue();
-
-                if (roleCorrections.isEmpty()) {
-                    continue;
-                }
+                final List<RoleCorrection> roleCorrections = entry.getValue().stream()
+                        .sorted((o1, o2) -> DefaultNameFormatter.getInstance().getRelationComparator()
+                                .compare(o1.relation, o2.relation))
+                        .collect(Collectors.toList());
 
                 final JLabel rolesLabel = new JLabel(tr("Roles in relations referring to"));