Index: src/org/openstreetmap/josm/actions/JoinAreasAction.java =================================================================== --- src/org/openstreetmap/josm/actions/JoinAreasAction.java (revision 4013) +++ src/org/openstreetmap/josm/actions/JoinAreasAction.java (working copy) @@ -41,6 +41,7 @@ import org.openstreetmap.josm.data.osm.RelationMember; import org.openstreetmap.josm.data.osm.TagCollection; import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil; import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog; import org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil; import org.openstreetmap.josm.tools.Geometry; @@ -330,22 +331,22 @@ allNodes.addAll(way.getNodes()); } - // TODO: Only display this warning when nodes outside dataSourceArea are deleted Area dataSourceArea = Main.main.getCurrentDataSet().getDataSourceArea(); if (dataSourceArea != null) { for (Node node : allNodes) { if (!dataSourceArea.contains(node.getCoor())) { - int option = JOptionPane.showConfirmDialog(Main.parent, - trn("The selected way has nodes outside of the downloaded data region.", + boolean option = ConditionalOptionPaneUtil.showConfirmationDialog( + "delete_outside_nodes",Main.parent, + trn("The selected way has nodes outside of the downloaded data region.", "The selected ways have nodes outside of the downloaded data region.", ways.size()) + "\n" + tr("This can lead to nodes being deleted accidentally.") + "\n" + tr("Are you really sure to continue?"), tr("Please abort if you are not sure"), JOptionPane.YES_NO_OPTION, - JOptionPane.WARNING_MESSAGE); + JOptionPane.WARNING_MESSAGE,JOptionPane.YES_OPTION); - if (option != JOptionPane.YES_OPTION) return; + if (!option) return; break; } } Index: src/org/openstreetmap/josm/actions/SimplifyWayAction.java =================================================================== --- src/org/openstreetmap/josm/actions/SimplifyWayAction.java (revision 4013) +++ src/org/openstreetmap/josm/actions/SimplifyWayAction.java (working copy) @@ -27,6 +27,7 @@ import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil; import org.openstreetmap.josm.gui.HelpAwareOptionPane; import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec; import org.openstreetmap.josm.gui.help.HelpUtil; @@ -61,22 +62,8 @@ } protected boolean confirmWayWithNodesOutsideBoundingBox() { - ButtonSpec[] options = new ButtonSpec[] { - new ButtonSpec( - tr("Yes, delete nodes"), - ImageProvider.get("ok"), - tr("Delete nodes outside of downloaded data regions"), - null - ), - new ButtonSpec( - tr("No, abort"), - ImageProvider.get("cancel"), - tr("Cancel operation"), - null - ) - }; - int ret = HelpAwareOptionPane.showOptionDialog( - Main.parent, + return ConditionalOptionPaneUtil.showConfirmationDialog( + "delete_outside_nodes",Main.parent, "" + trn("The selected way has nodes outside of the downloaded data region.", "The selected ways have nodes outside of the downloaded data region.", @@ -87,13 +74,8 @@ + tr("Do you want to delete them anyway?") + "", tr("Delete nodes outside of data regions?"), - JOptionPane.WARNING_MESSAGE, - null, // no special icon - options, - options[0], - HelpUtil.ht("/Action/SimplifyWay#ConfirmDeleteNodesOutsideBoundingBoxes") - ); - return ret == 0; + JOptionPane.YES_NO_OPTION, + JOptionPane.WARNING_MESSAGE,JOptionPane.YES_OPTION); } protected void alertSelectAtLeastOneWay() {