Merged V3.0 to HEAD

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

source/java/org/alfresco/repo/domain/ChildAssoc.java

@@ -58,18 +58,43 @@ public interface ChildAssoc extends Comparable<ChildAssoc>
     /**
      * A convenience method to get a reference to this association.
      * 
+     * @param qnameDAO      the DAO to resolve the qname references
      * @return              Returns a reference to this association
      */
-    public ChildAssociationRef getChildAssocRef();
+    public ChildAssociationRef getChildAssocRef(QNameDAO qnameDAO);
 
+    /**
+     * Convenience method to get the association's type
+     * 
+     * @param qnameDAO      the helper DAO
+     * @return              the association's type QName
+     */
+    public QName getTypeQName(QNameDAO qnameDAO);
+    
+    /**
+     * Convenience method to set the association's type
+     * 
+     * @param qnameDAO      the helper DAO
+     * @param typeQName     the association's type QName
+     */
+    public void setTypeQName(QNameDAO qnameDAO, QName typeQName);
+    
     /**
      * A convenience method to aggregate the qualified name's namespace and localname
      * into a single qualified name.
      * 
      * @return              Returns the qualified name of the association 
      */
-    public QName getQname();
+    public QName getQName(QNameDAO qnameDAO);
 
+    /**
+     * Convenience method to set the association's qname
+     * 
+     * @param qnameDAO      the helper DAO
+     * @param qname         the association's QName
+     */
+    public void setQName(QNameDAO qnameDAO, QName qname);
+    
     public Long getId();
 
     /**
@@ -84,12 +109,12 @@ public interface ChildAssoc extends Comparable<ChildAssoc>
     /**
      * @return              Returns the type of the association
      */
-    public QNameEntity getTypeQName();
+    public Long getTypeQNameId();
     
     /**
-     * @param typeQName     the association's dictionary type
+     * @param typeQNameId   the association's dictionary type
      */
-    public void setTypeQName(QNameEntity typeQName);
+    public void setTypeQNameId(Long typeQNameId);
 
     /**
      * @return Returns the child node name.  This may be truncated, in which case it
@@ -116,12 +141,12 @@ public interface ChildAssoc extends Comparable<ChildAssoc>
     /**
      * @return              Returns the namespace of the association's local QName
      */
-    public NamespaceEntity getQnameNamespace();
+    public Long getQnameNamespaceId();
     
     /**
-     * @param namespace     the namespace of the association's local QName
+     * @param namespaceId   the namespace of the association's local QName
      */
-    public void setQnameNamespace(NamespaceEntity namespace);
+    public void setQnameNamespaceId(Long namespaceId);
     
     /**
      * @return              Returns the localname of the association's local QName