Introduction of priority, fix for bug 392724

1 files changed, 11 insertions, 1 deletions

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/core/ui/pagebookview/ModelExplorerDecorationAdapter.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/core/ui/pagebookview/ModelExplorerDecorationAdapter.java
index 2bca32cc54c..a955d2b702e 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/core/ui/pagebookview/ModelExplorerDecorationAdapter.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/core/ui/pagebookview/ModelExplorerDecorationAdapter.java
@@ -118,8 +118,18 @@ public class ModelExplorerDecorationAdapter {
 		if(decoratedImage == null) {

 			// Otherwise create a new image and store it

 			ImageDescriptor[] decorationImages = new ImageDescriptor[5];

+			// Store the decoration by position 

+			IPapyrusDecoration[] decorationByPosition = new IPapyrusDecoration[5];

+

 			for(IPapyrusDecoration decoration : decorations) {

-				decorationImages[decoration.getPositionForJFace()] = decoration.getDecorationImageForME();

+				IPapyrusDecoration existingDecoration = decorationByPosition[decoration.getPositionForJFace()];

+				if (existingDecoration == null || existingDecoration.getPriority() < decoration.getPriority()) {

+					// if no decoration exists for the current position

+					// or if the existing decoration has a lower priority than the current

+					// replace the existing decoration with the current one

+					decorationImages[decoration.getPositionForJFace()] = decoration.getDecorationImageForME();

+					decorationByPosition[decoration.getPositionForJFace()] = decoration;

+				}

 			}

 			ImageDescriptor decoratedImageDesc = new DecorationOverlayIcon(decoratorTarget, decorationImages, size16);

 			Activator.getDefault().getImageRegistry().put(decoratedImageId, decoratedImageDesc);