Index: trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java (revision 4690) +++ trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java (revision 4691) @@ -3,4 +3,5 @@ import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; import java.io.IOException; @@ -13,6 +14,9 @@ import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.Collection; import java.util.Date; import java.util.Locale; +import java.util.Set; +import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -84,4 +88,27 @@ return msg; } + + /** + * Explains a precondition exception when a child node could not be deleted because + * it is still referred to by undeleted parent ways. + * + * @param e the exception + * @param childNode the child node + * @param parentWays the parent ways + * @return + */ + public static String explainDeletedNodeStillInUse(OsmApiException e, long childNode, Collection parentWays) { + String ids = parentWays.size() == 1 ? parentWays.iterator().next().toString() : parentWays.toString(); + String msg = trn( + "Failed to delete node {0}." + + " It is still referred to by way {1}.
" + + "Please load way {1}, remove the reference to node {0}, and upload again.", + "Failed to delete node {0}." + + " It is still referred to by ways {1}.
" + + "Please load ways {1}, remove the reference to node {0}, and upload again.", + parentWays.size(), childNode, ids + ); + return msg; + } /** @@ -94,11 +121,18 @@ String msg = e.getErrorHeader(); if (msg != null) { - String pattern = "Precondition failed: The relation (\\d+) is used in relation (\\d+)\\."; - Pattern p = Pattern.compile(pattern); - Matcher m = p.matcher(msg); + Matcher m = Pattern.compile("Precondition failed: The relation (\\d+) is used in relation (\\d+)\\.").matcher(msg); if (m.matches()) { long childRelation = Long.parseLong(m.group(1)); long parentRelation = Long.parseLong(m.group(2)); return explainDeletedRelationStillInUse(e, childRelation, parentRelation); + } + m = Pattern.compile("Precondition failed: Node (\\d+) is still used by ways (\\d+(?:,\\d+)*)\\.").matcher(msg); + if (m.matches()) { + long childNode = Long.parseLong(m.group(1)); + Set parentWays = new TreeSet(); // Error message can contain several times the same way + for (String s : m.group(2).split(",")) { + parentWays.add(Long.parseLong(s)); + } + return explainDeletedNodeStillInUse(e, childNode, parentWays); } }