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

Fix addition of aspects via JCR API - failed with NPE for any non JCR defined aspect.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2006-05-05 17:17:53 +00:00
parent 19e3138e1c
commit 3d4d316bdd
1 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
source/java/org/alfresco/jcr/dictionary/ClassMap.java
View File

@@ -67,6 +67,9 @@ public class ClassMap
removeMixin.put(ContentModel.ASPECT_VERSIONABLE, new VersionableMixin()); removeMixin.put(ContentModel.ASPECT_VERSIONABLE, new VersionableMixin());
} }
/** Default Mixin behaviour **/
private static DefaultMixin defaultMixin = new DefaultMixin();
/** /**
* Convert an Alfresco Class to a JCR Type * Convert an Alfresco Class to a JCR Type
@@ -100,7 +103,8 @@ public class ClassMap
*/ */
public static AddMixin getAddMixin(QName alfrescoClass) public static AddMixin getAddMixin(QName alfrescoClass)
{ {
return addMixin.get(alfrescoClass); AddMixin mixin = addMixin.get(alfrescoClass);
return (mixin == null) ? defaultMixin : mixin;
} }
/** /**
@@ -111,7 +115,8 @@ public class ClassMap
*/ */
public static RemoveMixin getRemoveMixin(QName alfrescoClass) public static RemoveMixin getRemoveMixin(QName alfrescoClass)
{ {
return removeMixin.get(alfrescoClass); RemoveMixin mixin = removeMixin.get(alfrescoClass);
return (mixin == null) ? defaultMixin : mixin;
} }
/** /**
@@ -136,4 +141,43 @@ public class ClassMap
public void postRemoveMixin(SessionImpl session, NodeRef nodeRef); public void postRemoveMixin(SessionImpl session, NodeRef nodeRef);
} }
/**
* Default NOOP Mixin behaviour
*/
private static class DefaultMixin implements AddMixin, RemoveMixin
{
/*
* (non-Javadoc)
* @see org.alfresco.jcr.dictionary.ClassMap.AddMixin#preAddMixin(org.alfresco.jcr.session.SessionImpl, org.alfresco.service.cmr.repository.NodeRef)
*/
public Map<QName, Serializable> preAddMixin(SessionImpl session, NodeRef nodeRef)
{
return null;
}
/*
* (non-Javadoc)
* @see org.alfresco.jcr.dictionary.ClassMap.AddMixin#postAddMixin(org.alfresco.jcr.session.SessionImpl, org.alfresco.service.cmr.repository.NodeRef)
*/
public void postAddMixin(SessionImpl session, NodeRef nodeRef)
{
}
/*
* (non-Javadoc)
* @see org.alfresco.jcr.dictionary.ClassMap.RemoveMixin#preRemoveMixin(org.alfresco.jcr.session.SessionImpl, org.alfresco.service.cmr.repository.NodeRef)
*/
public void preRemoveMixin(SessionImpl session, NodeRef nodeRef)
{
}
/*
* (non-Javadoc)
* @see org.alfresco.jcr.dictionary.ClassMap.RemoveMixin#postRemoveMixin(org.alfresco.jcr.session.SessionImpl, org.alfresco.service.cmr.repository.NodeRef)
*/
public void postRemoveMixin(SessionImpl session, NodeRef nodeRef)
{
}
}
} }