Changeset 1682 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks

Timestamp:

2009-06-20T09:31:00+02:00 (15 years ago)

Author:

Gubaer

Message:

removed old conflict resolution code
fixed bug in OsmApi (missing changeset initialization)

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified) (3 diffs)

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

@@ -21 +21 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -136 +135 @@
                 +  "There are {0} primitives in your local dataset which<br>"
                 + "might be deleted on the server. If you later try to delete or<br>"
-                + "update them on the server the server is likely to report a<br>"
+                + "update them the server is likely to report a<br>"
                 + "conflict.<br>"
                 + "<br>"
@@ -177 +176 @@
     }
 
-
     public Set<Long> getDownloadedIds() {
         HashSet<Long> ret = new HashSet<Long>();