[client] delete version through popupmenu with confirmation and refresh version table

1 files changed, 36 insertions, 32 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
index 9156ee46..123e1817 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
@@ -232,6 +232,34 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 	}
 
 	/**
+	 * Sets the owner of the selected image to the given user.
+	 * 
+	 * @param user UserInfo to set the owner to
+	 */
+	private void setImageOwner(final UserInfo user) {
+		QuickTimer.scheduleOnce(new Task() {
+			@Override
+			public void fire() {
+				try {
+					ThriftManager.getSatClient().setImageOwner(Session.getSatelliteToken(),
+							image.getImageBaseId(), user.getUserId());
+				} catch (TException e) {
+					ThriftError.showMessage(me, LOGGER, e, "Fehler beim Übertragen der Besitzrechte");
+					return;
+				}
+				Gui.showMessageBox(me, "Besitzrechte übertragen an " + FormatHelper.userName(user),
+						MessageType.INFO, null, null);
+				makeEditable(false);
+				String baseId = image.getImageBaseId();
+				synchronized (me) {
+					image = null;
+				}
+				setImage(baseId);
+			}
+		});
+	}
+
+	/**
 	 * Push the changes of the image details to the satellite 
 	 */
 	private void saveChanges() {
@@ -267,35 +295,6 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 			}
 		});
 	}
-
-	/**
-	 * Sets the owner of the selected image to the given user.
-	 * 
-	 * @param user UserInfo to set the owner to
-	 */
-	private void setImageOwner(final UserInfo user) {
-		QuickTimer.scheduleOnce(new Task() {
-			@Override
-			public void fire() {
-				try {
-					ThriftManager.getSatClient().setImageOwner(Session.getSatelliteToken(),
-							image.getImageBaseId(), user.getUserId());
-				} catch (TException e) {
-					ThriftError.showMessage(me, LOGGER, e, "Fehler beim Übertragen der Besitzrechte");
-					return;
-				}
-				Gui.showMessageBox(me, "Besitzrechte übertragen an " + FormatHelper.userName(user),
-						MessageType.INFO, null, null);
-				makeEditable(false);
-				String baseId = image.getImageBaseId();
-				synchronized (me) {
-					image = null;
-				}
-				setImage(baseId);
-			}
-		});
-	}
-
 	/**
 	 * Triggers the download of the given image version
 	 * 
@@ -317,10 +316,13 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 	 * @param version image version to delete
 	 */
 	private void deleteVersion(final ImageVersionDetails version) {
+		// requires confirmation of the user
+		if (!Gui.showMessageBox(me, "Wollen Sie diese Version des Images wirklich löschen?",
+				MessageType.QUESTION_YESNO, LOGGER, null))
+			return;
 		QuickTimer.scheduleOnce(new Task() {
 			@Override
 			public void fire() {
-				// disabled until finished
 				try {
 					ThriftManager.getSatClient().deleteImageVersion(Session.getSatelliteToken(), version.versionId);
 				} catch (TException e) {
@@ -328,11 +330,13 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 					return;
 				}
 				// no feedback, only force refresh
-				// TODO
 				Gui.asyncExec(new Runnable() {
 					@Override
 					public void run() {
-						// TODO: refreshList();
+						// "manual" refresh
+						String baseId = image.getImageBaseId();
+						image = null;
+						setImage(baseId);
 					}
 				});
 			}