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 V3.0 to HEAD

Browse Source 
12795: ALFCOM-2419: ResourceBundleWrapper is no longer (de)serializable after changes merged from 2.1-A rev 8323
   12826: Fix for ETHREEOH-37 and ETHREEOH-176.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12828 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-01-16 14:20:15 +00:00
parent 97a73fcc00
commit e4dae16f8c
15 changed files with 159 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/java/org/alfresco/repo/template/TemplateNode.java
View File

@@ -43,6 +43,8 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.TemplateImageResolver;
import org.alfresco.service.cmr.version.Version;
import org.alfresco.service.cmr.version.VersionHistory;
import org.alfresco.service.namespace.NamespacePrefixResolver;
import org.alfresco.service.namespace.NamespacePrefixResolverProvider;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.QNameMap;
import org.alfresco.service.namespace.RegexQNamePattern;
@@ -66,7 +68,7 @@ import freemarker.ext.dom.NodeModel;
*
* @author Kevin Roast
*/
public class TemplateNode extends BasePermissionsNode
public class TemplateNode extends BasePermissionsNode implements NamespacePrefixResolverProvider
{
private static final long serialVersionUID = 1234390333739034171L;
@@ -123,7 +125,7 @@ public class TemplateNode extends BasePermissionsNode
this.services = services;
this.imageResolver = resolver;
this.properties = new QNameMap<String, Serializable>(this.services.getNamespaceService());
this.properties = new QNameMap<String, Serializable>(this);
}
@@ -241,7 +243,7 @@ public class TemplateNode extends BasePermissionsNode
if (this.targetAssocs == null)
{
List<AssociationRef> refs = this.services.getNodeService().getTargetAssocs(this.nodeRef, RegexQNamePattern.MATCH_ALL);
this.targetAssocs = new QNameMap<String, List<TemplateNode>>(this.services.getNamespaceService());
this.targetAssocs = new QNameMap<String, List<TemplateNode>>(this);
for (AssociationRef ref : refs)
{
String qname = ref.getTypeQName().toString();
@@ -272,7 +274,7 @@ public class TemplateNode extends BasePermissionsNode
if (this.sourceAssocs == null)
{
List<AssociationRef> refs = this.services.getNodeService().getSourceAssocs(this.nodeRef, RegexQNamePattern.MATCH_ALL);
this.sourceAssocs = new QNameMap<String, List<TemplateNode>>(this.services.getNamespaceService());
this.sourceAssocs = new QNameMap<String, List<TemplateNode>>(this);
for (AssociationRef ref : refs)
{
String qname = ref.getTypeQName().toString();
@@ -303,7 +305,7 @@ public class TemplateNode extends BasePermissionsNode
if (this.childAssocs == null)
{
List<ChildAssociationRef> refs = this.services.getNodeService().getChildAssocs(this.nodeRef);
this.childAssocs = new QNameMap<String, List<TemplateNode>>(this.services.getNamespaceService());
this.childAssocs = new QNameMap<String, List<TemplateNode>>(this);
for (ChildAssociationRef ref : refs)
{
String qname = ref.getTypeQName().toString();
@@ -510,9 +512,15 @@ public class TemplateNode extends BasePermissionsNode
return this.imageResolver;
}
// ------------------------------------------------------------------------------
// Inner classes
public NamespacePrefixResolver getNamespacePrefixResolver()
{
return this.services.getNamespaceService();
}
/**
* Class to convert properties into template accessable objects
*/