summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/ftp
diff options
context:
space:
mode:
authorJonathan Bauer2014-10-28 12:39:11 +0100
committerJonathan Bauer2014-10-28 12:39:11 +0100
commit7c7c3d4b9006ab63a0899aa8ce16ff46814fa7ed (patch)
treecf52cd0e3b2ab2ef6496ecd73ec508cf086ae5e5 /dozentenmodul/src/main/java/ftp
parent[client] Fix upload not completing (diff)
downloadtutor-module-7c7c3d4b9006ab63a0899aa8ce16ff46814fa7ed.tar.gz
tutor-module-7c7c3d4b9006ab63a0899aa8ce16ff46814fa7ed.tar.xz
tutor-module-7c7c3d4b9006ab63a0899aa8ce16ff46814fa7ed.zip
[client] fixes "fertig stellen" button not beeing activated when download finishes
Diffstat (limited to 'dozentenmodul/src/main/java/ftp')
-rw-r--r--dozentenmodul/src/main/java/ftp/UploadTask.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/dozentenmodul/src/main/java/ftp/UploadTask.java b/dozentenmodul/src/main/java/ftp/UploadTask.java
index 06ee4c37..68af1f3c 100644
--- a/dozentenmodul/src/main/java/ftp/UploadTask.java
+++ b/dozentenmodul/src/main/java/ftp/UploadTask.java
@@ -61,17 +61,17 @@ public class UploadTask extends SwingWorker<Void, Void> {
util.uploadFile(uploadFile, destDir);
FileInputStream inputStream = new FileInputStream(uploadFile);
- byte[] buffer = new byte[BUFFER_SIZE];
- int bytesRead = -1;
- int i = 0;
- long totalBytesRead = 0;
- percentCompleted = 0;
long fileSize = uploadFile.length();
Image.image.setFilesize(fileSize);
firePropertyChange("filesize", 0, fileSize);
+
+ percentCompleted = 0;
+ byte[] buffer = new byte[BUFFER_SIZE];
+ int bytesRead = -1;
+ long totalBytesRead = 0;
long lastUpdate = 0;
- long currentBytes = 0;
long lastBytes = 0;
+ long currentBytes = 0;
while ((bytesRead = inputStream.read(buffer)) != -1 && !isCancelled()) {
util.writeFileBytes(buffer, 0, bytesRead);
currentBytes += bytesRead;
@@ -90,7 +90,7 @@ public class UploadTask extends SwingWorker<Void, Void> {
}
percentCompleted = (int) ((totalBytesRead * 100) / fileSize);
setProgress(percentCompleted);
-
+ firePropertyChange("bytesread", 0, totalBytesRead);
inputStream.close();
util.finish();