Changeset 33721 in osm for applications/editors/josm

Timestamp:

2017-10-19T00:19:04+02:00 (7 years ago)

Author:

donvip

Message:

fix #josm10261 - use JOSM date formatting system

File:

• applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java (modified) (6 diffs)

applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java

@@ -12 +12 @@
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Locale;
 import java.util.Set;
 
@@ -27 +26 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.OpenBrowser;
+import org.openstreetmap.josm.tools.date.DateUtils;
 
 class InfoPanel extends JPanel {
@@ -32 +32 @@
     private Collection<GpxTrack> tracks;
     private GpxTrack trk;
-    private DateFormat df;
 
     private JLabel label1 = new JLabel();
@@ -45 +44 @@
     InfoPanel() {
         super(new GridBagLayout());
-        df = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, Locale.getDefault());
         setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         add(label1, GBC.eol().insets(10, 0, 0, 0));
@@ -110 +108 @@
             but2.setVisible(false);
         } else {
-            label1.setText(df.format(wp.getTime()));
+            label1.setText(DateUtils.formatDateTime(wp.getTime(), DateFormat.DEFAULT, DateFormat.DEFAULT));
             but2.setVisible(true);
         }
@@ -123 +121 @@
         s = (String) wp.attr.get("ele");
         String s1 = "";
-        try {
-            s1 = String.format("H=%3.1f   ", Double.parseDouble(s));
-        } catch (Exception e) {
-            Logging.warn(e);
+        if (s != null) {
+            try {
+                s1 = String.format("H=%3.1f   ", Double.parseDouble(s));
+            } catch (NumberFormatException e) {
+                Logging.warn(e);
+            }
         }
         s1 = s1+"L="+(int) trk.length();