tag 748e7c1ff356a428a228bbb2adb446446e82a228
tagger Pierre-Charles David <pierre-charles.david@obeo.fr> Wed Apr 12 09:42:34 2017 +0200
object 06e5976837363087e6cbf9a9483ae79949a82852

Sirius 3.1.8

commit 06e5976837363087e6cbf9a9483ae79949a82852
author Maxime Porhel <maxime.porhel@obeo.fr> Tue Mar 21 12:19:58 2017 +0100
committer Maxime Porhel <maxime.porhel@obeo.fr> Tue Mar 21 10:04:05 2017 -0400
tree 4db7b458d0d673ce2936d0b8f5b26d06b537c57b
parent 8583155a93bc9f06503b990897dc0ec2aec57ef1

[512444] EditModeDecorator should compute isBroken image first

The previous commit on EditModeDecorator optimized the decorator refresh
by removing duplicates in calls to permission authority and isBroken
checks (see shoulBeDecorated() and getDecorationImage()). 

The logic of the previous version of shouldBeDecorated was moved to
getDecorationImage but this changed the image priority: now the lock
status is displayed even if the edit part is broken whereas we want to
display only the red cross when the part is broken even if the lock
status could lead to a specific decoration.

This commit set back the previous getImage() computation priority.

Bug: 512444
Cherry-picked-from: 512292
Change-Id: Ib146180cf051f17095787563e5ec121406a5825c
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>