Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 5774) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 5775) @@ -5,4 +5,5 @@ import static org.openstreetmap.josm.tools.I18n.marktr; import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; import java.awt.Color; @@ -23,4 +24,5 @@ import javax.swing.AbstractAction; import javax.swing.JList; +import javax.swing.JOptionPane; import javax.swing.ListModel; import javax.swing.ListSelectionModel; @@ -43,8 +45,10 @@ import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor; import org.openstreetmap.josm.data.osm.visitor.Visitor; +import org.openstreetmap.josm.gui.HelpAwareOptionPane; import org.openstreetmap.josm.gui.MapView; import org.openstreetmap.josm.gui.NavigatableComponent; import org.openstreetmap.josm.gui.OsmPrimitivRenderer; import org.openstreetmap.josm.gui.SideButton; +import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec; import org.openstreetmap.josm.gui.layer.OsmDataLayer; import org.openstreetmap.josm.gui.util.GuiHelper; @@ -407,4 +411,50 @@ } } - + + /** + * Warns the user about the number of detected conflicts + * + * @param numNewConflicts the number of detected conflicts + * @since 5775 + */ + public void warnNumNewConflicts(int numNewConflicts) { + if (numNewConflicts == 0) return; + + String msg1 = trn( + "There was {0} conflict detected.", + "There were {0} conflicts detected.", + numNewConflicts, + numNewConflicts + ); + + final StringBuffer sb = new StringBuffer(); + sb.append("").append(msg1).append(""); + if (numNewConflicts > 0) { + final ButtonSpec[] options = new ButtonSpec[] { + new ButtonSpec( + tr("OK"), + ImageProvider.get("ok"), + tr("Click to close this dialog and continue editing"), + null /* no specific help */ + ) + }; + GuiHelper.runInEDT(new Runnable() { + @Override + public void run() { + HelpAwareOptionPane.showOptionDialog( + Main.parent, + sb.toString(), + tr("Conflicts detected"), + JOptionPane.WARNING_MESSAGE, + null, /* no icon */ + options, + options[0], + ht("/Concepts/Conflict#WarningAboutDetectedConflicts") + ); + unfurlDialog(); + Main.map.repaint(); + } + }); + } + } } Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 5774) +++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 5775) @@ -74,6 +74,4 @@ import org.openstreetmap.josm.data.validation.TestError; import org.openstreetmap.josm.gui.ExtendedDialog; -import org.openstreetmap.josm.gui.HelpAwareOptionPane; -import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec; import org.openstreetmap.josm.gui.MapView; import org.openstreetmap.josm.gui.dialogs.LayerListDialog; @@ -81,5 +79,4 @@ import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor; import org.openstreetmap.josm.gui.progress.ProgressMonitor; -import org.openstreetmap.josm.gui.util.GuiHelper; import org.openstreetmap.josm.tools.DateUtils; import org.openstreetmap.josm.tools.FilteredCollection; @@ -410,53 +407,6 @@ Main.map.mapView.repaint(); } - warnNumNewConflicts(numNewConflicts); - } - - /** - * Warns the user about the number of detected conflicts - * - * @param numNewConflicts the number of detected conflicts - */ - protected void warnNumNewConflicts(int numNewConflicts) { - if (numNewConflicts == 0) return; - - String msg1 = trn( - "There was {0} conflict detected.", - "There were {0} conflicts detected.", - numNewConflicts, - numNewConflicts - ); - - final StringBuffer sb = new StringBuffer(); - sb.append("").append(msg1).append(""); - if (numNewConflicts > 0) { - final ButtonSpec[] options = new ButtonSpec[] { - new ButtonSpec( - tr("OK"), - ImageProvider.get("ok"), - tr("Click to close this dialog and continue editing"), - null /* no specific help */ - ) - }; - GuiHelper.runInEDT(new Runnable() { - @Override - public void run() { - HelpAwareOptionPane.showOptionDialog( - Main.parent, - sb.toString(), - tr("Conflicts detected"), - JOptionPane.WARNING_MESSAGE, - null, /* no icon */ - options, - options[0], - ht("/Concepts/Conflict#WarningAboutDetectedConflicts") - ); - Main.map.conflictDialog.unfurlDialog(); - Main.map.repaint(); - } - }); - } - } - + Main.map.conflictDialog.warnNumNewConflicts(numNewConflicts); + } @Override public boolean isMergable(final Layer other) {