inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

28
source/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtension.java
View File

@@ -42,11 +42,11 @@ public class VirtualCheckOutCheckInServiceExtension extends
super(CheckOutCheckInServiceTrait.class);
}
private VirtualStore virtualStore;
private VirtualStore smartStore;
public void setVirtualStore(VirtualStore virtualStore)
public void setSmartStore(VirtualStore smartStore)
{
this.virtualStore = virtualStore;
this.smartStore = smartStore;
}
@Override
@@ -54,8 +54,8 @@ public class VirtualCheckOutCheckInServiceExtension extends
QName destinationAssocQName)
{
CheckOutCheckInServiceTrait theTrait = getTrait();
NodeRef materialNodeRef = virtualStore.materializeIfPossible(nodeRef);
NodeRef materialDestination = virtualStore.materializeIfPossible(destinationParentNodeRef);
NodeRef materialNodeRef = smartStore.materializeIfPossible(nodeRef);
NodeRef materialDestination = smartStore.materializeIfPossible(destinationParentNodeRef);
NodeRef workingCopy = theTrait.checkout(materialNodeRef,
materialDestination,
destinationAssocTypeQName,
@@ -79,7 +79,7 @@ public class VirtualCheckOutCheckInServiceExtension extends
public NodeRef checkout(NodeRef nodeRef)
{
CheckOutCheckInServiceTrait theTrait = getTrait();
NodeRef materialNodeRef = virtualStore.materializeIfPossible(nodeRef);
NodeRef materialNodeRef = smartStore.materializeIfPossible(nodeRef);
NodeRef workingCopy = theTrait.checkout(materialNodeRef);
return virtualizeOriginalIfNeeded(nodeRef,
@@ -91,7 +91,7 @@ public class VirtualCheckOutCheckInServiceExtension extends
boolean keepCheckedOut)
{
CheckOutCheckInServiceTrait theTrait = getTrait();
NodeRef materialWorkingCopy = virtualStore.materializeIfPossible(workingCopyNodeRef);
NodeRef materialWorkingCopy = smartStore.materializeIfPossible(workingCopyNodeRef);
NodeRef materialOriginalNode = theTrait.checkin(materialWorkingCopy,
versionProperties,
contentUrl,
@@ -104,7 +104,7 @@ public class VirtualCheckOutCheckInServiceExtension extends
public NodeRef checkin(NodeRef workingCopyNodeRef, Map<String, Serializable> versionProperties, String contentUrl)
{
CheckOutCheckInServiceTrait theTrait = getTrait();
NodeRef materialWorkingCopy = virtualStore.materializeIfPossible(workingCopyNodeRef);
NodeRef materialWorkingCopy = smartStore.materializeIfPossible(workingCopyNodeRef);
NodeRef materialOriginalNode = theTrait.checkin(materialWorkingCopy,
versionProperties,
contentUrl);
@@ -133,7 +133,7 @@ public class VirtualCheckOutCheckInServiceExtension extends
public NodeRef checkin(NodeRef workingCopyNodeRef, Map<String, Serializable> versionProperties)
{
CheckOutCheckInServiceTrait theTrait = getTrait();
NodeRef materialWorkingCopy = virtualStore.materializeIfPossible(workingCopyNodeRef);
NodeRef materialWorkingCopy = smartStore.materializeIfPossible(workingCopyNodeRef);
NodeRef materialOriginalNode = theTrait.checkin(materialWorkingCopy,
versionProperties);
@@ -144,7 +144,7 @@ public class VirtualCheckOutCheckInServiceExtension extends
@Override
public NodeRef cancelCheckout(NodeRef workingCopyNodeRef)
{
NodeRef materialOriginalNode = getTrait().cancelCheckout(virtualStore.materializeIfPossible(workingCopyNodeRef));
NodeRef materialOriginalNode = getTrait().cancelCheckout(smartStore.materializeIfPossible(workingCopyNodeRef));
return virtualizeOriginalIfNeeded(workingCopyNodeRef,
materialOriginalNode);
@@ -154,7 +154,7 @@ public class VirtualCheckOutCheckInServiceExtension extends
public NodeRef getWorkingCopy(NodeRef nodeRef)
{
CheckOutCheckInServiceTrait theTrait = getTrait();
NodeRef materialWorkingCopy = theTrait.getWorkingCopy(virtualStore.materializeIfPossible(nodeRef));
NodeRef materialWorkingCopy = theTrait.getWorkingCopy(smartStore.materializeIfPossible(nodeRef));
return virtualizeVersionIfNeeded(nodeRef,
materialWorkingCopy);
@@ -181,7 +181,7 @@ public class VirtualCheckOutCheckInServiceExtension extends
public NodeRef getCheckedOut(NodeRef nodeRef)
{
CheckOutCheckInServiceTrait theTrait = getTrait();
NodeRef materialChekedOut = theTrait.getCheckedOut(virtualStore.materializeIfPossible(nodeRef));
NodeRef materialChekedOut = theTrait.getCheckedOut(smartStore.materializeIfPossible(nodeRef));
return virtualizeVersionIfNeeded(nodeRef,
materialChekedOut);
}
@@ -189,13 +189,13 @@ public class VirtualCheckOutCheckInServiceExtension extends
@Override
public boolean isWorkingCopy(NodeRef nodeRef)
{
return getTrait().isWorkingCopy(virtualStore.materializeIfPossible(nodeRef));
return getTrait().isWorkingCopy(smartStore.materializeIfPossible(nodeRef));
}
@Override
public boolean isCheckedOut(NodeRef nodeRef)
{
return getTrait().isCheckedOut(virtualStore.materializeIfPossible(nodeRef));
return getTrait().isCheckedOut(smartStore.materializeIfPossible(nodeRef));
}
}