Changeset 1690 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java

Timestamp:

23.06.2009 22:03:37 (3 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/actions/downloadtasks/DownloadOsmTaskList.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java

@@ -128 +128 @@
     protected void handlePotentiallyDeletedPrimitives(Set<Long> potentiallyDeleted) {
         String [] options = {
-                "Check individually",
+                "Check on the server",
                 "Ignore"
         };
@@ -138 +138 @@
                 + "conflict.<br>"
                 + "<br>"
-                + "Click <strong>{1}</strong> to check these primitives individually.<br>"
+                + "Click <strong>{1}</strong> to check the state of these primitives<br>"
+                + "on the server.<br>"
                 + "Click <strong>{2}</strong> to ignore.<br>"
                 + "</html>",