Merged HEAD (5.1) to 5.1.N (5.1.1)

121650 sdinuta: CM-710: Merged from alfresco/BRANCHES/DEV/VF_REP_INT_51/root into/alfresco/HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Raluca Munteanu
2016-01-29 14:49:19 +00:00
parent c1d4fccc48
commit 9f2d3441df
63 changed files with 643 additions and 638 deletions

View File

@@ -35,23 +35,23 @@ public class VirtualRatingServiceExtension extends SpringBeanExtension<RatingSer
implements RatingServiceExtension
{
private VirtualStore virtualStore;
private VirtualStore smartStore;
public VirtualRatingServiceExtension()
{
super(RatingServiceTrait.class);
}
public void setVirtualStore(VirtualStore virtualStore)
public void setSmartStore(VirtualStore smartStore)
{
this.virtualStore = virtualStore;
this.smartStore = smartStore;
}
public void applyRating(NodeRef targetNode, float rating, String ratingSchemeName)
{
NodeRef materialNode = virtualStore.materializeIfPossible(targetNode);
NodeRef materialNode = smartStore.materializeIfPossible(targetNode);
getTrait().applyRating(materialNode,
rating,
ratingSchemeName);
@@ -59,48 +59,48 @@ public class VirtualRatingServiceExtension extends SpringBeanExtension<RatingSer
public int getRatingsCount(NodeRef targetNode, String ratingSchemeName)
{
NodeRef materialNode = virtualStore.materializeIfPossible(targetNode);
NodeRef materialNode = smartStore.materializeIfPossible(targetNode);
return getTrait().getRatingsCount(materialNode,
ratingSchemeName);
}
public float getTotalRating(NodeRef targetNode, String ratingSchemeName)
{
NodeRef materialNode = virtualStore.materializeIfPossible(targetNode);
NodeRef materialNode = smartStore.materializeIfPossible(targetNode);
return getTrait().getTotalRating(materialNode,
ratingSchemeName);
}
public float getAverageRating(NodeRef targetNode, String ratingSchemeName)
{
NodeRef materialNode = virtualStore.materializeIfPossible(targetNode);
NodeRef materialNode = smartStore.materializeIfPossible(targetNode);
return getTrait().getAverageRating(materialNode,
ratingSchemeName);
}
public Rating getRatingByCurrentUser(NodeRef targetNode, String ratingSchemeName)
{
NodeRef materialNode = virtualStore.materializeIfPossible(targetNode);
NodeRef materialNode = smartStore.materializeIfPossible(targetNode);
return getTrait().getRatingByCurrentUser(materialNode,
ratingSchemeName);
}
public List<Rating> getRatingsByCurrentUser(NodeRef targetNode)
{
NodeRef materialNode = virtualStore.materializeIfPossible(targetNode);
NodeRef materialNode = smartStore.materializeIfPossible(targetNode);
return getTrait().getRatingsByCurrentUser(materialNode);
}
public Rating removeRatingByCurrentUser(NodeRef targetNode, String ratingSchemeName)
{
NodeRef materialNode = virtualStore.materializeIfPossible(targetNode);
NodeRef materialNode = smartStore.materializeIfPossible(targetNode);
return getTrait().removeRatingByCurrentUser(materialNode,
ratingSchemeName);
}
public Serializable getRatingRollup(NodeRef targetNode, String ratingSchemeName, String ratingRollupName)
{
NodeRef materialNode = virtualStore.materializeIfPossible(targetNode);
NodeRef materialNode = smartStore.materializeIfPossible(targetNode);
return getTrait().getRatingRollup(materialNode,
ratingSchemeName,
ratingRollupName);