Changeset 12672 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

Timestamp:

2017-08-27T17:07:54+02:00 (9 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:

• trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -30 +30 @@
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.conflict.ConflictCollection;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -196 +197 @@
     private final Collection<DataSource> dataSources = new LinkedList<>();
 
+    private final ConflictCollection conflicts = new ConflictCollection();
+
     /**
      * Constructs a new {@code DataSet}.
@@ -1347 +1350 @@
     }
 
+    /**
+     * Replies the set of conflicts currently managed in this layer.
+     *
+     * @return the set of conflicts currently managed in this layer
+     * @since 12672
+     */
+    public ConflictCollection getConflicts() {
+        return conflicts;
+    }
+
     /* --------------------------------------------------------------------------------- */
     /* interface ProjectionChangeListner                                                 */