Index: /trunk/src/org/openstreetmap/josm/actions/JosmAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/JosmAction.java (revision 18180) +++ /trunk/src/org/openstreetmap/josm/actions/JosmAction.java (revision 18181) @@ -24,4 +24,5 @@ import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil; import org.openstreetmap.josm.gui.MainApplication; +import org.openstreetmap.josm.gui.Notification; import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent; @@ -513,28 +514,10 @@ int checkRes = Command.checkOutlyingOrIncompleteOperation(primitives, ignore); if ((checkRes & Command.IS_OUTSIDE) != 0) { - JPanel msg = new JPanel(new GridBagLayout()); - msg.add(new JMultilineLabel("" + outsideDialogMessage + "")); - boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog( - operation + "_outside_nodes", - MainApplication.getMainFrame(), - msg, - dialogTitle, - JOptionPane.YES_NO_OPTION, - JOptionPane.QUESTION_MESSAGE, - JOptionPane.YES_OPTION); + boolean answer = showConfirmOutlyingOperationDialog(operation + "_outside_nodes", outsideDialogMessage, dialogTitle); if (!answer) return false; } if ((checkRes & Command.IS_INCOMPLETE) != 0) { - JPanel msg = new JPanel(new GridBagLayout()); - msg.add(new JMultilineLabel("" + incompleteDialogMessage + "")); - boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog( - operation + "_incomplete", - MainApplication.getMainFrame(), - msg, - dialogTitle, - JOptionPane.YES_NO_OPTION, - JOptionPane.QUESTION_MESSAGE, - JOptionPane.YES_OPTION); + boolean answer = showConfirmOutlyingOperationDialog(operation + "_incomplete", incompleteDialogMessage, dialogTitle); if (!answer) return false; @@ -542,3 +525,22 @@ return true; } + + private static boolean showConfirmOutlyingOperationDialog(String preferenceKey, String dialogMessage, String dialogTitle) { + JPanel msg = new JPanel(new GridBagLayout()); + msg.add(new JMultilineLabel("" + dialogMessage + "")); + boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog( + preferenceKey, + MainApplication.getMainFrame(), + msg, + dialogTitle, + JOptionPane.YES_NO_OPTION, + JOptionPane.QUESTION_MESSAGE, + JOptionPane.YES_OPTION); + if (!answer && JOptionPane.NO_OPTION == ConditionalOptionPaneUtil.getDialogReturnValue(preferenceKey)) { + String message = tr("Operation was not performed, as per {0} preference", preferenceKey); + new Notification(message).show(); + Logging.info(message); + } + return answer; + } }