Changeset 6478 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation
- Timestamp:
- 2013-12-16T01:51:52+01:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
r6336 r6478 11 11 import java.util.List; 12 12 import java.util.Set; 13 import java.util.TreeSet; 13 14 import java.util.concurrent.CopyOnWriteArrayList; 14 15 … … 402 403 int idx = index; 403 404 for (OsmPrimitive primitive : primitives) { 404 final String role = presets.isEmpty() ? null : presets.iterator().next().suggestRoleForOsmPrimitive(primitive); 405 Set<String> potentialRoles = new TreeSet<String>(); 406 for (TaggingPreset tp : presets) { 407 String suggestedRole = tp.suggestRoleForOsmPrimitive(primitive); 408 if (suggestedRole != null) { 409 potentialRoles.add(suggestedRole); 410 } 411 } 412 // TODO: propose user to choose role among potential ones instead of picking first one 413 final String role = potentialRoles.isEmpty() ? null : potentialRoles.iterator().next(); 405 414 RelationMember member = new RelationMember(role == null ? "" : role, primitive); 406 415 members.add(idx++, member);
Note:
See TracChangeset
for help on using the changeset viewer.