inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Web Script unit test base class added, helpers for JSON support in web scripts added (JSON reader, JSON error template), update to test webscript server to support easy submit of content, first cut of site service API (JS and HTTP) - create site and listSites available

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2008-04-29 10:45:00 +00:00
parent dbf9141c1c
commit c5733ca5ae
17 changed files with 988 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/java/org/alfresco/repo/thumbnail/ThumbnailServiceImpl.java
View File

@@ -363,6 +363,8 @@ public class ThumbnailServiceImpl implements ThumbnailService
/**
* Determine whether the thumbnail meta-data matches the given mimetype and options
*
* If mimetype and transformation options are null then match is guarenteed
*
* @param thumbnail thumbnail node reference
* @param mimetype mimetype
* @param options transformation options
@@ -372,26 +374,21 @@ public class ThumbnailServiceImpl implements ThumbnailService
{
boolean result = true;
// Check the mimetype
String thumbnailMimetype = ((ContentData)this.nodeService.getProperty(thumbnail, ContentModel.PROP_CONTENT)).getMimetype();
if (mimetype.equals(thumbnailMimetype) == true)
if (mimetype != null)
{
// TODO continue to check options ...
// Check the mimetype
String thumbnailMimetype = ((ContentData)this.nodeService.getProperty(thumbnail, ContentModel.PROP_CONTENT)).getMimetype();
if (mimetype.equals(thumbnailMimetype) == false)
{
result = false;
}
}
else
if (result != false && options != null)
{
result = false;
// TODO .. check for matching options here ...
}
return result;
}
/**
* @see org.alfresco.service.cmr.thumbnail.ThumbnailService#getThumbnails(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.namespace.QName, java.lang.String)
*/
public List<NodeRef> getThumbnails(NodeRef node, QName contentProperty, String mimetype)
{
return getThumbnails(node, contentProperty, mimetype, null);
}
}