Changeset 3093 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2010-03-07T14:41:05+01:00 (14 years ago)

Author:

Gubaer

Message:

Ouch, shouldn't have removed getData(). Fixes the previous commit.

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• UpdateModifiedAction.java (modified) (2 diffs)
• UpdateSelectionAction.java (modified) (2 diffs)

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

@@ -7 +7 @@
 import java.awt.event.KeyEvent;
 import java.util.Collection;
+import java.util.Collections;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -51 +52 @@
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
     }
+
+    @Override
+    public Collection<OsmPrimitive> getData() {
+        if (getCurrentDataSet() == null) return Collections.emptyList();
+        return getCurrentDataSet().allModifiedPrimitives();
+    }
 }

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

@@ -118 +118 @@
         if (! isEnabled())
             return;
-        Collection<OsmPrimitive> selection =getCurrentDataSet().getSelected();
-        if (selection.size() == 0) {
+        Collection<OsmPrimitive> toUpdate =getData();
+        if (toUpdate.size() == 0) {
             JOptionPane.showMessageDialog(
                     Main.parent,
@@ -128 +128 @@
             return;
         }
-        updatePrimitives(selection);
+        updatePrimitives(toUpdate);
+    }
+
+    public Collection<OsmPrimitive> getData() {
+        return getCurrentDataSet().getSelected();
     }
 }