Ignore:
Timestamp:
2009-08-11T13:23:06+02:00 (10 years ago)
Author:
Gubaer
Message:

Moved package org.openstreetmap.josm.gui.conflict to org.openstreetmap.josm.gui.conflict.pair

Location:
trunk/src/org/openstreetmap/josm/command
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java

    r1750 r1954  
    1313import org.openstreetmap.josm.data.osm.Node;
    1414import org.openstreetmap.josm.data.osm.OsmPrimitive;
    15 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
     15import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
    1616import org.openstreetmap.josm.tools.ImageProvider;
    1717
  • trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java

    r1750 r1954  
    1212import org.openstreetmap.josm.data.conflict.Conflict;
    1313import org.openstreetmap.josm.data.osm.OsmPrimitive;
    14 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
     14import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
    1515import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    1616import org.openstreetmap.josm.tools.ImageProvider;
  • trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java

    r1750 r1954  
    1515import org.openstreetmap.josm.data.osm.OsmPrimitive;
    1616import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
    17 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
    18 import org.openstreetmap.josm.gui.conflict.tags.TagMergeItem;
     17import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
     18import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeItem;
    1919import org.openstreetmap.josm.tools.ImageProvider;
    2020
Note: See TracChangeset for help on using the changeset viewer.