Skip to content
Snippets Groups Projects
Commit bba15ee4 authored by srosse's avatar srosse
Browse files

OO-1281: cast the right object in the right order, MetaTagged and than get MetaInfo

parent e69d09ed
No related branches found
No related tags found
No related merge requests found
......@@ -41,6 +41,7 @@ import org.olat.basesecurity.SecurityGroup;
import org.olat.basesecurity.SecurityGroupMembershipImpl;
import org.olat.core.commons.modules.bc.FolderConfig;
import org.olat.core.commons.modules.bc.meta.MetaInfo;
import org.olat.core.commons.modules.bc.meta.tagged.MetaTagged;
import org.olat.core.commons.persistence.DB;
import org.olat.core.commons.persistence.PersistenceHelper;
import org.olat.core.commons.services.image.ImageService;
......@@ -691,8 +692,11 @@ public class CatalogManager extends BasicManager implements UserDataDeletable, I
public void deleteImage(CatalogEntryRef entry) {
VFSLeaf imgFile = getImage(entry);
if (imgFile != null) {
if(imgFile instanceof MetaInfo) {
((MetaInfo)imgFile).clearThumbnails();
if(imgFile instanceof MetaTagged) {
MetaInfo info = ((MetaTagged)imgFile).getMetaInfo();
if(info != null) {
info.clearThumbnails();
}
}
imgFile.delete();
}
......@@ -701,8 +705,11 @@ public class CatalogManager extends BasicManager implements UserDataDeletable, I
public boolean setImage(VFSLeaf newImageFile, CatalogEntryRef re) {
VFSLeaf currentImage = getImage(re);
if(currentImage != null) {
if(currentImage instanceof MetaInfo) {
((MetaInfo)currentImage).clearThumbnails();
if(currentImage instanceof MetaTagged) {
MetaInfo info = ((MetaTagged)currentImage).getMetaInfo();
if(info != null) {
info.clearThumbnails();
}
}
currentImage.delete();
}
......
......@@ -48,6 +48,7 @@ import org.olat.catalog.CatalogEntry;
import org.olat.core.CoreSpringFactory;
import org.olat.core.commons.modules.bc.FolderConfig;
import org.olat.core.commons.modules.bc.meta.MetaInfo;
import org.olat.core.commons.modules.bc.meta.tagged.MetaTagged;
import org.olat.core.commons.persistence.DB;
import org.olat.core.commons.persistence.DBQuery;
import org.olat.core.commons.persistence.PersistenceHelper;
......@@ -169,8 +170,11 @@ public class RepositoryManager extends BasicManager {
public void deleteImage(RepositoryEntry re) {
VFSLeaf imgFile = getImage(re);
if (imgFile != null) {
if(imgFile instanceof MetaInfo) {
((MetaInfo)imgFile).clearThumbnails();
if(imgFile instanceof MetaTagged) {
MetaInfo info = ((MetaTagged)imgFile).getMetaInfo();
if(info != null) {
info.clearThumbnails();
}
}
imgFile.delete();
}
......@@ -194,8 +198,11 @@ public class RepositoryManager extends BasicManager {
public boolean setImage(VFSLeaf newImageFile, RepositoryEntry re) {
VFSLeaf currentImage = getImage(re);
if(currentImage != null) {
if(currentImage instanceof MetaInfo) {
((MetaInfo)currentImage).clearThumbnails();
if(currentImage instanceof MetaTagged) {
MetaInfo info = ((MetaTagged)currentImage).getMetaInfo();
if(info != null) {
info.clearThumbnails();
}
}
currentImage.delete();
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment