[538112] Change the name of the tool "Link Note"

It is now "Representation Link".

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

14 files changed, 39 insertions, 39 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui/plugin.properties b/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
index d57a8035b3..736d1f9865 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
@@ -100,7 +100,7 @@ menu.find.label = Find
 menu.showHide.label = Show/Hide
 
 palettetool.linkNote.description = Create a Note that references another representation
-palettetool.linkNote.label = Link Note
+palettetool.linkNote.label = Representation Link
 palettetool.linkNote.elementTypeName=LinkNote
 
 ## GENERATED ##
diff --git a/plugins/org.eclipse.sirius.diagram.ui/plugin.xml b/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
index a6481aab55..bc978948e5 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
+++ b/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
@@ -1251,7 +1251,7 @@
               class="org.eclipse.sirius.diagram.ui.tools.internal.testers.LinkNoteTester"
               id="org.eclipse.sirius.diagram.ui.LinkNoteTester"
               namespace="org.eclipse.sirius.diagram.ui"
-              properties="isLinkNote"
+              properties="isRepresentationLink"
               type="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
         </propertyTester>
    </extension>
@@ -1810,7 +1810,7 @@
               </count>
               <iterate>
                  <test
-                       property="org.eclipse.sirius.diagram.ui.isLinkNote">
+                       property="org.eclipse.sirius.diagram.ui.isRepresentationLink">
                  </test>
               </iterate>
            </and>
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/OpenDRepresentationEditPolicy.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/OpenDRepresentationEditPolicy.java
index 0669ef3302..c65ac991c5 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/OpenDRepresentationEditPolicy.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/OpenDRepresentationEditPolicy.java
@@ -27,8 +27,8 @@ import org.eclipse.sirius.ui.tools.internal.editor.NavigateToCommand;
 import org.eclipse.sirius.viewpoint.DRepresentationDescriptor;
 
 /**
- * This edit policy handles 'Open' requests on link note edit parts by opening the target representation in a new
- * editor.
+ * This edit policy handles 'Open' requests on representation link edit parts by opening the target representation in a
+ * new editor.
  */
 public class OpenDRepresentationEditPolicy extends OpenDiagramEditPolicy {
 
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/SiriusDiagramNameCompartmentEditPart.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/SiriusDiagramNameCompartmentEditPart.java
index c68d8e280c..8a78b49c8a 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/SiriusDiagramNameCompartmentEditPart.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/SiriusDiagramNameCompartmentEditPart.java
@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.swt.graphics.Image;
 
 /**
- * An edit part that shows representation name/icon as a header in diagram link notes.
+ * An edit part that shows representation name/icon as a header in representation link notes.
  */
 public class SiriusDiagramNameCompartmentEditPart extends DiagramNameCompartmentEditPart {
 
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/SiriusNoteEditPart.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/SiriusNoteEditPart.java
index ade17e732a..25814db5bb 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/SiriusNoteEditPart.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/SiriusNoteEditPart.java
@@ -50,7 +50,7 @@ import com.google.common.collect.Iterables;
  */
 public class SiriusNoteEditPart extends NoteEditPart {
 
-    /* this handles removal of diagram link notes when the referenced diagram is deleted */
+    /* this handles removal of representation link notes when the referenced diagram is deleted */
     static final Adapter LINK_ADAPTER = new DiagramLinkAdapter();
 
     private boolean diagramLinkMode = false;
@@ -100,7 +100,7 @@ public class SiriusNoteEditPart extends NoteEditPart {
                 addListenerFilter("ShowingMode", this, diagram.get(), DiagramPackage.eINSTANCE.getDDiagram_IsInShowingMode()); //$NON-NLS-1$
             }
         }
-        if (isLinkNote()) {
+        if (isRepresentationLink()) {
             getNotationView().eAdapters().add(LINK_ADAPTER);
         }
 
@@ -110,7 +110,7 @@ public class SiriusNoteEditPart extends NoteEditPart {
     protected void removeNotationalListeners() {
         super.removeNotationalListeners();
         removeListenerFilter("ShowingMode"); //$NON-NLS-1$
-        if (isLinkNote()) {
+        if (isRepresentationLink()) {
             getNotationView().eAdapters().remove(LINK_ADAPTER);
         }
     }
@@ -177,8 +177,8 @@ public class SiriusNoteEditPart extends NoteEditPart {
     protected void handleNotificationEvent(Notification notification) {
         super.handleNotificationEvent(notification);
 
-        // this handles link note label refresh when the linked representation name changes
-        if (isLinkNote()) {
+        // this handles representation link note label refresh when the linked representation name changes
+        if (isRepresentationLink()) {
             if (getNotationView().getElement() == notification.getNotifier() && notification.getFeature() == ViewpointPackage.Literals.DREPRESENTATION_DESCRIPTOR__NAME) {
                 Iterable<DiagramNameCompartmentEditPart> diagramNameCompartmentEditPartsfilter = Iterables.filter(this.getChildren(), DiagramNameCompartmentEditPart.class);
                 if (Iterables.size(diagramNameCompartmentEditPartsfilter) == 1) {
@@ -194,18 +194,18 @@ public class SiriusNoteEditPart extends NoteEditPart {
         super.createDefaultEditPolicies();
 
         // replace the default open policy with one that handles DRepresentationDescriptors
-        if (isLinkNote()) {
+        if (isRepresentationLink()) {
             removeEditPolicy(EditPolicyRoles.OPEN_ROLE);
             installEditPolicy(EditPolicyRoles.OPEN_ROLE, new OpenDRepresentationEditPolicy());
         }
     }
 
     /**
-     * Is this a link note or is it a 'simple' note?
+     * Is this a diagram link or is it a 'simple' note?
      * 
-     * @return true if this is a link note, false otherwise
+     * @return true if this is a diagram link, false otherwise
      */
-    public boolean isLinkNote() {
+    public boolean isRepresentationLink() {
         return getNotationView() != null && getNotationView().getElement() instanceof DRepresentationDescriptor;
     }
 
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/handler/SetLinkNoteTargetHandler.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/handler/SetLinkNoteTargetHandler.java
index 8e96c3179f..0de7ae16d0 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/handler/SetLinkNoteTargetHandler.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/handler/SetLinkNoteTargetHandler.java
@@ -30,7 +30,7 @@ import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.handlers.HandlerUtil;
 
 /**
- * Changes the target representation descriptor for diagram link notes.
+ * Changes the target representation descriptor for representation link notes.
  */
 public class SetLinkNoteTargetHandler extends AbstractHandler {
 
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/LinkNoteTester.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/LinkNoteTester.java
index 964999462a..b41f96330c 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/LinkNoteTester.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/LinkNoteTester.java
@@ -19,9 +19,9 @@ import org.eclipse.sirius.diagram.ui.internal.edit.parts.SiriusNoteEditPart;
 public class LinkNoteTester extends PropertyTester {
 
     /**
-     * The 'isLinkNote' property.
+     * The 'isRepresentationLink' property.
      */
-    public static final String PROPERTY_IS_LINK_NOTE = "isLinkNote"; //$NON-NLS-1$
+    public static final String PROPERTY_IS_LINK_NOTE = "isRepresentationLink"; //$NON-NLS-1$
 
     /**
      * {@inheritDoc}
@@ -32,7 +32,7 @@ public class LinkNoteTester extends PropertyTester {
     @Override
     public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
         if (PROPERTY_IS_LINK_NOTE.equals(property)) {
-            return receiver instanceof SiriusNoteEditPart && ((SiriusNoteEditPart) receiver).isLinkNote();
+            return receiver instanceof SiriusNoteEditPart && ((SiriusNoteEditPart) receiver).isRepresentationLink();
         }
         throw new IllegalArgumentException("Unknown property: " + property); //$NON-NLS-1$
     }
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
index 7520eedc2f..32b8ff8541 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
@@ -94,6 +94,7 @@
 			<li><span class="label label-success">Added</span> A new preference has been added in the Sirius preference panel. It allows Sirius to ask the user if he wants to save session resources after an automatic migration. If the new preference is ticked, the pop-up will only appear for session opening caused by a direct action of the user (i.e. opening a diagram or unfolding the resources in the model explorer). You can refer to the 
 				<a href="user/general/Modeling%20Project.html#Migration">user documentation </a> for more details. 
 			</li>
+			<li><span class="label label-info">Modified</span> The tool &#8220;Link Note&#8221;, introduced in Sirius 6.0.0, has been renamed into &#8220;Representation Link&#8221;.</li>
 		</ul>
 		<h3 id="SpecifierVisibleChanges">Specifier-Visible Changes</h3>
 		<ul>
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
index 8ac16907f3..d0062ee48f 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
@@ -9,6 +9,7 @@ h2(#sirius6.1.0). Changes in Sirius 6.1.0
 h3. User-Visible Changes
 
 * <span class="label label-success">Added</span> A new preference has been added in the Sirius preference panel. It allows Sirius to ask the user if he wants to save session resources after an automatic migration. If the new preference is ticked, the pop-up will only appear for session opening caused by a direct action of the user (i.e. opening a diagram or unfolding the resources in the model explorer). You can refer to the "user documentation ":user/general/Modeling%20Project.html#Migration for more details. 
+* <span class="label label-info">Modified</span> The tool "Link Note", introduced in Sirius 6.0.0, has been renamed into "Representation Link".
 
 h3. Specifier-Visible Changes
 
diff --git a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.html b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.html
index 296b2ccda9..d346b3bbcc 100644
--- a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.html
+++ b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.html
@@ -1345,22 +1345,22 @@
 			<em>Zoom out</em>) button is active, clicking anywhere on the diagram will increment (resp. decrement) the zoom level by 25%. The current zoom level is visible in the tabbar when no diagram element is selected (see the section on the tabbar buttons for more ways to control the zoom level).
 		</p>
 		<p id="notes">
-			<i>Notes, Link Notes and Note attachments</i>. All Sirius diagrams support the creation of notes and text elements, which can be attached to diagram elements. These elements are purely graphical annotations, and have no effect on the semantic model. The tools used to create them are available in a combo-box in the palette&#8217;s top row. By default, the 
+			<i>Notes, Representation Links and Note attachments</i>. All Sirius diagrams support the creation of notes and text elements, which can be attached to diagram elements. These elements are purely graphical annotations, and have no effect on the semantic model. The tools used to create them are available in a combo-box in the palette&#8217;s top row. By default, the 
 			<em>Note</em> tool (represented by a yellow sticky note) is selected. If you click on the small arrow next to the sticky note, a menu appears where you can select one of the available tools: 
 			<em>Note</em>, 
-			<em>Link Note</em>, 
+			<em>Representation Link</em>, 
 			<em>Text</em> or 
 			<em>Note attachment</em>.
 		</p>
 		<p>
 			<em>Notes</em>, 
-			<em>Link Notes</em> and 
+			<em>Representation Links</em> and 
 			<em>Text</em> elements are created in a similar way: either a single click somewhere on the diagram (which creates an element with a default size), or a click-drag to create the element with a custom initial size. Once created, one can edit the text inside the note or text zone usual the standard &#8220;direct edit&#8221; behavior (
 			<em>F2</em>, a slow double click, or by directly starting to enter alpha-numeric text). The only difference between notes and text zones is the visual presentation; notes have a yellow background (by default) and a border which represents a sticky not with a folded top-right corner. 
 		</p>
 		<p>A 
-			<em>Link Note</em> is a special kind of note which references any existing representation in the project. When creating a link note, a the target representation must be selected from a dialog. The link note displays the name of the target representation and its icon as the note header. It is possible to navigate to the target representation by double clicking on a link note. When the targeted representation is deleted, all link notes that reference it are deleted automatically. Just like normal notes, link notes have a text field for free text and can be attached to other elements with the note attachment tool. It is also possible to set a new target representation for an existing link note by selecting 
-			<em>Set target representation ...</em> from the link note&#8217;s context menu.
+			<em>Representation Link</em> is a special kind of note which references any existing representation in the project. When creating a representation link, a the target representation must be selected from a dialog. The representation link displays the name of the target representation and its icon as the note header. It is possible to navigate to the target representation by double clicking on a representation link. When the targeted representation is deleted, all representation links that reference it are deleted automatically. Just like normal notes, representation links have a text field for free text and can be attached to other elements with the note attachment tool. It is also possible to set a new target representation for an existing representation link by selecting 
+			<em>Set target representation ...</em> from the representation link&#8217;s context menu.
 		</p>
 		<p>
 			<em>Note attachments</em> can be created to link either notes or text zone to diagram elements (including other notes and text attachments). To create an attachment, activate the tool and then click once on the source element and once on the target element. You can also click and drag from the source to the target elements.
diff --git a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.textile b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.textile
index db3047362a..7b03002239 100644
--- a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.textile
@@ -830,11 +830,11 @@ Selected elements have an outline and anchors drawn on their border. Note that w
 
 __Zoom__. Next in the palette come two buttons to control the zoom level of the main diagram area. When the _Zoom in_ (resp. _Zoom out_) button is active, clicking anywhere on the diagram will increment (resp. decrement) the zoom level by 25%. The current zoom level is visible in the tabbar when no diagram element is selected (see the section on the tabbar buttons for more ways to control the zoom level).
 
-p(#notes). __Notes, Link Notes and Note attachments__. All Sirius diagrams support the creation of notes and text elements, which can be attached to diagram elements. These elements are purely graphical annotations, and have no effect on the semantic model. The tools used to create them are available in a combo-box in the palette's top row. By default, the _Note_ tool (represented by a yellow sticky note) is selected. If you click on the small arrow next to the sticky note, a menu appears where you can select one of the available tools: _Note_, _Link Note_, _Text_ or _Note attachment_.
+p(#notes). __Notes, Representation Links and Note attachments__. All Sirius diagrams support the creation of notes and text elements, which can be attached to diagram elements. These elements are purely graphical annotations, and have no effect on the semantic model. The tools used to create them are available in a combo-box in the palette's top row. By default, the _Note_ tool (represented by a yellow sticky note) is selected. If you click on the small arrow next to the sticky note, a menu appears where you can select one of the available tools: _Note_, _Representation Link_, _Text_ or _Note attachment_.
 
-_Notes_, _Link Notes_ and _Text_ elements are created in a similar way: either a single click somewhere on the diagram (which creates an element with a default size), or a click-drag to create the element with a custom initial size. Once created, one can edit the text inside the note or text zone usual the standard "direct edit" behavior (_F2_, a slow double click, or by directly starting to enter alpha-numeric text). The only difference between notes and text zones is the visual presentation; notes have a yellow background (by default) and a border which represents a sticky not with a folded top-right corner. 
+_Notes_, _Representation Links_ and _Text_ elements are created in a similar way: either a single click somewhere on the diagram (which creates an element with a default size), or a click-drag to create the element with a custom initial size. Once created, one can edit the text inside the note or text zone usual the standard "direct edit" behavior (_F2_, a slow double click, or by directly starting to enter alpha-numeric text). The only difference between notes and text zones is the visual presentation; notes have a yellow background (by default) and a border which represents a sticky not with a folded top-right corner. 
 
-A _Link Note_ is a special kind of note which references any existing representation in the project. When creating a link note, a the target representation must be selected from a dialog. The link note displays the name of the target representation and its icon as the note header. It is possible to navigate to the target representation by double clicking on a link note. When the targeted representation is deleted, all link notes that reference it are deleted automatically. Just like normal notes, link notes have a text field for free text and can be attached to other elements with the note attachment tool. It is also possible to set a new target representation for an existing link note by selecting _Set target representation ..._ from the link note's context menu.
+A _Representation Link_ is a special kind of note which references any existing representation in the project. When creating a representation link, a the target representation must be selected from a dialog. The representation link displays the name of the target representation and its icon as the note header. It is possible to navigate to the target representation by double clicking on a representation link. When the targeted representation is deleted, all representation links that reference it are deleted automatically. Just like normal notes, representation links have a text field for free text and can be attached to other elements with the note attachment tool. It is also possible to set a new target representation for an existing representation link by selecting _Set target representation ..._ from the representation link's context menu.
 
 _Note attachments_ can be created to link either notes or text zone to diagram elements (including other notes and text attachments). To create an attachment, activate the tool and then click once on the source element and once on the target element. You can also click and drag from the source to the target elements.
 
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/PaletteManagerWithLayersWithExtensionTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/PaletteManagerWithLayersWithExtensionTest.java
index 619509e393..98cb314138 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/PaletteManagerWithLayersWithExtensionTest.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/PaletteManagerWithLayersWithExtensionTest.java
@@ -95,7 +95,7 @@ public class PaletteManagerWithLayersWithExtensionTest extends AbstractPaletteMa
             //
             createNewEntry("SectionSharedWithOtherLayersA", "ToolL2-A-1", "ToolL4-A-1"),
             //
-            createNewEntry("Standard", "Generic Connection Creation Tool", "Link Note", "Note", "Note Attachment", "Pin", "Select", "Text", "Unpin", "Zoom In", "Zoom Out", "[Separator]")
+            createNewEntry("Standard", "Generic Connection Creation Tool", "Representation Link", "Note", "Note Attachment", "Pin", "Select", "Text", "Unpin", "Zoom In", "Zoom Out", "[Separator]")
     //
     ));
 
@@ -111,7 +111,7 @@ public class PaletteManagerWithLayersWithExtensionTest extends AbstractPaletteMa
             //
             createNewEntry("SectionSharedWithOtherLayersA", "ToolL2-A-1"),
             //
-            createNewEntry("Standard", "Generic Connection Creation Tool", "Link Note", "Note", "Note Attachment", "Pin", "Select", "Text", "Unpin", "Zoom In", "Zoom Out", "[Separator]")
+            createNewEntry("Standard", "Generic Connection Creation Tool", "Representation Link", "Note", "Note Attachment", "Pin", "Select", "Text", "Unpin", "Zoom In", "Zoom Out", "[Separator]")
     //
     ));
 
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/LinkNoteFragmentModelCreationTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/LinkNoteFragmentModelCreationTest.java
index 16668c003b..858e8264cd 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/LinkNoteFragmentModelCreationTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/LinkNoteFragmentModelCreationTest.java
@@ -24,12 +24,12 @@ import org.eclipse.sirius.viewpoint.description.Viewpoint;
 import org.eclipse.ui.PartInitException;
 
 /**
- * Test the link note tool in a fragmented model. More link note tests can be
- * found in {@link NoteCreationTest}.
+ * Test the representation link tool in a fragmented model. More representation link tests can be found in
+ * {@link NoteCreationTest}.
  */
 public class LinkNoteFragmentModelCreationTest extends AbstractSiriusSwtBotGefTestCase {
 
-    private static final String LINK_NOTE_TOOL = "Link Note";
+    private static final String LINK_NOTE_TOOL = "Representation Link";
 
     private static final String REPRESENTATION_INSTANCE_NAME = "root package entities";
 
@@ -73,9 +73,8 @@ public class LinkNoteFragmentModelCreationTest extends AbstractSiriusSwtBotGefTe
     }
 
     /**
-     * This test creates a link note from the main diagram to the fragment
-     * diagram, and verifies that the diagram in the fragment can be opened by
-     * doubleclick on the link note.
+     * This test creates a representation link from the main diagram to the fragment diagram, and verifies that the
+     * diagram in the fragment can be opened by doubleclick on the representation link.
      * 
      * @throws Exception
      *             any test exception
@@ -87,9 +86,8 @@ public class LinkNoteFragmentModelCreationTest extends AbstractSiriusSwtBotGefTe
     }
 
     /**
-     * This test creates a link note from the fragment diagram to the main
-     * diagram and verifies that the main diagram can be opened by doubleclick
-     * on the link note.
+     * This test creates a representation link from the fragment diagram to the main diagram and verifies that the main
+     * diagram can be opened by doubleclick on the representation link.
      * 
      * @throws Exception
      *             any test exception
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/NoteCreationTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/NoteCreationTest.java
index 968d0b38bc..24feee2a02 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/NoteCreationTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/NoteCreationTest.java
@@ -80,7 +80,7 @@ public class NoteCreationTest extends AbstractSiriusSwtBotGefTestCase {
 
     private static final String NOTE_TOOL = "Note";
 
-    private static final String LINK_NOTE_TOOL = "Link Note";
+    private static final String LINK_NOTE_TOOL = "Representation Link";
 
     private static final String LINK_TARGET_NEW_NAME = "Renamed Representation";