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 V2.2 to HEAD

Browse Source 
7073: WCM Search UI
   7088: Fix to issue with similarly named bean getter with different return values causing issue with JSF component
   7239: Fix to minor refresh issue with new WCM Search UI
   Removed "final" SearchContent bean


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8230 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-02-08 15:43:43 +00:00
parent 522af9f56e
commit f401b6fa76
8 changed files with 505 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/java/org/alfresco/web/bean/wcm/AVMNode.java
View File

@@ -57,7 +57,6 @@ import org.alfresco.web.ui.common.Utils;
*/
public class AVMNode extends Node implements Map<String, Object>
{
public final static NodePropertyResolver RESOLVER_PREVIEW_URL =
new NodePropertyResolver()
{
@@ -125,7 +124,37 @@ public class AVMNode extends Node implements Map<String, Object>
}
}
};
public final static NodePropertyResolver RESOLVER_DISPLAY_PATH =
new NodePropertyResolver()
{
public Object get(final Node node)
{
if (! (node instanceof AVMNode))
{
return null;
}
// the display path is the parent path to the node
String parentPath = AVMNodeConverter.SplitBase(node.getPath())[0];
return AVMUtil.getSandboxRelativePath(parentPath);
}
};
public final static NodePropertyResolver RESOLVER_PARENT_PATH =
new NodePropertyResolver()
{
public Object get(final Node node)
{
if (! (node instanceof AVMNode))
{
return null;
}
return AVMNodeConverter.SplitBase(node.getPath())[0];
}
};
private final AVMNodeDescriptor avmRef;
private LayeringDescriptor layeringDesc;
private final int version;