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 e2c66899cc
commit 8031cc6574
322 changed files with 20776 additions and 6550 deletions

View File

@@ -38,6 +38,8 @@ public class ChildAssocImpl implements ChildAssoc, Serializable
private Node parent;
private Node child;
private QName typeQName;
private String childNodeName;
private long childNodeNameCrc;
private QName qName;
private boolean isPrimary;
private int index;
@@ -60,15 +62,11 @@ public class ChildAssocImpl implements ChildAssoc, Serializable
// add the forward associations
this.setParent(parentNode);
this.setChild(childNode);
// add the inverse associations
parentNode.getChildAssocs().add(this);
childNode.getParentAssocs().add(this);
}
public void removeAssociation()
{
// maintain inverse assoc from parent node to this instance
this.getParent().getChildAssocs().remove(this);
// maintain inverse assoc from child node to this instance
this.getChild().getParentAssocs().remove(this);
}
@@ -128,7 +126,8 @@ public class ChildAssocImpl implements ChildAssoc, Serializable
sb.append("ChildAssoc")
.append("[ parent=").append(parent)
.append(", child=").append(child)
.append(", name=").append(getQname())
.append(", child name crc=").append(childNodeNameCrc)
.append(", assoc name=").append(getQname())
.append(", isPrimary=").append(isPrimary)
.append("]");
return sb.toString();
@@ -149,12 +148,19 @@ public class ChildAssocImpl implements ChildAssoc, Serializable
return false;
}
ChildAssoc that = (ChildAssoc) obj;
return (
EqualsHelper.nullSafeEquals(this.getTypeQName(), that.getTypeQName())
&& EqualsHelper.nullSafeEquals(this.getQname(), that.getQname())
&& EqualsHelper.nullSafeEquals(this.getParent(), that.getParent())
&& EqualsHelper.nullSafeEquals(this.getChild(), that.getChild())
);
if (EqualsHelper.nullSafeEquals(id, that.getId()))
{
return true;
}
else
{
return (
EqualsHelper.nullSafeEquals(this.getChild().getId(), that.getChild().getId())
&& EqualsHelper.nullSafeEquals(this.getQname(), that.getQname())
&& EqualsHelper.nullSafeEquals(this.getParent().getId(), that.getParent().getId())
&& EqualsHelper.nullSafeEquals(this.getTypeQName(), that.getTypeQName())
);
}
}
public int hashCode()
@@ -274,6 +280,26 @@ public class ChildAssocImpl implements ChildAssoc, Serializable
}
}
public String getChildNodeName()
{
return childNodeName;
}
public void setChildNodeName(String childNodeName)
{
this.childNodeName = childNodeName;
}
public long getChildNodeNameCrc()
{
return childNodeNameCrc;
}
public void setChildNodeNameCrc(long crc)
{
this.childNodeNameCrc = crc;
}
public QName getQname()
{
return qName;