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

Timestamp:

2016-01-10T13:48:42+01:00 (9 years ago)

Author:

simon04

Message:

Refactoring: introduce UncheckedParseException

In addition, DateUtils#fromString does no longer return "now" when
date cannot be parsed, but throws an UncheckedParseException instead.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/OverpassDownloadAction.java (modified) (2 diffs)
• tools/OverpassTurboQueryWizard.java (modified) (2 diffs)
• tools/UncheckedParseException.java (added)
• tools/date/DateUtils.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/OverpassDownloadAction.java

@@ -50 +50 @@
 import org.openstreetmap.josm.tools.OverpassTurboQueryWizard;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.UncheckedParseException;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -157 +158 @@
                     try {
                         overpassQuery.setText(OverpassTurboQueryWizard.getInstance().constructQuery(overpassWizardText));
-                    } catch (OverpassTurboQueryWizard.ParseException ex) {
+                    } catch (UncheckedParseException ex) {
                         HelpAwareOptionPane.showOptionDialog(
                                 Main.parent,

trunk/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java

@@ -24 +24 @@
     private static OverpassTurboQueryWizard instance;
     private final ScriptEngine engine = new ScriptEngineManager().getEngineByName("JavaScript");
-
-    /**
-     * An exception to indicate a failed parse.
-     */
-    public static class ParseException extends RuntimeException {
-    }
 
     /**
@@ -60 +54 @@
      * @param search the {@link org.openstreetmap.josm.actions.search.SearchAction} like query
      * @return an Overpass QL query
-     * @throws ParseException when the parsing fails
+     * @throws UncheckedParseException when the parsing fails
      */
-    public String constructQuery(String search) throws ParseException {
+    public String constructQuery(String search) throws UncheckedParseException {
         try {
             final Object result = ((Invocable) engine).invokeFunction("construct_query", search);
             if (result == Boolean.FALSE) {
-                throw new ParseException();
+                throw new UncheckedParseException();
             }
             String query = (String) result;

trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java

@@ -18 +18 @@
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.UncheckedParseException;
 
 /**
@@ -66 +67 @@
      * @param str The XML date as string
      * @return The date
-     */
-    public static synchronized Date fromString(String str) {
+     * @throws UncheckedParseException if the date does not match any of the supported date formats
+     */
+    public static synchronized Date fromString(String str) throws UncheckedParseException {
         return new Date(tsFromString(str));
     }
@@ -75 +77 @@
      * @param str The XML date as string
      * @return The date in milliseconds since epoch
-     */
-    public static synchronized long tsFromString(String str) {
+     * @throws UncheckedParseException if the date does not match any of the supported date formats
+     */
+    public static synchronized long tsFromString(String str) throws UncheckedParseException {
         // "2007-07-25T09:26:24{Z|{+|-}01:00}"
         if (checkLayout(str, "xxxx-xx-xxTxx:xx:xxZ") ||
@@ -130 +133 @@
             return XML_DATE.newXMLGregorianCalendar(str).toGregorianCalendar().getTimeInMillis();
         } catch (Exception ex) {
-            return System.currentTimeMillis();
+            throw new UncheckedParseException("The date string (" + str + ") could not be parsed.");
         }
     }