diff options
| author | Michael Wilson | 2014-10-28 12:38:40 +0100 |
|---|---|---|
| committer | Michael Wilson | 2014-10-28 12:38:40 +0100 |
| commit | 3fecbd446d60a72cc1666e5d3e87be84b8c30c41 (patch) | |
| tree | 6425d6885f395b7511157da183d201a12ae50879 /dozentenmodul/src/main/java | |
| parent | [client] Fix upload not completing (diff) | |
| download | tutor-module-3fecbd446d60a72cc1666e5d3e87be84b8c30c41.tar.gz tutor-module-3fecbd446d60a72cc1666e5d3e87be84b8c30c41.tar.xz tutor-module-3fecbd446d60a72cc1666e5d3e87be84b8c30c41.zip | |
Bug behoben: GUI erkennt nun wieder einen abgeschlossenen Up-/Download
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); } |