[client] Fix image deletion

1 files changed, 20 insertions, 18 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
index 456e6762..0aaa81f3 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
@@ -3,7 +3,6 @@ package org.openslx.dozmod.gui.window;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
-import java.util.UUID;
 
 import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -14,10 +13,10 @@ import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Shell;
 import org.openslx.bwlp.thrift.iface.ImagePermissions;
 import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
+import org.openslx.dozmod.gui.MainWindow;
 import org.openslx.dozmod.gui.helper.Gui;
 import org.openslx.dozmod.gui.helper.ImageListComparator;
 import org.openslx.dozmod.gui.helper.ImageListFilter;
@@ -152,28 +151,32 @@ public class ImageListWindow extends ImageListWindowLayout {
 		deleteButton.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(final SelectionEvent e) {
+				IStructuredSelection selection = (IStructuredSelection) tableViewer.getSelection();
+				if (selection == null) {
+					MainWindow.showMessageBox("SELECIT ONULL!", MessageType.ERROR, LOGGER, null);
+					return;
+				}
+				final ImageSummaryRead image = (ImageSummaryRead) selection.getFirstElement();
+				if (image == null) {
+					MainWindow.showMessageBox("IMAGE ONULL!", MessageType.ERROR, LOGGER, null);
+					return;
+				}
 				// TODO FIX THIS PIECE OF SHIT
 				QuickTimer.scheduleOnce(new Task() {
-					UUID uuid = null;
-					boolean success = false;
 					@Override
 					public void fire() {
-						success = false;
-						Button b = (Button) e.getSource();
-						ImageSummaryRead isr = (ImageSummaryRead) b.getData();
-						uuid = UUID.fromString(isr.getCurrentVersionId());
+						Throwable t = null;
 						try {
 							ThriftManager.getSatClient().deleteImageVersion(
-									Session.getSatelliteToken(), isr.getCurrentVersionId());
+									Session.getSatelliteToken(), image.getCurrentVersionId());
 						} catch (Exception e) {
-							LOGGER.error("Error while creating image: ", e);
-							deleteCallback(uuid, false, e);
-							return;
+							t = e;
 						}
+						final Throwable t2 = t;
 						Gui.display.asyncExec(new Runnable() {
 							@Override
 							public void run() {
-								deleteCallback(uuid, success, null);
+								deleteCallback(image, t2);
 							}
 						});
 					}
@@ -200,15 +203,14 @@ public class ImageListWindow extends ImageListWindowLayout {
 		refreshList();
 	}
 
-	public void deleteCallback(UUID uuid, boolean success, Throwable t) {
-		if (success) {
-			LOGGER.info("Deleted image with UUID '" + uuid + "' successfully.");
-			Gui.showMessageBox(getShell(), "Deleted image with UUID '" + uuid + "'.", MessageType.INFO, LOGGER, t);
+	public void deleteCallback(ImageSummaryRead image, Throwable t) {
+		if (t == null) {
+			Gui.showMessageBox(getShell(), "Deleted image with UUID '" + image + "'.", MessageType.INFO, LOGGER, t);
 		} else {
-			LOGGER.error("Could not deleted image with UUID '" + uuid + "'!");
 			Gui.showMessageBox(getShell(), "Failed to delete image!", MessageType.ERROR, LOGGER, t);
 		}
 	}
+	
 	public ImageSummaryRead getCurrentImageSummaryRead() {
 		IStructuredSelection selection = (IStructuredSelection) tableViewer.getSelection();
 		return (ImageSummaryRead) selection.getFirstElement();