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

Timestamp:

2009-11-29T15:42:27+01:00 (15 years ago)

Author:

stoecker

Message:

fixed display issue

Location:

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

Files:

• tests/UnconnectedWays.java (modified) (7 diffs)
• util/NameVisitor.java (modified) (4 diffs)

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

@@ -92 +92 @@
             long now = System.currentTimeMillis();
             if (now - last_print > 200) {
-                System.err.println("processing segment nr: " + nr + " of " + ways.size());
+                //System.err.println("processing segment nr: " + nr + " of " + ways.size());
                 last_print = now;
             }
@@ -118 +118 @@
             }
         }
-        System.out.println("p1 elapesd: " + (System.currentTimeMillis()-last));
+        //System.out.println("p1 elapsed: " + (System.currentTimeMillis()-last));
         last = System.currentTimeMillis();
         }
@@ -139 +139 @@
             }
         }
-        System.out.println("p2 elapesd: " + (System.currentTimeMillis()-last));
+        //System.out.println("p2 elapsed: " + (System.currentTimeMillis()-last));
         last = System.currentTimeMillis();
         for(Map.Entry<Node, Way> error : map.entrySet())
@@ -160 +160 @@
                 }
             }
-            System.out.println("p3 elapesd: " + (System.currentTimeMillis()-last));
+            //System.out.println("p3 elapsed: " + (System.currentTimeMillis()-last));
             last = System.currentTimeMillis();
             for(Map.Entry<Node, Way> error : map.entrySet())
@@ -178 +178 @@
                 }
             }
-            System.out.println("p4 elapesd: " + (System.currentTimeMillis()-last));
+            //System.out.println("p4 elapsed: " + (System.currentTimeMillis()-last));
             last = System.currentTimeMillis();
             for(Map.Entry<Node, Way> error : map.entrySet())
@@ -190 +190 @@
         endnodes = null;
         super.endTest();
-        System.out.println("p99 elapesd: " + (System.currentTimeMillis()-last));
+        //System.out.println("p99 elapsed: " + (System.currentTimeMillis()-last));
         last = System.currentTimeMillis();
     }
@@ -278 +278 @@
                 // one now being asked for...
                 if (nearbyNodeCacheDist > dist) {
-                    System.out.println("had to trim MyWaySegment nearby node cache.");
+                    //System.out.println("had to trim MyWaySegment nearby node cache.");
                     // Used the cached result and trim out
                     // the nodes that are not in the smaller

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java

@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -43 +44 @@
      */
     public void visit(Node n) {
-        name = n.getName();
+        name = n.getDisplayName(DefaultNameFormatter.getInstance());
         addId(n);
         icon = ImageProvider.get("data", "node");
@@ -55 +56 @@
      */
     public void visit(Way w) {
-        name = w.getName();
+        name = w.getDisplayName(DefaultNameFormatter.getInstance());
         addId(w);
         icon = ImageProvider.get("data", "way");
@@ -65 +66 @@
      */
     public void visit(Relation e) {
-        name = e.getName();
+        name = e.getDisplayName(DefaultNameFormatter.getInstance());
         addId(e);
         icon = ImageProvider.get("data", "relation");