diff options
| author | Jonathan Bauer | 2014-10-28 12:39:54 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2014-10-28 12:39:54 +0100 |
| commit | 2d47444515b3f8056f98df6c2436af722a58c0e0 (patch) | |
| tree | dd1584e5a7c46acc3936917918e4dd41c53dc670 /dozentenmodul/src/main/java | |
| parent | [client] fixes "fertig stellen" button not beeing activated when download fin... (diff) | |
| parent | Bug behoben: GUI erkennt nun wieder einen abgeschlossenen Up-/Download (diff) | |
| download | tutor-module-2d47444515b3f8056f98df6c2436af722a58c0e0.tar.gz tutor-module-2d47444515b3f8056f98df6c2436af722a58c0e0.tar.xz tutor-module-2d47444515b3f8056f98df6c2436af722a58c0e0.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module
Diffstat (limited to 'dozentenmodul/src/main/java')
4 files changed, 11 insertions, 7 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java index ad420aec..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 { diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java index b26f4169..5cd9d8f9 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java @@ -552,8 +552,9 @@ public class FTPEditDownloader_GUI extends JFrame implements } // Button zum Fertigstellen freischalten, wenn 100% erreicht sind - if (isCurrentlyLoading() == false) { - // not uploading currently + if (isCurrentlyLoading() == false || progressBar.getPercentComplete() == 1.0) { + // no download + //LOGGER.info("finished downloading file"); btnDownloadStoppen.setEnabled(false); } else { // currently uploading, don't let user interact diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java index 5bc80241..369bf110 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java @@ -595,8 +595,9 @@ public class FTPEditUploader_GUI extends JFrame implements } // Fertigstellen erlauben wenn upload abgeschlossen - if (isCurrentlyLoading() == false) { + if (isCurrentlyLoading() == false || progressBar.getPercentComplete() == 1.0) { // no upload + //LOGGER.info("finished uploading file"); btnUploadStoppen.setEnabled(false); btnFinish.setEnabled(true); } else { diff --git a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java index 49da4e01..c2799052 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java @@ -556,12 +556,13 @@ public class FTPSearchDownloader_GUI extends JFrame implements } // Button zum Fertigstellen freischalten, wenn 100% erreicht sind - if (isCurrentlyLoading() == false) { - // not uploading currently + if (isCurrentlyLoading() == false || progressBar.getPercentComplete() == 1.0) { + // not downloading currently + //LOGGER.info("finished downloading file"); btnDownloadStoppen.setEnabled(false); btnMainMenu.setEnabled(true); } else { - // currently uploading, don't let user interact + // currently downloading, don't let user interact btnDownloadStoppen.setEnabled(true); btnMainMenu.setEnabled(false); } |