Changeset 2273 in josm for trunk/src/org/openstreetmap/josm/data/APIDataSet.java
- Timestamp:
- 2009-10-11T16:37:08+02:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/APIDataSet.java
r2250 r2273 58 58 continue; 59 59 } 60 if (osm. getId() == 0&& !osm.isDeleted()) {60 if (osm.isNew() && !osm.isDeleted()) { 61 61 toAdd.addLast(osm); 62 62 } else if (osm.isModified() && !osm.isDeleted()) { 63 63 toUpdate.addLast(osm); 64 } else if (osm.isDeleted() && osm.getId() != 0&& osm.isModified()) {64 } else if (osm.isDeleted() && !osm.isNew() && osm.isModified()) { 65 65 toDelete.addFirst(osm); 66 66 } … … 119 119 toDelete.clear(); 120 120 for (OsmPrimitive osm: primitives) { 121 if (osm. getId() == 0&& !osm.isDeleted()) {121 if (osm.isNew() && !osm.isDeleted()) { 122 122 toAdd.addLast(osm); 123 123 } else if (osm.isModified() && !osm.isDeleted()) { 124 124 toUpdate.addLast(osm); 125 } else if (osm.isDeleted() && osm.getId() != 0&& osm.isModified()) {125 } else if (osm.isDeleted() && !osm.isNew() && osm.isModified()) { 126 126 toDelete.addFirst(osm); 127 127 } … … 216 216 boolean refersToNewRelation = false; 217 217 for (RelationMember m : relation.getMembers()) { 218 if (m.isRelation() && m.getMember(). getId() <= 0) {218 if (m.isRelation() && m.getMember().isNew()) { 219 219 refersToNewRelation = true; 220 220 break; … … 253 253 this.relations = new HashSet<Relation>(); 254 254 for(Relation relation: relations) { 255 if ( relation.getId() > 0) {255 if (!relation.isNew() ) { 256 256 continue; 257 257 } 258 258 this.relations.add(relation); 259 259 for (RelationMember m: relation.getMembers()) { 260 if (m.isRelation() && m.getMember(). getId() == 0) {260 if (m.isRelation() && m.getMember().isNew()) { 261 261 addDependency(relation, (Relation)m.getMember()); 262 262 } … … 306 306 new Comparator<Relation>() { 307 307 public int compare(Relation o1, Relation o2) { 308 return new Integer(uploadOrder.indexOf(o1)).compareTo(uploadOrder.indexOf(o2));308 return Integer.valueOf(uploadOrder.indexOf(o1)).compareTo(uploadOrder.indexOf(o2)); 309 309 } 310 310 }
Note:
See TracChangeset
for help on using the changeset viewer.