From 3a1aaf5a7c2d3fa0bbb7dc9ffbbe3a24a948eca5 Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Wed, 23 Jul 2014 11:34:45 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 76965: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 68032: MNT-10822 - LockType javadoc is incorrect git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77806 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/service/cmr/lock/LockType.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/service/cmr/lock/LockType.java b/source/java/org/alfresco/service/cmr/lock/LockType.java index d4ea9cc9b6..3ab23371cf 100644 --- a/source/java/org/alfresco/service/cmr/lock/LockType.java +++ b/source/java/org/alfresco/service/cmr/lock/LockType.java @@ -30,14 +30,20 @@ public enum LockType { /** * No-one can update or delete the locked node. No one can add children to the locked node. - * + * + * No-one can update or delete the locked node. + *

+ * No one can add children to the locked node. + * * @deprecated Deprecated in 4.1.6. Will be replaced by a more descriptive name. */ @Deprecated READ_ONLY_LOCK, /** - * Only the owner can update or delete the locked node. The owner can add children to the locked node. + * The owner can update or delete the locked node. + *

+ * The owner can add children to the locked node. * * @deprecated Deprecated in 4.1.6. Will be replaced by a more descriptive name. */ @@ -45,7 +51,10 @@ public enum LockType WRITE_LOCK, /** - * No-one can update or delete the locked node. The owner and non-owner can create children to the locked node. + + * No-one can update or delete the locked node. + *

+ * There are no restrictions on adding children to the locked node. * * @deprecated Deprecated in 4.1.6. Will be replaced by a more descriptive name. */