Changeset 12672 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2017-08-27T17:07:54+02:00 (7 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/gui/layer/OsmDataLayer.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -351 +351 @@
 
     /**
-     * the collection of conflicts detected in this layer
-     */
-    private final ConflictCollection conflicts;
-
-    /**
      * a texture for non-downloaded area
      */
@@ -407 +402 @@
         this.data = data;
         this.setAssociatedFile(associatedFile);
-        conflicts = new ConflictCollection();
         data.addDataSetListener(new DataSetListenerAdapter(this));
         data.addDataSetListener(MultipolygonCache.getInstance());
@@ -567 +561 @@
         int numNewConflicts = 0;
         for (Conflict<?> c : visitor.getConflicts()) {
-            if (!conflicts.hasConflict(c)) {
+            if (!data.getConflicts().hasConflict(c)) {
                 numNewConflicts++;
-                conflicts.add(c);
+                data.getConflicts().add(c);
             }
         }
@@ -924 +918 @@
      */
     public ConflictCollection getConflicts() {
-        return conflicts;
+        return data.getConflicts();
     }