mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged V2.2 to HEAD (QNames)
7624: QName Refactor Merge 1 of 9 7625: QName Refactor Merge 2 of 9 7626: QName Refactor Merge 3 of 9 7627: QName Refactor Merge 4 of 9 7628: QName Refactor Merge 5 of 9 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8436 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -31,8 +31,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
|
||||
|
||||
import org.alfresco.repo.domain.Node;
|
||||
import org.alfresco.repo.domain.NodeAssoc;
|
||||
import org.alfresco.repo.domain.QNameEntity;
|
||||
import org.alfresco.service.cmr.repository.AssociationRef;
|
||||
import org.alfresco.service.namespace.QName;
|
||||
import org.alfresco.util.EqualsHelper;
|
||||
|
||||
/**
|
||||
@@ -48,7 +48,7 @@ public class NodeAssocImpl implements NodeAssoc, Serializable
|
||||
private Long version;
|
||||
private Node source;
|
||||
private Node target;
|
||||
private QName typeQName;
|
||||
private QNameEntity typeQName;
|
||||
|
||||
private transient ReadLock refReadLock;
|
||||
private transient WriteLock refWriteLock;
|
||||
@@ -103,7 +103,7 @@ public class NodeAssocImpl implements NodeAssoc, Serializable
|
||||
{
|
||||
nodeAssocRef = new AssociationRef(
|
||||
getSource().getNodeRef(),
|
||||
this.typeQName,
|
||||
this.typeQName.getQName(),
|
||||
getTarget().getNodeRef());
|
||||
}
|
||||
return nodeAssocRef;
|
||||
@@ -222,12 +222,12 @@ public class NodeAssocImpl implements NodeAssoc, Serializable
|
||||
}
|
||||
}
|
||||
|
||||
public QName getTypeQName()
|
||||
public QNameEntity getTypeQName()
|
||||
{
|
||||
return typeQName;
|
||||
}
|
||||
|
||||
public void setTypeQName(QName typeQName)
|
||||
public void setTypeQName(QNameEntity typeQName)
|
||||
{
|
||||
refWriteLock.lock();
|
||||
try
|
||||
|
Reference in New Issue
Block a user