Changeset 9270 in osm for applications/editors/josm/plugins/validator

Timestamp:

2008-07-24T09:53:50+02:00 (16 years ago)

Author:

stoecker

Message:

skip not-uploaded stuff for ignore

Location:

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator

Files:

• TestError.java (modified) (1 diff)
• ValidateAction.java (modified) (1 diff)
• ValidatorDialog.java (modified) (1 diff)

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java

@@ -146 +146 @@
                 for (OsmPrimitive o : primitives)
                 {
+                        // ignore data not yet uploaded
+                        if(o.id == 0)
+                                return null;
                         String type = "u";
                         if (o instanceof Way) type = "w";

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java

@@ -103 +103 @@
                         for(TestError error : errors)
                         {
-                                if(plugin.validationDialog.ignoredErrors.contains(error.getIgnoreState()))
+                                String state = error.getIgnoreState();
+                                if(state != null && plugin.validationDialog.ignoredErrors.contains(state))
                                 {
                                         error.setIgnored(true);

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java

@@ -215 +215 @@
                                         TestError error = (TestError)nodeInfo;
                                         String state = error.getIgnoreState();
-                                        ignoredErrors.add(state);
+                                        if(state != null)
+                                                ignoredErrors.add(state);
                                         changed = true;
                                         error.setIgnored(true);