Index: trunk/src/org/openstreetmap/josm/command/DeleteCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (revision 2053)
+++ trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (revision 2054)
@@ -109,7 +109,7 @@
String msg = "";
switch(OsmPrimitiveType.from(primitive)) {
- case NODE: msg = "Delete node {0}"; break;
- case WAY: msg = "Delete way {0}"; break;
- case RELATION:msg = "Delete relation {0}"; break;
+ case NODE: msg = "Delete node {0}"; break;
+ case WAY: msg = "Delete way {0}"; break;
+ case RELATION:msg = "Delete relation {0}"; break;
}
@@ -130,7 +130,7 @@
apiname = t.getAPIName();
switch(t) {
- case NODE: msg = trn("Delete {0} node", "Delete {0} nodes", toDelete.size(), toDelete.size()); break;
- case WAY: msg = trn("Delete {0} way", "Delete {0} ways", toDelete.size(), toDelete.size()); break;
- case RELATION: msg = trn("Delete {0} relation", "Delete {0} relations", toDelete.size(), toDelete.size()); break;
+ case NODE: msg = trn("Delete {0} node", "Delete {0} nodes", toDelete.size(), toDelete.size()); break;
+ case WAY: msg = trn("Delete {0} way", "Delete {0} ways", toDelete.size(), toDelete.size()); break;
+ case RELATION: msg = trn("Delete {0} relation", "Delete {0} relations", toDelete.size(), toDelete.size()); break;
}
}
@@ -191,15 +191,32 @@
}
}
- if (role.length() > 0)
- return new ExtendedDialog(Main.parent, tr("Conflicting relation"), tr(
- "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\nDelete from relation?",
- osm.getDisplayName(DefaultNameFormatter.getInstance()), ref.getDisplayName(DefaultNameFormatter.getInstance()), role), new String[] { tr("Delete from relation"),
- tr("Cancel") }, new String[] { "dialogs/delete.png", "cancel.png" }).getValue();
- else
- return new ExtendedDialog(Main.parent, tr("Conflicting relation"), tr(
- "Selection \"{0}\" is used by relation \"{1}\".\nDelete from relation?",
- osm.getDisplayName(DefaultNameFormatter.getInstance()),
- ref.getDisplayName(DefaultNameFormatter.getInstance())), new String[] { tr("Delete from relation"), tr("Cancel") }, new String[] {
- "dialogs/delete.png", "cancel.png" }).getValue();
+ ExtendedDialog dialog = new ExtendedDialog(
+ Main.parent,
+ tr("Conflicting relation"),
+ new String[] { tr("Delete from relation"),tr("Cancel") }
+ );
+ dialog.setButtonIcons( new String[] { "dialogs/delete.png", "cancel.png" });
+ if (role.length() > 0) {
+ dialog.setContent(
+ tr(
+ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete from relation?",
+ osm.getDisplayName(DefaultNameFormatter.getInstance()),
+ ref.getDisplayName(DefaultNameFormatter.getInstance()),
+ role
+ )
+ );
+ dialog.showDialog();
+ return dialog.getValue();
+ } else {
+ dialog.setContent(
+ tr(
+ "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?",
+ osm.getDisplayName(DefaultNameFormatter.getInstance()),
+ ref.getDisplayName(DefaultNameFormatter.getInstance())
+ )
+ );
+ dialog.showDialog();
+ return dialog.getValue();
+ }
}
@@ -277,5 +294,5 @@
}
- if (!checkAndConfirmOutlyingDeletes(layer,primitivesToDelete) && !simulate)
+ if (!simulate && !checkAndConfirmOutlyingDeletes(layer,primitivesToDelete))
return null;