[506695] Rename drop source 'diagram' into 'representation' in the UI

The documentation and the VSM editor's UI used the "diagram" term to
denote the possible source of a drop tool, which actually handle all
types of Sirius representations.

Do not modify the metamodel type (which still has a DragSource.DIAGRAM
enum), but change how it is presented in the UI and update the
documentation to use the more general "representation" term.

Bug: 506695
Change-Id: Icc01d03e1c476bd594572149a2df83e74c122445
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

6 files changed, 9 insertions, 9 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui/plugin.properties b/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
index 77129074c8..ffddbae1ac 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
@@ -644,7 +644,7 @@ _UI_ContainerDropDescription_element_feature = Element
 _UI_ContainerDropDescription_newViewContainer_feature = New View Container
 _UI_ContainerDropDescription_initialOperation_feature = Initial Operation
 _UI_ContainerDropDescription_dragSource_feature = Drag Source
-_UI_ContainerDropDescription_dragSource_description = Tell whether the source of this Drag and Drop is a Diagram, an item of the Model Content View or both.
+_UI_ContainerDropDescription_dragSource_description = Tell whether the source of this Drag and Drop is a representation, an item of the Model Content View or both.
 _UI_ContainerDropDescription_moveEdges_feature = Move Edges
 _UI_ContainerDropDescription_moveEdges_description = If set to true, drop to the container will not invalidate the linked edges.
 _UI_Filter_filterKind_feature = Filter Kind
diff --git a/plugins/org.eclipse.sirius.diagram/model/diagram.genmodel b/plugins/org.eclipse.sirius.diagram/model/diagram.genmodel
index dba12bb914..5e7662643e 100644
--- a/plugins/org.eclipse.sirius.diagram/model/diagram.genmodel
+++ b/plugins/org.eclipse.sirius.diagram/model/diagram.genmodel
@@ -920,7 +920,7 @@
           <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diagram.ecore#//description/tool/ContainerDropDescription/newViewContainer"/>
           <genFeatures property="None" children="true" createChild="true" propertyCategory=""
               ecoreFeature="ecore:EReference diagram.ecore#//description/tool/ContainerDropDescription/initialOperation"/>
-          <genFeatures createChild="false" propertyCategory="General" propertyDescription="Tell whether the source of this Drag and Drop is an item of a Diagram, of the Model Explorer View or both."
+          <genFeatures createChild="false" propertyCategory="General" propertyDescription="Tell whether the source of this Drag and Drop is an item of a representation, of the Model Explorer View or both."
               ecoreFeature="ecore:EAttribute diagram.ecore#//description/tool/ContainerDropDescription/dragSource"/>
           <genFeatures createChild="false" propertyCategory="Advanced" propertyDescription="If set to true, drop to the container will not invalidate the linked edges."
               ecoreFeature="ecore:EAttribute diagram.ecore#//description/tool/ContainerDropDescription/moveEdges"/>
diff --git a/plugins/org.eclipse.sirius.doc/doc/specifier/diagrams/Diagrams.html b/plugins/org.eclipse.sirius.doc/doc/specifier/diagrams/Diagrams.html
index 1d6cfe5eb9..bc09979468 100644
--- a/plugins/org.eclipse.sirius.doc/doc/specifier/diagrams/Diagrams.html
+++ b/plugins/org.eclipse.sirius.doc/doc/specifier/diagrams/Diagrams.html
@@ -815,12 +815,12 @@
 		<p>
 			<strong>Container Drop</strong> You can associate a 
 			<em>Container Drop</em> description to your container mappings to react to drag&#8217;n&#8217;drop operations into the container. The 
