|
Last change
on this file since 104 was 104, checked in by imi, 18 years ago |
- started i18n
- started "download incomplete ways" action
- added straight line selection mode
|
|
File size:
639 bytes
|
| Line | |
|---|
| 1 | package org.openstreetmap.josm.data.conflict;
|
|---|
| 2 |
|
|---|
| 3 | import static org.openstreetmap.josm.tools.I18n.tr;
|
|---|
| 4 |
|
|---|
| 5 | import org.openstreetmap.josm.data.osm.OsmPrimitive;
|
|---|
| 6 |
|
|---|
| 7 | public class DeleteConflict extends ConflictItem {
|
|---|
| 8 |
|
|---|
| 9 | @Override public boolean hasConflict(OsmPrimitive key, OsmPrimitive value) {
|
|---|
| 10 | return key.deleted != value.deleted;
|
|---|
| 11 | }
|
|---|
| 12 |
|
|---|
| 13 | @Override public String key() {
|
|---|
| 14 | return "deleted|"+tr("deleted");
|
|---|
| 15 | }
|
|---|
| 16 |
|
|---|
| 17 | @Override protected String str(OsmPrimitive osm) {
|
|---|
| 18 | return osm.deleted ? tr("true") : tr("false");
|
|---|
| 19 | }
|
|---|
| 20 |
|
|---|
| 21 | @Override public void apply(OsmPrimitive target, OsmPrimitive other) {
|
|---|
| 22 | target.deleted = other.deleted;
|
|---|
| 23 | }
|
|---|
| 24 | }
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
