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

Timestamp:

2009-10-11T23:06:32+02:00 (15 years ago)

Author:

jttt

Message:

Use OsmPrimitive.isNew() instead of getId() == 0

Location:

applications/editors/josm/plugins/validator

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/TestError.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java (modified) (3 diffs)

applications/editors/josm/plugins/validator/build.xml

@@ -26 +26 @@
                 <attribute name="Plugin-Description" value="An OSM data validator. It checks for problems in data, and provides fixes for the common ones. Spellcheck integrated for tag names."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Validator"/>
-                <attribute name="Plugin-Mainversion" value="2263"/>
+                <attribute name="Plugin-Mainversion" value="2273"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>

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

@@ -153 +153 @@
         for (OsmPrimitive o : primitives) {
             // ignore data not yet uploaded
-            if (o.getId() == 0)
+            if (o.isNew())
                 return null;
             String type = "u";

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

@@ -4 +4 @@
 
 import java.awt.geom.Area;
-
 import java.util.Collection;
 import java.util.LinkedList;
@@ -31 +30 @@
  */
 public class DuplicateNode extends Test{
-        
+
         private static BackreferencedDataSet backreferences;
-        
+
         public static BackreferencedDataSet getBackreferenceDataSet() {
                 if (backreferences == null) {
@@ -41 +40 @@
                 return backreferences;
         }
-        
+
         public static void clearBackreferences() {
                 backreferences = null;
         }
-        
+
     protected static int DUPLICATE_NODE = 1;
 
@@ -132 +131 @@
         if (a != null) {
             for (OsmPrimitive osm : del) {
-                if (osm instanceof Node && osm.getId() != 0) {
+                if (osm instanceof Node && !osm.isNew()) {
                     Node n = (Node) osm;
                     if (!a.contains(n.getCoor())) {

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

@@ -6 +6 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Vector;
-import java.util.Map;
 
 import org.openstreetmap.josm.Main;
@@ -15 +15 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.plugins.validator.Severity;
@@ -120 +120 @@
         // or one "at random" if no such exists. Rest of the ways will be deleted
         for (Way w: ways) {
-            if (w.getId() > 0) {
+            if (!w.isNew()) {
                 if (idToKeep == 0 || w.getId() < idToKeep) idToKeep = w.getId();
             }