-			<em>Drag Source</em> property indicates if you want to react to graphical elements from a diagram, to semantic model elements dragged from another Eclipse view (for example from the 
+			<em>Drag Source</em> property indicates if you want to react to graphical elements from a Sirius representation, to semantic model elements dragged from another Eclipse view (for example from the 
 			<em>Model Explorer</em>), or both. The 
 			<em>Containers</em> property indicates for which drop kind of container mappings this tool applies. The 
 			<em>Mappings</em> property indicates what kinds of graphical elements can be dropped into the specified containers, when the 
 			<em>Drag Source</em> is 
-			<em>Diagram</em> or 
+			<em>Representation</em> or 
 			<em>Both</em>. The body of the tool (the 
 			<a href="../general/Model_Operations.html">model operations</a> ) specify how to react when an element is dropped into a container.
 		</p>
diff --git a/plugins/org.eclipse.sirius.doc/doc/specifier/diagrams/Diagrams.textile b/plugins/org.eclipse.sirius.doc/doc/specifier/diagrams/Diagrams.textile
index b4c19aa765..0ec7f54b44 100644
--- a/plugins/org.eclipse.sirius.doc/doc/specifier/diagrams/Diagrams.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/specifier/diagrams/Diagrams.textile
@@ -257,7 +257,7 @@ See the "tools":#tools section for a general presentation of how tools are defin
 
 By default, your container creation tools will be available on all the graphical elements which can contain an instance of the _Container Mappings_ you specified in the tool, and users will see a "forbidden" sign if they try to apply the tool on an incompatible type of element. You can specify a _Precondition_ to forbid the application of the tool on some of the elements where it would normally be allowed. The precondition is evaluated in the context of the _view element_ on which the user has put the mouse. If it returns a false value, the tool's application will be forbidden. Symmetrically, you can specify _Extra Mappings_ (_Advanced_ section) on which the tool should be applicable, even though these mapping can not contain containers of the type you will create. In this case, the container created by the tool will actually appear elsewhere on the diagram, but it can often help usability to allow users to click on related elements.
 
-*Container Drop* You can associate a _Container Drop_ description to your container mappings to react to drag'n'drop operations into the container. The _Drag Source_ property indicates if you want to react to graphical elements from a diagram, to semantic model elements dragged from another Eclipse view (for example from the _Model Explorer_), or both. The _Containers_ property indicates for which drop kind of container mappings this tool applies. The _Mappings_ property indicates what kinds of graphical elements can be dropped into the specified containers, when the _Drag Source_ is _Diagram_ or _Both_. The body of the tool (the "model operations":../general/Model_Operations.html ) specify how to react when an element is dropped into a container.
+*Container Drop* You can associate a _Container Drop_ description to your container mappings to react to drag'n'drop operations into the container. The _Drag Source_ property indicates if you want to react to graphical elements from a Sirius representation, to semantic model elements dragged from another Eclipse view (for example from the _Model Explorer_), or both. The _Containers_ property indicates for which drop kind of container mappings this tool applies. The _Mappings_ property indicates what kinds of graphical elements can be dropped into the specified containers, when the _Drag Source_ is _Representation_ or _Both_. The body of the tool (the "model operations":../general/Model_Operations.html ) specify how to react when an element is dropped into a container.
 
 __WARNING__: if you choose _Model_ or _Both_ as source, your tool must be prepared to accept any type of source element which can be present in the _Model Explorer_ view, including elements which have no relation to the source mappings you specified for the tool. Use a precondition to check the nature of the element being dragged (available through the @element@ variable) to disable the tool source elements your tool does not support.
 
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/tool/containerdropdescription/ContainerDropDescriptionDragSourcePropertySection.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/tool/containerdropdescription/ContainerDropDescriptionDragSourcePropertySection.java
index c9a872624e..e13cfbc468 100644
--- a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/tool/containerdropdescription/ContainerDropDescriptionDragSourcePropertySection.java
+++ b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/tool/containerdropdescription/ContainerDropDescriptionDragSourcePropertySection.java
@@ -84,7 +84,7 @@ public class ContainerDropDescriptionDragSourcePropertySection extends AbstractR
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
 
-        nameLabel.setToolTipText("Tell whether the source of this Drag and Drop is an item of a Diagram, of the Model Explorer View or both.");
+        nameLabel.setToolTipText("Tell whether the source of this Drag and Drop is an item of a representation, of the Model Explorer View or both.");
 
         CLabel help = getWidgetFactory().createCLabel(composite, "");
         FormData data = new FormData();
@@ -92,7 +92,7 @@ public class ContainerDropDescriptionDragSourcePropertySection extends AbstractR
         data.left = new FormAttachment(nameLabel);
         help.setLayoutData(data);
         help.setImage(getHelpIcon());
-        help.setToolTipText("Tell whether the source of this Drag and Drop is an item of a Diagram, of the Model Explorer View or both.");
+        help.setToolTipText("Tell whether the source of this Drag and Drop is an item of a representation, of the Model Explorer View or both.");
         nameLabel.setFont(SiriusEditor.getFontRegistry().get("required"));
 
     }
diff --git a/plugins/org.eclipse.sirius.ui/plugin.properties b/plugins/org.eclipse.sirius.ui/plugin.properties
index d1da268b82..1119e7dc13 100644
--- a/plugins/org.eclipse.sirius.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.ui/plugin.properties
@@ -592,7 +592,7 @@ _UI_FoldingStyle_TARGET_literal = Target
 _UI_ReconnectionKind_RECONNECT_TARGET_literal = Reconnect Target
 _UI_ReconnectionKind_RECONNECT_SOURCE_literal = Reconnect Source
 _UI_ReconnectionKind_RECONNECT_BOTH_literal = Reconnect Both
-_UI_DragSource_DIAGRAM_literal = Diagram
+_UI_DragSource_DIAGRAM_literal = Representation
 _UI_DragSource_PROJECT_EXPLORER_literal = Model
 _UI_DragSource_BOTH_literal = Both
 _UI_VALIDATION_LANGAGE_acceleo_literal = acceleo
@@ -1199,7 +1199,7 @@ _UI_ContainerCreationDescription_containerMappings_description = Container mappi
 _UI_ContainerCreationDescription_iconPath_description = Path to a specific icon, if unset the icon associated to the Node mapping will be used. Otherwise use path\nlike /myProject/myDirectory/myImage.gif, the tool will look for it first in the workspace, then in the plugins.
 _UI_ContainerCreationDescription_extraMappings_description = Usefull if you want to enable the tool on other mappings and then provide a specific behavior.
 _UI_ContainerDropDescription_mappings_description = Mapping of the element to drop on the container
-_UI_ContainerDropDescription_dragSource_description = Tell whether the source of this Drag and Drop is a Diagram, an item of the Model Content View or both.
+_UI_ContainerDropDescription_dragSource_description = Tell whether the source of this Drag and Drop is a representation, an item of the Model Content View or both.
 _UI_ContainerDropDescription_moveEdges_description = If set to true, drop to the container will not invalidate the linked edges.
 _UI_DeleteHook_id_description = An id of an extension to org.eclipse.sirius.deleteHook extension point. It may be used to add a confirmation dialog before deletion
 _UI_RequestDescription_type_description = Arbitrary identifier of a request sent on the current EditPart. You should use the provided API to install an EditPolicy reacting to the request.