[570524] Improve error messages

Bug: 570524
Change-Id: I27af7df81bfbd0230730880029bd1c7d8f9c3749
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>

3 files changed, 11 insertions, 6 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui/plugin.properties b/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
index 6d3cc67c8c..9ec46bb952 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
@@ -1022,11 +1022,11 @@ MappingBasedSiriusFormatManagerFactory_ErrorMappingfunctionIncompleteOnSequenceD
 MappingBasedSiriusFormatManagerFactory_ErrorMappingfunctionIsEmpty=Source to target semantic mapping must not be empty
 MappingBasedSiriusFormatManagerFactory_ErrorDiagramIsNull=Diagram parameters must not be null
 MappingBasedSiriusFormatManagerFactory_ErrorTargetDiagramNameIsEmpty=Created target diagram name must not be empty
-MappingBasedSiriusFormatManagerFactory_ErrorSourceAndTargetDiagramDecriptionsDoesNotMatch= Source diagram description [{0}] does not match with target diagram description: {1}
+MappingBasedSiriusFormatManagerFactory_ErrorSourceAndTargetDiagramDecriptionsDoesNotMatch= Source diagram description "{0}" does not match with target diagram description "{1}", details:\n* Source diagram description "{2}"\n* Target diagram description "{3}"
 MappingBasedSiriusFormatManagerFactory_ErrorSourceAndTargetDiagramsAreTheSame=Source and target diagrams must be different
 MappingBasedSiriusFormatManagerFactory_ErrorSourceAndOrTargetSessionsNull=Source and/or target session must not be null
 MappingBasedSiriusFormatManagerFactory_ErrorTargetDiagramRootIsNull=Target diagram root element must not be null
-MappingBasedSiriusFormatManagerFactory_ImpossibleToSuitableDescription=Cannot find a representation description among descriptions [{0}] matching name [{1}] from target session: {2} 
+MappingBasedSiriusFormatManagerFactory_ImpossibleToSuitableDescription=Cannot find a representation description among descriptions [{0}] matching name "{1}" from target session: "{2}" 
 MessageFormatParser_InvalidInputError=Invalid input at {0}
 MessageFormatParser_ProxyOrNullSemanticTargetMessage=Something occurred during direct edit: semantic target of the applied direct edit is now null or proxy.
 MessageFormatParser_ProxyOrNullTargetMessage=Something occurred during direct edit: target of the applied direct edit is now null or proxy.
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/format/MappingBasedSiriusFormatManagerFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/format/MappingBasedSiriusFormatManagerFactory.java
index 1d0d0de339..981ee960f8 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/format/MappingBasedSiriusFormatManagerFactory.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/format/MappingBasedSiriusFormatManagerFactory.java
@@ -67,6 +67,7 @@ import org.eclipse.sirius.diagram.ui.tools.internal.format.semantic.diagram.util
 import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.description.RepresentationDescription;
 import org.eclipse.sirius.viewpoint.description.Viewpoint;
+import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 
@@ -313,8 +314,8 @@ public class MappingBasedSiriusFormatManagerFactory {
             throw new IllegalArgumentException(Messages.MappingBasedSiriusFormatManagerFactory_ErrorSourceAndTargetDiagramsAreTheSame);
         }
         if (!EqualityHelper.areEquals(sourceDiagram.getDescription(), targetDiagram.getDescription())) {
-            throw new IllegalArgumentException(MessageFormat.format(Messages.MappingBasedSiriusFormatManagerFactory_ErrorSourceAndTargetDiagramDecriptionsDoesNotMatch, sourceDiagram.getDescription(),
-                    targetDiagram.getDescription()));
+            throw new IllegalArgumentException(MessageFormat.format(Messages.MappingBasedSiriusFormatManagerFactory_ErrorSourceAndTargetDiagramDecriptionsDoesNotMatch,
+                    sourceDiagram.getDescription().getName(), targetDiagram.getDescription().getName(), sourceDiagram.getDescription(), targetDiagram.getDescription()));
         }
     }
 
@@ -451,7 +452,10 @@ public class MappingBasedSiriusFormatManagerFactory {
             }
             return targetDiagram;
         } else {
-            DiagramPlugin.getDefault().logError(MessageFormat.format(Messages.MappingBasedSiriusFormatManagerFactory_ImpossibleToSuitableDescription, descs, sourceDescName, targetSession));
+            DiagramPlugin.getDefault()
+                    .logError(MessageFormat.format(Messages.MappingBasedSiriusFormatManagerFactory_ImpossibleToSuitableDescription,
+                            descs.stream().map(desc -> desc.getName()).collect(Collectors.joining(", ")), sourceDescName, //$NON-NLS-1$
+                    SiriusEditPlugin.getPlugin().getUiCallback().getSessionNameToDisplayWhileSaving(targetSession)));
         }
         return null;
     }
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/MappingBasedSiriusFormatDataManagerCallCheckTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/MappingBasedSiriusFormatDataManagerCallCheckTest.java
index 280bc24054..703d269de7 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/MappingBasedSiriusFormatDataManagerCallCheckTest.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/MappingBasedSiriusFormatDataManagerCallCheckTest.java
@@ -212,7 +212,8 @@ public class MappingBasedSiriusFormatDataManagerCallCheckTest extends AbstractMa
         try {
             applyPredefinedFormatDataOnRawDiagrams(diagramToCopyFormat, diagramToPasteFormat, getFullTestConfiguration(), session, session);
         } catch (IllegalArgumentException e) {
-            assertEquals(e.getMessage(), MessageFormat.format(Messages.MappingBasedSiriusFormatManagerFactory_ErrorSourceAndTargetDiagramDecriptionsDoesNotMatch, diagramToCopyFormat.getDescription(),
+            assertEquals(e.getMessage(), MessageFormat.format(Messages.MappingBasedSiriusFormatManagerFactory_ErrorSourceAndTargetDiagramDecriptionsDoesNotMatch,
+                    diagramToCopyFormat.getDescription().getName(), diagramToPasteFormat.getDescription().getName(), diagramToCopyFormat.getDescription(),
                     diagramToPasteFormat.getDescription()));
         }
     }