Changeset 10302 in josm for trunk/src/org/openstreetmap/josm/io/ProgressOutputStream.java
- Timestamp:
- 2016-05-30T09:24:08+02:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/ProgressOutputStream.java
r9669 r10302 19 19 private final StreamProgressUpdater updater; 20 20 private final OutputStream out; 21 private final boolean finishOnClose; 21 22 22 23 /** … … 26 27 * @param size the total size which will be sent 27 28 * @param progressMonitor the monitor to report to 29 * @param finishOnClose whether to call {@link ProgressMonitor#finishTask} when this stream is closed 30 * @since 10302 28 31 */ 29 public ProgressOutputStream(OutputStream out, long size, ProgressMonitor progressMonitor) { 30 if (progressMonitor == null) { 31 progressMonitor = NullProgressMonitor.INSTANCE; 32 } 33 this.updater = new StreamProgressUpdater(size, progressMonitor, tr("Uploading data ...")); 32 public ProgressOutputStream(OutputStream out, long size, ProgressMonitor progressMonitor, boolean finishOnClose) { 33 this.updater = new StreamProgressUpdater(size, 34 progressMonitor != null ? progressMonitor : NullProgressMonitor.INSTANCE, tr("Uploading data ...")); 34 35 this.out = out; 36 this.finishOnClose = finishOnClose; 35 37 } 36 38 … … 52 54 out.close(); 53 55 } finally { 54 updater.finishTask(); 56 if (finishOnClose) { 57 updater.finishTask(); 58 } 55 59 } 56 60 }
Note:
See TracChangeset
for help on using the changeset viewer.