Ignore:
Timestamp:
2017-08-27T17:07:54+02:00 (2 years ago)
Author:
Don-vip
Message:

see #15182 - move ConflictCollection from OsmDataLayer to DataSet. Simplifies some code where a data set is enough, and a layer is not needed

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

    r12620 r12672  
    3030import org.openstreetmap.josm.data.ProjectionBounds;
    3131import org.openstreetmap.josm.data.SelectionChangedListener;
     32import org.openstreetmap.josm.data.conflict.ConflictCollection;
    3233import org.openstreetmap.josm.data.coor.EastNorth;
    3334import org.openstreetmap.josm.data.coor.LatLon;
     
    196197    private final Collection<DataSource> dataSources = new LinkedList<>();
    197198
     199    private final ConflictCollection conflicts = new ConflictCollection();
     200
    198201    /**
    199202     * Constructs a new {@code DataSet}.
     
    13471350    }
    13481351
     1352    /**
     1353     * Replies the set of conflicts currently managed in this layer.
     1354     *
     1355     * @return the set of conflicts currently managed in this layer
     1356     * @since 12672
     1357     */
     1358    public ConflictCollection getConflicts() {
     1359        return conflicts;
     1360    }
     1361
    13491362    /* --------------------------------------------------------------------------------- */
    13501363    /* interface ProjectionChangeListner                                                 */
Note: See TracChangeset for help on using the changeset viewer.