From 3a2bc14eb682fbc11ddaa8951de615063f476fd0 Mon Sep 17 00:00:00 2001
From: Stephan Schwaer
Date: Wed, 7 Oct 2015 16:40:46 +0200
Subject: [client] Refresh imagelist after image deletion.

---
 .../src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java | 5 ++++-
 .../main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java | 2 +-
 .../src/main/java/org/openslx/dozmod/thrift/ThriftActions.java       | 5 +----
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'dozentenmodul/src/main/java')

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 2ea3ea94..18409997 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
@@ -345,7 +345,7 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa
 	 */
 	//TODO seems like it's no longer needed.
 	private void deleteBaseImage(final ImageSummaryRead image) {
-		ThriftActions.deleteImageBase(JOptionPane.getFrameForComponent(this), image.getImageBaseId(), this);
+		ThriftActions.deleteImageBase(JOptionPane.getFrameForComponent(this), image.getImageBaseId());
 	}
 
 	/**
@@ -356,10 +356,12 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa
 	 */
 	private void deleteImages(List<ImageSummaryRead> imageList) {
 		boolean failedToDeleteAll = false;
+		boolean deletedAtLeastOne = false;
 		StringBuilder builder = new StringBuilder();
 		for (ImageSummaryRead image : imageList) {
 			if (ImagePerms.canAdmin(image)) {
 				deleteBaseImage(image);
+				deletedAtLeastOne = true;
 			} else {
 				failedToDeleteAll = true;
 				builder.append('\n');
@@ -370,6 +372,7 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa
 			Gui.showMessageBox("Folgende images konnten nicht gelöscht werden: " + builder.toString(),
 					MessageType.INFO, LOGGER, null);
 		}
+		imageListViewer.refreshList(deletedAtLeastOne, 1000);
 	}
 
 	/**
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java
index ed6e30da..7fe785ab 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java
@@ -89,7 +89,7 @@ public class ImageCreationWizard extends Wizard implements UiFeedback {
 				} catch (TException e) {
 					Gui.showMessageBox(this, "Konnte die Berechtigungen nicht auf dem Satelliten speichern!",
 							MessageType.ERROR, null, null);
-					ThriftActions.deleteImageBase(JOptionPane.getFrameForComponent(this), state.uuid, null);
+					ThriftActions.deleteImageBase(JOptionPane.getFrameForComponent(this), state.uuid);
 					return false;
 				}
 			}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java
index 1f3ac817..902e9458 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java
@@ -675,10 +675,8 @@ public class ThriftActions {
 	 * 
 	 * @param frame to display user feedback on
 	 * @param imageBaseId image base id to delete
-	 * @param callback interface to report the outcome to the gui
 	 */
-	public static void deleteImageBase(final Frame frame, final String imageBaseId,
-			final DeleteCallback callback) {
+	public static void deleteImageBase(final Frame frame, final String imageBaseId) {
 		if (imageBaseId == null || imageBaseId.isEmpty())
 			return;
 		// first look if we have versions
@@ -735,7 +733,6 @@ public class ThriftActions {
 		} catch (TException e) {
 			ThriftError.showMessage(frame, LOGGER, e, "Konnte Basis-Image nicht löschen!");
 		}
-
 	}
 
 	/**
-- 
cgit v1.2.3-55-g7522