RM-7034 Merged master

This commit is contained in:
Roxana Lucanu
2019-11-04 12:44:38 +02:00
7 changed files with 16 additions and 29 deletions

View File

@@ -44,7 +44,7 @@ public interface HoldServicePolicies
{
interface BeforeCreateHoldPolicy extends ClassPolicy
{
QName BEFORE_CREATE_HOLD = QName.createQName(NamespaceService.ALFRESCO_URI, "beforeCreateHold");
public static final QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "beforeCreateHold");
/**
* Called before a hold is created.
*
@@ -56,7 +56,7 @@ public interface HoldServicePolicies
interface OnCreateHoldPolicy extends ClassPolicy
{
QName ON_CREATE_HOLD = QName.createQName(NamespaceService.ALFRESCO_URI, "onCreateHold");
public static final QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "onCreateHold");
/**
* Called when a hold is created.
*
@@ -67,9 +67,9 @@ public interface HoldServicePolicies
interface BeforeDeleteHoldPolicy extends ClassPolicy
{
QName BEFORE_DELETE_HOLD = QName.createQName(NamespaceService.ALFRESCO_URI, "beforeDeleteHold");
public static final QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "beforeDeleteHold");
/**
* Called before a hold is created.
* Called before a hold is deleted.
*
* @param hold node reference
*/
@@ -78,7 +78,7 @@ public interface HoldServicePolicies
interface OnDeleteHoldPolicy extends ClassPolicy
{
QName ON_DELETE_HOLD = QName.createQName(NamespaceService.ALFRESCO_URI, "onDeleteHold");
public static final QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "onDeleteHold");
/**
* Called when a hold is deleted.
@@ -95,7 +95,7 @@ public interface HoldServicePolicies
/**
* Called before adding content to hold.
*
* @param hold the hold to be added into
* @param hold the hold to be added into
* @param contentNodeRef the item to be added to hold
*/
void beforeAddToHold(NodeRef hold, NodeRef contentNodeRef);
@@ -108,7 +108,7 @@ public interface HoldServicePolicies
/**
* Called when content is added to hold.
*
* @param hold the hold to be added into
* @param hold the hold to be added into
* @param contentNodeRef the item to be added to hold
*/
void onAddToHold(NodeRef hold, NodeRef contentNodeRef);
@@ -121,7 +121,7 @@ public interface HoldServicePolicies
/**
* Called before removing content from hold.
*
* @param hold the hold to be removed from
* @param hold the hold to be removed from
* @param contentNodeRef the item to be removed from hold
*/
void beforeRemoveFromHold(NodeRef hold, NodeRef contentNodeRef);
@@ -134,9 +134,10 @@ public interface HoldServicePolicies
/**
* Called when removing content from hold.
*
* @param hold the hold to be removed from
* @param hold the hold to be removed from
* @param contentNodeRef the item to be removed from hold
*/
void onRemoveFromHold(NodeRef hold, NodeRef contentNodeRef);
}
}

View File

@@ -35,7 +35,6 @@ import java.util.Map;
import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.hold.HoldService;
import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
import org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService;
import org.alfresco.module.org_alfresco_module_rm.util.NodeTypeUtility;
import org.alfresco.service.cmr.repository.NodeRef;
@@ -61,9 +60,6 @@ public abstract class BaseHold extends DeclarativeWebScript
/** Hold Service */
private HoldService holdService;
/** record service */
private RecordService recordService;
/** record folder service */
private RecordFolderService recordFolderService;
@@ -91,14 +87,6 @@ public abstract class BaseHold extends DeclarativeWebScript
this.recordFolderService = recordFolderService;
}
/**
* @param recordService record service
*/
public void setRecordService(RecordService recordService)
{
this.recordService = recordService;
}
/**
* @param nodeService node service
*/