Changeset 1930 in josm for trunk/src/org/openstreetmap/josm/corrector

Timestamp:

2009-08-08T11:59:13+02:00 (15 years ago)

Author:

jttt

Message:

Replace RelationMember.role with RelationMember.getRole() and RelationMember.hasRole()

Location:

trunk/src/org/openstreetmap/josm/corrector

Files:

• ReverseWayTagCorrector.java (modified) (2 diffs)
• RoleCorrectionTableModel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java

@@ -119 +119 @@
             for (RelationMember member : relation.getMembers()) {
                 if (!member.member.hasEqualSemanticAttributes(oldway)
-                        || member.role.length() == 0) {
+                        || !member.hasRole()) {
                     position++;
                     continue;
@@ -127 +127 @@
                 String newRole = null;
                 for (PrefixSuffixSwitcher prefixSuffixSwitcher : prefixSuffixSwitchers) {
-                    newRole = prefixSuffixSwitcher.apply(member.role);
-                    if (!newRole.equals(member.role)) {
+                    newRole = prefixSuffixSwitcher.apply(member.getRole());
+                    if (!newRole.equals(member.getRole())) {
                         found = true;
                         break;

trunk/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java

@@ -42 +42 @@
             return NAME_FORMATTER.getName(roleCorrection.relation);
         case 1:
-            return roleCorrection.member.role;
+            return roleCorrection.member.getRole();
         case 2:
             return roleCorrection.newRole;