|
Last change
on this file since 17333 was 17333, checked in by Don-vip, 3 years ago |
|
see #20129 - Fix typos and misspellings in the code (patch by gaben)
|
-
Property svn:eol-style
set to
native
|
|
File size:
606 bytes
|
| Line | |
|---|
| 1 | // License: GPL. For details, see LICENSE file.
|
|---|
| 2 | package org.openstreetmap.josm.gui.conflict.pair;
|
|---|
| 3 |
|
|---|
| 4 | import org.openstreetmap.josm.data.conflict.Conflict;
|
|---|
| 5 | import org.openstreetmap.josm.data.osm.OsmPrimitive;
|
|---|
| 6 | import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
|
|---|
| 7 |
|
|---|
| 8 | /**
|
|---|
| 9 | * The conflict resolver receives the result of a {@link ConflictDialog}.
|
|---|
| 10 | * It should then apply the resolution the user selected.
|
|---|
| 11 | */
|
|---|
| 12 | public interface IConflictResolver {
|
|---|
| 13 |
|
|---|
| 14 | void deletePrimitive(boolean deleted);
|
|---|
| 15 |
|
|---|
| 16 | void populate(Conflict<? extends OsmPrimitive> conflict);
|
|---|
| 17 |
|
|---|
| 18 | void decideRemaining(MergeDecisionType decision);
|
|---|
| 19 | }
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
