Ignore:
Timestamp:
2016-11-26T21:28:20+01:00 (7 years ago)
Author:
Don-vip
Message:

refactor conflict classes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java

    r8465 r11318  
    1818import org.openstreetmap.josm.gui.conflict.pair.ListRole;
    1919
    20 public class NodeListMergeModel extends ListMergeModel<Node> {
     20/**
     21 * The model for merging two lists of way nodess
     22 * @since 1622
     23 */
     24public class NodeListMergeModel extends ListMergeModel<Node, WayNodesConflictResolverCommand> {
    2125
    2226    /**
    … …  
    4953    }
    5054
    51     /**
    52      * Builds the command to resolve conflicts in the node list of a way
    53      *
    54      * @param conflict the conflict data set
    55      * @return the command
    56      * @throws IllegalStateException if the merge is not yet frozen
    57      */
     55    @Override
    5856    public WayNodesConflictResolverCommand buildResolveCommand(Conflict<? extends OsmPrimitive> conflict) {
    5957        if (!isFrozen())
Note: See TracChangeset for help on using the changeset viewer.