Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 16548) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 16549) @@ -17,4 +17,5 @@ import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.EnumSet; import java.util.HashMap; @@ -23,5 +24,4 @@ import java.util.Map; import java.util.Map.Entry; -import java.util.Optional; import java.util.Set; import java.util.TreeMap; @@ -673,6 +673,5 @@ if (ref instanceof IRelation && !ref.isIncomplete() && !ref.isDeleted()) { IRelation r = (IRelation) ref; - MemberInfo mi = Optional.ofNullable(roles.get(r)).orElseGet(() -> new MemberInfo(newSel)); - roles.put(r, mi); + MemberInfo mi = roles.computeIfAbsent(r, ignore -> new MemberInfo(newSel)); int i = 1; for (IRelationMember m : r.getMembers()) { @@ -975,5 +974,10 @@ } else if (e.getSource() == membershipTable) { int row = membershipTable.rowAtPoint(e.getPoint()); - if (row > -1) { + int col = membershipTable.columnAtPoint(e.getPoint()); + if (row > -1 && col == 1) { + final Relation relation = (Relation) membershipData.getValueAt(row, 0); + final MemberInfo memberInfo = (MemberInfo) membershipData.getValueAt(row, 1); + RelationRoleEditor.editRole(relation, memberInfo); + } else if (row > -1) { editMembership(row); } @@ -1024,4 +1028,8 @@ } return Utils.shortenString(positionString, 20); + } + + List> getRole() { + return Collections.unmodifiableList(role); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/RelationRoleEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/RelationRoleEditor.java (revision 16549) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/RelationRoleEditor.java (revision 16549) @@ -0,0 +1,53 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.dialogs.properties; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.util.Collection; +import java.util.List; + +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.command.ChangeCommand; +import org.openstreetmap.josm.data.UndoRedoHandler; +import org.openstreetmap.josm.data.osm.DefaultNameFormatter; +import org.openstreetmap.josm.data.osm.Relation; +import org.openstreetmap.josm.data.osm.RelationMember; +import org.openstreetmap.josm.gui.MainApplication; +import org.openstreetmap.josm.tools.Utils; + +/** + * Quickly change the relation roles of the selected members. + */ +final class RelationRoleEditor { + + private RelationRoleEditor() { + } + + /** + * Shows an {{@linkplain JOptionPane#showInputDialog input dialog} in order to quickly change + * the roles of the selected members. + * @param relation the relation to edit + * @param memberInfo the corresponding member info + */ + static void editRole(Relation relation, PropertiesDialog.MemberInfo memberInfo) { + if (MainApplication.getLayerManager().getActiveDataLayer().isLocked()) { + return; + } + final Collection members = Utils.filteredCollection(memberInfo.getRole(), RelationMember.class); + final String oldRole = memberInfo.getRoleString(); + final DefaultNameFormatter formatter = DefaultNameFormatter.getInstance(); + final String newRole = JOptionPane.showInputDialog("" + tr("Change role for {0} in relation {1}", + formatter.formatAsHtmlUnorderedList(Utils.transform(members, RelationMember::getMember), 5), + formatter.formatAsHtmlUnorderedList(relation)), + oldRole); + if (newRole == null || oldRole.equals(newRole) || tr("").equals(newRole)) { + return; + } + final Relation newRelation = new Relation(relation); + final List newMembers = newRelation.getMembers(); + newMembers.replaceAll(m -> members.contains(m) ? new RelationMember(newRole, m.getMember()) : m); + newRelation.setMembers(newMembers); + UndoRedoHandler.getInstance().add(new ChangeCommand(relation, newRelation)); + } +}