Merge OpenOLAT 9.3 to OpenOLAT default branch with c144628d3a47586098f48ae52f787aa04dd8b572

src/main/java/org/olat/repository/RepositoryManager.java

@@ -853,6 +853,7 @@ public class RepositoryManager extends BasicManager {
 		reloadedRe.setLastUsage(newUsage);
 		RepositoryEntry updatedRe = dbInstance.getCurrentEntityManager().merge(reloadedRe);
 		dbInstance.commit();
+		updateLifeCycle(reloadedRe, lastUsage);
 		return updatedRe;
 	}
 

src/main/java/org/olat/repository/delete/ReadyToDeleteController.java

@@ -70,7 +70,7 @@ public class ReadyToDeleteController extends BasicController {
 	private TableController tableCtr;
 	private RepositoryEntryDeleteTableModel redtm;
 	private Link feedbackBackLink;
-	private List readyToDeleteRepositoryEntries;
+	private List<RepositoryEntry> readyToDeleteRepositoryEntries;
 	private DialogBoxController deleteConfirmController;
 
 
@@ -115,7 +115,7 @@ public class ReadyToDeleteController extends BasicController {
 				TableEvent te = (TableEvent) event;
 				if (te.getActionId().equals(ACTION_SINGLESELECT_CHOOSE)) {
 					int rowid = te.getRowId();
-					RepositoryManager.getInstance().setLastUsageNowFor( (RepositoryEntry) redtm.getObject(rowid) );
+					RepositoryManager.getInstance().setLastUsageNowFor(redtm.getObject(rowid) );
 					updateRepositoryEntryList();
 				}
 			} else if (event.getCommand().equals(Table.COMMAND_MULTISELECT)) {
@@ -173,7 +173,7 @@ public class ReadyToDeleteController extends BasicController {
 	}
 
 	protected void updateRepositoryEntryList() {
-		List l = RepositoryDeletionManager.getInstance().getReprositoryEntriesReadyToDelete(RepositoryDeletionManager.getInstance().getDeleteEmailDuration());
+		List<RepositoryEntry> l = RepositoryDeletionManager.getInstance().getReprositoryEntriesReadyToDelete(RepositoryDeletionManager.getInstance().getDeleteEmailDuration());
 		redtm = new RepositoryEntryDeleteTableModel(l);
 		tableCtr.setTableDataModel(redtm);
 	}

src/main/java/org/olat/repository/delete/RepositoryEntryDeleteTableModel.java

@@ -38,13 +38,13 @@ import org.olat.repository.delete.service.RepositoryDeletionManager;
  * 
  * @author Christian Guretzki
  */
-public class RepositoryEntryDeleteTableModel extends DefaultTableDataModel {
+public class RepositoryEntryDeleteTableModel extends DefaultTableDataModel<RepositoryEntry> {
 
 	
 	/**
 	 * @param objects
 	 */
-	public RepositoryEntryDeleteTableModel(List objects) {
+	public RepositoryEntryDeleteTableModel(List<RepositoryEntry> objects) {
 		super(objects);
 	}
 
@@ -52,7 +52,7 @@ public class RepositoryEntryDeleteTableModel extends DefaultTableDataModel {
 	 * @see org.olat.core.gui.components.table.TableDataModel#getValueAt(int, int)
 	 */
 	public final Object getValueAt(int row, int col) {
-		RepositoryEntry repositoryEntry = (RepositoryEntry) getObject(row);
+		RepositoryEntry repositoryEntry = getObject(row);
 		switch (col) {
 			case 0 :
 				//TODO:cg check data garbage in db, each repositoryEntry should have a ores => cleanup-code to remove this entries