Merge remote-tracking branch 'origin/OpenOLAT_13.0'

src/main/java/org/olat/core/gui/components/stack/BreadcrumbedStackedPanel.java

@@ -514,9 +514,7 @@ public class BreadcrumbedStackedPanel extends Panel implements StackedPanel, Bre
 		BreadCrumb crumb  = (BreadCrumb)currentLink.getUserObject();
 		if(crumb.getController() == null) {
 			if(crumbIndex - 1 >= 0) {
-				Link parentLink = stack.get(crumbIndex - 1);
-				BreadCrumb parentCrumb  = (BreadCrumb)parentLink.getUserObject();
-				setContent(parentCrumb.getController());
+				setContent(crumbIndex - 1);
 			}
 		} else {
 			setContent(crumb.getController());

src/main/java/org/olat/core/util/pdf/PdfDocument.java

@@ -153,7 +153,7 @@ public class PdfDocument {
                 text = "";
             } else {
                 String subString = text.substring(0, spaceIndex);
-                float size = fontSize * textFont.getStringWidth(subString) / 1000;
+                float size = getStringWidth(subString, textFont, fontSize);
                 if (size > paragraphWidth) {
                     if (lastSpace < 0) // So we have a word longer than the line... draw it anyways
                         lastSpace = spaceIndex;
@@ -179,15 +179,20 @@ public class PdfDocument {
     }
     
     public float getStringWidth(String string, float fontSize)
+    throws IOException {
+    	return getStringWidth(string, font, fontSize);
+    }
+    
+    public float getStringWidth(String string, PDFont textFont, float fontSize)
     throws IOException {
     	if(string == null || string.length() == 0) return 0.0f;
     	
     	try {
 			string = cleanString(string);
-			return fontSize * font.getStringWidth(string) / 1000;
+			return fontSize * textFont.getStringWidth(string) / 1000;
 		} catch (IllegalArgumentException e) {
 			log.error("", e);
-			return getStringEstimatedWidth(string.length(), fontSize);
+			return getStringEstimatedWidth(string.length(), textFont, fontSize);
 		}
     }
     
@@ -199,10 +204,10 @@ public class PdfDocument {
      * @return A width
      * @throws IOException
      */
-    public float getStringEstimatedWidth(int length, float fontSize) throws IOException {
+    public float getStringEstimatedWidth(int length, PDFont textFont, float fontSize) throws IOException {
     	char[] onlyA = new char[length];
     	Arrays.fill(onlyA, 'A');
-    	return fontSize * font.getStringWidth(String.valueOf(onlyA)) / 1000.0f;
+    	return fontSize * textFont.getStringWidth(String.valueOf(onlyA)) / 1000.0f;
     }
     
     public static String cleanString(String string) {

src/main/java/org/olat/ims/qti21/ui/assessment/CorrectionAssessmentItemListController.java

@@ -205,13 +205,16 @@ public class CorrectionAssessmentItemListController extends FormBasicController
 		for(Map.Entry<Identity, AssessmentTestSession> entry:model.getLastSessions().entrySet()) {
 			if(model.getLastSessions().containsKey(entry.getKey())) {
 				TestSessionState testSessionState = model.getTestSessionStates().get(entry.getKey());
-				for(Map.Entry<TestPlanNodeKey, ItemSessionState> itemEntry:testSessionState.getItemSessionStates().entrySet()) {
-					String itemRefIdentifier = itemEntry.getKey().getIdentifier().toString();
-					CorrectionAssessmentItemRow row = itemRefIdToRows.get(itemRefIdentifier);
-					if(row != null) {
-						AssessmentItemSession itemSession = itemSessionMap
-								.get(new ItemSessionKey(entry.getValue().getKey(), itemRefIdentifier));
-						appendStatistics(row, itemSession, itemEntry.getValue());
+				Map<TestPlanNodeKey, ItemSessionState> itemSessionStates = (testSessionState == null ? null : testSessionState.getItemSessionStates());
+				if(itemSessionStates != null) {
+					for(Map.Entry<TestPlanNodeKey, ItemSessionState> itemEntry:itemSessionStates.entrySet()) {
+						String itemRefIdentifier = itemEntry.getKey().getIdentifier().toString();
+						CorrectionAssessmentItemRow row = itemRefIdToRows.get(itemRefIdentifier);
+						if(row != null) {
+							AssessmentItemSession itemSession = itemSessionMap
+									.get(new ItemSessionKey(entry.getValue().getKey(), itemRefIdentifier));
+							appendStatistics(row, itemSession, itemEntry.getValue());
+						}
 					}
 				}
 			}

src/main/java/org/olat/modules/fo/manager/ForumManager.java

@@ -778,12 +778,11 @@ public class ForumManager {
 	 * @param creator
 	 * @param replyToMessage
 	 */
-	public void replyToMessage(Message newMessage, Message replyToMessage) {
+	public Message replyToMessage(Message newMessage, Message replyToMessage) {
 		Message top = replyToMessage.getThreadtop();
 		newMessage.setThreadtop((top != null ? top : replyToMessage));
 		newMessage.setParent(replyToMessage);
-		
-		saveMessage(newMessage);
+		return saveMessage(newMessage);
 	}
 
 	/**
@@ -791,10 +790,10 @@ public class ForumManager {
 	 * @param forum
 	 * @param topMessage
 	 */
-	public void addTopMessage(Message topMessage) {
+	public Message addTopMessage(Message topMessage) {
 		topMessage.setParent(null);
 		topMessage.setThreadtop(null);
-		saveMessage(topMessage);
+		return saveMessage(topMessage);
 	}
 
 	/**

src/main/java/org/olat/modules/fo/ui/MessageEditController.java

@@ -494,7 +494,7 @@ public class MessageEditController extends FormBasicController {
 		if(editMode == EditMode.newThread) {
 			if(foCallback.mayOpenNewThread()) {
 				// save a new thread
-				fm.addTopMessage(message);
+				message = fm.addTopMessage(message);
 				fm.markNewMessageAsRead(getIdentity(), forum, message);
 				persistTempUploadedFiles(message);
 				// if notification is enabled -> notify the publisher about news
@@ -527,7 +527,7 @@ public class MessageEditController extends FormBasicController {
 				showWarning("may.not.save.msg.as.author");
 			}
 		} else if(editMode == EditMode.reply) { 
-			fm.replyToMessage(message, parentMessage);
+			message = fm.replyToMessage(message, parentMessage);
 			fm.markNewMessageAsRead(getIdentity(), forum, message);
 			persistTempUploadedFiles(message);
 			notifiySubscription();
@@ -657,11 +657,7 @@ public class MessageEditController extends FormBasicController {
 	 * @return the edited message
 	 */
 	public Message getMessage() {
-		if (!StringHelper.containsNonWhitespace(message.getTitle()) && message == null) {
-			throw new AssertException("Getting back the edited message failed! You first have to edit one and intialize properly!");
-		} else {
-			return message;
-		}
+		return message;
 	}
 
 	/**

src/main/java/org/olat/modules/fo/ui/MessageListController.java

@@ -310,7 +310,7 @@ public class MessageListController extends BasicController implements GenericEve
 			} else {
 				scrollTo(message);
 			}
-		} else if(message != null) {
+		} else if(message != null && message.getKey() != null) {
 			MessageView view = loadView(ureq, message);
 			int index = 0;
 			for(int i=0; i<backupViews.size(); i++) {