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

Timestamp:

2009-08-02T18:02:44+02:00 (17 years ago)

Author:

Gubaer

Message:

fixed two issues in #3141: conflict resolution flags false conflicts on nodes

File:

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

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

@@ -10 +10 @@
 import java.util.List;
 
-import javax.swing.JOptionPane;
-
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTaskList;
 import org.openstreetmap.josm.data.osm.DataSource;
-import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -43 +39 @@
         if (! isEnabled())
             return;
+        if (getEditLayer() == null)
+            return;
+
         int bboxCount = 0;
         List<Area> areas = new ArrayList<Area>();
-        for(DataSource ds : Main.map.mapView.getEditLayer().data.dataSources) {
+        for(DataSource ds : getEditLayer().data.dataSources) {
             areas.add(new Area(ds.bounds.asRect()));
         }
@@ -73 +72 @@
 
         if(bboxCount == 0) {
-            OptionPaneUtil.showMessageDialog(
-                    Main.parent,
-                    tr("No data to update found. Have you already opened or downloaded a data layer?"),
-                    tr("No data"),
-                    JOptionPane.WARNING_MESSAGE
-            );
-            return;
+            // no bounds defined in the dataset? we update all primitives in the data set
+            // using a series of multi fetch requests
+            //
+            new UpdateSelectionAction().updatePrimitives(getEditLayer().data.allPrimitives());
+        } else {
+            // bounds defined? => use the bbox downloader
+            //
+            new DownloadOsmTaskList().download(false, areas, new PleaseWaitProgressMonitor());
         }
-
-        new DownloadOsmTaskList().download(false, areas, new PleaseWaitProgressMonitor());
     }
 }