Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Raluca Munteanu
2016-04-26 13:03:25 +00:00
parent 8674e2bfc8
commit dc6b2852d0
830 changed files with 142585 additions and 142585 deletions

View File

@@ -1,71 +1,71 @@
package org.alfresco.repo.version;
import org.alfresco.repo.copy.CopyBehaviourCallback.AssocCopySourceAction;
import org.alfresco.repo.copy.CopyBehaviourCallback.CopyAssociationDetails;
import org.alfresco.service.namespace.QName;
/**
* A callback to modify version revert behaviour associated with a given type or aspect. This
* callback is called per type and per aspect.
*
* @since 4.2
* @author mrogers
*
*/
public interface VersionRevertCallback
{
/**
*
*/
public enum RevertAspectAction implements Comparable<RevertAspectAction>
{
/**
* Revert this aspect, if it does not exist on the target version then it will be removed.
*/
REVERT,
/**
* Ignore the aspect, do not remove it or its properties.
*/
IGNORE,
}
/**
* How should the specified aspect be reverted?
*
* @param aspectName the name of the aspect to revert
* @param details details of the aspect to revert
*
*/
public RevertAspectAction getRevertAspectAction(QName aspectName, VersionRevertDetails details);
/**
*
*/
public enum RevertAssocAction implements Comparable<RevertAssocAction>
{
/**
* Revert this assoc, if it does not exist on the target version then it will be removed.
*/
REVERT,
/**
* Ignore the assoc, do not remove it or add it.
*/
IGNORE,
}
/**
* How should the specified assoc be reverted?
*
* @param assocName the name of the assoc to revert
* @param details details of the node to revert
*
*/
public RevertAssocAction getRevertAssocAction(QName assocName, VersionRevertDetails details);
}
package org.alfresco.repo.version;
import org.alfresco.repo.copy.CopyBehaviourCallback.AssocCopySourceAction;
import org.alfresco.repo.copy.CopyBehaviourCallback.CopyAssociationDetails;
import org.alfresco.service.namespace.QName;
/**
* A callback to modify version revert behaviour associated with a given type or aspect. This
* callback is called per type and per aspect.
*
* @since 4.2
* @author mrogers
*
*/
public interface VersionRevertCallback
{
/**
*
*/
public enum RevertAspectAction implements Comparable<RevertAspectAction>
{
/**
* Revert this aspect, if it does not exist on the target version then it will be removed.
*/
REVERT,
/**
* Ignore the aspect, do not remove it or its properties.
*/
IGNORE,
}
/**
* How should the specified aspect be reverted?
*
* @param aspectName the name of the aspect to revert
* @param details details of the aspect to revert
*
*/
public RevertAspectAction getRevertAspectAction(QName aspectName, VersionRevertDetails details);
/**
*
*/
public enum RevertAssocAction implements Comparable<RevertAssocAction>
{
/**
* Revert this assoc, if it does not exist on the target version then it will be removed.
*/
REVERT,
/**
* Ignore the assoc, do not remove it or add it.
*/
IGNORE,
}
/**
* How should the specified assoc be reverted?
*
* @param assocName the name of the assoc to revert
* @param details details of the node to revert
*
*/
public RevertAssocAction getRevertAssocAction(QName assocName, VersionRevertDetails details);
}