Changeset 4310 in josm for trunk/src/org/openstreetmap/josm/gui/history
- Timestamp:
- 2011-08-11T00:26:21+02:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
r3083 r4310 47 47 public class HistoryLoadTask extends PleaseWaitRunnable { 48 48 49 private boolean cancel led = false;49 private boolean canceled = false; 50 50 private Exception lastException = null; 51 51 private HashSet<PrimitiveId> toLoad; … … 160 160 protected void cancel() { 161 161 OsmApi.getOsmApi().cancel(); 162 cancel led = true;162 canceled = true; 163 163 } 164 164 165 165 @Override 166 166 protected void finish() { 167 if (isCancel led())167 if (isCanceled()) 168 168 return; 169 169 if (lastException != null) { … … 179 179 try { 180 180 for(PrimitiveId pid: toLoad) { 181 if (cancel led) {181 if (canceled) { 182 182 break; 183 183 } … … 196 196 ds = reader.parseHistory(progressMonitor.createSubTaskMonitor(1, false)); 197 197 } catch(OsmTransferException e) { 198 if (cancel led)198 if (canceled) 199 199 return; 200 200 throw e; … … 208 208 } 209 209 210 public boolean isCancel led() {211 return cancel led;210 public boolean isCanceled() { 211 return canceled; 212 212 } 213 213
Note:
See TracChangeset
for help on using the changeset viewer.