Changeset 2291 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2009-10-15T22:20:19+02:00 (17 years ago)

Author:

Gubaer

Message:

Replaced OsmPrimtive.user by setters/getters

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapStatus.java (modified) (1 diff)
• dialogs/UserListDialog.java (modified) (2 diffs)

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

@@ -425 +425 @@
             }
 
-            if(osm.user != null) {
-                text.append(" [" + tr("User:") + " " + osm.user.getName() + "]");
+            if(osm.getUser() != null) {
+                text.append(" [" + tr("User:") + " " + osm.getUser().getName() + "]");
             }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java

@@ -278 +278 @@
             if (primitives == null || primitives.isEmpty()) return ret;
             for (OsmPrimitive primitive: primitives) {
-                if (primitive.user == null) {
+                if (primitive.getUser() == null) {
                     continue;
                 }
-                if (ret.containsKey(primitive.user)) {
-                    ret.put(primitive.user, ret.get(primitive.user) + 1);
+                if (ret.containsKey(primitive.getUser())) {
+                    ret.put(primitive.getUser(), ret.get(primitive.getUser()) + 1);
                 } else {
-                    ret.put(primitive.user, 1);
+                    ret.put(primitive.getUser(), 1);
                 }
             }
@@ -335 +335 @@
             Collection<OsmPrimitive> byUser = new LinkedList<OsmPrimitive>();
             for (OsmPrimitive p : selected) {
-                if (p.user == null) {
+                if (p.getUser() == null) {
                     continue;
                 }
-                if (users.contains(p.user)) {
+                if (users.contains(p.getUser())) {
                     byUser.add(p);
                 }