Changeset 203 in josm for src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

Timestamp:

2007-02-17T17:09:49+01:00 (19 years ago)

Author:

imi

Message:

• Fixed a bug in the Merger/Conflict to auto-resolve marked changes without real changes
• Fixed bug in split way, that reversed the order of segments in one way.
• Fixed bug where dialogs did not update anymore after loading a dataset twice

File:

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

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

@@ -166 +166 @@
         /**
          * Perform an equality compare for all non-volatile fields not only for the id 
-         * but for the whole object (for conflict resolving etc)
+         * but for the whole object (for conflict resolving)
+         * @param semanticOnly if <code>true</code>, modified flag and timestamp are not compared
          */
-        public boolean realEqual(OsmPrimitive osm) {
+        public boolean realEqual(OsmPrimitive osm, boolean semanticOnly) {
                 return
-                id == osm.id && 
-                modified == osm.modified && 
-                deleted == osm.deleted &&
-                (timestamp == null ? osm.timestamp==null : timestamp.equals(osm.timestamp)) &&
-                (keys == null ? osm.keys==null : keys.equals(osm.keys));
+                        id == osm.id && 
+                        (semanticOnly || (modified == osm.modified)) && 
+                        deleted == osm.deleted &&
+                        (semanticOnly || (timestamp == null ? osm.timestamp==null : timestamp.equals(osm.timestamp))) &&
+                        (keys == null ? osm.keys==null : keys.equals(osm.keys));
         }