Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-07-02 16:13:03 +00:00
parent 4c30e52dc3
commit 7dd2291753
784 changed files with 5454 additions and 5487 deletions

View File

@@ -28,13 +28,13 @@ import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.namespace.NamespaceService;
import org.springframework.beans.factory.InitializingBean;
/**
* This class provides the basic implementation of a rating property rollup.
* By providing an implementation of this class (or reusing an existing one),
* injecting the object into the {@link org.alfresco.service.cmr.rating.RatingScheme} and following the content
* model naming conventions described in {@link RatingRollupNamingConventionsUtil}, it
* should be possible to have new rating property rollups automatically calculated
* and persisted into the Alfresco content model, thereby enabling indexing, searching
/**
* This class provides the basic implementation of a rating property rollup.
* By providing an implementation of this class (or reusing an existing one),
* injecting the object into the {@link org.alfresco.service.cmr.rating.RatingScheme} and following the content
* model naming conventions, it
* should be possible to have new rating property rollups automatically calculated
* and persisted into the Alfresco content model, thereby enabling indexing, searching
* and sorting of rating-related properties.
*
* @author Neil McErlean
@@ -88,8 +88,8 @@ public abstract class AbstractRatingRollupAlgorithm implements InitializingBean
/**
* This method returns the rollup name, for example "Total" or "Count".
* This rollup name is used as part of the convention-based naming of content model
* property names see {@link RatingRollupNamingConventionsUtil}.
* @return
* property names.
* @return String
*/
public String getRollupName()
{