Changeset 17591 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests

Timestamp:

2021-03-19T19:52:15+01:00 (5 years ago)

Author:

simon04

Message:

see #20626 - OpeningHoursParser: report multiple parse exceptions

File:

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

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

@@ -11 +11 @@
 import java.util.Locale;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import javax.swing.JCheckBox;
 import javax.swing.JPanel;
 
+import ch.poole.openinghoursparser.OpeningHoursParseException;
 import ch.poole.openinghoursparser.OpeningHoursParser;
-import ch.poole.openinghoursparser.ParseException;
 import ch.poole.openinghoursparser.Rule;
 import ch.poole.openinghoursparser.Util;
@@ -106 +107 @@
                 new OpeningHoursParser(new StringReader(value)).rules(true);
             }
-        } catch (ParseException e) {
-            return Collections.singletonList(createTestError(Severity.WARNING, e.getMessage(), key, value, prettifiedValue, p));
+        } catch (OpeningHoursParseException e) {
+            String message = e.getExceptions().stream()
+                    .map(OpeningHoursParseException::getMessage)
+                    .distinct()
+                    .collect(Collectors.joining("; "));
+            return Collections.singletonList(createTestError(Severity.WARNING, message, key, value, prettifiedValue, p));
         }