Changeset 1499 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2009-03-18T16:13:41+01:00 (15 years ago)

Author:

stoecker

Message:

close #2302 - patch by jttt - optimizations and encapsulation

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• GpxLayer.java (modified) (2 diffs)
• OsmDataLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -68 +68 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.AudioMarker;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
+import org.openstreetmap.josm.tools.DateUtils;
 import org.openstreetmap.josm.tools.DontShowAgainInfo;
 import org.openstreetmap.josm.tools.GBC;
@@ -660 +661 @@
                         if(timestr != null)
                         {
-                            timestr = timestr.replace("Z","+00:00");
-                            n.timestamp = timestr;
+                            n.setTimestamp(DateUtils.fromString(timestr));
                         }
                         ds.nodes.add(n);

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -61 +61 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
+import org.openstreetmap.josm.tools.DateUtils;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -402 +403 @@
                     trk.trackSegs.add(trkseg);
                 }
-                if (!n.tagged) {
+                if (!n.isTagged()) {
                     doneNodes.add(n);
                 }
-                WayPoint wpt = new WayPoint(n.coor);
-                if (n.timestamp != null)
+                WayPoint wpt = new WayPoint(n.coor);                
+                if (!n.isTimestampEmpty())
                 {
-                    wpt.attr.put("time", n.timestamp);
+                    wpt.attr.put("time", DateUtils.fromDate(n.getTimestamp()));
                     wpt.setTime();
                 }
@@ -420 +421 @@
             if (n.incomplete || n.deleted || doneNodes.contains(n)) continue;
             WayPoint wpt = new WayPoint(n.coor);
-            if (n.timestamp != null) {
-                wpt.attr.put("time", n.timestamp);
+            if (!n.isTimestampEmpty()) {
+                wpt.attr.put("time", DateUtils.fromDate(n.getTimestamp()));
                 wpt.setTime();
             }