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}. It should then apply the resulution the user selected. 010 */ 011public interface IConflictResolver { 012 013 void deletePrimitive(boolean deleted); 014 015 void populate(Conflict<? extends OsmPrimitive> conflict); 016 017 void decideRemaining(MergeDecisionType decision); 018}