Big honkin' merge from head. Sheesh!

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-08-27 01:01:30 +00:00
parent 465ae145be
commit b0d02fa6be
241 changed files with 12379 additions and 1061 deletions

View File

@@ -243,8 +243,8 @@ public class DocumentDetailsBean extends BaseDetailsBean
{
// we know for now that the general classifiable aspect only will be
// applied so we can retrive the categories property direclty
Collection categories = (Collection)this.nodeService.getProperty(getDocument().getNodeRef(),
ContentModel.PROP_CATEGORIES);
Collection<NodeRef> categories = (Collection<NodeRef>)this.nodeService.getProperty(
getDocument().getNodeRef(), ContentModel.PROP_CATEGORIES);
if (categories == null || categories.size() == 0)
{
@@ -256,16 +256,13 @@ public class DocumentDetailsBean extends BaseDetailsBean
MSG_HAS_FOLLOWING_CATEGORIES));
builder.append("<ul>");
for (Object obj : categories)
for (NodeRef ref : categories)
{
if (obj instanceof NodeRef)
if (this.nodeService.exists(ref))
{
if (this.nodeService.exists((NodeRef)obj))
{
builder.append("<li>");
builder.append(Repository.getNameForNode(this.nodeService, (NodeRef)obj));
builder.append("</li>");
}
builder.append("<li>");
builder.append(Repository.getNameForNode(this.nodeService, ref));
builder.append("</li>");
}
}
builder.append("</ul>");
@@ -992,14 +989,6 @@ public class DocumentDetailsBean extends BaseDetailsBean
{
return "document-props";
}
/**
* @see org.alfresco.web.bean.BaseDetailsBean#getReturnOutcome()
*/
protected String getReturnOutcome()
{
return OUTCOME_RETURN;
}
/**
* Returns a model for use by a template on the Document Details page.