Changeset 2682 in josm

Timestamp:

Dec 27, 2009 2:33:13 PM (3 years ago)

Author:

stoecker

Message:

added update modified action

Location:

trunk

Files:

• images/updatemodified.png (added)
• src/org/openstreetmap/josm/actions/UpdateModifiedAction.java (added)
• src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified) (4 diffs)
• src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/MainMenu.java (modified) (3 diffs)

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

@@ -87 +87 @@
                 tr("Updates the currently selected objects from the server (re-downloads data)"),
                 Shortcut.registerShortcut("file:updateselection",
-                        tr("Update Selection"),
+                        tr("Update selection"),
                         KeyEvent.VK_U,
                         Shortcut.GROUP_HOTKEY + Shortcut.GROUPS_ALT2),
                         true);
         putValue("help", ht("UpdateSelection"));
+    }
+    public UpdateSelectionAction(String name, String iconName, String tooltip,
+    Shortcut shortcut, boolean register) {
+        super(name, iconName, tooltip, shortcut, register);
     }
 
@@ -99 +103 @@
             setEnabled(false);
         } else {
-            updateEnabledState(getCurrentDataSet().getSelected());
+            updateEnabledState(getData());
         }
     }
@@ -114 +118 @@
         if (! isEnabled())
             return;
-        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
+        Collection<OsmPrimitive> selection = getData();
         if (selection.size() == 0) {
             JOptionPane.showMessageDialog(
@@ -126 +130 @@
         updatePrimitives(selection);
     }
+
+    protected Collection<OsmPrimitive> getData() {
+        return getCurrentDataSet().getSelected();
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -182 +182 @@
                 o.add(osm);
             }
+        return o;
+    }
+
+    /**
+     * @return A collection containing all modified primitives
+     */
+    public Collection<OsmPrimitive> allModifiedPrimitives() {
+        Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
+        for (OsmPrimitive osm : allPrimitives()) {
+            if (osm.isVisible() && osm.isModified()) {
+                o.add(osm);
+            }
+        }
         return o;
     }

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -63 +63 @@
 import org.openstreetmap.josm.actions.UnselectAllAction;
 import org.openstreetmap.josm.actions.UpdateDataAction;
+import org.openstreetmap.josm.actions.UpdateModifiedAction;
 import org.openstreetmap.josm.actions.UpdateSelectionAction;
 import org.openstreetmap.josm.actions.UploadAction;
@@ -102 +103 @@
     public final JosmAction update = new UpdateDataAction();
     public final JosmAction updateSelection = new UpdateSelectionAction();
+    public final JosmAction updateModified = new UpdateModifiedAction();
     public final JosmAction upload = new UploadAction();
     public final JosmAction uploadSelection = new UploadSelectionAction();
@@ -210 +212 @@
         add(fileMenu, update);
         add(fileMenu, updateSelection);
+        add(fileMenu, updateModified);
         fileMenu.addSeparator();
         add(fileMenu, upload);