[client] Updated comments in ImageUploadPage

1 files changed, 6 insertions, 5 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java
index 6852c3e8..1ccc187c 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java
@@ -331,8 +331,11 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 			return;
 		}
 		// always update progress bar
-		blockProgressBar.setStatus(event.progress);
-		// TODO: Move to central listener when we have it
+		if (event.progress != null) {
+			// TODO: Maybe only display percentage in the wizard pages once we have the status bar in mainwindow
+			blockProgressBar.setStatus(event.progress);
+		}
+		// TODO: Move user interaction to central listener when we have it
 		switch (event.state) {
 			case FINISHED:
 				cancelUpload.setEnabled(false);
@@ -346,10 +349,8 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 					createAndUploadImage();
 				}
 				break;
-//			case CANCELLED:
 			case WORKING:
 			case IDLE:
-				// WORKING|IDLE	= noops?
 				break;
 			default:
 				LOGGER.warn("Unhandled transfer state: " + event.state);
@@ -365,8 +366,8 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 		} catch (Exception e) {
 			LOGGER.debug("Remote error while canceling upload for " + uploadWizardState.uuid, e);
 		}
+		// Then cancel the task
 		uploadWizardState.uploadTask.cancel();
-		// now try to stop our upload thread
 		cancelUpload.setEnabled(false);
 		blockProgressBar.setVisible(false);
 	}