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

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/data/osm

Files:

• RelationMember.java (modified) (1 diff)
• visitor/MapPaintVisitor.java (modified) (6 diffs)

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())