From 37306c4ac39416662d8501949d263d0c45f0d062 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Wed, 29 Oct 2014 17:48:09 +0100 Subject: [client] some comments for UploadTask --- dozentenmodul/src/main/java/ftp/UploadTask.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'dozentenmodul/src/main/java/ftp/UploadTask.java') diff --git a/dozentenmodul/src/main/java/ftp/UploadTask.java b/dozentenmodul/src/main/java/ftp/UploadTask.java index 68af1f3c..e0c6db29 100644 --- a/dozentenmodul/src/main/java/ftp/UploadTask.java +++ b/dozentenmodul/src/main/java/ftp/UploadTask.java @@ -60,11 +60,15 @@ public class UploadTask extends SwingWorker { util.connect(); util.uploadFile(uploadFile, destDir); - FileInputStream inputStream = new FileInputStream(uploadFile); + // show filesize in the GUI long fileSize = uploadFile.length(); Image.image.setFilesize(fileSize); firePropertyChange("filesize", 0, fileSize); + // prepare input stream + FileInputStream inputStream = new FileInputStream(uploadFile); + + // initialize the counters needed for speed calculations percentCompleted = 0; byte[] buffer = new byte[BUFFER_SIZE]; int bytesRead = -1; @@ -88,11 +92,12 @@ public class UploadTask extends SwingWorker { currentBytes = 0; } } + // finalize the upload by updating the progress bar one last time + // (in case we didn't get to do it because of the time interval) percentCompleted = (int) ((totalBytesRead * 100) / fileSize); setProgress(percentCompleted); firePropertyChange("bytesread", 0, totalBytesRead); inputStream.close(); - util.finish(); } catch (FTPException ex) { JOptionPane.showMessageDialog(null, -- cgit v1.2.3-55-g7522 From 7765bf7d43bb1e8f86a4feac6cc7fdeca8d0cd9a Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Wed, 29 Oct 2014 17:55:48 +0100 Subject: [client] remove misleading comment --- dozentenmodul/src/main/java/ftp/UploadTask.java | 2 -- 1 file changed, 2 deletions(-) (limited to 'dozentenmodul/src/main/java/ftp/UploadTask.java') diff --git a/dozentenmodul/src/main/java/ftp/UploadTask.java b/dozentenmodul/src/main/java/ftp/UploadTask.java index e0c6db29..2579b125 100644 --- a/dozentenmodul/src/main/java/ftp/UploadTask.java +++ b/dozentenmodul/src/main/java/ftp/UploadTask.java @@ -24,9 +24,7 @@ public class UploadTask extends SwingWorker { */ private final static Logger LOGGER = Logger.getLogger(UploadTask.class); - // 8MB buffer private static final int BUFFER_SIZE = 1024 * 1024; - private static final double UPDATE_INTERVAL_SECONDS = 0.6; private static final double UPDATE_INTERVAL_MS = UPDATE_INTERVAL_SECONDS * 1000; private static final double BYTES_PER_MIB = 1024 * 1024; -- cgit v1.2.3-55-g7522