Changeset 1930 in josm for trunk/src/org

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

Files:

• actions/CombineWayAction.java (modified) (2 diffs)
• actions/MergeNodesAction.java (modified) (2 diffs)
• actions/SplitWayAction.java (modified) (1 diff)
• actions/UnGlueAction.java (modified) (1 diff)
• command/ChangeRelationMemberRoleCommand.java (modified) (1 diff)
• command/DeleteCommand.java (modified) (1 diff)
• corrector/ReverseWayTagCorrector.java (modified) (2 diffs)
• corrector/RoleCorrectionTableModel.java (modified) (1 diff)
• data/osm/RelationMember.java (modified) (1 diff)
• data/osm/visitor/MapPaintVisitor.java (modified) (6 diffs)
• gui/conflict/relation/RelationMemberListMergeModel.java (modified) (2 diffs)
• gui/conflict/relation/RelationMemberTableCellEditor.java (modified) (2 diffs)
• gui/conflict/relation/RelationMemberTableCellRenderer.java (modified) (3 diffs)
• gui/dialogs/PropertiesDialog.java (modified) (2 diffs)
• gui/dialogs/relation/MemberTableModel.java (modified) (2 diffs)
• gui/dialogs/relation/ac/AutoCompletionCache.java (modified) (1 diff)
• io/OsmWriter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -97 +97 @@
                     for(Way w : selectedWays) {
                         if (rm.member == w) {
-                            Pair<Relation,String> pair = new Pair<Relation,String>(r, rm.role == null ? "" : rm.role);
+                            Pair<Relation,String> pair = new Pair<Relation,String>(r, rm.getRole());
                             HashSet<Way> waylinks = new HashSet<Way>();
                             if (backlinks.containsKey(pair)) {
@@ -232 +232 @@
                 // note to re-add it later on.
                 if (selectedWays.contains(rm.member)) {
-                    rolesToReAdd.add(rm.role);
+                    rolesToReAdd.add(rm.getRole());
                 } else {
                     newRel.members.add(rm);

trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

@@ -134 +134 @@
                     for (Node n : allNodes) {
                         if (rm.member == n) {
-                            Pair<Relation,String> pair = new Pair<Relation,String>(r, rm.role);
+                            Pair<Relation,String> pair = new Pair<Relation,String>(r, rm.getRole());
                             HashSet<Node> nodelinks = new HashSet<Node>();
                             if (backlinks.containsKey(pair)) {
@@ -282 +282 @@
                 // just keep a note to re-add it later on.
                 if (allNodes.contains(rm.member)) {
-                    rolesToReAdd.add(rm.role);
+                    rolesToReAdd.add(rm.getRole());
                 } else {
                     newRel.members.add(rm);

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -316 +316 @@
 
                         int j = i;
-                        boolean backwards = "backward".equals(rm.role);
+                        boolean backwards = "backward".equals(rm.getRole());
                         for(Way wayToAdd : newWays)
                         {
-                            RelationMember em = new RelationMember(rm.role, wayToAdd);
-                            if(em.role != null && em.role.length() > 0 && !("multipolygon".equals(type))) {
+                            RelationMember em = new RelationMember(rm.getRole(), wayToAdd);
+                            if(em.hasRole() && !("multipolygon".equals(type))) {
                                 warnmerole = true;
                             }

trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

@@ -335 +335 @@
                             rolesToReAdd = new HashSet<String>();
                         }
-                        rolesToReAdd.add(rm.role);
+                        rolesToReAdd.add(rm.getRole());
                     }
                 }

trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java

@@ -48 +48 @@
         }
 
-        oldRole = relation.getMember(position).role;
+        oldRole = relation.getMember(position).getRole();
         relation.getMember(position).role = newRole;
 

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -166 +166 @@
         for (RelationMember m : ref.getMembers()) {
             if (m.member == osm) {
-                role = m.role;
+                role = m.getRole();
                 break;
             }

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;

trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java

@@ -12 +12 @@
     public String role;
     public OsmPrimitive member;
+
+    /**
+     *
+     * @return Role name or "". Never returns null
+     * @since 1930
+     */
+    public String getRole() {
+        if (role == null) {
+            return "";
+        } else {
+            return role;
+        }
+    }
+
+    /**
+     *
+     * @return True if role is set
+     * @since 1930
+     */
+    public boolean hasRole() {
+        return role != null && !"".equals(role);
+    }
 
     /**

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -556 +556 @@
                         w.getName()), true);
                     }
-                    else if("from".equals(m.role)) {
+                    else if("from".equals(m.getRole())) {
                         if(fromWay != null)
                             r.putError(tr("More than one \"from\" way found."), true);
@@ -562 +562 @@
                             fromWay = w;
                         }
-                    } else if("to".equals(m.role)) {
+                    } else if("to".equals(m.getRole())) {
                         if(toWay != null)
                             r.putError(tr("More than one \"to\" way found."), true);
@@ -568 +568 @@
                             toWay = w;
                         }
-                    } else if("via".equals(m.role)) {
+                    } else if("via".equals(m.getRole())) {
                         if(via != null)
                             r.putError(tr("More than one \"via\" found."), true);
@@ -575 +575 @@
                     }
                     else
-                        r.putError(tr("Unknown role ''{0}''.", m.role), true);
+                        r.putError(tr("Unknown role ''{0}''.", m.getRole()), true);
                 }
                 else if(m.member instanceof Node)
                 {
                     Node n = (Node) m.member;
-                    if("via".equals(m.role))
+                    if("via".equals(m.getRole()))
                     {
                         if(via != null)
@@ -588 +588 @@
                     }
                     else
-                        r.putError(tr("Unknown role ''{0}''.", m.role), true);
+                        r.putError(tr("Unknown role ''{0}''.", m.getRole()), true);
                 }
                 else
@@ -801 +801 @@
                         w.getName()), true);
                     }
-                    else if("inner".equals(m.role))
+                    else if("inner".equals(m.getRole()))
                         inner.add(w);
-                    else if("outer".equals(m.role))
+                    else if("outer".equals(m.getRole()))
                         outer.add(w);
                     else
                     {
                         r.putError(tr("No useful role ''{0}'' for Way ''{1}''.",
-                        m.role == null ? "" : m.role, w.getName()), true);
-                        if(m.role == null || m.role.length() == 0)
+                          m.getRole(), w.getName()), true);
+                        if(!m.hasRole())
                             outer.add(w);
                         else if(r.isSelected())

trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java

@@ -24 +24 @@
     @Override
     public boolean isEqualEntry(RelationMember e1, RelationMember e2) {
-        boolean ret =
-            (    (e1.role == null && e2.role == null)
-                    || (e1.role != null && e1.role.equals(e2.role))
-            );
+        boolean ret = e1.getRole().equals(e2.getRole());
         if (e1.member.id > 0 ) {
             ret = ret && (e1.member.id == e2.member.id);
@@ -100 +97 @@
     @Override
     protected RelationMember cloneEntryForMergedList(RelationMember entry) {
-        return new RelationMember(entry.role, entry.member);
+        return new RelationMember(entry);
     }
 

trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberTableCellEditor.java

@@ -15 +15 @@
 /**
  * {@see TableCellEditor} for the the role column in a table for {@see RelationMember}s.
- * 
+ *
  */
 public class RelationMemberTableCellEditor extends AbstractCellEditor implements TableCellEditor{
@@ -37 +37 @@
         RelationMember member = (RelationMember)value;
 
-        editor.setText(member.role == null ? "" : member.role);
+        editor.setText(member.getRole());
         editor.selectAll();
         return editor;

trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberTableCellRenderer.java

@@ -25 +25 @@
 /**
  * This is the {@see TableCellRenderer} used in the tables of {@see RelationMemberMerger}.
- * 
+ *
  */
 public  class RelationMemberTableCellRenderer extends JLabel implements TableCellRenderer {
@@ -48 +48 @@
     /**
      * Load the image icon for an OSM primitive of type node
-     * 
+     *
      * @return the icon; null, if not found
      */
@@ -153 +153 @@
 
     protected void renderRole(RelationMember member) {
-        setText(member.role == null ? "" : member.role);
-        setToolTipText(member.role == null ? "" : member.role);
+        setText(member.getRole());
+        setToolTipText(member.getRole());
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -535 +535 @@
                     for (RelationMember r : col) {
                         if (text == null) {
-                            text = r.role;
+                            text = r.getRole();
                         }
-                        else if (!text.equals(r.role)) {
+                        else if (!text.equals(r.getRole())) {
                             text = tr("<different>");
                             break;
@@ -595 +595 @@
                                     if (rm.member == osm)
                                     {
-                                        RelationMember mem = new RelationMember(rm.role, rm.member);
-                                        rel.members.remove(mem);
+                                        rel.members.remove(rm);
                                         break;
                                     }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -87 +87 @@
         switch (columnIndex) {
             case 0:
-                return members.get(rowIndex).role;
+                return members.get(rowIndex).getRole();
             case 1:
                 return members.get(rowIndex).member;
@@ -386 +386 @@
     /**
      * Replies the set of selected referers. Never null, but may be empty.
-     * 
+     *
      * @return the set of selected referers
      */

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ac/AutoCompletionCache.java

@@ -132 +132 @@
     protected void cacheRelationMemberRoles(Relation relation){
         for (RelationMember m: relation.getMembers()) {
-            if (m.role == null || m.role.trim().equals("")) {
-                continue;
-            }
-            if (!roleCache.contains(m.role)) {
-                roleCache.add(m.role);
+            if (m.hasRole() && !roleCache.contains(m.getRole())) {
+                roleCache.add(m.getRole());
             }
         }

trunk/src/org/openstreetmap/josm/io/OsmWriter.java

@@ -135 +135 @@
                 out.print(OsmPrimitiveType.from(em.member).getAPIName());
                 out.println("' ref='"+getUsedId(em.member)+"' role='" +
-                        XmlWriter.encode(em.role == null ? "" : em.role) + "' />");
+                        XmlWriter.encode(em.getRole()) + "' />");
             }
             addTags(e, "relation", false);