diff options
| author | Pierre-Charles David | 2017-03-07 15:53:12 +0000 |
|---|---|---|
| committer | Pierre-Charles David | 2017-04-19 12:38:31 +0000 |
| commit | fc11a14ef7e45da032e2d9c35b2b664ed5b3c3c2 (patch) | |
| tree | 6b24bf547b92ea467f7ed6d5b51c48fe34ff76e8 | |
| parent | 7c863d6cd1eb338d7f284d78be53f2590831f219 (diff) | |
| download | org.eclipse.sirius-fc11a14ef7e45da032e2d9c35b2b664ed5b3c3c2.tar.gz org.eclipse.sirius-fc11a14ef7e45da032e2d9c35b2b664ed5b3c3c2.tar.xz org.eclipse.sirius-fc11a14ef7e45da032e2d9c35b2b664ed5b3c3c2.zip | |
[513254] Add support for the LOCKED_PERMISSION status
Bug: 513254
Change-Id: I2b24c17d7b11d1befe03ac56810be640c4e4d99b
Cherry-picks: 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.java | 6 |
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 82d54f0712..4e33fe5a06 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; } /** |