Changeset 2070 in josm for trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

Timestamp:

2009-09-06T23:07:33+02:00 (15 years ago)

Author:

Gubaer

Message:

new: rewrite of CombineWay action
new: conflict resolution dialog for CombineWay, including conflicts for different relation memberships
cleanup: cleanup in OsmReader, reduces memory footprint and reduces parsing time
cleanup: made most of the public fields in OsmPrimitive @deprecated, added accessors and changed the code
cleanup: replaced usages of @deprecated constructors for ExtendedDialog
fixed #3208: Combine ways brokes relation order

WARNING: this changeset touches a lot of code all over the code base. "latest" might become slightly unstable in the next days. Also experience incompatibility issues with plugins in the next few days.

File:

• trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

@@ -74 +74 @@
     protected String decorateNameWithId(String name, OsmPrimitive primitive) {
         if (Main.pref.getBoolean("osm-primitives.showid"))
-            return name + tr(" [id: {0}]", primitive.id);
+            return name + tr(" [id: {0}]", primitive.getId());
         else
             return name;
@@ -96 +96 @@
             }
             if (name == null) {
-                name = node.id == 0 ? tr("node") : ""+ node.id;
+                name = node.getId() == 0 ? tr("node") : ""+ node.getId();
             }
             name += " (" + node.getCoor().latToString(CoordinateFormat.getDefaultFormat()) + ", " + node.getCoor().lonToString(CoordinateFormat.getDefaultFormat()) + ")";
@@ -175 +175 @@
             }
             if (nameTag == null) {
-                name += Long.toString(relation.id) + ", ";
+                name += Long.toString(relation.getId()) + ", ";
             } else {
                 name += "\"" + nameTag + "\", ";
@@ -197 +197 @@
      */
     public String format(Changeset changeset) {
-        return tr("Changeset {0}",changeset.id);
+        return tr("Changeset {0}",changeset.getId());
     }
 }