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

Timestamp:

2011-08-08T00:00:54+02:00 (13 years ago)

Author:

stoecker

Message:

fix #6357 - patch by simon04 - validator: false error warning - duplicated relations

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/DuplicateRelation.java (modified) (1 diff)
• gui/DefaultNameFormatter.java (modified) (3 diffs)

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

@@ -176 +176 @@
     public void visit(Relation r)
     {
-        if( !r.isUsable() )
+        if (!r.isUsable() || r.hasIncompleteMembers())
             return;
         List<RelationMember> rMembers=r.getMembers();

trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

@@ -300 +300 @@
 
             if (relation instanceof Relation) {
-                if (relationHasIncompleteMember((Relation) relation)) {
+                if (((Relation) relation).hasIncompleteMembers()) {
                     name += ", "+tr("incomplete");
                 }
@@ -364 +364 @@
                 return (r1.getMembersCount() > r2.getMembersCount())?1:-1;
 
-            comp = Boolean.valueOf(relationHasIncompleteMember(r1)).compareTo(Boolean.valueOf(relationHasIncompleteMember(r2)));
+            comp = Boolean.valueOf(r1.hasIncompleteMembers()).compareTo(Boolean.valueOf(r2.hasIncompleteMembers()));
             if (comp != 0)
                 return comp;
@@ -443 +443 @@
         }
         return null;
-    }
-
-    private boolean relationHasIncompleteMember(Relation relation) {
-        for (RelationMember m : relation.getMembers()) {
-            if (m.getMember().isIncomplete())
-                return true;
-        }
-        return false;
     }