Changeset 2444 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2009-11-13T11:34:34+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #3908: Exception when updating a way
fixed a few I18n issues

File:

• trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified) (7 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 import java.awt.event.ActionEvent;
@@ -67 +67 @@
 
     /**
-     * Updates the data for for the {@see OsmPrimitive}s with id <code>id</code>
+     * Updates the data for  the {@see OsmPrimitive}s with id <code>id</code>
      * with the data currently kept on the server.
      *
-     * @param id  the id of a primitive in the {@see DataSet} of the current edit layser
+     * @param id  the id of a primitive in the {@see DataSet} of the current edit layer
      * @exception IllegalStateException thrown if there is no primitive with <code>id</code> in
      *   the current dataset
@@ -89 +89 @@
      */
     public UpdateSelectionAction() {
-        super(tr("Update selections"),
+        super(tr("Update selection"),
                 "updateselection",
                 tr("Updates the currently selected objects from the server (re-downloads data)"),
@@ -124 +124 @@
             JOptionPane.showMessageDialog(
                     Main.parent,
-                    tr("There are no selected primitives to update."),
+                    tr("There are no selected objects to update."),
                     tr("Selection empty"),
                     JOptionPane.INFORMATION_MESSAGE
@@ -145 +145 @@
 
         public UpdatePrimitivesTask(Collection<? extends OsmPrimitive> toUpdate) {
-            super("Update primitives", false /* don't ignore exception*/);
+            super(tr("Update objects"), false /* don't ignore exception*/);
             canceled = false;
             this.toUpdate = toUpdate;
@@ -168 +168 @@
             if (ds != null) {
                 Main.map.mapView.getEditLayer().mergeFrom(ds);
+                Main.map.mapView.getEditLayer().onPostDownloadFromServer();
             }
         }
@@ -215 +216 @@
                 DataSetMerger merger = new DataSetMerger(ds, theirDataSet);
                 merger.merge();
-                // a ways loaded with MultiFetch may be incomplete because at least one of its
+                // a way loaded with MultiFetch may be incomplete because at least one of its
                 // nodes isn't present in the local data set. We therefore fully load all
                 // incomplete ways.