Changeset 22457 in osm for applications/editors/josm/plugins/validator/src

Timestamp:

2010-07-27T21:43:12+02:00 (14 years ago)

Author:

jttt

Message:

Update to latest josm (no changes, only needs recompiling)

File:

• applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java (modified) (8 diffs)

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java

@@ -9 +9 @@
 import java.util.HashMap;
 import java.util.LinkedList;
-import java.util.Map;
-
-import org.openstreetmap.josm.data.osm.Node;
+
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.preferences.TaggingPresetPreference;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
@@ -114 +111 @@
         {
             errors.add( new TestError(this, Severity.WARNING, tr("Relation type is unknown"),
-            RELATION_UNKNOWN, n) );
+                    RELATION_UNKNOWN, n) );
 
         }
@@ -144 +141 @@
             if(map.size() == 0)
                 errors.add( new TestError(this, Severity.ERROR, tr("Relation is empty"),
-                RELATION_EMPTY, n) );
+                        RELATION_EMPTY, n) );
             else
             {
@@ -163 +160 @@
                             String s = marktr("Role {0} missing");
                             errors.add( new TestError(this, Severity.WARNING, tr("Role verification problem"),
-                            tr(s, keyname), MessageFormat.format(s, keyname), ROLE_MISSING, n) );
+                                    tr(s, keyname), MessageFormat.format(s, keyname), ROLE_MISSING, n) );
                         }
                         else if(vc > count)
@@ -169 +166 @@
                             String s = marktr("Number of {0} roles too low ({1})");
                             errors.add( new TestError(this, Severity.WARNING, tr("Role verification problem"),
-                            tr(s, keyname, count), MessageFormat.format(s, keyname, count), LOW_COUNT, n) );
+                                    tr(s, keyname, count), MessageFormat.format(s, keyname, count), LOW_COUNT, n) );
                         }
                         else
@@ -175 +172 @@
                             String s = marktr("Number of {0} roles too high ({1})");
                             errors.add( new TestError(this, Severity.WARNING, tr("Role verification problem"),
-                            tr(s, keyname, count), MessageFormat.format(s, keyname, count), HIGH_COUNT, n) );
+                                    tr(s, keyname, count), MessageFormat.format(s, keyname, count), HIGH_COUNT, n) );
                         }
                     }
                     if(ri != null && ((!r.types.contains("way") && (r.types.contains("closedway") ? ri.openways > 0 : ri.ways > 0))
-                    || (!r.types.contains("node") && ri.nodes > 0) || (!r.types.contains("relation") && ri.relations > 0)))
+                            || (!r.types.contains("node") && ri.nodes > 0) || (!r.types.contains("relation") && ri.relations > 0)))
                     {
                         String s = marktr("Member for role {0} of wrong type");
                         errors.add( new TestError(this, Severity.WARNING, tr("Role verification problem"),
-                        tr(s, keyname), MessageFormat.format(s, keyname), WRONG_TYPE, n) );
+                                tr(s, keyname), MessageFormat.format(s, keyname), WRONG_TYPE, n) );
                     }
                 }
@@ -194 +191 @@
                             String s = marktr("Role {0} unknown");
                             errors.add( new TestError(this, Severity.WARNING, tr("Role verification problem"),
-                            tr(s, key), MessageFormat.format(s, key), ROLE_UNKNOWN, n) );
+                                    tr(s, key), MessageFormat.format(s, key), ROLE_UNKNOWN, n) );
                         }
                         else
@@ -200 +197 @@
                             String s = marktr("Empty role found");
                             errors.add( new TestError(this, Severity.WARNING, tr("Role verification problem"),
-                            tr(s), s, ROLE_EMPTY, n) );
+                                    tr(s), s, ROLE_EMPTY, n) );
                         }
                     }