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

Merged V1.3 to HEAD (3027:3044)

Browse Source 
svn merge svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3027 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3044 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3339 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-07-18 15:17:28 +00:00
parent c235f3463f
commit b56cc82043
13 changed files with 169 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/java/org/alfresco/web/config/AspectEvaluator.java
View File

@@ -16,10 +16,9 @@
*/
package org.alfresco.web.config;
import javax.faces.context.FacesContext;
import java.util.Set;
import org.alfresco.config.evaluator.Evaluator;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.namespace.QName;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
@@ -38,19 +37,18 @@ public final class AspectEvaluator implements Evaluator
*/
public boolean applies(Object obj, String condition)
{
boolean result = false;
if (obj instanceof Node)
{
DictionaryService dd = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getDictionaryService();
QName aspectQName = Repository.resolveToQName(condition);
for (QName aspect : ((Node)obj).getAspects())
Set aspects = ((Node)obj).getAspects();
if (aspects != null)
{
if (dd.isSubClass(aspect, aspectQName) == true)
{
return true;
}
QName spaceQName = Repository.resolveToQName(condition);
result = aspects.contains(spaceQName);
}
}
return false;
return result;
}
}