Changes between Initial Version and Version 1 of Ticket #22118, comment 1


Ignore:
Timestamp:
2022-06-08T15:44:47+02:00 (3 years ago)
Author:
taylor.smock

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #22118, comment 1

    initial v1  
    22{{{#!diff
    33diff --git a/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
    4 index cf8f78faf5..64a293a170 100644
     4index cf8f78faf5..ea9718104d 100644
    55--- a/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
    66+++ b/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
    … …  
    2121 import org.openstreetmap.josm.tools.Logging;
    2222 import org.openstreetmap.josm.tools.Shortcut;
    23 @@ -229,6 +231,11 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
     23@@ -229,6 +231,13 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
    2424         GuiHelper.runInEDT(() -> {
    2525             model.fireContentChanged();
    2626             updateTitle();
    27 +            if (conflicts.isEmpty() && Config.getPref().getBoolean("conflict-dialog.hide-when-no-conflicts", true)) {
     27+            if (conflicts.isEmpty() && Config.getPref().getBoolean("conflict-dialog.hide-when-no-conflicts", true)
     28+            && MainApplication.getLayerManager().getLayersOfType(OsmDataLayer.class).stream().map(OsmDataLayer::getDataSet)
     29+                    .map(DataSet::getConflicts).allMatch(ConflictCollection::isEmpty)) {
    2830+                this.hideDialog();
    2931+                this.hideNotify();
    … …  
    3335     }
    3436 
    35 
    3637}}}