inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Big honkin' merge from head. Sheesh!

Browse Source 
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 e2c66899cc
commit 8031cc6574
322 changed files with 20776 additions and 6550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
source/java/org/alfresco/repo/domain/hibernate/NodeImpl.java
View File

@@ -29,7 +29,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import org.alfresco.repo.domain.ChildAssoc;
import org.alfresco.repo.domain.DbAccessControlList;
import org.alfresco.repo.domain.Node;
import org.alfresco.repo.domain.NodeAssoc;
import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.repo.domain.Store;
import org.alfresco.service.cmr.repository.NodeRef;
@@ -52,12 +51,8 @@ public class NodeImpl extends LifecycleAdapter implements Node, Serializable
private Store store;
private String uuid;
private QName typeQName;
// private NodeStatus status;
private Set<QName> aspects;
private Collection<NodeAssoc> sourceNodeAssocs;
private Collection<NodeAssoc> targetNodeAssocs;
private Collection<ChildAssoc> parentAssocs;
private Collection<ChildAssoc> childAssocs;
private Map<QName, PropertyValue> properties;
private DbAccessControlList accessControlList;
@@ -68,10 +63,7 @@ public class NodeImpl extends LifecycleAdapter implements Node, Serializable
public NodeImpl()
{
aspects = new HashSet<QName>(5);
sourceNodeAssocs = new HashSet<NodeAssoc>(5);
targetNodeAssocs = new HashSet<NodeAssoc>(5);
parentAssocs = new HashSet<ChildAssoc>(5);
childAssocs = new HashSet<ChildAssoc>(11);
properties = new HashMap<QName, PropertyValue>(5);
ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
@@ -137,8 +129,14 @@ public class NodeImpl extends LifecycleAdapter implements Node, Serializable
return false;
}
Node that = (Node) obj;
return (EqualsHelper.nullSafeEquals(getStore(), that.getStore())
&& EqualsHelper.nullSafeEquals(getUuid(), that.getUuid()));
if (EqualsHelper.nullSafeEquals(id, that.getId()))
{
return true;
}
else
{
return (this.getNodeRef().equals(that.getNodeRef()));
}
}
public int hashCode()
@@ -221,16 +219,6 @@ public class NodeImpl extends LifecycleAdapter implements Node, Serializable
this.typeQName = typeQName;
}
// public NodeStatus getStatus()
// {
// return status;
// }
//
// public void setStatus(NodeStatus status)
// {
// this.status = status;
// }
//
public Set<QName> getAspects()
{
return aspects;
@@ -245,34 +233,6 @@ public class NodeImpl extends LifecycleAdapter implements Node, Serializable
this.aspects = aspects;
}
public Collection<NodeAssoc> getSourceNodeAssocs()
{
return sourceNodeAssocs;
}
/**
* For Hibernate use
*/
@SuppressWarnings("unused")
private void setSourceNodeAssocs(Collection<NodeAssoc> sourceNodeAssocs)
{
this.sourceNodeAssocs = sourceNodeAssocs;
}
public Collection<NodeAssoc> getTargetNodeAssocs()
{
return targetNodeAssocs;
}
/**
* For Hibernate use
*/
@SuppressWarnings("unused")
private void setTargetNodeAssocs(Collection<NodeAssoc> targetNodeAssocs)
{
this.targetNodeAssocs = targetNodeAssocs;
}
public Collection<ChildAssoc> getParentAssocs()
{
return parentAssocs;
@@ -287,20 +247,6 @@ public class NodeImpl extends LifecycleAdapter implements Node, Serializable
this.parentAssocs = parentAssocs;
}
public Collection<ChildAssoc> getChildAssocs()
{
return childAssocs;
}
/**
* For Hibernate use
*/
@SuppressWarnings("unused")
private void setChildAssocs(Collection<ChildAssoc> childAssocs)
{
this.childAssocs = childAssocs;
}
public Map<QName, PropertyValue> getProperties()
{
return properties;