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/NodeAssoc.java

@@ -25,6 +25,7 @@
 package org.alfresco.repo.domain;
 
 import org.alfresco.service.cmr.repository.AssociationRef;
+import org.alfresco.service.namespace.QName;
 
 /**
  * Represents a generic association between two nodes.  The association is named
@@ -47,7 +48,29 @@ public interface NodeAssoc
      */
     public void buildAssociation(Node sourceNode, Node targetNode);
 
-    public AssociationRef getNodeAssocRef();
+    /**
+     * Convenience method to retrieve the association's reference
+     * 
+     * @param qnameDAO          helper DAO
+     * @return                  the association's reference
+     */
+    public AssociationRef getNodeAssocRef(QNameDAO qnameDAO);
+    
+    /**
+     * Convenience method to retrieve the association's type QName
+     * 
+     * @param qnameDAO          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);
     
     public Long getId();
     
@@ -63,10 +86,10 @@ public interface NodeAssoc
     /**
      * @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);
 }