Changeset 1938 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationNodeMap.java

Timestamp:

2009-08-08T22:39:04+02:00 (15 years ago)

Author:

jttt

Message:

Replace some occurrences of RelationMember.member with getters

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationNodeMap.java (modified) (8 diffs)

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

@@ -9 +9 @@
 /**
  * A mapping from Node positions to elements in a Relation (currently Nodes and Ways only)
- * 
+ *
  * @author Christiaan Welvaart <cjw@time4t.net>
- * 
+ *
  */
 public class RelationNodeMap {
@@ -29 +29 @@
         for (i = 0; i < members.size(); ++i) {
             RelationMember m = members.get(i);
-            if (m.member.incomplete)
+            if (m.getMember().incomplete)
             {
                 remaining.add(Integer.valueOf(i));
@@ -47 +47 @@
             if (result == null) {
                 result = points.get(node).first();
-                if (members.get(current).member == members.get(result).member) {
+                if (members.get(current).getMember() == members.get(result).getMember()) {
                     result = points.get(node).last();
                 }
@@ -59 +59 @@
 
     void add(int n, RelationMember m) {
-        if (m.member instanceof Way) {
-            Way w = (Way) m.member;
+        if (m.isWay()) {
+            Way w = m.getWay();
             if (w.lastNode() == w.firstNode())
             {
@@ -77 +77 @@
                 points.get(w.lastNode()).add(Integer.valueOf(n));
             }
-        } else if (m.member instanceof Node) {
-            Node node = (Node) m.member;
+        } else if (m.isNode()) {
+            Node node = m.getNode();
             nodes.put(node, Integer.valueOf(n));
         } else {
@@ -87 +87 @@
     boolean remove(int n, RelationMember a) {
         boolean result;
-        if (a.member instanceof Way) {
-            Way w = (Way) a.member;
+        if (a.isWay()) {
+            Way w = a.getWay();
             if (w.firstNode() == w.lastNode())
             {
@@ -99 +99 @@
             }
         } else {
-            result = (nodes.remove(a.member) != null);
+            result = (nodes.remove(a.getMember()) != null);
         }
         return result;
@@ -135 +135 @@
                 if (!set.isEmpty()) {
                     result = set.first();
-                    Way w = (Way) members.get(result).member;
+                    Way w = members.get(result).getWay();
                     points.get(w.firstNode()).remove(result);
                     points.get(w.lastNode()).remove(result);