Merge "[442680] change default icon for edge with a link"

2 files changed, 8 insertions, 1 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/palette/PaletteImageProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/palette/PaletteImageProvider.java
index b9b83a2525..41d7722eff 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/palette/PaletteImageProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/palette/PaletteImageProvider.java
@@ -71,7 +71,11 @@ public class PaletteImageProvider {
                     SiriusPlugin.getDefault().warning("No icon is available for the tool " + abstractToolDescription.getName() + ". A default icon has been set instead.", null);
                 }
             }
-            path = DiagramImagesPath.PALETTE_FACTORY_DEFAULT_PATH;
+            if (abstractToolDescription instanceof EdgeCreationDescription) {
+                path = DiagramImagesPath.PALETTE_EDGE_PATH;
+            } else {
+                path = DiagramImagesPath.PALETTE_FACTORY_DEFAULT_PATH;
+            }
         }
 
         final Image res = getImageFromPath(path);
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/tools/api/image/DiagramImagesPath.java b/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/tools/api/image/DiagramImagesPath.java
index 4c06538738..1d633b459d 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/tools/api/image/DiagramImagesPath.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/tools/api/image/DiagramImagesPath.java
@@ -142,4 +142,7 @@ public interface DiagramImagesPath {
 
     /** path to image not found. */
     String IMAGE_NOT_FOUND = "/org.eclipse.sirius.common.ui/images/NotFound.png";
+
+    /** path of the palette edge image. */
+    String PALETTE_EDGE_PATH = "/org.eclipse.sirius.diagram.ui/icons/full/obj16/DEdge.gif"; //$NON-NLS-1$
 }