diff --git a/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java b/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java index fdfc0a4..f849e2f 100644 --- a/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java +++ b/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java @@ -12,16 +12,7 @@ import java.awt.event.WindowEvent; import java.util.ArrayList; import java.util.List; -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.Icon; -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JDialog; -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import javax.swing.KeyStroke; -import javax.swing.SwingUtilities; +import javax.swing.*; import org.openstreetmap.josm.gui.help.HelpBrowser; import org.openstreetmap.josm.gui.help.HelpUtil; @@ -166,7 +157,12 @@ public class HelpAwareOptionPane { } if (msg instanceof String) { - msg = new JLabel((String)msg); + JEditorPane pane = new JEditorPane(); + pane.setContentType("text/html"); + pane.setText((String) msg); + pane.setEditable(false); + pane.setOpaque(false); + msg = pane; } final JOptionPane pane = new JOptionPane( diff --git a/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java b/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java index a7b0b6b..9ae8a31 100644 --- a/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java +++ b/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java @@ -7,6 +7,8 @@ import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; import java.net.HttpURLConnection; import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.regex.Matcher; @@ -30,7 +32,9 @@ import org.openstreetmap.josm.io.OsmApiException; import org.openstreetmap.josm.io.OsmApiInitializationException; import org.openstreetmap.josm.io.OsmApiPrimitiveGoneException; import org.openstreetmap.josm.tools.DateUtils; +import org.openstreetmap.josm.tools.ExceptionUtil; import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.tools.Pair; public abstract class AbstractUploadTask extends PleaseWaitRunnable { public AbstractUploadTask(String title, boolean ignoreException) { @@ -205,41 +209,38 @@ public abstract class AbstractUploadTask extends PleaseWaitRunnable { * Handles the case where deleting a node failed because it is still in use in * a non-deleted way on the server. */ - protected void handleUploadConflictForNodeStillInUse(long nodeId, long wayId) { + protected void handleUploadPreconditionFailedConflict(OsmApiException e, Pair> conflict) { ButtonSpec[] options = new ButtonSpec[] { new ButtonSpec( tr("Prepare conflict resolution"), ImageProvider.get("ok"), - tr("Click to download all parent ways for node {0}", nodeId), + tr("Click to download all referring objects for {0}", conflict.a), null /* no specific help context */ ), new ButtonSpec( tr("Cancel"), ImageProvider.get("cancel"), - tr("Click to cancel and to resume editing the map", nodeId), + tr("Click to cancel and to resume editing the map"), null /* no specific help context */ ) }; - String msg = tr("Uploading failed because you tried " - + "to delete node {0} which is still in use in way {1}.

" - + "Click {2} to download all parent ways of node {0}.
" - + "If necessary JOSM will create conflicts which you can resolve in the Conflict Resolution Dialog." - + "", - nodeId, wayId, options[0].text - ); - + String msg = ExceptionUtil.explainPreconditionFailed(e).replace("", "

" + tr( + "Click {0} to load them now.
" + + "If necessary JOSM will create conflicts which you can resolve in the Conflict Resolution Dialog.", + options[0].text)) + ""; int ret = HelpAwareOptionPane.showOptionDialog( Main.parent, msg, - tr("Node still in use"), + tr("Object still in use"), JOptionPane.ERROR_MESSAGE, null, options, options[0], "/Action/Upload#NodeStillInUseInWay" - ); - if (ret != 0) return; - DownloadReferrersAction.downloadReferrers(Main.map.mapView.getEditLayer(), nodeId, OsmPrimitiveType.NODE); +); + if (ret == 0) { + DownloadReferrersAction.downloadReferrers(Main.map.mapView.getEditLayer(), Arrays.asList(conflict.a)); + } } /** @@ -262,13 +263,6 @@ public abstract class AbstractUploadTask extends PleaseWaitRunnable { handleUploadConflictForClosedChangeset(Long.parseLong(m.group(1)), DateUtils.fromString(m.group(2))); return; } - pattern = "Node (\\d+) is still used by way (\\d+)."; - p = Pattern.compile(pattern); - m = p.matcher(e.getErrorHeader()); - if (m.matches()) { - handleUploadConflictForNodeStillInUse(Long.parseLong(m.group(1)), Long.parseLong(m.group(2))); - return; - } System.out.println(tr("Warning: error header \"{0}\" did not match with an expected pattern", e.getErrorHeader())); handleUploadConflictForUnknownConflict(); } @@ -279,15 +273,14 @@ public abstract class AbstractUploadTask extends PleaseWaitRunnable { * @param e the exception */ protected void handlePreconditionFailed(OsmApiException e) { - String pattern = "Precondition failed: Node (\\d+) is still used by way (\\d+)."; - Pattern p = Pattern.compile(pattern); - Matcher m = p.matcher(e.getErrorHeader()); - if (m.matches()) { - handleUploadConflictForNodeStillInUse(Long.parseLong(m.group(1)), Long.parseLong(m.group(2))); - return; + // in the worst case, ExceptionUtil.parsePreconditionFailed is executed trice - should not be too expensive + Pair> conflict = ExceptionUtil.parsePreconditionFailed(e.getErrorHeader()); + if (conflict != null) { + handleUploadPreconditionFailedConflict(e, conflict); + } else { + System.out.println(tr("Warning: error header \"{0}\" did not match with an expected pattern", e.getErrorHeader())); + ExceptionDialogUtil.explainPreconditionFailed(e); } - System.out.println(tr("Warning: error header \"{0}\" did not match with an expected pattern", e.getErrorHeader())); - ExceptionDialogUtil.explainPreconditionFailed(e); } /** diff --git a/src/org/openstreetmap/josm/tools/ExceptionUtil.java b/src/org/openstreetmap/josm/tools/ExceptionUtil.java index e9d3083..3bf372d 100644 --- a/src/org/openstreetmap/josm/tools/ExceptionUtil.java +++ b/src/org/openstreetmap/josm/tools/ExceptionUtil.java @@ -22,6 +22,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Relation; +import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder; import org.openstreetmap.josm.io.ChangesetClosedException; import org.openstreetmap.josm.io.IllegalDataException; @@ -32,6 +36,7 @@ import org.openstreetmap.josm.io.OsmApiInitializationException; import org.openstreetmap.josm.io.OsmTransferException; import org.openstreetmap.josm.io.auth.CredentialsManager; +@SuppressWarnings("CallToThreadDumpStack") public class ExceptionUtil { private ExceptionUtil() { } @@ -45,7 +50,7 @@ public class ExceptionUtil { e.printStackTrace(); String msg = tr( "Failed to initialize communication with the OSM server {0}.
" - + "Check the server URL in your preferences and your internet connection.", Main.pref.get( + + "Check the server URL in your preferences and your internet connection.", Main.pref.get( "osm-server.url", "http://api.openstreetmap.org/api")); return msg; } @@ -69,46 +74,51 @@ public class ExceptionUtil { return msg; } - /** - * 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; - } - - /** - * 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 the way, remove the reference to the node, and upload again.", - "Failed to delete node {0}." - + " It is still referred to by ways {1}.
" - + "Please load the ways, remove the reference to the node, and upload again.", - parentWays.size(), childNode, ids - ); - return msg; + public static Pair> parsePreconditionFailed(String msg) { + final String ids = "(\\d+(?:,\\d+)*)"; + final Collection refs = new TreeSet(); // error message can contain several times the same way + Matcher m; + m = Pattern.compile(".*Node (\\d+) is still used by relations " + ids + ".*").matcher(msg); + if (m.matches()) { + OsmPrimitive n = new Node(Long.parseLong(m.group(1))); + for (String s : m.group(2).split(",")) { + refs.add(new Relation(Long.parseLong(m.group(2)))); + } + return Pair.create(n, refs); + } + m = Pattern.compile(".*Node (\\d+) is still used by ways " + ids + ".*").matcher(msg); + if (m.matches()) { + OsmPrimitive n = new Node(Long.parseLong(m.group(1))); + for (String s : m.group(2).split(",")) { + refs.add(new Way(Long.parseLong(m.group(2)))); + } + return Pair.create(n, refs); + } + m = Pattern.compile(".*The relation (\\d+) is used in relations? " + ids + ".*").matcher(msg); + if (m.matches()) { + OsmPrimitive n = new Relation(Long.parseLong(m.group(1))); + for (String s : m.group(2).split(",")) { + refs.add(new Relation(Long.parseLong(m.group(2)))); + } + return Pair.create(n, refs); + } + m = Pattern.compile(".*Way (\\d+) is still used by relations " + ids + ".*").matcher(msg); + if (m.matches()) { + OsmPrimitive n = new Way(Long.parseLong(m.group(1))); + for (String s : m.group(2).split(",")) { + refs.add(new Relation(Long.parseLong(m.group(2)))); + } + return Pair.create(n, refs); + } + m = Pattern.compile(".*Way (\\d+) requires the nodes with id in " + ids + ".*").matcher(msg); // ... ", which either do not exist, or are not visible" + if (m.matches()) { + OsmPrimitive n = new Way(Long.parseLong(m.group(1))); + for (String s : m.group(2).split(",")) { + refs.add(new Node(Long.parseLong(m.group(2)))); + } + return Pair.create(n, refs); + } + return null; } /** @@ -119,28 +129,120 @@ public class ExceptionUtil { public static String explainPreconditionFailed(OsmApiException e) { e.printStackTrace(); String msg = e.getErrorHeader(); - if (msg != null) { - 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)); + Pair> conflict = parsePreconditionFailed(e.getErrorHeader()); + if (conflict != null) { + OsmPrimitive firstRefs = conflict.b.iterator().next(); + Long objId = conflict.a.getId(); + Collection refIds= Utils.transform(conflict.b, new Utils.Function() { + + @Override + public Long apply(OsmPrimitive x) { + return x.getId(); + } + }); + String refIdsString = refIds.size() == 1 ? refIds.iterator().next().toString() : refIds.toString(); + if (conflict.a instanceof Node) { + if (firstRefs instanceof Node) { + return "" + trn( + "Failed to delete node {0}." + + " It is still referred to by node {1}.
" + + "Please load the node, remove the reference to the node, and upload again.", + "Failed to delete node {0}." + + " It is still referred to by nodes {1}.
" + + "Please load the nodes, remove the reference to the node, and upload again.", + conflict.b.size(), objId, refIdsString) + ""; + } else if (firstRefs instanceof Way) { + return "" + trn( + "Failed to delete node {0}." + + " It is still referred to by way {1}.
" + + "Please load the way, remove the reference to the node, and upload again.", + "Failed to delete node {0}." + + " It is still referred to by ways {1}.
" + + "Please load the ways, remove the reference to the node, and upload again.", + conflict.b.size(), objId, refIdsString) + ""; + } else if (firstRefs instanceof Relation) { + return "" + trn( + "Failed to delete node {0}." + + " It is still referred to by relation {1}.
" + + "Please load the relation, remove the reference to the node, and upload again.", + "Failed to delete node {0}." + + " It is still referred to by relations {1}.
" + + "Please load the relations, remove the reference to the node, and upload again.", + conflict.b.size(), objId, refIdsString) + ""; + } else { + throw new IllegalStateException(); + } + } else if (conflict.a instanceof Way) { + if (firstRefs instanceof Node) { + return "" + trn( + "Failed to delete way {0}." + + " It is still referred to by node {1}.
" + + "Please load the node, remove the reference to the way, and upload again.", + "Failed to delete way {0}." + + " It is still referred to by nodes {1}.
" + + "Please load the nodes, remove the reference to the way, and upload again.", + conflict.b.size(), objId, refIdsString) + ""; + } else if (firstRefs instanceof Way) { + return "" + trn( + "Failed to delete way {0}." + + " It is still referred to by way {1}.
" + + "Please load the way, remove the reference to the way, and upload again.", + "Failed to delete way {0}." + + " It is still referred to by ways {1}.
" + + "Please load the ways, remove the reference to the way, and upload again.", + conflict.b.size(), objId, refIdsString) + ""; + } else if (firstRefs instanceof Relation) { + return "" + trn( + "Failed to delete way {0}." + + " It is still referred to by relation {1}.
" + + "Please load the relation, remove the reference to the way, and upload again.", + "Failed to delete way {0}." + + " It is still referred to by relations {1}.
" + + "Please load the relations, remove the reference to the way, and upload again.", + conflict.b.size(), objId, refIdsString) + ""; + } else { + throw new IllegalStateException(); + } + } else if (conflict.a instanceof Relation) { + if (firstRefs instanceof Node) { + return "" + trn( + "Failed to delete relation {0}." + + " It is still referred to by node {1}.
" + + "Please load the node, remove the reference to the relation, and upload again.", + "Failed to delete relation {0}." + + " It is still referred to by nodes {1}.
" + + "Please load the nodes, remove the reference to the relation, and upload again.", + conflict.b.size(), objId, refIdsString) + ""; + } else if (firstRefs instanceof Way) { + return "" + trn( + "Failed to delete relation {0}." + + " It is still referred to by way {1}.
" + + "Please load the way, remove the reference to the relation, and upload again.", + "Failed to delete relation {0}." + + " It is still referred to by ways {1}.
" + + "Please load the ways, remove the reference to the relation, and upload again.", + conflict.b.size(), objId, refIdsString) + ""; + } else if (firstRefs instanceof Relation) { + return "" + trn( + "Failed to delete relation {0}." + + " It is still referred to by relation {1}.
" + + "Please load the relation, remove the reference to the relation, and upload again.", + "Failed to delete relation {0}." + + " It is still referred to by relations {1}.
" + + "Please load the relations, remove the reference to the relation, and upload again.", + conflict.b.size(), objId, refIdsString) + ""; + } else { + throw new IllegalStateException(); } - return explainDeletedNodeStillInUse(e, childNode, parentWays); + } else { + throw new IllegalStateException(); } + } else { + return tr( + "Uploading to the server failed because your current
" + + "dataset violates a precondition.
" + "The error message is:
" + "{0}" + "", + escapeReservedCharactersHTML(e.getMessage())); } - msg = tr( - "Uploading to the server failed because your current
" - + "dataset violates a precondition.
" + "The error message is:
" + "{0}" + "", - escapeReservedCharactersHTML(e.getMessage())); - return msg; } public static String explainFailedBasicAuthentication(OsmApiException e) { @@ -275,14 +377,14 @@ public class ExceptionUtil { } if (closeDate == null) { msg = tr( - "Closing of changeset {0} failed
because it has already been closed.", + "Closing of changeset {0} failed
because it has already been closed.", changesetId ); } else { SimpleDateFormat dateFormat = new SimpleDateFormat(); msg = tr( "Closing of changeset {0} failed
" - +" because it has already been closed on {1}.", + +" because it has already been closed on {1}.", changesetId, dateFormat.format(closeDate) ); @@ -294,10 +396,10 @@ public class ExceptionUtil { "Error message (untranslated):
{0}", msg ); + } else { + msg = tr( + "The server reported that it has detected a conflict."); } - msg = tr( - "The server reported that it has detected a conflict." - ); return msg; } @@ -312,7 +414,7 @@ public class ExceptionUtil { SimpleDateFormat dateFormat = new SimpleDateFormat(); msg = tr( "Failed to upload to changeset {0}
" - +"because it has already been closed on {1}.", + +"because it has already been closed on {1}.", e.getChangesetId(), e.getClosedOn() == null ? "?" : dateFormat.format(e.getClosedOn()) ); @@ -353,7 +455,7 @@ public class ExceptionUtil { String message = tr("Failed to open a connection to the remote server
" + "''{0}''
" + "for security reasons. This is most likely because you are running
" - + "in an applet and because you did not load your applet from ''{1}''.", apiUrl, host); + + "in an applet and because you did not load your applet from ''{1}''.", apiUrl, host); return message; } @@ -368,7 +470,7 @@ public class ExceptionUtil { public static String explainNestedSocketException(OsmTransferException e) { String apiUrl = e.getUrl(); String message = tr("Failed to open a connection to the remote server
" + "''{0}''.
" - + "Please check your internet connection.", apiUrl); + + "Please check your internet connection.", apiUrl); e.printStackTrace(); return message; } @@ -416,7 +518,7 @@ public class ExceptionUtil { public static String explainInternalServerError(OsmTransferException e) { String apiUrl = e.getUrl(); String message = tr("The OSM server
" + "''{0}''
" + "reported an internal server error.
" - + "This is most likely a temporary problem. Please try again later.", apiUrl); + + "This is most likely a temporary problem. Please try again later.", apiUrl); e.printStackTrace(); return message; } @@ -494,7 +596,7 @@ public class ExceptionUtil { String message = tr("Failed to open a connection to the remote server
" + "''{0}''.
" + "Host name ''{1}'' could not be resolved.
" - + "Please check the API URL in your preferences and your internet connection.", apiUrl, host); + + "Please check the API URL in your preferences and your internet connection.", apiUrl, host); e.printStackTrace(); return message; } diff --git a/src/org/openstreetmap/josm/tools/Utils.java b/src/org/openstreetmap/josm/tools/Utils.java index 4541a6b..a838e32 100644 --- a/src/org/openstreetmap/josm/tools/Utils.java +++ b/src/org/openstreetmap/josm/tools/Utils.java @@ -20,6 +20,7 @@ import java.security.NoSuchAlgorithmException; import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collection; +import java.util.Iterator; import java.util.List; /** @@ -395,4 +396,122 @@ public class Utils { if (sorted.size() != size) throw new RuntimeException(); return sorted; } + + /** + * Represents a function that can be applied to objects of {@code A} and + * returns objects of {@code B}. + * @param class of input objects + * @param class of transformed objects + */ + public static interface Function { + + /** + * Applies the function on {@code x}. + * @param x an object of + * @return the transformed object + */ + B apply(A x); + } + + /** + * Transforms the collection {@code c} into an unmodifiable collection and + * applies the {@link Function} {@code f} on each element upon access. + * @param class of input collection + * @param class of transformed collection + * @param c a collection + * @param f a function that transforms objects of {@code A} to objects of {@code B} + * @return the transformed unmodifiable collection + */ + public static Collection transform(final Collection c, final Function f) { + return new Collection() { + + @Override + public int size() { + return c.size(); + } + + @Override + public boolean isEmpty() { + return c.isEmpty(); + } + + @Override + public boolean contains(Object o) { + return c.contains(o); + } + + @Override + public Object[] toArray() { + return c.toArray(); + } + + @Override + public T[] toArray(T[] a) { + return c.toArray(a); + } + + @Override + public String toString() { + return c.toString(); + } + + @Override + public Iterator iterator() { + return new Iterator() { + + private Iterator it = c.iterator(); + + @Override + public boolean hasNext() { + return it.hasNext(); + } + + @Override + public B next() { + return f.apply(it.next()); + } + + @Override + public void remove() { + throw new UnsupportedOperationException(); + } + }; + } + + @Override + public boolean add(B e) { + throw new UnsupportedOperationException(); + } + + @Override + public boolean remove(Object o) { + throw new UnsupportedOperationException(); + } + + @Override + public boolean containsAll(Collection c) { + throw new UnsupportedOperationException(); + } + + @Override + public boolean addAll(Collection c) { + throw new UnsupportedOperationException(); + } + + @Override + public boolean removeAll(Collection c) { + throw new UnsupportedOperationException(); + } + + @Override + public boolean retainAll(Collection c) { + throw new UnsupportedOperationException(); + } + + @Override + public void clear() { + throw new UnsupportedOperationException(); + } + }; + } }