diff options
| author | unknown | 2014-05-08 13:59:31 +0200 |
|---|---|---|
| committer | unknown | 2014-05-08 13:59:31 +0200 |
| commit | ea2bbcbaa29508d11404a31b2c17380edc38f80a (patch) | |
| tree | 275929ef8da853da76e62ad1780ef233aadf0120 /Dozentenmodul/src/ftp/UploadTask.java | |
| parent | FAQ & OTRS (diff) | |
| parent | -Kopieren von Temp zu Prod inkl. änderung des Pfades in SQL-DB (diff) | |
| download | tutor-module-ea2bbcbaa29508d11404a31b2c17380edc38f80a.tar.gz tutor-module-ea2bbcbaa29508d11404a31b2c17380edc38f80a.tar.xz tutor-module-ea2bbcbaa29508d11404a31b2c17380edc38f80a.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class
Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class
Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class
Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class
Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class
Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class
Diffstat (limited to 'Dozentenmodul/src/ftp/UploadTask.java')
| -rw-r--r-- | Dozentenmodul/src/ftp/UploadTask.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Dozentenmodul/src/ftp/UploadTask.java b/Dozentenmodul/src/ftp/UploadTask.java index 788acad6..2dbeff8d 100644 --- a/Dozentenmodul/src/ftp/UploadTask.java +++ b/Dozentenmodul/src/ftp/UploadTask.java @@ -5,6 +5,8 @@ import java.io.FileInputStream; import javax.swing.JOptionPane; import javax.swing.SwingWorker; + +import models.Image; /** * Executes the file upload in a background thread and updates progress to @@ -50,6 +52,7 @@ public class UploadTask extends SwingWorker<Void, Void> { long totalBytesRead = 0; int percentCompleted = 0; long fileSize = uploadFile.length(); + Image.image.setFilesize(fileSize); long start=System.nanoTime(); final double NANOS_PER_SECOND = 1000000000.0; final double BYTES_PER_MIB = 1024*1024; |