Conflict Dialog Panel should close after Resolving all

[Hb---]

The conflict dialog panel in the sidebar should close after the last conflict is resolved.

[taylor.smock]

Are you thinking of something like this:

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

@@ -58 +58 @@
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.NavigatableComponent;
+import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.PopupMenuHandler;
 import org.openstreetmap.josm.gui.PrimitiveRenderer;
 import org.openstreetmap.josm.gui.SideButton;
@@ -68 +69 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -229 +231 @@
         GuiHelper.runInEDT(() -> {
             model.fireContentChanged();
             updateTitle();
+            if (conflicts.isEmpty() && Config.getPref().getBoolean("conflict-dialog.hide-when-no-conflicts", true)) {
+                this.hideDialog();
+                this.hideNotify();
+                new Notification(tr("All conflicts resolved, hiding conflict dialog")).setIcon(JOptionPane.INFORMATION_MESSAGE).show();
+            }
         });
     }
 

[skyper]

Please, be careful and do not hide conflicts. Either the toggle dialogs need to be set per layer or all data layers should be checked. I sometimes have more than one data layer with pending conflicts and after solving all in one layer, I still need the conflict toggle dialog with the other data layer.

[taylor.smock]

skyper: Thanks for the feedback. Probably all data layers should be checked.

EDIT: I've edited the patch a bit to account for that.

[skyper]

Mmh, one more honey pot might be undo: Solve the last conflict resp. all conflicts at once. Undo.