Changeset 1690 in josm for trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java

Timestamp:

2009-06-23T22:03:37+02:00 (15 years ago)

Author:

Gubaer

Message:

new: MultiFetchServerObjectReader using APIs Multi Fetch method
update: now uses Multi Fetch to check for deleted primitives on the server
update: now uses Multi Fetch to update the selected primitives with the state from the server
fixed: cleaned up merging in MergeVisitor
new: conflict resolution dialog; now resolves conflicts due to different visibilities
new: replacement for realEqual() on OsmPrimitive and derived classes; realEqual now @deprecated
fixed: cleaning up OsmReader
fixed: progress indication in OsmApi

File:

• trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java (modified) (1 diff)

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

@@ -33 +33 @@
 
     @Override public boolean equals(Object other) {
-        if (!(other instanceof RelationMember)) return false;
+        if (other == null || !(other instanceof RelationMember)) return false;
         RelationMember otherMember = (RelationMember) other;
         return otherMember.role.equals(role) && otherMember.member.equals(member);