Merge DEV to HEAD

ContentDiskDriver rework.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29451 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2011-07-29 09:08:54 +00:00
parent 65cb62ceb8
commit b4bd3a21c2
83 changed files with 11518 additions and 1101 deletions

View File

@@ -29,7 +29,6 @@ import org.alfresco.service.cmr.repository.NodeRef;
*/
public class ContentFileInfo extends FileInfo {
// Version id
private static final long serialVersionUID = 2518699645372408663L;
@@ -40,6 +39,11 @@ public class ContentFileInfo extends FileInfo {
// Linked node
private NodeRef m_linkRef;
public ContentFileInfo(NodeRef nodeRef)
{
this.m_nodeRef = nodeRef;
}
/**
* Return the file/folder node
@@ -90,4 +94,27 @@ public class ContentFileInfo extends FileInfo {
{
m_linkRef = link;
}
@Override
public boolean equals(Object other)
{
if (this == other)
{
return true;
}
if (other == null || !(other instanceof FileInfo))
{
return false;
}
ContentFileInfo o = (ContentFileInfo)other;
return m_nodeRef.equals(o.getNodeRef());
}
@Override
public int hashCode()
{
return m_nodeRef.hashCode();
}
}