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 V3.0 to HEAD

Browse Source 
12083: Fix for ETHREEOH-790 - when using external auth such as NTLM the Change Password and Logout features are no longer available in the Share UI.
   12085: ETHREEOH-565: Failure to generate flash preview for PPT file
   12086: ETHREEOH-903 	 Sites drop-down Favorites UI improvements
          ETHREEOH-904 	 My Sites dashlet Favorites UI improvements
          ETHREEOH-547 	 User who is not a site manager can delete sites: my sites dashlet and sites page
   12093: ETHREEOH-861, ETHREEOH-928
   12094: Remove __MACOSX folder that has appeared in Share webapp
   12096: Removed spurious files from YUI 2.6.0 distribution
   12100: ETHREEOH-929   Tightening up transport adapters field (should never be shown for ASR)
   12104: Fix for ETHREEOH-944. Admin now able to reset user home location again ((regression).
   12105: Fixed: ETHREEOH-934 Multi-clicking Site favoriate icons can cause multiple requests before others finish and effectively cause a browser lock-up until page refresh
   12106: Exception needs to be rethrown after releasing packet to the memory pool on a Winsock NetBIOS receive. ETHREEOH-628.
   12110: An i18n message didn't work for failures. Related to ETHREEOH-934 Multi-clicking Site favoriate icons can cause multiple requests before others finish and effectively cause a browser lock-up until page refresh
   12115: Added unit test to check for cm:folder-derived type support
   12116: Removed unused, old patch-related query
   12117: Merged V2.2 to V3.0
      11454: Fixed ASH-7: QName fetching is inefficient when run without L2 cache
   12118: Fixed compilation error after merge
   12119: DM User Usages - 2nd pass (fix ETHREEOH-677)
   12122: UserUsage does nothing if system is READ-ONLY.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12500 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2008-12-18 17:10:36 +00:00
parent 9f42bfac4c
commit ab4bdfc013
38 changed files with 2011 additions and 948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
source/java/org/alfresco/repo/domain/hibernate/ChildAssocImpl.java
View File

@@ -30,9 +30,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import org.alfresco.repo.domain.ChildAssoc;
import org.alfresco.repo.domain.NamespaceEntity;
import org.alfresco.repo.domain.Node;
import org.alfresco.repo.domain.QNameEntity;
import org.alfresco.repo.domain.QNameDAO;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.EqualsHelper;
@@ -48,8 +47,8 @@ public class ChildAssocImpl implements ChildAssoc, Serializable
private Long version;
private Node parent;
private Node child;
private QNameEntity typeQName;
private NamespaceEntity qnameNamespace;
private Long typeQNameId;
private Long qnameNamespaceId;
private String qnameLocalName;
private String childNodeName;
private long childNodeNameCrc;
@@ -59,6 +58,7 @@ public class ChildAssocImpl implements ChildAssoc, Serializable
private transient ReadLock refReadLock;
private transient WriteLock refWriteLock;
private transient ChildAssociationRef childAssocRef;
private transient QName typeQName;
private transient QName qname;
public ChildAssocImpl()
@@ -86,7 +86,7 @@ public class ChildAssocImpl implements ChildAssoc, Serializable
* <p>
* This method is thread-safe and lazily creates the required references, if required.
*/
public ChildAssociationRef getChildAssocRef()
public ChildAssociationRef getChildAssocRef(QNameDAO qnameDAO)
{
boolean trashReference = false;
// first check if it is available
@@ -119,10 +119,19 @@ public class ChildAssocImpl implements ChildAssoc, Serializable
// double check
if (childAssocRef == null || trashReference)
{
if (typeQName == null)
{
typeQName = qnameDAO.getQName(this.typeQNameId).getSecond();
}
if (qname == null )
{
String qnameNamespace = qnameDAO.getNamespace(qnameNamespaceId).getSecond();
qname = QName.createQName(qnameNamespace, qnameLocalName);
}
childAssocRef = new ChildAssociationRef(
this.typeQName.getQName(),
typeQName,
parent.getNodeRef(),
this.getQname(),
qname,
child.getNodeRef(),
this.isPrimary,
index);
@@ -135,12 +144,55 @@ public class ChildAssocImpl implements ChildAssoc, Serializable
}
}
/**
* {@inheritDoc}
*/
public QName getTypeQName(QNameDAO qnameDAO)
{
refReadLock.lock();
try
{
if (typeQName != null)
{
return typeQName;
}
}
finally
{
refReadLock.unlock();
}
refWriteLock.lock();
try
{
typeQName = qnameDAO.getQName(typeQNameId).getSecond();
return typeQName;
}
finally
{
refWriteLock.unlock();
}
}
public void setTypeQName(QNameDAO qnameDAO, QName typeQName)
{
Long typeQNameId = qnameDAO.getOrCreateQName(typeQName).getFirst();
refWriteLock.lock();
try
{
setTypeQNameId(typeQNameId);
}
finally
{
refWriteLock.unlock();
}
}
/**
* {@inheritDoc}
* <p>
* This method is thread-safe and lazily creates the required references, if required.
*/
public QName getQname()
public QName getQName(QNameDAO qnameDAO)
{
// first check if it is available
refReadLock.lock();
@@ -162,7 +214,8 @@ public class ChildAssocImpl implements ChildAssoc, Serializable
// double check
if (qname == null )
{
qname = QName.createQName(qnameNamespace.getUri(), qnameLocalName);
String qnameNamespace = qnameDAO.getNamespace(qnameNamespaceId).getSecond();
qname = QName.createQName(qnameNamespace, qnameLocalName);
}
return qname;
}
@@ -172,6 +225,24 @@ public class ChildAssocImpl implements ChildAssoc, Serializable
}
}
public void setQName(QNameDAO qnameDAO, QName qname)
{
String assocQNameNamespace = qname.getNamespaceURI();
String assocQNameLocalName = qname.getLocalName();
Long assocQNameNamespaceId = qnameDAO.getOrCreateNamespace(assocQNameNamespace).getFirst();
// get write lock
refWriteLock.lock();
try
{
setQnameNamespaceId(assocQNameNamespaceId);
setQnameLocalName(assocQNameLocalName);
}
finally
{
refWriteLock.unlock();
}
}
public boolean equals(Object obj)
{
if (obj == null)
@@ -187,10 +258,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.getChild(), that.getChild())
&& EqualsHelper.nullSafeEquals(this.getParent(), that.getParent()));
if (EqualsHelper.nullSafeEquals(id, that.getId()))
{
return true;
}
else
{
return (EqualsHelper.nullSafeEquals(this.getParent(), that.getParent())
&& EqualsHelper.nullSafeEquals(this.typeQNameId, that.getTypeQNameId())
&& EqualsHelper.nullSafeEquals(this.getChild(), that.getChild())
&& EqualsHelper.nullSafeEquals(this.qnameLocalName, that.getQnameLocalName())
&& EqualsHelper.nullSafeEquals(this.qnameNamespaceId, that.getQnameNamespaceId())
);
}
}
public int hashCode()
@@ -207,8 +287,9 @@ public class ChildAssocImpl implements ChildAssoc, Serializable
.append(", child=").append(child.getId())
.append(", child name=").append(childNodeName)
.append(", child name crc=").append(childNodeNameCrc)
.append(", assoc type=").append(getTypeQName().getQName())
.append(", assoc name=").append(getQname())
.append(", assoc type=").append(typeQNameId)
.append(", assoc qname ns=").append(qnameNamespaceId)
.append(", assoc qname localname=").append(qnameLocalName)
.append(", isPrimary=").append(isPrimary)
.append("]");
return sb.toString();
@@ -321,18 +402,19 @@ public class ChildAssocImpl implements ChildAssoc, Serializable
}
}
public QNameEntity getTypeQName()
public Long getTypeQNameId()
{
return typeQName;
return typeQNameId;
}
public void setTypeQName(QNameEntity typeQName)
public void setTypeQNameId(Long typeQNameId)
{
refWriteLock.lock();
try
{
this.typeQName = typeQName;
this.typeQNameId = typeQNameId;
this.childAssocRef = null;
this.typeQName = null;
}
finally
{
@@ -340,17 +422,17 @@ public class ChildAssocImpl implements ChildAssoc, Serializable
}
}
public NamespaceEntity getQnameNamespace()
public Long getQnameNamespaceId()
{
return qnameNamespace;
return qnameNamespaceId;
}
public void setQnameNamespace(NamespaceEntity qnameNamespace)
public void setQnameNamespaceId(Long qnameNamespaceId)
{
refWriteLock.lock();
try
{
this.qnameNamespace = qnameNamespace;
this.qnameNamespaceId = qnameNamespaceId;
this.childAssocRef = null;
this.qname = null;
}