source: josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java@ 298

Last change on this file since 298 was 298, checked in by imi, 17 years ago
  • added license description to head of each source file
File size: 701 bytes
Line 
1// License: GPL. Copyright 2007 by Immanuel Scholz and others
2package org.openstreetmap.josm.data.conflict;
3
4import static org.openstreetmap.josm.tools.I18n.tr;
5
6import org.openstreetmap.josm.data.osm.OsmPrimitive;
7
8public class DeleteConflict extends ConflictItem {
9
10 @Override public boolean hasConflict(OsmPrimitive key, OsmPrimitive value) {
11 return key.deleted != value.deleted;
12 }
13
14 @Override public String key() {
15 return "deleted|"+tr("deleted");
16 }
17
18 @Override protected String str(OsmPrimitive osm) {
19 return osm.deleted ? tr("true") : tr("false");
20 }
21
22 @Override public void apply(OsmPrimitive target, OsmPrimitive other) {
23 target.deleted = other.deleted;
24 }
25}
Note: See TracBrowser for help on using the repository browser.