Changeset 2762 in josm for trunk/src

Timestamp:

2010-01-07T21:25:13+01:00 (15 years ago)

Author:

jttt

Message:

Remove error checks form MapPaintVisitor that are already done in validator

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java

@@ -356 +356 @@
         for (RelationMember m : r.getMembers())
         {
-            if (m.getMember().isDeleted()) {
-                putError(r, tr("Deleted member ''{0}'' in relation.",
-                        m.getMember().getDisplayName(DefaultNameFormatter.getInstance())), true);
-            } else if(m.getMember().isIncomplete())
+            if(m.getMember().isIncomplete())
                 return;
             else
@@ -366 +363 @@
                 {
                     Way w = m.getWay();
-                    if(w.getNodesCount() < 2)
-                    {
-                        putError(r, tr("Way ''{0}'' with less than two points.",
-                                w.getDisplayName(DefaultNameFormatter.getInstance())), true);
-                    }
-                    else if("from".equals(m.getRole())) {
+                    if(w.getNodesCount() < 2) {
+                        continue;
+                    }
+
+                    if("from".equals(m.getRole())) {
                         if(fromWay != null) {
                             putError(r, tr("More than one \"from\" way found."), true);
@@ -671 +667 @@
         // Fill inner and outer list with valid ways
         for (RelationMember m : r.getMembers()) {
-            if (m.getMember().isDeleted()) {
-                putError(r, tr("Deleted member ''{0}'' in relation.",
-                        m.getMember().getDisplayName(DefaultNameFormatter.getInstance())), true);
-            } else if (m.getMember().isIncomplete()) {
+            if (m.getMember().isIncomplete()) {
                 incomplete = true;
             } else if(m.getMember().isDrawable()) {
@@ -680 +673 @@
                     Way w = m.getWay();
                     if(w.getNodesCount() < 2) {
-                        putError(r, tr("Way ''{0}'' with less than two points.",
-                                w.getDisplayName(DefaultNameFormatter.getInstance())), true);
-                    }
-                    else if("inner".equals(m.getRole())) {
+                        continue;
+                    }
+
+                    if("inner".equals(m.getRole())) {
                         inner.add(w);
                     } else if("outer".equals(m.getRole())) {