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

Timestamp:

2017-01-22T19:14:12+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #14275 - robustness against invalid timestamps in GPX files

File:

• trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java

@@ -37 +37 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.UncheckedParseException;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
@@ -44 +45 @@
  */
 public abstract class ConvertToDataLayerAction<T extends Layer> extends AbstractAction {
+    /** source layer */
     protected final transient T layer;
 
+    /**
+     * Constructs a new {@code ConvertToDataLayerAction}
+     * @param layer source layer
+     */
     protected ConvertToDataLayerAction(final T layer) {
         super(tr("Convert to data layer"), ImageProvider.get("converttoosm"));
@@ -75 +81 @@
                         String timestr = p.getString(GpxConstants.PT_TIME);
                         if (timestr != null) {
-                            n.setTimestamp(DateUtils.fromString(timestr));
+                            try {
+                                n.setTimestamp(DateUtils.fromString(timestr));
+                            } catch (UncheckedParseException e) {
+                                Main.warn(e, false);
+                            }
                         }
                         ds.addPrimitive(n);
@@ -151 +161 @@
         }
         final DataSet ds = convert();
-        final OsmDataLayer layer = new OsmDataLayer(ds, tr("Converted from: {0}", this.layer.getName()), null);
-        if (this.layer.getAssociatedFile() != null) {
-            layer.setAssociatedFile(new File(this.layer.getAssociatedFile().getParentFile(), this.layer.getAssociatedFile().getName() + ".osm"));
+        final OsmDataLayer osmLayer = new OsmDataLayer(ds, tr("Converted from: {0}", layer.getName()), null);
+        if (layer.getAssociatedFile() != null) {
+            osmLayer.setAssociatedFile(new File(layer.getAssociatedFile().getParentFile(), layer.getAssociatedFile().getName() + ".osm"));
         }
-        layer.setUploadDiscouraged(true);
-        Main.getLayerManager().addLayer(layer);
-        Main.getLayerManager().removeLayer(this.layer);
+        osmLayer.setUploadDiscouraged(true);
+        Main.getLayerManager().addLayer(osmLayer);
+        Main.getLayerManager().removeLayer(layer);
     }
 }