Changeset 8225 in josm for trunk

Timestamp:

2015-04-18T22:44:31+02:00 (10 years ago)

Author:

simon04

Message:

Note dialog/reader/writer: use helper methods from DateUtils

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/dialogs/NotesDialog.java (modified) (4 diffs)
• io/NoteReader.java (modified) (7 diffs)
• io/NoteWriter.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java

@@ -10 +10 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.text.SimpleDateFormat;
+import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -46 +46 @@
 import org.openstreetmap.josm.gui.layer.NoteLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.date.DateUtils;
 
 /**
@@ -229 +230 @@
 
         private DefaultListCellRenderer defaultListCellRenderer = new DefaultListCellRenderer();
-        private final SimpleDateFormat sdf = new SimpleDateFormat("dd MMM yyyy kk:mm");
+        private final DateFormat dateFormat = DateUtils.getDateTimeFormat(DateFormat.MEDIUM, DateFormat.SHORT);
 
         @Override
@@ -241 +242 @@
                     userName = "<Anonymous>";
                 }
-                String toolTipText = userName + " @ " + sdf.format(note.getCreatedAt());
+                String toolTipText = userName + " @ " + dateFormat.format(note.getCreatedAt());
                 JLabel jlabel = (JLabel)comp;
                 jlabel.setText(note.getId() + ": " +text);

trunk/src/org/openstreetmap/josm/io/NoteReader.java

@@ -6 +6 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Locale;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -22 +19 @@
 import org.openstreetmap.josm.data.notes.NoteComment.Action;
 import org.openstreetmap.josm.data.osm.User;
+import org.openstreetmap.josm.tools.date.DateUtils;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -49 +47 @@
      */
     private class Parser extends DefaultHandler {
-
-        private final SimpleDateFormat ISO8601_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssX", Locale.ENGLISH);
-        private final SimpleDateFormat NOTE_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z", Locale.ENGLISH);
 
         private NoteParseMode parseMode;
@@ -106 +101 @@
                 } else {
                     thisNote.setState(Note.State.closed);
-                    thisNote.setClosedAt(parseDate(ISO8601_FORMAT, closedTimeStr));
-                }
-                thisNote.setCreatedAt(parseDate(ISO8601_FORMAT, attrs.getValue("created_at")));
+                    thisNote.setClosedAt(DateUtils.fromString(closedTimeStr));
+                }
+                thisNote.setCreatedAt(DateUtils.fromString(attrs.getValue("created_at")));
                 break;
             case "comment":
@@ -119 +114 @@
                 commentUsername = attrs.getValue("user");
                 noteAction = Action.valueOf(attrs.getValue("action"));
-                commentCreateDate = parseDate(ISO8601_FORMAT, attrs.getValue("timestamp"));
+                commentCreateDate = DateUtils.fromString(attrs.getValue("timestamp"));
                 String isNew = attrs.getValue("is_new");
                 if(isNew == null) {
@@ -166 +161 @@
                 break;
             case "date_created":
-                thisNote.setCreatedAt(parseDate(NOTE_DATE_FORMAT, buffer.toString()));
+                thisNote.setCreatedAt(DateUtils.fromString(buffer.toString()));
                 break;
             case "date_closed":
-                thisNote.setClosedAt(parseDate(NOTE_DATE_FORMAT, buffer.toString()));
+                thisNote.setClosedAt(DateUtils.fromString(buffer.toString()));
                 break;
             case "date":
-                commentCreateDate = parseDate(NOTE_DATE_FORMAT, buffer.toString());
+                commentCreateDate = DateUtils.fromString(buffer.toString());
                 break;
             case "user":
@@ -196 +191 @@
         public void endDocument() throws SAXException  {
             parsedNotes = notes;
-        }
-
-        /**
-         * Convenience method to handle the date parsing try/catch. Will return null if
-         * there is a parsing exception. This means whatever generated this XML is in error
-         * and there isn't anything we can do about it.
-         * @param dateStr - String to parse
-         * @return Parsed date, null if parsing fails
-         */
-        private Date parseDate(SimpleDateFormat sdf, String dateStr) {
-            try {
-                return sdf.parse(dateStr);
-            } catch(ParseException e) {
-                Main.error(e);
-                return null;
-            }
         }
     }

trunk/src/org/openstreetmap/josm/io/NoteWriter.java

@@ -7 +7 @@
 import java.io.PrintWriter;
 import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
-import java.util.Locale;
+import java.text.DateFormat;
 
 import org.openstreetmap.josm.data.notes.Note;
@@ -14 +13 @@
 import org.openstreetmap.josm.data.osm.NoteData;
 import org.openstreetmap.josm.data.osm.User;
+import org.openstreetmap.josm.tools.date.DateUtils;
 
 /**
@@ -23 +23 @@
 public class NoteWriter extends XmlWriter {
 
-    private final SimpleDateFormat ISO8601_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssX", Locale.ENGLISH);
+    private final DateFormat ISO8601_FORMAT = DateUtils.newIsoDateTimeFormat();
 
     /**