Changeset 1811 in josm for trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java
- Timestamp:
- 2009-07-19T17:38:55+02:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java
r1790 r1811 4 4 import static org.openstreetmap.josm.tools.I18n.tr; 5 5 6 import java.io.IOException;7 6 import java.io.InputStream; 8 7 9 import org.openstreetmap.josm.Main;10 8 import org.openstreetmap.josm.data.osm.DataSet; 11 import org. xml.sax.SAXException;9 import org.openstreetmap.josm.gui.progress.ProgressMonitor; 12 10 13 11 public class OsmServerLocationReader extends OsmServerReader { … … 23 21 */ 24 22 @Override 25 public DataSet parseOsm( ) throws OsmTransferException {23 public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException { 26 24 InputStream in = null; 25 progressMonitor.beginTask(tr("Contacting Server...", 10)); 27 26 try { 28 Main.pleaseWaitDlg.progress.setValue(0); 29 Main.pleaseWaitDlg.currentAction.setText(tr("Contacting Server...")); 30 31 in = getInputStreamRaw(url, Main.pleaseWaitDlg); 27 in = getInputStreamRaw(url, progressMonitor.createSubTaskMonitor(9, false)); 32 28 if (in == null) 33 29 return null; 34 Main.pleaseWaitDlg.currentAction.setText(tr("Downloading OSM data..."));35 return OsmReader.parseDataSet(in, Main.pleaseWaitDlg);30 progressMonitor.subTask(tr("Downloading OSM data...")); 31 return OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(1, false)); 36 32 } catch(OsmTransferException e) { 37 33 throw e; … … 41 37 throw new OsmTransferException(e); 42 38 } finally { 39 progressMonitor.finishTask(); 43 40 try { 44 41 if (in != null) {
Note:
See TracChangeset
for help on using the changeset viewer.