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

Timestamp:

2009-09-06T23:07:33+02:00 (15 years ago)

Author:

Gubaer

Message:

new: rewrite of CombineWay action
new: conflict resolution dialog for CombineWay, including conflicts for different relation memberships
cleanup: cleanup in OsmReader, reduces memory footprint and reduces parsing time
cleanup: made most of the public fields in OsmPrimitive @deprecated, added accessors and changed the code
cleanup: replaced usages of @deprecated constructors for ExtendedDialog
fixed #3208: Combine ways brokes relation order

WARNING: this changeset touches a lot of code all over the code base. "latest" might become slightly unstable in the next days. Also experience incompatibility issues with plugins in the next few days.

Location:

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

Files:

• Changeset.java (modified) (2 diffs)
• DataSet.java (modified) (2 diffs)
• Node.java (modified) (6 diffs)
• OsmPrimitive.java (modified) (9 diffs)
• Relation.java (modified) (8 diffs)
• RelationMember.java (modified) (8 diffs)
• Tag.java (modified) (2 diffs)
• TagCollection.java (modified) (3 diffs)
• User.java (modified) (4 diffs)
• Way.java (modified) (4 diffs)
• visitor/CollectBackReferencesVisitor.java (modified) (2 diffs)
• visitor/MergeVisitor.java (modified) (4 diffs)

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

@@ -30 +30 @@
 
     public int compareTo(OsmPrimitive other) {
-        if (other instanceof Changeset) return Long.valueOf(id).compareTo(other.id);
+        if (other instanceof Changeset) return Long.valueOf(getId()).compareTo(other.getId());
         return 1;
     }
@@ -37 +37 @@
     public String getName() {
         // no translation
-        return "changeset " + id;
+        return "changeset " + getId();
     }
 
     @Override
     public String getLocalName(){
-        return tr("Changeset {0}",id);
+        return tr("Changeset {0}",getId());
     }
 

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

@@ -373 +373 @@
     protected void deleteWay(Way way) {
         way.setNodes(null);
-        way.delete(true);
+        way.setDeleted(true);
     }
 
@@ -471 +471 @@
         return false;
     }
+
+    public Set<Relation> getReferringRelations(Collection<? extends OsmPrimitive> primitives) {
+        HashSet<Relation> ret = new HashSet<Relation>();
+        if (primitives == null) return ret;
+        Set<? extends OsmPrimitive> referred;
+        if (primitives instanceof Set<?>) {
+            referred = (Set<? extends OsmPrimitive>)primitives;
+        } else {
+            referred = new HashSet<OsmPrimitive>(primitives);
+        }
+        referred.remove(null); // just in case - remove null element from primitives
+        for (Relation r: relations) {
+            if (r.isDeleted() || r.incomplete) {
+                continue;
+            }
+            Set<OsmPrimitive> memberPrimitives = r.getMemberPrimitives();
+            memberPrimitives.retainAll(referred);
+            if (!memberPrimitives.isEmpty()) {
+                ret.add(r);
+            }
+        }
+        return ret;
+    }
 }

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

