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

Timestamp:

2009-08-08T20:07:43+02:00 (17 years ago)

Author:

jttt

Message:

Replace some occurrences of RelationMember.member with getters

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• DataSet.java (modified) (1 diff)
• RelationMember.java (modified) (1 diff)
• visitor/AllNodesVisitor.java (modified) (1 diff)
• visitor/BoundingXYVisitor.java (modified) (1 diff)
• visitor/CollectBackReferencesVisitor.java (modified) (1 diff)
• visitor/MapPaintVisitor.java (modified) (9 diffs)
• visitor/MergeSourceBuildingVisitor.java (modified) (4 diffs)
• visitor/MergeVisitor.java (modified) (1 diff)

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

@@ -404 +404 @@
             while(it.hasNext()) {
                 RelationMember member = it.next();
-                if (member.member.equals(primitive)) {
+                if (member.getMember().equals(primitive)) {
                     it.remove();
                 }

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

@@ -34 +34 @@
         return role != null && !"".equals(role);
     }
+
+    /**
+     *
+     * @return True if member is relation
+     * @since 1937
+     */
+    public boolean isRelation() {
+        return member instanceof Relation;
+    }
+
+    /**
+    *
+    * @return True if member is way
+    * @since 1937
+    */
+    public boolean isWay() {
+        return member instanceof Way;
+    }
+
+    /**
+    *
+    * @return True if member is node
+    * @since 1937
+    */
+    public boolean isNode() {
+        return member instanceof Node;
+    }
+
+    /**
+     *
+     * @return Member as relation
+     * @since 1937
+     */
+    public Relation getRelation() {
+        return (Relation)member;
+    }
+
+    /**
+    *
+    * @return Member as way
+    * @since 1937
+    */
+    public Way getWay() {
+        return (Way)member;
+    }
+
+    /**
+    *
+    * @return Member as node
+    * @since 1937
+    */
+    public Node getNode() {
+        return (Node)member;
+    }
+
+    /**
+    *
+    * @return Member
+    * @since 1937
+    */
+    public OsmPrimitive getMember() {
+        return member;
+    }
+
 
     /**

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

@@ -44 +44 @@
     public void visit(Relation e) {
         for (RelationMember m : e.getMembers())
-            if (m.member instanceof Node) visit((Node)m.member);
+            if (m.isNode()) visit(m.getNode());
     }
     /**

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

@@ -34 +34 @@
         // only use direct members
         for (RelationMember m : e.getMembers()) {
-            if (!(m.member instanceof Relation)) {
-                m.member.visit(this);
+            if (!m.isRelation()) {
+                m.getMember().visit(this);
             }
         }

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

@@ -74 +74 @@
             if (r.incomplete || r.deleted) continue;
             for (RelationMember m : r.getMembers()) {
-                if (m.member == p) {
+                if (m.getMember() == p) {
                     if (!data.contains(r)) {
                         data.add(r);

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

@@ -487 +487 @@
             for (RelationMember m : r.getMembers())
             {
-                if (m.member != null && !m.member.incomplete && !m.member.deleted
-                && m.member instanceof Node)
-                {
-                    drawSelectedMember(m.member, styles != null ? getPrimitiveStyle(m.member) : null, true, true);
+                if (m.isNode() && !m.getMember().incomplete && !m.getMember().deleted)
+                {
+                    drawSelectedMember(m.getMember(), styles != null ? getPrimitiveStyle(m.getMember()) : null, true, true);
                 }
             }
@@ -509 +508 @@
             for (RelationMember m : r.getMembers())
             {
-                if (m.member != null && !m.member.incomplete && !m.member.deleted
-                && m.member instanceof Way) /* nodes drawn on second call */
-                {
-                    drawSelectedMember(m.member, styles != null ? getPrimitiveStyle(m.member)
+                if (m.isWay() && !m.getMember().incomplete && !m.getMember().deleted) /* nodes drawn on second call */
+                {
+                    drawSelectedMember(m.getMember(), styles != null ? getPrimitiveStyle(m.getMember())
                     : null, true, true);
                 }
@@ -537 +535 @@
             //    System.out.println("member " + m.member + " selected " + r.selected);
 
-            if(m.member == null)
+            if(m.getMember() == null)
+                // TODO Nullable member will not be allowed after RelationMember.member is encalupsed
                 r.putError(tr("Empty member in relation."), true);
-            else if(m.member.deleted)
+            else if(m.getMember().deleted)
                 r.putError(tr("Deleted member ''{0}'' in relation.",
-                m.member.getName()), true);
-            else if(m.member.incomplete)
+                m.getMember().getName()), true);
+            else if(m.getMember().incomplete)
             {
                 return;
@@ -548 +547 @@
             else
             {
-                if(m.member instanceof Way)
-                {
-                    Way w = (Way) m.member;
+                if(m.isWay())
+                {
+                    Way w = m.getWay();
                     if(w.getNodesCount() < 2)
                     {
@@ -577 +576 @@
                         r.putError(tr("Unknown role ''{0}''.", m.getRole()), true);
                 }
-                else if(m.member instanceof Node)
-                {
-                    Node n = (Node) m.member;
+                else if(m.isNode())
+                {
+                    Node n = m.getNode();
                     if("via".equals(m.getRole()))
                     {
@@ -591 +590 @@
                 }
                 else
-                    r.putError(tr("Unknown member type for ''{0}''.", m.member.getName()), true);
+                    r.putError(tr("Unknown member type for ''{0}''.", m.getMember().getName()), true);
             }
         }
@@ -784 +783 @@
         for (RelationMember m : r.getMembers())
         {
-            if(m.member == null)
+            if(m.getMember() == null)
+                //TODO Remove useless nullcheck when RelationMember.member is encalupsed
                 r.putError(tr("Empty member in relation."), true);
-            else if(m.member.deleted)
+            else if(m.getMember().deleted)
                 r.putError(tr("Deleted member ''{0}'' in relation.",
-                m.member.getName()), true);
-            else if(m.member.incomplete)
+                m.getMember().getName()), true);
+            else if(m.getMember().incomplete)
                 incomplete = true;
             else
             {
-                if(m.member instanceof Way)
-                {
-                    Way w = (Way) m.member;
+                if(m.isWay())
+                {
+                    Way w = m.getWay();
                     if(w.getNodesCount() < 2)
                     {
@@ -812 +812 @@
                             outer.add(w);
                         else if(r.isSelected())
-                            drawSelectedMember(m.member, styles != null
-                            ? getPrimitiveStyle(m.member) : null, true, true);
+                            drawSelectedMember(m.getMember(), styles != null
+                            ? getPrimitiveStyle(m.getMember()) : null, true, true);
                     }
                 }
@@ -819 +819 @@
                 {
                     r.putError(tr("Non-Way ''{0}'' in multipolygon.",
-                    m.member.getName()), true);
+                    m.getMember().getName()), true);
                 }
             }

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

@@ -92 +92 @@
         clone.members.clear();
         for (RelationMember member: r.getMembers()) {
-            RelationMember cloneMember = new RelationMember(member);
-            cloneMember.member = mappedPrimitives.get(member.member);
+            RelationMember cloneMember = new RelationMember(member.getRole(), mappedPrimitives.get(member.getMember()));
             clone.members.add(cloneMember);
         }
@@ -190 +189 @@
         rememberRelationPartial(r);
         for (RelationMember member: r.getMembers()) {
-            if (isAlreadyRemembered(member.member)) {
+            if (isAlreadyRemembered(member.getMember())) {
                 // referred primitive already remembered
                 //
                 continue;
             }
-            if (member.member instanceof Node) {
-                Node node = (Node)member.member;
+            if (member.isNode()) {
+                Node node = member.getNode();
                 if (isInSelectionBase(node)) {
                     rememberNode(node);
@@ -204 +203 @@
                     rememberNodeIncomplete(node);
                 }
-            } else if (member.member instanceof Way) {
-                Way way = (Way)member.member;
+            } else if (member.isWay()) {
+                Way way = member.getWay();
                 if (isInSelectionBase(way)) {
                     way.visit(this);
@@ -213 +212 @@
                     rememberWayIncomplete(way);
                 }
-            } else if (member.member instanceof Relation) {
-                Relation relation = (Relation)member.member;
-                if (isInSelectionBase(member.member)) {
+            } else if (member.isRelation()) {
+                Relation relation = member.getRelation();
+                if (isInSelectionBase(member.getMember())) {
                     relation.visit(this);
                 } else if (isNew(relation)) {

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

@@ -193 +193 @@
         LinkedList<RelationMember> newMembers = new LinkedList<RelationMember>();
         for (RelationMember myMember : r.getMembers()) {
-            OsmPrimitive mergedMember = merged.get(myMember.member);
+            OsmPrimitive mergedMember = merged.get(myMember.getMember());
             if (mergedMember == null) {
                 newMembers.add(myMember);
             } else {
                 if (! mergedMember.deleted) {
-                    RelationMember newMember = new RelationMember(myMember);
-                    newMember.member = mergedMember;
+                    RelationMember newMember = new RelationMember(myMember.getRole(), mergedMember);
                     newMembers.add(newMember);
                 }