Merge remote-tracking branch 'origin/OpenOLAT_12.5'

src/main/java/org/olat/core/commons/modules/bc/components/ListRenderer.java

@@ -302,21 +302,19 @@ public class ListRenderer {
 				sb.append("</div>");
 				hasMeta = true;
 			}
-			//boolean hasThumbnail = false;
+			
 			if(metaInfo.isThumbnailAvailable() && !xssErrors) {
 				sb.append("<div class='o_thumbnail' style='background-image:url("); 
 				ubu.buildURI(sb, new String[] { PARAM_SERV_THUMBNAIL}, new String[] { "x" }, pathAndName, AJAXFlags.MODE_NORMAL);
 				sb.append("); background-repeat:no-repeat; background-position:50% 50%;'></div>");
 				hasMeta = true;
-				//hasThumbnail = true;
 			}
 
 			// first try author info from metadata (creator)
-			//boolean hasMetaAuthor = false;
 			String author = metaInfo.getCreator();
 			// fallback use file author (uploader)
-			if (StringHelper.containsNonWhitespace(author)) {
-				//hasMetaAuthor = true;
+			if(StringHelper.containsNonWhitespace(author)) {
+				//
 			} else {
 				author = metaInfo.getAuthor();
 				if(!"-".equals(author)) {
@@ -354,14 +352,17 @@ public class ListRenderer {
 		// filesize
 		if (!isContainer) {
 			// append filesize
-			sb.append("<span class='text-muted small'>");
-			sb.append(Formatter.formatBytes(leaf.getSize()));
-			sb.append("</span>");
-		}
-		else if (child instanceof VFSContainer) {
-			sb.append("<span class='text-muted small'>");
-			sb.append(((VFSContainer) child).getItems(new SystemItemFilter()).size());
-			sb.append(" "+translator.translate("mf.elements")+"</span>");
+			sb.append("<span class='text-muted small'>")
+			  .append(Formatter.formatBytes(leaf.getSize()))
+			  .append("</span>");
+		} else if (child instanceof VFSContainer) {
+			try {
+				sb.append("<span class='text-muted small'>")
+				  .append(((VFSContainer) child).getItems(new SystemItemFilter()).size())
+				  .append(" ").append(translator.translate("mf.elements")).append("</span>");
+			} catch (Exception e) {
+				log.error("", e);
+			}
 		}
 		sb.append("</td><td>");
 		

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

@@ -117,17 +117,23 @@ public class TooledStackedPanel extends BreadcrumbedStackedPanel implements Stac
 	
 	public void removeTool(Component toolComponent) {
 		if(toolComponent == null) return;
-
-		for(Iterator<Tool> it=getCurrentCrumb().getTools().iterator(); it.hasNext(); ) {
-			if(toolComponent == it.next().getComponent()) {
-				it.remove();
+		
+		TooledBreadCrumb breadCrumb = getCurrentCrumb();
+		if(breadCrumb != null) {
+			for(Iterator<Tool> it=breadCrumb.getTools().iterator(); it.hasNext(); ) {
+				if(toolComponent == it.next().getComponent()) {
+					it.remove();
+				}
 			}
 		}
 		setDirty(true);
 	}
 	
 	public void removeAllTools() {
-		getCurrentCrumb().getTools().clear();
+		TooledBreadCrumb breadCrumb = getCurrentCrumb();
+		if(breadCrumb != null) {
+			breadCrumb.getTools().clear();
+		}
 		setDirty(true);
 	}
 
@@ -139,7 +145,10 @@ public class TooledStackedPanel extends BreadcrumbedStackedPanel implements Stac
 		if(toolComponent == null) return;
 		
 		Tool tool = new Tool(toolComponent, align, inherit, css);
-		getCurrentCrumb().addTool(tool);
+		TooledBreadCrumb breadCrumb = getCurrentCrumb();
+		if(breadCrumb != null) {
+			breadCrumb.addTool(tool);
+		}
 		setDirty(true);
 	}
 	
@@ -159,7 +168,11 @@ public class TooledStackedPanel extends BreadcrumbedStackedPanel implements Stac
 				}
 			}
 		}
-		currentTools.addAll(getCurrentCrumb().getTools());
+		
+		TooledBreadCrumb breadCrumb = getCurrentCrumb();
+		if(breadCrumb != null) {
+			currentTools.addAll(breadCrumb.getTools());
+		}
 		return currentTools;
 	}