[client] Fix appearance of lecture and resulting NPE after deleting image the lecture linked to. Also make user feedback of deleting images more clear.

3 files changed, 8 insertions, 5 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 9fd25b5c..eb63b1b7 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
@@ -34,6 +34,7 @@ import org.openslx.dozmod.permissions.ImagePerms;
 import org.openslx.dozmod.thrift.ThriftActions;
 import org.openslx.dozmod.thrift.ThriftActions.DeleteCallback;
 import org.openslx.dozmod.thrift.ThriftActions.DownloadCallback;
+import org.openslx.dozmod.thrift.cache.LectureCache;
 
 /**
  * Window with the list of available images.
@@ -368,6 +369,7 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa
 					MessageType.INFO, LOGGER, null);
 		}
 		imageListViewer.refreshList(deletedAtLeastOne, 1000);
+		LectureCache.get(true);
 	}
 
 	/**
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java
index 882309d6..f8fb7ac2 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java
@@ -397,8 +397,9 @@ public class LectureListWindow extends LectureListWindowLayout {
 						if (fLectures.size() > 0) {
 							StringBuilder builder = new StringBuilder();
 							for (LectureSummary lecture : fLectures.keySet()) {
-								builder.append('\n');
-								builder.append(lecture.lectureName);
+								builder.append("\n\n");
+								builder.append(lecture.lectureName + " \n" );
+								builder.append("Begründung: " + fLectures.get(lecture).getLocalizedMessage());
 								LOGGER.error("Couldn't delete lecture " + lecture.lectureName + ", reason:", fLectures.get(lecture) );
 								// TODO Should the exception be printed in the debugger or is this to much information?
 							}
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 b1c21cff..9161bdeb 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java
@@ -712,7 +712,7 @@ public class ThriftActions {
 		}
 		String questionText;
 		if (versionToBeDeleted != null && !versionToBeDeleted.isEmpty()) {
-			questionText = "Dieses Image hat folgende gültige Versionen:\n";
+			questionText = "Das Image \" " + details.getImageName() + "\" hat folgende gültige Versionen:\n";
 			for (ImageVersionDetails version : versionToBeDeleted) {
 				questionText += version.getVersionId() + "\n";
 			}
@@ -721,13 +721,13 @@ public class ThriftActions {
 			questionText = "";
 		}
 		if (lecturesToBeDeleted != null && !lecturesToBeDeleted.isEmpty()) {
-			questionText += "Dieses Image ist mit folgenden Veranstaltungen verknüpft:\n";
+			questionText += "Folgende Veranstaltungen sind mit dem Image verknüpft: \n";
 			for (LectureSummary lecture : lecturesToBeDeleted) {
 				questionText += lecture.getLectureName() + "\n";
 			}
 			questionText += "\n";
 		}
-		questionText += "Wollen Sie dieses Image wirklich löschen?";
+		questionText += "Wollen Sie wirklich mit dem Löschen fortfahren?";
 		if (!userConfirmed(frame, questionText))
 			return;
 		try {