Ticket #6357: 6357.patch

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

@@ -175 +175 @@
     @Override
     public void visit(Relation r)
     {
-        if( !r.isUsable() )
+        if (!r.isUsable() || r.hasIncompleteMembers())
             return;
         List<RelationMember> rMembers=r.getMembers();
         Map<String, String> rkeys=r.getKeys();

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

@@ -299 +299 @@
             name += trn("{0} member", "{0} members", mbno, mbno);
 
             if (relation instanceof Relation) {
-                if (relationHasIncompleteMember((Relation) relation)) {
+                if (((Relation) relation).hasIncompleteMembers()) {
                     name += ", "+tr("incomplete");
                 }
             }
@@ -363 +363 @@
             if (r1.getMembersCount() != r2.getMembersCount())
                 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;
 
@@ -444 +444 @@
         return null;
     }
 
-    private boolean relationHasIncompleteMember(Relation relation) {
-        for (RelationMember m : relation.getMembers()) {
-            if (m.getMember().isIncomplete())
-                return true;
-        }
-        return false;
-    }
-
     /**
      * Formats a name for a changeset
      *