Changeset 2444 in josm

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/UpdateSelectionAction.java (modified) (7 diffs)
• data/osm/DataSetMerger.java (modified) (2 diffs)
• io/OsmReader.java (modified) (2 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.

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

@@ -135 +135 @@
     }
 
-    protected OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) {
+    protected OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) throws IllegalStateException{
         Long targetId = mergedMap.get(mergeSource.getUniqueId());
         if (targetId == null)
-            throw new RuntimeException(tr("Missing merge target for way with id {0}", mergeSource.getUniqueId()));
+            return null;
         return targetDataSet.getPrimitiveById(targetId, mergeSource.getType());
     }
@@ -306 +306 @@
             childrenToMerge.add(source.getUniqueId());
         } else if (target.isModified() && ! source.isModified() && target.getVersion() == source.getVersion()) {
-            // my is same as other but mine is modified
-            // => keep mine
+            // target is same as source but target is modified
+            // => keep target
         } else if (! target.hasEqualSemanticAttributes(source)) {
-            // my is modified and is not semantically equal with other. Can't automatically
+            // target is modified and is not semantically equal with source. Can't automatically
             // resolve the differences
             // =>  create a conflict

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -23 +23 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -428 +429 @@
                                 )
                         );
-                    n = new Node(id);
-                    n.incomplete = true;
+                    // create an incomplete node if necessary
+                    //
+                    n = (Node)ds.getPrimitiveById(id,OsmPrimitiveType.NODE);
+                    if (n == null) {
+                        n = new Node(id);
+                        n.incomplete = true;
+                        ds.addPrimitive(n);
+                    }
                     incomplete = true;
                 }