Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (revision 4747) +++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (revision 4748) @@ -150,26 +150,26 @@ tr("Click to check whether objects in your local dataset are deleted on the server"), null /* no specific help topic */ - ), - new ButtonSpec( - tr("Ignore"), - ImageProvider.get("cancel"), - tr("Click to abort and to resume editing"), - null /* no specific help topic */ - ), + ), + new ButtonSpec( + tr("Ignore"), + ImageProvider.get("cancel"), + tr("Click to abort and to resume editing"), + null /* no specific help topic */ + ), }; String message = "" - + trn("There is {0} object in your local dataset which " - + "might be deleted on the server. If you later try to delete or " - + "update this the server is likely to report a conflict.", - "There are {0} objects in your local dataset which " - + "might be deleted on the server. If you later try to delete or " - + "update them the server is likely to report a conflict.", potentiallyDeleted.size(), potentiallyDeleted.size()) - + "
" - + trn("Click {0} to check the state of this object on the server.", - "Click {0} to check the state of these objects on the server.", - potentiallyDeleted.size(), - options[0].text) + "
" - + tr("Click {0} to ignore." + "", options[1].text); + + trn("There is {0} object in your local dataset which " + + "might be deleted on the server. If you later try to delete or " + + "update this the server is likely to report a conflict.", + "There are {0} objects in your local dataset which " + + "might be deleted on the server. If you later try to delete or " + + "update them the server is likely to report a conflict.", potentiallyDeleted.size(), potentiallyDeleted.size()) + + "
" + + trn("Click {0} to check the state of this object on the server.", + "Click {0} to check the state of these objects on the server.", + potentiallyDeleted.size(), + options[0].text) + "
" + + tr("Click {0} to ignore." + "", options[1].text); int ret = HelpAwareOptionPane.showOptionDialog( @@ -182,5 +182,5 @@ options[0], ht("/Action/UpdateData#SyncPotentiallyDeletedObjects") - ); + ); if (ret != 0 /* OK */) return; @@ -265,5 +265,8 @@ DataSet ds = ((DownloadOsmTask) task).getDownloadedData(); if (ds != null) { - myPrimitives.removeAll(ds.allPrimitives()); + // myPrimitives.removeAll(ds.allPrimitives()) will do the same job but much slower + for (OsmPrimitive primitive: ds.allPrimitives()) { + myPrimitives.remove(primitive); + } } }