001// License: GPL. For details, see LICENSE file.
002package org.openstreetmap.josm.gui.conflict.pair;
003
004import org.openstreetmap.josm.data.conflict.Conflict;
005import org.openstreetmap.josm.data.osm.OsmPrimitive;
006import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
007
008/**
009 * The conflict resolver receives the result of a {@link ConflictDialog}.
010 * It should then apply the resolution the user selected.
011 */
012public interface IConflictResolver {
013
014    void deletePrimitive(boolean deleted);
015
016    void populate(Conflict<? extends OsmPrimitive> conflict);
017
018    void decideRemaining(MergeDecisionType decision);
019}