Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java
- Timestamp:
- 2015-06-20T23:42:21+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java
r8291 r8510 83 83 protected void cancel() { 84 84 canceled = true; 85 synchronized (this) {85 synchronized (this) { 86 86 if (multiObjectReader != null) { 87 87 multiObjectReader.cancel(); … … 105 105 public void run() { 106 106 layer.mergeFrom(ds); 107 if (Main.map != null)107 if (Main.map != null) 108 108 AutoScaleAction.zoomTo(ds.allPrimitives()); 109 109 layer.onPostDownloadFromServer(); … … 139 139 DataSet theirDataSet; 140 140 try { 141 synchronized (this) {141 synchronized (this) { 142 142 if (canceled) return; 143 143 multiObjectReader = new MultiFetchServerObjectReader(); … … 146 146 theirDataSet = multiObjectReader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false)); 147 147 missingPrimitives = multiObjectReader.getMissingPrimitives(); 148 synchronized (this) {148 synchronized (this) { 149 149 multiObjectReader = null; 150 150 } … … 158 158 // (it may happen because "relations" has no deterministic sort order, see #10388) 159 159 if (r.isIncomplete() || r.hasIncompleteMembers()) { 160 synchronized (this) {160 synchronized (this) { 161 161 if (canceled) return; 162 162 objectReader = new OsmServerObjectReader(r.getId(), OsmPrimitiveType.RELATION, fullRelation); … … 178 178 if (canceled) return; 179 179 if (w.hasIncompleteNodes()) { 180 synchronized (this) {180 synchronized (this) { 181 181 if (canceled) return; 182 182 objectReader = new OsmServerObjectReader(w.getId(), OsmPrimitiveType.WAY, true /* full */); … … 191 191 } 192 192 193 } catch (Exception e) {193 } catch (Exception e) { 194 194 if (canceled) return; 195 195 lastException = e;
Note:
See TracChangeset
for help on using the changeset viewer.