[client] Add better error messages to image upload wizard

1 files changed, 13 insertions, 8 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 cbe2f8fa..61fc64bb 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
@@ -18,6 +18,7 @@ import javax.swing.UIManager;
 import javax.swing.filechooser.FileNameExtensionFilter;
 
 import org.apache.log4j.Logger;
+import org.openslx.bwlp.thrift.iface.TImageDataException;
 import org.openslx.dozmod.Config;
 import org.openslx.dozmod.filetransfer.TransferEvent;
 import org.openslx.dozmod.filetransfer.TransferEventListener;
@@ -206,9 +207,13 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 			try {
 				state.uuid = ThriftManager.getSatClient()
 						.createImage(Session.getSatelliteToken(), state.name);
+			} catch (TImageDataException e) {
+				Gui.showMessageBox(this, "Ungültige Angaben (" + e.getNumber() + ")\n" + e.getMessage(),
+						MessageType.ERROR, null, null);
+				return false;
 			} catch (Exception e) {
-				setErrorMessage("Konnte das Image nicht auf dem Satelliten erstellen");
-				LOGGER.error("Error while creating image: ", e);
+				Gui.showMessageBox(this, "Unbekannter Fehler beim Erstellen der VM", MessageType.ERROR,
+						LOGGER, e);
 				return false;
 			}
 			imageNameTextField.setEnabled(false);
@@ -223,8 +228,7 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 						Session.getSatelliteToken(), state.uuid, state.diskFile.length(), null,
 						state.meta.getFilteredDefinition());
 			} catch (Exception e) {
-				setErrorMessage("Fehler beim Aushandeln des Uploads");
-				LOGGER.error("Error while requesting download for: " + state.uuid, e);
+				Gui.showMessageBox(this, "Fehler beim Aushandeln des Uploads", MessageType.ERROR, LOGGER, e);
 				return false;
 			}
 		}
@@ -236,7 +240,7 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 						state.transferInformation.getPlainPort(), state.transferInformation.getToken(),
 						state.diskFile);
 			} catch (FileNotFoundException e) {
-				Gui.showMessageBox(getTopLevelAncestor(), "Cannot upload file: Not found\n\n"
+				Gui.showMessageBox(getTopLevelAncestor(), "Kann VM nicht hochladen: Datei nicht gefunden\n\n"
 						+ state.diskFile.getAbsolutePath(), MessageType.ERROR, LOGGER, e);
 				return false;
 			}
@@ -257,12 +261,13 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 			new Thread(state.uploadTask).start();
 			do {
 				Util.sleep(5);
-			} while (state.uploadTask.getConnectFailCount() == 0 && state.uploadTask.getTransferCount() == 0);
+			} while (state.uploadTask.getConnectFailCount() == 0 && state.uploadTask.getTransferCount() == 0
+					&& !state.uploadTask.isCanceled());
 		}
 
 		if (state.uploadTask.getTransferCount() == 0) {
-			Gui.showMessageBox(this, "Error connecting to Satellite for upload!", MessageType.ERROR, LOGGER,
-					null);
+			Gui.showMessageBox(this, "Aufbau der Verbindung zum Hochladen fehlgeschlagen", MessageType.ERROR,
+					LOGGER, null);
 			return false;
 		}
 		// -- check image creation --