Changeset 12672 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

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/dialogs/ConflictDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -218 +218 @@
      */
     public void refreshView() {
-        OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
+        DataSet editDs = MainApplication.getLayerManager().getEditDataSet();
         synchronized (this) {
-            conflicts = editLayer == null ? new ConflictCollection() : editLayer.getConflicts();
+            conflicts = editDs == null ? new ConflictCollection() : editDs.getConflicts();
         }
         GuiHelper.runInEDT(() -> {