Changeset 50 in josm for src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java

Timestamp:

2006-02-12T12:05:34+01:00 (19 years ago)

Author:

imi

Message:

• fixed exception when merging some keys (download)
• fixed "please wait" doesn't disappearing
• added "There are changes" - dialog

File:

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

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

@@ -166 +166 @@
                         if (myOsm.keys == null)
                                 myOsm.keys = otherOsm.keys;
-                        else
+                        else if (otherOsm.keys != null)
                                 myOsm.keys.putAll(otherOsm.keys);
                         myOsm.modifiedProperties = true;