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

Timestamp:

2009-01-02T15:09:04+01:00 (15 years ago)

Author:

stoecker

Message:

fix bug #1949 and some other minor issues

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• GpxExportAction.java (modified) (1 diff)
• PasteAction.java (modified) (1 diff)

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

@@ -136 +136 @@
         } catch (IOException x) {
             x.printStackTrace();
-            JOptionPane.showMessageDialog(Main.parent, tr("Error while exporting {0}", fn)+":\n"+x.getMessage(), tr("Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Main.parent, tr("Error while exporting {0}:\n{1}", fn,x.getMessage()), tr("Error"), JOptionPane.ERROR_MESSAGE);
         }
     }

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

@@ -88 +88 @@
             List<RelationMember> members = new ArrayList<RelationMember>();
             for (RelationMember m : r.members) {
-                RelationMember mnew = new RelationMember(m);
-                mnew.member = map.get(m.member);
-                members.add(mnew);
+                OsmPrimitive mo = map.get(m.member);
+                if(mo != null) /* TODO - This only prevents illegal data, but kills the relation */
+                {
+                    RelationMember mnew = new RelationMember(m);
+                    mnew.member = map.get(m.member);
+                    members.add(mnew);
+                }
             }
             rnew.members.clear();