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

Merge of all UI clustering changes originally applied to 2.2

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8292 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2008-02-15 14:59:11 +00:00
parent d20d8a7007
commit a450598ecb
281 changed files with 17771 additions and 15322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/web/bean/LinkPropertiesDialog.java
View File

@@ -34,11 +34,9 @@ import javax.faces.event.ActionEvent;
import org.alfresco.model.ContentModel;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.dictionary.PropertyDefinition;
import org.alfresco.service.cmr.repository.InvalidNodeRefException;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.namespace.QName;
import org.alfresco.web.app.AlfrescoNavigationHandler;
import org.alfresco.web.app.Application;
@@ -56,6 +54,8 @@ import org.alfresco.web.ui.common.Utils.URLMode;
*/
public class LinkPropertiesDialog extends BaseDialogBean
{
private static final long serialVersionUID = -167326851073011187L;
private Node editableNode;
public Map<String, Object> getProperties()
@@ -106,7 +106,7 @@ public class LinkPropertiesDialog extends BaseDialogBean
{
NodeRef destRef = (NodeRef)this.editableNode.getProperties().get(ContentModel.PROP_LINK_DESTINATION);
return Repository.getNamePath(
this.nodeService, this.nodeService.getPath(destRef), null, "/", null);
this.getNodeService(), this.getNodeService().getPath(destRef), null, "/", null);
}
/**
@@ -139,7 +139,7 @@ public class LinkPropertiesDialog extends BaseDialogBean
NodeRef nodeRef = this.editableNode.getNodeRef();
Map<String, Object> props = this.editableNode.getProperties();
Map<QName, Serializable> properties = this.nodeService.getProperties(nodeRef);
Map<QName, Serializable> properties = this.getNodeService().getProperties(nodeRef);
// we need to put all the properties from the editable bag back into
// the format expected by the repository
@@ -150,7 +150,7 @@ public class LinkPropertiesDialog extends BaseDialogBean
if (title != null || description != null)
{
// add the aspect to be sure it's present
nodeService.addAspect(nodeRef, ContentModel.ASPECT_TITLED, null);
getNodeService().addAspect(nodeRef, ContentModel.ASPECT_TITLED, null);
// other props will get added later in setProperties()
}
@@ -168,7 +168,7 @@ public class LinkPropertiesDialog extends BaseDialogBean
if ((propValue != null) && (propValue instanceof String) &&
(propValue.toString().length() == 0))
{
PropertyDefinition propDef = this.dictionaryService.getProperty(qname);
PropertyDefinition propDef = this.getDictionaryService().getProperty(qname);
if (propDef != null)
{
if (propDef.getDataType().getName().equals(DataTypeDefinition.DOUBLE) ||
@@ -185,7 +185,7 @@ public class LinkPropertiesDialog extends BaseDialogBean
}
// send the properties back to the repository
this.nodeService.setProperties(nodeRef, properties);
this.getNodeService().setProperties(nodeRef, properties);
// reset any document held by the browse bean as it's just been updated
// if this is a space link then it doesn't matter anyway