Changeset 1879 in josm for trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
- Timestamp:
- 2009-08-02T14:36:40+02:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
r1835 r1879 99 99 public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException { 100 100 progressMonitor.beginTask(tr("Contacting OSM Server..."), 10); 101 InputStream in = null; 101 102 try { 102 103 progressMonitor.indeterminateSubTask(null); 103 final InputStreamin = getInputStream("map?bbox="+lon1+","+lat1+","+lon2+","+lat2, progressMonitor.createSubTaskMonitor(9, false));104 in = getInputStream("map?bbox="+lon1+","+lat1+","+lon2+","+lat2, progressMonitor.createSubTaskMonitor(9, false)); 104 105 if (in == null) 105 106 return null; 106 final DataSet data = OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(1, false)); 107 in.close(); 108 activeConnection = null; 109 return data; 110 } catch (IOException e) { 111 if (cancel) 112 return null; 113 throw new OsmTransferException(e); 114 } catch (SAXException e) { 115 throw new OsmTransferException(e); 107 return OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(1, false)); 116 108 } catch(OsmTransferException e) { 117 109 throw e; 118 110 } catch (Exception e) { 119 if (cancel)120 return null;121 111 throw new OsmTransferException(e); 122 112 } finally { 123 113 progressMonitor.finishTask(); 114 if (in != null) { 115 try {in.close();} catch(IOException e) {} 116 } 117 activeConnection = null; 124 118 } 125 119 }
Note:
See TracChangeset
for help on using the changeset viewer.