From a9b232b235a23160ef4861444346c4cb358577c9 Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Wed, 30 Apr 2014 16:37:06 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 68229: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud) 68099: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3) 68049: Merged DEV to V4.1-BUG-FIX (4.1.9) 63586: MNT-10822 : LockType javadoc is incorrect Fixed javadoc for LockType enum. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68477 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/service/cmr/lock/LockType.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/source/java/org/alfresco/service/cmr/lock/LockType.java b/source/java/org/alfresco/service/cmr/lock/LockType.java index 19861f824b..d4ea9cc9b6 100644 --- a/source/java/org/alfresco/service/cmr/lock/LockType.java +++ b/source/java/org/alfresco/service/cmr/lock/LockType.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2014 Alfresco Software Limited. * * This file is part of Alfresco * @@ -29,21 +29,23 @@ import org.alfresco.api.AlfrescoPublicApi; public enum LockType { /** - * NODE_LOCK - no-one can update or delete 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, + /** - * READ_ONLY_LOCK - no-one can update or delete the locked node. No one can add children to the locked node. + * Only 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. */ @Deprecated WRITE_LOCK, + /** - * WRITE_LOCK - the owner can update or delete the locked node. The owner can add children to the locked node. + * No-one can update or delete the locked node. The owner and non-owner can create children to the locked node. * * @deprecated Deprecated in 4.1.6. Will be replaced by a more descriptive name. */