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

Timestamp:

2014-07-20T22:57:24+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10283 - wrong time format in GPX/images layer leading to wrong correlation (regression from r7299)

Location:

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

Files:

• GpxLayer.java (modified) (6 diffs)
• geoimage/CorrelateGpxWithImages.java (modified) (3 diffs)
• geoimage/ImageViewerDialog.java (modified) (1 diff)

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

@@ -22 +22 @@
 import javax.swing.JScrollPane;
 import javax.swing.SwingUtilities;
+
 import org.openstreetmap.josm.Main;
-
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.actions.SaveActionBase;
@@ -29 +29 @@
 import org.openstreetmap.josm.data.gpx.GpxConstants;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.GpxRoute;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -64 +62 @@
 
     private final GpxDrawHelper drawHelper;
-    
+
     public GpxLayer(GpxData d) {
         super((String) d.attr.get("name"));
@@ -87 +85 @@
         return drawHelper.getColor(getName(), ignoreCustom);
     }
-    
+
     /**
      * Returns a human readable string that shows the timespan of the given track
@@ -106 +104 @@
                 ts += tf.format(bounds[0]) + " - " + tf.format(bounds[1]);
             } else {
-                DateFormat dtf = DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.SHORT);
+                DateFormat dtf = DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.MEDIUM);
                 ts += dtf.format(bounds[0]) + " - " + dtf.format(bounds[1]);
             }
@@ -290 +288 @@
             }
         }
-        
-    }
-    
+
+    }
+
     private LinkedList<WayPoint> listVisibleSegments(Bounds box) {
         WayPoint last = null;
         LinkedList<WayPoint> visibleSegments = new LinkedList<>();
-        
+
         ensureTrackVisibilityLength();
         for (Collection<WayPoint> segment : data.getLinesIterable(trackVisibility)) {
-            
+
             for(WayPoint pt : segment)
             {

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -238 +238 @@
         @Override
         public void actionPerformed(ActionEvent arg0) {
-            SimpleDateFormat dateFormat = (SimpleDateFormat) DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.SHORT);
+            SimpleDateFormat dateFormat = (SimpleDateFormat) DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.MEDIUM);
 
             panel = new JPanel();
@@ -362 +362 @@
                     Date date = yLayer.data.get(index).getExifTime();
                     if (date != null) {
-                        DateFormat df = DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.SHORT);
+                        DateFormat df = DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.MEDIUM);
                         lbExifTime.setText(df.format(date));
                         tfGpsTime.setText(df.format(date));
@@ -403 +403 @@
                     }
                     if (date != null) {
-                        lbExifTime.setText(DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.SHORT).format(date));
+                        lbExifTime.setText(DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.MEDIUM).format(date));
                         tfGpsTime.setText(DateUtils.getDateFormat(DateFormat.SHORT).format(date)+" ");
                         tfGpsTime.setEnabled(true);

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

@@ -264 +264 @@
                 osd.append(tr("\nDirection {0}\u00b0", Math.round(entry.getExifImgDir())));
             }
-            DateFormat dtf = DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.SHORT);
+            DateFormat dtf = DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.MEDIUM);
             if (entry.hasExifTime()) {
                 osd.append(tr("\nEXIF time: {0}", dtf.format(entry.getExifTime())));