Changeset 2054 in josm


Ignore:
Timestamp:
2009-09-04T17:44:20+02:00 (15 years ago)
Author:
Gubaer
Message:

applied #3389: patch by podolsir: "delete confirmation" message dialogue
cleanup of ExtendedDialog in DeleteCommand

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

    r2026 r2054  
    109109            String msg = "";
    110110            switch(OsmPrimitiveType.from(primitive)) {
    111                 case NODE: msg = "Delete node {0}"; break;
    112                 case WAY: msg = "Delete way {0}"; break;
    113                 case RELATION:msg = "Delete relation {0}"; break;
     111            case NODE: msg = "Delete node {0}"; break;
     112            case WAY: msg = "Delete way {0}"; break;
     113            case RELATION:msg = "Delete relation {0}"; break;
    114114            }
    115115
    … …  
    130130            apiname = t.getAPIName();
    131131            switch(t) {
    132                 case NODE: msg = trn("Delete {0} node", "Delete {0} nodes", toDelete.size(), toDelete.size()); break;
    133                 case WAY: msg = trn("Delete {0} way", "Delete {0} ways", toDelete.size(), toDelete.size()); break;
    134                 case RELATION: msg = trn("Delete {0} relation", "Delete {0} relations", toDelete.size(), toDelete.size()); break;
     132            case NODE: msg = trn("Delete {0} node", "Delete {0} nodes", toDelete.size(), toDelete.size()); break;
     133            case WAY: msg = trn("Delete {0} way", "Delete {0} ways", toDelete.size(), toDelete.size()); break;
     134            case RELATION: msg = trn("Delete {0} relation", "Delete {0} relations", toDelete.size(), toDelete.size()); break;
    135135            }
    136136        }
    … …  
    191191            }
    192192        }
    193         if (role.length() > 0)
    194             return new ExtendedDialog(Main.parent, tr("Conflicting relation"), tr(
    195                     "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\nDelete from relation?",
    196                     osm.getDisplayName(DefaultNameFormatter.getInstance()), ref.getDisplayName(DefaultNameFormatter.getInstance()), role), new String[] { tr("Delete from relation"),
    197                 tr("Cancel") }, new String[] { "dialogs/delete.png", "cancel.png" }).getValue();
    198         else
    199             return new ExtendedDialog(Main.parent, tr("Conflicting relation"), tr(
    200                     "Selection \"{0}\" is used by relation \"{1}\".\nDelete from relation?",
    201                     osm.getDisplayName(DefaultNameFormatter.getInstance()),
    202                     ref.getDisplayName(DefaultNameFormatter.getInstance())), new String[] { tr("Delete from relation"), tr("Cancel") }, new String[] {
    203                 "dialogs/delete.png", "cancel.png" }).getValue();
     193        ExtendedDialog dialog = new ExtendedDialog(
     194                Main.parent,
     195                tr("Conflicting relation"),
     196                new String[] { tr("Delete from relation"),tr("Cancel") }
     197        );
     198        dialog.setButtonIcons( new String[] { "dialogs/delete.png", "cancel.png" });
     199        if (role.length() > 0) {
     200            dialog.setContent(
     201                    tr(
     202                            "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete from relation?</html>",
     203                            osm.getDisplayName(DefaultNameFormatter.getInstance()),
     204                            ref.getDisplayName(DefaultNameFormatter.getInstance()),
     205                            role
     206                    )
     207            );
     208            dialog.showDialog();
     209            return dialog.getValue();
     210        } else {
     211            dialog.setContent(
     212                    tr(
     213                            "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?</html>",
     214                            osm.getDisplayName(DefaultNameFormatter.getInstance()),
     215                            ref.getDisplayName(DefaultNameFormatter.getInstance())
     216                    )
     217            );
     218            dialog.showDialog();
     219            return dialog.getValue();
     220        }
    204221    }
    205222
    … …  
    277294        }
    278295
    279         if (!checkAndConfirmOutlyingDeletes(layer,primitivesToDelete) && !simulate)
     296        if (!simulate && !checkAndConfirmOutlyingDeletes(layer,primitivesToDelete))
    280297            return null;
    281298
Note: See TracChangeset for help on using the changeset viewer.