Changeset 1670 in josm for trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java

Timestamp:

15.06.2009 20:22:46 (3 years ago)

Author:

Gubaer

Message:

fixed: bug in OsmApi.getOsmApi()
cleanup: exception handling in interfacing with OSM API
new: new action for updating individual elements with the their current state on the server (including new menu item in the file menu)
new: improved user feedback in case of conflicts
new: handles 410 Gone conflicts when uploading a changeset
new: undoable command for "purging" a primitive from the current dataset (necessary if the primitive is already deleted on the server and the user wants to remove it from its local dataset)
new: undoable command for "undeleting" an already deleted primitive on the server (kind of "cloning")
new: after a full upload, checks whether there are primitives in the local dataset which might be deleted on the server.
new: data structures for history data
new: history download support in io package

File:

• trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java

@@ -15 +15 @@
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTaskList;
 import org.openstreetmap.josm.data.osm.DataSource;
-import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -26 +25 @@
                         tr("Update Data"),
                         KeyEvent.VK_U,
-                        Shortcut.GROUP_NONE),
-                true);
+                        Shortcut.GROUP_HOTKEY),
+                        true);
     }
 
@@ -33 +32 @@
         int bboxCount = 0;
         List<Area> areas = new ArrayList<Area>();
-        for(DataSource ds : Main.main.editLayer().data.dataSources)
+        for(DataSource ds : Main.main.editLayer().data.dataSources) {
             areas.add(new Area(ds.bounds.asRect()));
-
-        // This would loop over all DataLayers but download all data to the currently
-        // selected one
-        /*for(Layer l : Main.map.mapView.getAllLayers()) {
-            if(!(l instanceof OsmDataLayer)) continue;
-
-            for(DataSource ds : ((OsmDataLayer)l).data.dataSources)
-                areas.add(new Area(ds.bounds.asRect()));
-        }*/
+        }
 
         // The next two blocks removes every intersection from every DataSource Area
@@ -62 +53 @@
 
         for(Area a : areas) {
-            if(a.isEmpty())
+            if(a.isEmpty()) {
                 continue;
+            }
             bboxCount++;
         }
@@ -69 +61 @@
         if(bboxCount == 0) {
             JOptionPane.showMessageDialog(Main.parent,
-                        tr("No data to update found. Have you already opened or downloaded a data layer?"));
-                return;
+                    tr("No data to update found. Have you already opened or downloaded a data layer?"));
+            return;
         }
-
-        int result = new ExtendedDialog(Main.parent,
-                tr("Update Data"),
-                tr("This action will require {0} individual download requests. "
-                        + "Do you wish to continue?", bboxCount),
-                new String[] { tr("Update Data"), tr("Cancel") },
-                new String[] { "updatedata.png", "cancel.png" }).getValue();
-
-        if(result != 1)
-            return;
 
         new DownloadOsmTaskList().download(false, areas);
     }
-
 }