Changeset 1811 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
- Timestamp:
- 2009-07-19T17:38:55+02:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
r1465 r1811 16 16 import org.openstreetmap.josm.gui.layer.GpxLayer; 17 17 import org.openstreetmap.josm.gui.layer.Layer; 18 import org.openstreetmap.josm.gui.progress.ProgressMonitor; 18 19 import org.openstreetmap.josm.io.BoundingBoxDownloader; 19 20 import org.xml.sax.SAXException; … … 26 27 private GpxData rawData; 27 28 private final boolean newLayer; 28 private String msg = "";29 29 30 public Task(boolean newLayer, BoundingBoxDownloader reader, boolean silent, String msg) {30 public Task(boolean newLayer, BoundingBoxDownloader reader, ProgressMonitor progressMonitor) { 31 31 super(tr("Downloading GPS data")); 32 this.msg = msg;33 32 this.reader = reader; 34 33 this.newLayer = newLayer; 35 this.silent = silent;36 34 } 37 35 38 36 @Override public void realRun() throws IOException, SAXException { 39 Main.pleaseWaitDlg.setCustomText(msg); 40 rawData = reader.parseRawGps(); 37 rawData = reader.parseRawGps(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false)); 41 38 } 42 39 … … 52 49 else 53 50 x.mergeFrom(layer); 54 55 Main.pleaseWaitDlg.setCustomText("");56 51 } 57 52 … … 72 67 if (reader != null) 73 68 reader.cancel(); 74 Main.pleaseWaitDlg.cancel.setEnabled(false);75 69 } 76 70 } … … 79 73 80 74 public void download(DownloadAction action, double minlat, double minlon, 81 double maxlat, double maxlon) { 82 download(action, minlat, minlon, maxlat, maxlon, false, ""); 83 } 84 85 public void download(DownloadAction action, double minlat, double minlon, 86 double maxlat, double maxlon, boolean silent, String message) { 75 double maxlat, double maxlon, ProgressMonitor progressMonitor) { 87 76 Task t = new Task(action.dialog.newLayer.isSelected(), 88 new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon), 89 silent, 90 message); 77 new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon), progressMonitor); 91 78 // We need submit instead of execute so we can wait for it to finish and get the error 92 79 // message if necessary. If no one calls getErrorMessage() it just behaves like execute. … … 116 103 try { 117 104 Task t = task.get(); 118 return t. errorMessage== null105 return t.getProgressMonitor().getErrorMessage() == null 119 106 ? "" 120 : t. errorMessage;107 : t.getProgressMonitor().getErrorMessage(); 121 108 } catch (Exception e) { 122 109 return "";
Note:
See TracChangeset
for help on using the changeset viewer.