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

Timestamp:

2015-01-25T03:15:10+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #10945 - restore warning at INFO level when relations all have the same name

File:

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

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

@@ -58 +58 @@
         }
         public AddressError(int code, Collection<OsmPrimitive> collection, String message, String description, String englishDescription) {
-            super(Addresses.this, Severity.WARNING, message, description, englishDescription, code, collection);
+            this(code, Severity.WARNING, collection, message, description, englishDescription);
+        }
+        public AddressError(int code, Severity severity, Collection<OsmPrimitive> collection, String message, String description,
+                String englishDescription) {
+            super(Addresses.this, severity, message, description, englishDescription, code, collection);
         }
     }
@@ -78 +82 @@
         }
         if (list.size() > 1) {
-            // no warning if several relations have the same name, see #10945
+            Severity level;
+            // warning level only if several relations have different names, see #10945
             final String name = list.get(0).get("name");
             if (name == null || Utils.filter(list, new Predicate<Relation>() {
@@ -86 +91 @@
                 }
             }).size() < list.size()) {
-                List<OsmPrimitive> errorList = new ArrayList<OsmPrimitive>(list);
-                errorList.add(0, p);
-                errors.add(new AddressError(MULTIPLE_STREET_RELATIONS, errorList, tr("Multiple associatedStreet relations")));
-            }
+                level = Severity.WARNING;
+            } else {
+                level = Severity.OTHER;
+            }
+            List<OsmPrimitive> errorList = new ArrayList<OsmPrimitive>(list);
+            errorList.add(0, p);
+            errors.add(new AddressError(MULTIPLE_STREET_RELATIONS, level, errorList,
+                    tr("Multiple associatedStreet relations"), null, null));
         }
         return list;