Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Charles David2017-03-07 15:53:12 +0000
committerPierre-Charles David2017-04-06 09:24:49 +0000
commitfc375aebeed9dca037af91f2a5c8d7b5e00335d4 (patch)
treea6655902c7768dedb79e78aa4dc808be4b2dff13
parent544af6e3ca342ebc9f01ece6f9b8da296565f63a (diff)
downloadorg.eclipse.sirius-fc375aebeed9dca037af91f2a5c8d7b5e00335d4.tar.gz
org.eclipse.sirius-fc375aebeed9dca037af91f2a5c8d7b5e00335d4.tar.xz
org.eclipse.sirius-fc375aebeed9dca037af91f2a5c8d7b5e00335d4.zip
[513249] Add support for the LOCKED_PERMISSION status
Bug: 513249 Change-Id: Iadcd968593afc0f63807f43529f9e59acad44cb9 Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/TransactionalEditingDomainContextAdapter.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/TransactionalEditingDomainContextAdapter.java b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/TransactionalEditingDomainContextAdapter.java
index 4015c286d7..8e3d058295 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/TransactionalEditingDomainContextAdapter.java
+++ b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/TransactionalEditingDomainContextAdapter.java
@@ -183,7 +183,11 @@ public class TransactionalEditingDomainContextAdapter implements EditingContextA
@Override
public LockStatus getLockStatus(EObject obj) {
- return convertLockStatus(this.auth.getLockStatus(obj));
+ LockStatus result = convertLockStatus(this.auth.getLockStatus(obj));
+ if (result == LockStatus.UNLOCKED && !this.auth.canEditInstance(obj)) {
+ result = LockStatus.LOCKED_PERMISSION;
+ }
+ return result;
}
/**

Back to the top