Changeset 13298 in josm for trunk/src

Timestamp:

2018-01-08T00:39:56+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15582 - simplify public API for opening_hours parsing

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java

@@ -289 +289 @@
     /**
      * Translates and shortens the error/warning message.
-     * @param key OSM key
      * @param o error/warning message returned by {@link #getOpeningHoursErrors} or {@link #getOpeningHoursWarnings}
      * @return translated/shortened error/warning message
-     * @since 13297
-     */
-    public static String getErrorMessage(String key, Object o) {
-        String msg = o.toString().trim()
+     * @since 13298
+     */
+    public static String getErrorMessage(Object o) {
+        return o.toString().trim()
         .replace("Unexpected token:", tr("Unexpected token:"))
         .replace("Unexpected token (school holiday parser):", tr("Unexpected token (school holiday parser):"))
@@ -304 +303 @@
         .replace("Unexpected token in year range:", tr("Unexpected token in year range:"))
         .replace("This means that the syntax is not valid at that point or it is currently not supported.", tr("Invalid/unsupported syntax."));
-        return key + " - " + msg;
+    }
+
+    /**
+     * Translates and shortens the error/warning message.
+     * @param key OSM key
+     * @param o error/warning message returned by {@link #getOpeningHoursErrors} or {@link #getOpeningHoursWarnings}
+     * @return translated/shortened error/warning message
+     */
+    static String getErrorMessage(String key, Object o) {
+        return key + " - " + getErrorMessage(o);
     }