diff options
| author | Nino Breuer | 2014-10-28 20:03:48 +0100 |
|---|---|---|
| committer | Nino Breuer | 2014-10-28 20:03:48 +0100 |
| commit | 27f8ecc87220d588ff889e7be1ba5ec419a942ba (patch) | |
| tree | 0e79413dc22c3eb857e88ee833c8329baff0b901 /dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java | |
| parent | changed implementation of full text search in some classes (diff) | |
| parent | Serverseitiges Read und Write von Rechten korrigiert (diff) | |
| download | tutor-module-27f8ecc87220d588ff889e7be1ba5ec419a942ba.tar.gz tutor-module-27f8ecc87220d588ff889e7be1ba5ec419a942ba.tar.xz tutor-module-27f8ecc87220d588ff889e7be1ba5ec419a942ba.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java index 43df4d12..b222b7ed 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java @@ -607,8 +607,9 @@ public class FTPCreateUploader_GUI extends JFrame implements // Fertigstellen erlauben wenn upload abgeschlossen und abbrechen // erlauben wenn kein load aktiv ist - if (isCurrentlyLoading() == false) { + if (isCurrentlyLoading() == false || progressBar.getPercentComplete() == 1.0) { // no upload + //LOGGER.info("finished uploading file"); btnUploadStoppen.setEnabled(false); btnFinish.setEnabled(true); } else { @@ -621,8 +622,7 @@ public class FTPCreateUploader_GUI extends JFrame implements speed = (double) arg0.getNewValue(); // if(speed<=1){ - lblUpSpeed.setText(String.valueOf(speed).substring(0, - String.valueOf(speed).lastIndexOf(".") + 3) + lblUpSpeed.setText(String.format("%.2f", speed) + " MB/s"); } |