source: josm/trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java@ 2198

Last change on this file since 2198 was 2198, checked in by Gubaer, 15 years ago

fixed #3249: Resolve conflicts between invisible and deleted primitives automatically

File size: 6.4 KB
Line 
1// License: GPL. For details, see LICENSE file.
2package org.openstreetmap.josm.gui.io;
3
4import static org.openstreetmap.josm.tools.I18n.tr;
5
6import java.util.Collection;
7import java.util.HashSet;
8
9import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
10import org.openstreetmap.josm.data.APIDataSet;
11import org.openstreetmap.josm.data.osm.Changeset;
12import org.openstreetmap.josm.data.osm.DataSet;
13import org.openstreetmap.josm.data.osm.OsmPrimitive;
14import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
15import org.openstreetmap.josm.gui.DefaultNameFormatter;
16import org.openstreetmap.josm.gui.layer.OsmDataLayer;
17import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
18import org.openstreetmap.josm.gui.progress.ProgressMonitor;
19import org.openstreetmap.josm.io.OsmApi;
20import org.openstreetmap.josm.io.OsmApiPrimitiveGoneException;
21import org.openstreetmap.josm.io.OsmServerWriter;
22import org.openstreetmap.josm.io.OsmTransferException;
23
24/**
25 * UploadLayerTask uploads the data managed by an {@see OsmDataLayer} asynchronously.
26 *
27 * <pre>
28 * ExecutorService executorService = ...
29 * UploadLayerTask task = new UploadLayerTask(layer, monitor);
30 * Future<?> taskFuture = executorServce.submit(task)
31 * try {
32 * // wait for the task to complete
33 * taskFuture.get();
34 * } catch(Exception e) {
35 * e.printStackTracek();
36 * }
37 * </pre>
38 */
39class UploadLayerTask extends AbstractIOTask implements Runnable {
40 private OsmServerWriter writer;
41 private OsmDataLayer layer;
42 private ProgressMonitor monitor;
43 private Changeset changeset;
44 private boolean closeChangesetAfterUpload;
45 private Collection<OsmPrimitive> toUpload;
46 private HashSet<OsmPrimitive> processedPrimitives;
47
48 /**
49 *
50 * @param layer the layer. Must not be null.
51 * @param monitor a progress monitor. If monitor is null, uses {@see NullProgressMonitor#INSTANCE}
52 * @param changeset the changeset to be used
53 * @param closeChangesetAfterUpload true, if the changeset should be closed after the upload
54 * @throws IllegalArgumentException thrown, if layer is null
55 */
56 public UploadLayerTask(OsmDataLayer layer, ProgressMonitor monitor, Changeset changeset, boolean closeChangesetAfterUpload) {
57 if (layer == null)
58 throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", layer));
59 if (monitor == null) {
60 monitor = NullProgressMonitor.INSTANCE;
61 }
62 this.layer = layer;
63 this.monitor = monitor;
64 this.changeset = changeset;
65 this.closeChangesetAfterUpload = closeChangesetAfterUpload;
66 processedPrimitives = new HashSet<OsmPrimitive>();
67 }
68
69 protected OsmPrimitive getPrimitive(OsmPrimitiveType type, long id) {
70 for (OsmPrimitive p: toUpload) {
71 if (OsmPrimitiveType.from(p).equals(type) && p.getId() == id)
72 return p;
73 }
74 return null;
75 }
76
77 /**
78 * Retries to recover the upload operation from an exception which was thrown because
79 * an uploaded primitive was already deleted on the server.
80 *
81 * @param e the exception throw by the API
82 * @param monitor a progress monitor
83 * @throws OsmTransferException thrown if we can't recover from the exception
84 */
85 protected void recoverFromGoneOnServer(OsmApiPrimitiveGoneException e, ProgressMonitor monitor) throws OsmTransferException{
86 if (!e.isKnownPrimitive()) throw e;
87 OsmPrimitive p = getPrimitive(e.getPrimitiveType(), e.getPrimitiveId());
88 if (p == null) throw e;
89 if (p.isDeleted()) {
90 // we tried to delete an already deleted primitive.
91 //
92 System.out.println(tr("Warning: primitive ''{0}'' is already deleted on the server. Skipping this primitive and retrying to upload.", p.getDisplayName(DefaultNameFormatter.getInstance())));
93 processedPrimitives.addAll(writer.getProcessedPrimitives());
94 processedPrimitives.add(p);
95 toUpload.removeAll(processedPrimitives);
96 return;
97 }
98 // exception was thrown because we tried to *update* an already deleted
99 // primitive. We can't resolve this automatically. Re-throw exception,
100 // a conflict is going to be created later.
101 throw e;
102 }
103
104 @Override
105 public void run() {
106 monitor.subTask(tr("Preparing primitives to upload ..."));
107 APIDataSet ds = new APIDataSet(layer.data);
108 try {
109 ds.adjustRelationUploadOrder();
110 } catch(CyclicUploadDependencyException e) {
111 setLastException(e);
112 return;
113 }
114 toUpload = ds.getPrimitives();
115 if (toUpload.isEmpty())
116 return;
117 writer = new OsmServerWriter();
118 try {
119 while(true) {
120 try {
121 ProgressMonitor m = monitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
122 if (isCancelled()) return;
123 writer.uploadOsm(layer.data.version, toUpload, changeset, m);
124 processedPrimitives.addAll(writer.getProcessedPrimitives());
125 break;
126 } catch(OsmApiPrimitiveGoneException e) {
127 recoverFromGoneOnServer(e, monitor);
128 }
129 }
130 if (closeChangesetAfterUpload) {
131 if (changeset != null && changeset.getId() > 0) {
132 OsmApi.getOsmApi().closeChangeset(changeset, monitor.createSubTaskMonitor(0, false));
133 }
134 }
135 } catch (Exception sxe) {
136 if (isCancelled()) {
137 System.out.println("Ignoring exception caught because upload is cancelled. Exception is: " + sxe.toString());
138 return;
139 }
140 setLastException(sxe);
141 }
142
143 if (isCancelled())
144 return;
145 layer.cleanupAfterUpload(processedPrimitives);
146 DataSet.fireSelectionChanged(layer.data.getSelected());
147 layer.fireDataChange();
148 layer.onPostUploadToServer();
149
150 // don't process exceptions remembered with setLastException().
151 // Caller is supposed to deal with them.
152 }
153
154 @Override
155 public void cancel() {
156 setCancelled(true);
157 if (writer != null) {
158 writer.cancel();
159 }
160 }
161}
Note: See TracBrowser for help on using the repository browser.