@@ -17 +17 @@
 
     public final void setCoor(LatLon coor) {
-        if(coor != null)
-        {
+        if(coor != null){
             if(this.coor == null) {
                 this.coor = new CachedLatLon(coor);
@@ -47 +46 @@
 
 
+    /**
+     * Create a new local node with id 0.
+     * 
+     */
+    public Node() {
+        this(0);
+    }
+
 
     /**
@@ -52 +59 @@
      */
     public Node(long id) {
-        this.id = id;
-        incomplete = true;
+        super(id);
     }
 
@@ -60 +66 @@
      */
     public Node(Node clone) {
+        super(clone.getId());
         cloneFrom(clone);
     }
 
     public Node(LatLon latlon) {
+        super(0);
         setCoor(latlon);
     }
 
     public Node(EastNorth eastNorth) {
+        super(0);
         setEastNorth(eastNorth);
     }
@@ -81 +90 @@
 
     @Override public String toString() {
-        if (coor == null) return "{Node id="+id+"}";
-        return "{Node id="+id+",version="+version+",lat="+coor.lat()+",lon="+coor.lon()+"}";
+        if (coor == null) return "{Node id="+getId()+"}";
+        return "{Node id="+getId()+",version="+getVersion()+",lat="+coor.lat()+",lon="+coor.lon()+"}";
     }
 
@@ -101 +110 @@
 
     public int compareTo(OsmPrimitive o) {
-        return o instanceof Node ? Long.valueOf(id).compareTo(o.id) : 1;
+        return o instanceof Node ? Long.valueOf(getId()).compareTo(o.getId()) : 1;
     }
 

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

@@ -10 +10 @@
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import java.util.Map.Entry;
 
@@ -31 +35 @@
 abstract public class OsmPrimitive implements Comparable<OsmPrimitive> {
 
+    static public <T extends OsmPrimitive>  List<T> getFilteredList(Collection<OsmPrimitive> list, Class<T> type) {
+        if (list == null) return null;
+        List<T> ret = new LinkedList<T>();
+        for(OsmPrimitive p: list) {
+            if (type.isInstance(p)) {
+                ret.add(type.cast(p));
+            }
+        }
+        return ret;
+    }
+
+    static public <T extends OsmPrimitive>  Set<T> getFilteredSet(Collection<OsmPrimitive> set, Class<T> type) {
+        if (set == null) return null;
+        HashSet<T> ret = new HashSet<T>();
+        for(OsmPrimitive p: set) {
+            if (type.isInstance(p)) {
+                ret.add(type.cast(p));
+            }
+        }
+        return ret;
+    }
+
+
     /* mappaint data */
     public ElemStyle mappaintStyle = null;
@@ -70 +97 @@
      * the respective class.
      * 
-     * @deprecated use {@see #getId()}. Don't assign an id, create a primitive with
+     * @deprecated use {@see #getId()} and {@see #setId()}. Don't assign an id, create a primitive with
      * the respective constructors.
      */
@@ -120 +147 @@
 
     /**
+     * If set to true, this object is incomplete, which means only the id
+     * and type is known (type is the objects instance class)
+     */
+    public boolean incomplete = false;
+
+    /**
+     * Contains the version number as returned by the API. Needed to
+     * ensure update consistency
+     * @deprecated use {@see #getVersion()} and {@see #setVersion(long)}
+     */
+    @Deprecated
+    public int version = 0;
+
+
+    /**
+     * Creates a new primitive with id 0.
+     * 
+     */
+    public OsmPrimitive() {
+        this(0);
+    }
+
+    /**
+     * Creates a new primitive for the given id. If the id > 0, the primitive is marked
+     * as incomplete.
+     * 
+     * @param id the id. > 0 required
+     * @throws IllegalArgumentException thrown if id < 0
+     */
+    public OsmPrimitive(long id) throws IllegalArgumentException {
+        if (id < 0)
+            throw new IllegalArgumentException(tr("expected id >= 0. Got {0}", id));
+        this.id = id;
+        this.version = 0;
+        this.incomplete = id >0;
+    }
+
+    /* ------------------------------------------------------------------------------------ */
+    /* accessors                                                                            */
+    /* ------------------------------------------------------------------------------------ */
+
+    /**
      * Sets whether this primitive is selected or not.
      * 
@@ -162 +231 @@
      *
      * @return <code>true</code>, if the object has been deleted.
-     * @see #delete(boolean)
+     * @see #setDeleted(boolean)
      */
     public boolean isDeleted() {
@@ -205 +274 @@
 
     /**
+     * Replies the version number as returned by the API. The version is 0 if the id is 0 or
+     * if this primitive is incomplete.
+     * 
+     * @see #setVersion(int)
+     */
+    public long getVersion() {
+        return version;
+    }
+
+    /**
      * Replies the id of this primitive.
      * 
@@ -214 +293 @@
 
     /**
-     * If set to true, this object is highlighted. Currently this is only used to
-     * show which ways/nodes will connect
-     */
-    public volatile boolean highlighted = false;
-
-    private int timestamp;
+     * Sets the id and the version of this primitive if it is known to the OSM API.
+     * 
+     * Since we know the id and its version it can't be incomplete anymore. incomplete
+     * is set to false.
+     * 
+     * @param id the id. > 0 required
+     * @param version the version > 0 required
+     * @throws IllegalArgumentException thrown if id <= 0
+     * @throws IllegalArgumentException thrown if version <= 0
+     */
+    public void setOsmId(long id, int version) {
+        if (id <= 0)
+            throw new IllegalArgumentException(tr("id > 0 expected. Got {0}", id));
+        if (version <= 0)
+            throw new IllegalArgumentException(tr("version > 0 expected. Got {0}", version));
+        this.id = id;
+        this.version = version;
+        this.incomplete = false;
+    }
+
+    /**
+     * Clears the id and version known to the OSM API. The id and the version is set to 0.
+     * incomplete is set to false.
+     * 
+     * <strong>Caution</strong>: Do not use this method on primitives which are already added to a {@see DataSet}.
+     * Ways and relations might already refer to the primitive and clearing the OSM ID
+     * result in corrupt data.
+     * 
+     * Here's an example use case:
+     * <pre>
+     *     // create a clone of an already existing node
+     *     Node copy = new Node(otherExistingNode);
+     * 
+     *     // reset the clones OSM id
+     *     copy.clearOsmId();
+     * </pre>
+     * 
+     */
+    public void clearOsmId() {
+        this.id = 0;
+        this.version = 0;
+        this.incomplete = false;
+    }
 
     public void setTimestamp(Date timestamp) {
@@ -240 +356 @@
 
     /**
-     * If set to true, this object is incomplete, which means only the id
-     * and type is known (type is the objects instance class)
-     */
-    public boolean incomplete = false;
-
-    /**
-     * Contains the version number as returned by the API. Needed to
-     * ensure update consistency
-     */
-    public int version = -1;
+     * If set to true, this object is highlighted. Currently this is only used to
+     * show which ways/nodes will connect
+     */
+    public volatile boolean highlighted = false;
+
+    private int timestamp;
 
     private static Collection<String> uninteresting = null;
@@ -288 +400 @@
     abstract public void visit(Visitor visitor);
 
-    public final void delete(boolean deleted) {
+    /**
+     * Sets whether this primitive is deleted or not.
+     * 
+     * Also marks this primitive as modified if deleted is true and sets selected to false.
+     * 
+     * @param deleted  true, if this primitive is deleted; false, otherwise
+     */
+    public void setDeleted(boolean deleted) {
+        this.modified = deleted;
         this.deleted = deleted;
-        setSelected(false);
-        modified = true;
+        this.selected = false;
     }
 

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

@@ -2 +2 @@
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
@@ -17 +19 @@
      * All members of this relation. Note that after changing this,
      * makeBackReferences and/or removeBackReferences should be called.
-     */
+     * 
+     * @deprecated use the improved API instead of accessing this list directly
+     */
+    @Deprecated
     public final List<RelationMember> members = new ArrayList<RelationMember>();
 
@@ -104 +109 @@
 
     /**
+     * Create a new relation with id 0
+     */
+    public Relation() {
+
+    }
+
+    /**
      * Create an identical clone of the argument (including the id)
      */
     public Relation(Relation clone) {
+        super(clone.getId());
         cloneFrom(clone);
     }
 
     /**
-     * Create an incomplete Relation.
-     */
-    public Relation(long id) {
-        this.id = id;
-        incomplete = true;
-    }
-
-    /**
-     * Create an empty Relation. Use this only if you set meaningful values
-     * afterwards.
-     */
-    public Relation() {
-    }
+     * Creates a new relation for the given id. If the id > 0, the way is marked
+     * as incomplete.
+     * 
+     * @param id the id. > 0 required
+     * @throws IllegalArgumentException thrown if id < 0
+     */
+    public Relation(long id) throws IllegalArgumentException {
+        super(id);
+    }
+
 
     @Override public void cloneFrom(OsmPrimitive osm) {
@@ -138 +148 @@
         // return "{Relation id="+id+" version="+version+" members="+Arrays.toString(members.toArray())+"}";
         // adding members in string increases memory usage a lot and overflows for looped relations
-        return "{Relation id="+id+" version="+version+"}";
+        return "{Relation id="+getId()+" version="+getVersion()+"}";
     }
 
@@ -152 +162 @@
 
     public int compareTo(OsmPrimitive o) {
-        return o instanceof Relation ? Long.valueOf(id).compareTo(o.id) : -1;
+        return o instanceof Relation ? Long.valueOf(getId()).compareTo(o.getId()) : -1;
     }
 
@@ -158 +168 @@
     public boolean isIncomplete() {
         for (RelationMember m : members)
-            if (m.member == null)
+            if (m.getMember() == null)
                 return true;
         return false;
@@ -183 +193 @@
         ArrayList<RelationMember> todelete = new ArrayList<RelationMember>();
         for (RelationMember member: members) {
-            if (member.member == primitive) {
+            if (member.getMember() == primitive) {
                 todelete.add(member);
             }
@@ -194 +204 @@
         return formatter.format(this);
     }
+
+    /**
+     * Replies the set of  {@see OsmPrimitive}s referred to by at least one
+     * member of this relation
+     * 
+     * @return the set of  {@see OsmPrimitive}s referred to by at least one
+     * member of this relation
+     */
+    public Set<OsmPrimitive> getMemberPrimitives() {
+        HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
+        for (RelationMember m: members) {
+            if (m.getMember() != null) {
+                ret.add(m.getMember());
+            }
+        }
+        return ret;
+    }
 }

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

@@ -6 +6 @@
  * list is not sufficient.
  *
- * @author Frederik Ramm <frederik@remote.org>
  */
 public class RelationMember {
 
+    /**
+     * 
+     * @deprecated use {@see #getRole()} or create a clone in order to assign a new role
+     */
+    @Deprecated
     public String role;
+
+    /**
+     * 
+     * @deprecated use {@see #getMember()} or create a clone in order to assign a new member
+     */
+    @Deprecated
     public OsmPrimitive member;
 
@@ -19 +29 @@
      */
     public String getRole() {
-        if (role == null) {
+        if (role == null)
             return "";
-        } else {
-            return role;
-        }
+        return role;
     }
 
@@ -45 +53 @@
 
     /**
-    *
-    * @return True if member is way
-    * @since 1937
-    */
+     *
+     * @return True if member is way
+     * @since 1937
+     */
     public boolean isWay() {
         return member instanceof Way;
@@ -54 +62 @@
 
     /**
-    *
-    * @return True if member is node
-    * @since 1937
-    */
+     *
+     * @return True if member is node
+     * @since 1937
+     */
     public boolean isNode() {
         return member instanceof Node;
@@ -72 +80 @@
 
     /**
-    *
-    * @return Member as way
-    * @since 1937
-    */
+     *
+     * @return Member as way
+     * @since 1937
+     */
     public Way getWay() {
         return (Way)member;
@@ -81 +89 @@
 
     /**
-    *
-    * @return Member as node
-    * @since 1937
-    */
+     *
+     * @return Member as node
+     * @since 1937
+     */
     public Node getNode() {
         return (Node)member;
@@ -90 +98 @@
 
     /**
-    *
-    * @return Member
-    * @since 1937
-    */
+     *
+     * @return Member
+     * @since 1937
+     */
     public OsmPrimitive getMember() {
         return member;
@@ -101 +109 @@
     /**
      * Default constructor. Does nothing.
-     * @deprecated Use other constructors because RelationMember class will became immutable
+     * @deprecated Use other constructors because RelationMember class will become immutable
      * in the future
      */

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
 
 /**
@@ -27 +32 @@
      */
     public Tag(String key) {
+        this();
         this.key = key == null ? "" : key;
     }

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

@@ -6 +6 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -571 +572 @@
             throw new IllegalStateException(tr("tag collection can't be applied to a primitive because there are keys with multiple values"));
         for (Tag tag: tags) {
-            primitive.put(tag.getKey(), tag.getValue());
+            if (tag.getValue() == null || tag.getValue().equals("")) {
+                primitive.remove(tag.getKey());
+            } else {
+                primitive.put(tag.getKey(), tag.getValue());
+            }
         }
     }
@@ -682 +687 @@
         return ret;
     }
+
+    /**
+     * Replies the concatenation of all tag values (concatenated by a semicolon)
+     * 
+     * @return the concatenation of all tag values
+     */
+    public String getJoinedValues(String key) {
+        StringBuffer buffer = new StringBuffer();
+        List<String> values = new ArrayList<String>(getValues(key));
+        values.remove("");
+        Collections.sort(values);
+        Iterator<String> iter = values.iterator();
+        while (iter.hasNext()) {
+            buffer.append(iter.next());
+            if (iter.hasNext()) {
+                buffer.append(";");
+            }
+        }
+        return buffer.toString();
+    }
 }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 /**
@@ -11 +13 @@
  * is only one user object.
  *
- * @author fred
  *
  */
 public class User {
+    static private long uidCounter = 0;
+    /**
+     * the map of known users
+     */
+    private static HashMap<Long,User> userMap = new HashMap<Long,User>();
 
-    /** storage for existing User objects. */
-    private static HashMap<String,User> userMap = new HashMap<String,User>();
 
-    /** the username. */
-    public String name;
+    private static long getNextLocalUid() {
+        synchronized(User.class) {
+            uidCounter--;
+            return uidCounter;
+        }
+    }
 
-    /** the user ID (since API 0.6) */
-    public String uid;
+    /**
+     * Creates a local user with the given name
+     * 
+     * @param name the name
+     */
+    public static User createLocalUser(String name) {
+        User user = new User(getNextLocalUid(), name);
+        userMap.put(user.getId(), user);
+        return user;
+    }
+
+    /**
+     * Creates a user known to the OSM server
+     * 
+     * @param uid  the user id
+     * @param name the name
+     */
+    public static User  createOsmUser(long uid, String name) {
+        User user = new User(uid, name);
+        userMap.put(user.getId(), user);
+        return user;
+    }
+
+
+    /**
+     * Returns the user with user id <code>uid</code> or null if this user doesn't exist
+     * 
+     * @param uid the user id
+     * @return the user; null, if there is no user with  this id
+     */
+    public static User getById(long uid) {
+        return userMap.get(uid);
+    }
+
+    /**
+     * Returns the list of users with name <code>name</code> or the empty list if
+     * no such users exist
+     * 
+     * @param name the user name
+     * @return the list of users with name <code>name</code> or the empty list if
+     * no such users exist
+     */
+    public static List<User> getByName(String name) {
+        name = name == null ? "" : name;
+        List<User> ret = new ArrayList<User>();
+        for (User user: userMap.values()) {
+            if (user.getName().equals(name)) {
+                ret.add(user);
+            }
+        }
+        return ret;
+    }
+
+    /** the user name */
+    private String name;
+    /** the user id */
+    private long uid;
+
+    /**
+     * Replies the user name
+     * 
+     * @return the user name. Never null, but may be the empty string
+     */
+    public String getName() {
+        return name == null ? "" : name;
+    }
+
+    /**
+     * Replies the user id. If this user is known to the OSM server the positive user id
+     * from the server is replied. Otherwise, a negative local value is replied.
+     * 
+     * A negative local is only unique during an editing session. It is lost when the
+     * application is closed and there is no guarantee that a negative local user id is
+     * always bound to a user with the same name.
+     * 
+     */
+    public long getId() {
+        return uid;
+    }
 
     /** private constructor, only called from get method. */
-    private User(String name) {
+    private User(long uid, String name) {
+        this.uid = uid;
         this.name = name;
     }
 
-    /** returns a new or existing User object that represents the given name. */
-    public static User get(String name) {
-        User user = userMap.get(name);
-        if (user == null) {
-            user = new User(name);
-            userMap.put(name, user);
-        }
-        return user;
+    public boolean isOsmUser() {
+        return uid > 0;
+    }
+
+    public boolean isLocalUser() {
+        return uid < 0;
     }
 
@@ -45 +129 @@
         int result = 1;
         result = prime * result + ((name == null) ? 0 : name.hashCode());
-        result = prime * result + ((uid == null) ? 0 : uid.hashCode());
+        result = prime * result + (int) (uid ^ (uid >>> 32));
         return result;
     }
@@ -63 +147 @@
         } else if (!name.equals(other.name))
             return false;
-        if (uid == null) {
-            if (other.uid != null)
-                return false;
-        } else if (!uid.equals(other.uid))
+        if (uid != other.uid)
             return false;
         return true;

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

@@ -119 +119 @@
 
     /**
+     * Creates a new way with id 0.
+     * 
+     */
+    public Way(){
+    }
+
+    /**
      * Create an identical clone of the argument (including the id).
      * 
@@ -124 +131 @@
      */
     public Way(Way original) {
+        super(original.getId());
         cloneFrom(original);
     }
 
     /**
-     * Create an empty way without id. Use this only if you set meaningful
-     * values yourself.
-     */
-    public Way() {
-    }
-
-    /**
-     * Create an incomplete Way with a given id.
-     * 
-     * @param id  the id. id > 0 required.
-     */
-    public Way(long id) {
-        // FIXME: shouldn't we check for id > 0?
-        //
-        this.id = id;
-        incomplete = true;
+     * Creates a new way for the given id. If the id > 0, the way is marked
+     * as incomplete.
+     * 
+     * @param id the id. > 0 required
+     * @throws IllegalArgumentException thrown if id < 0
+     */
+    public Way(long id) throws IllegalArgumentException {
+        super(id);
     }
 
@@ -153 +153 @@
 
     @Override public String toString() {
-        if (incomplete) return "{Way id="+id+" version="+version+" (incomplete)}";
-        return "{Way id="+id+" version="+version+" nodes="+Arrays.toString(nodes.toArray())+"}";
+        if (incomplete) return "{Way id="+getId()+" version="+getVersion()+" (incomplete)}";
+        return "{Way id="+getId()+" version="+getVersion()+" nodes="+Arrays.toString(nodes.toArray())+"}";
     }
 
@@ -170 +170 @@
         if (o instanceof Relation)
             return 1;
-        return o instanceof Way ? Long.valueOf(id).compareTo(o.id) : -1;
+        return o instanceof Way ? Long.valueOf(getId()).compareTo(o.getId()) : -1;
     }
 

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

@@ -46 +46 @@
     public void visit(Node n) {
         for (Way w : ds.ways) {
-            if (w.deleted || w.incomplete) continue;
+            if (w.isDeleted() || w.incomplete) {
+                continue;
+            }
             for (Node n2 : w.getNodes()) {
                 if (n == n2) {
@@ -72 +74 @@
         // references.
         for (Relation r : ds.relations) {
-            if (r.incomplete || r.deleted) continue;
+            if (r.incomplete || r.isDeleted()) {
+                continue;
+            }
             for (RelationMember m : r.getMembers()) {
                 if (m.getMember() == p) {

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

@@ -236 +236 @@
         if (myPrimitivesWithDefinedIds.containsKey(other.getId())) {
             P my = myPrimitivesWithDefinedIds.get(other.getId());
-            if (my.version <= other.version) {
+            if (my.getVersion() <= other.getVersion()) {
                 if (! my.isVisible() && other.isVisible()) {
                     // should not happen
@@ -243 +243 @@
                             + "their primitive with lower version {2} is not visible. "
                             + "Can't deal with this inconsistency. Keeping my primitive. ",
-                            Long.toString(my.getId()),Long.toString(my.version), Long.toString(other.version)
+                            Long.toString(my.getId()),Long.toString(my.getVersion()), Long.toString(other.getVersion())
                     ));
                     merged.put(other, my);
@@ -270 +270 @@
                     //
                     merged.put(other, my);
-                } else if (my.isDeleted() && ! other.isDeleted() && my.version == other.version) {
+                } else if (my.isDeleted() && ! other.isDeleted() && my.getVersion() == other.getVersion()) {
                     // same version, but my is deleted. Assume mine takes precedence
                     // otherwise too many conflicts when refreshing from the server
@@ -288 +288 @@
                     my.cloneFrom(other);
                     merged.put(other, my);
-                } else if (! my.isModified() && !other.isModified() && my.version == other.version) {
+                } else if (! my.isModified() && !other.isModified() && my.getVersion() == other.getVersion()) {
                     // both not modified. Keep mine
                     //
                     merged.put(other,my);
-                } else if (! my.isModified() && !other.isModified() && my.version < other.version) {
+                } else if (! my.isModified() && !other.isModified() && my.getVersion() < other.getVersion()) {
                     // my not modified but other is newer. clone other onto mine.
                     //
                     my.cloneFrom(other);
                     merged.put(other,my);
-                } else if (my.isModified() && ! other.isModified() && my.version == other.version) {
+                } else if (my.isModified() && ! other.isModified() && my.getVersion() == other.getVersion()) {
                     // my is same as other but mine is modified
                     // => keep mine