|
Last change
on this file since 9440 was 9440, checked in by simon04, 8 years ago |
|
see #12338 - Conflict resolution: add expert actions "Resolve to my/their versions" in popup menu
This resolves all selected conflicts to my/their versions.
|
-
Property svn:eol-style
set to
native
|
|
File size:
408 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 |
|
|---|
| 7 | public interface IConflictResolver {
|
|---|
| 8 |
|
|---|
| 9 | void deletePrimitive(boolean deleted);
|
|---|
| 10 |
|
|---|
| 11 | void populate(Conflict<? extends OsmPrimitive> conflict);
|
|---|
| 12 |
|
|---|
| 13 | void decideRemaining(MergeDecisionType decision);
|
|---|
| 14 | }
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
