Index: /trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java (revision 2245)
+++ /trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java (revision 2246)
@@ -10,6 +10,9 @@
import java.net.URL;
import java.net.UnknownHostException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.io.OsmApiException;
@@ -51,4 +54,22 @@
}
+ /**
+ * Explains a precondition exception when a child relation could not be deleted because
+ * it is still referred to by an undeleted parent relation.
+ *
+ * @param e the exception
+ * @param childRelation the child relation
+ * @param parentRelation the parent relation
+ * @return
+ */
+ public static String explainDeletedRelationStillInUse(OsmApiException e, long childRelation, long parentRelation) {
+ String msg = tr(
+ "Failed to delete relation {0}."
+ + " It is still referred to by relation {1}.
"
+ + "Please load relation {1}, remove the reference to relation {0}, and upload again.",
+ childRelation,parentRelation
+ );
+ return msg;
+ }
/**
@@ -59,5 +80,16 @@
public static String explainPreconditionFailed(OsmApiException e) {
e.printStackTrace();
- String msg = tr(
+ 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);
+ if (m.matches()) {
+ long childRelation = Long.parseLong(m.group(1));
+ long parentRelation = Long.parseLong(m.group(2));
+ return explainDeletedRelationStillInUse(e, childRelation, parentRelation);
+ }
+ }
+ msg = tr(
"Uploading to the server failed because your current
"
+ "dataset violates a precondition.
" + "The error message is:
" + "{0}" + "", e