[457355] Fix incorrect id and java qualified name for ExternalJavaAction

- PinElementsAction & UnpinElementsAction was in incorrect package and
their id in DiagramEnvironment.odesign was also incorrect.

Bug: 457355
Change-Id: I83370126da177ad382ff585876900a99a69910ea
Signed-off-by: Esteban Dugueperoux <esteban.dugueperoux@obeo.fr>

5 files changed, 29 insertions, 6 deletions

diff --git a/plugins/org.eclipse.sirius.diagram/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.diagram/META-INF/MANIFEST.MF
index 6d07bd9ca4..e881c8a78c 100644
--- a/plugins/org.eclipse.sirius.diagram/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.diagram/META-INF/MANIFEST.MF
@@ -82,10 +82,10 @@ Export-Package: org.eclipse.sirius.diagram;version="3.0.0",
  org.eclipse.sirius.diagram.tools.api.preferences;version="2.0.4",
  org.eclipse.sirius.diagram.tools.api.refresh;version="2.0.4",
  org.eclipse.sirius.diagram.tools.api.validation.constraint;version="2.0.4",
+ org.eclipse.sirius.diagram.tools.internal.actions.pinning;version="2.0.0";x-internal:=true,
  org.eclipse.sirius.diagram.tools.internal.command;x-internal:=true;version="3.0.0",
  org.eclipse.sirius.diagram.tools.internal.command.builders;x-internal:=true;version="2.0.4",
  org.eclipse.sirius.diagram.tools.internal.command.reconnect;x-internal:=true;version="2.0.4",
- org.eclipse.sirius.diagram.tools.internal.pinning.actions;x-internal:=true;version="2.0.0",
  org.eclipse.sirius.diagram.tools.internal.preferences;x-internal:=true;version="2.0.4",
  org.eclipse.sirius.diagram.tools.internal.validation.constraints;x-internal:=true;version="2.0.4",
  org.eclipse.sirius.diagram.tools.internal.validation.description.constraints;x-internal:=true;version="2.1.0",
diff --git a/plugins/org.eclipse.sirius.diagram/model/DiagramEnvironment.odesign b/plugins/org.eclipse.sirius.diagram/model/DiagramEnvironment.odesign
index 775d79abbd..009e7df08f 100644
--- a/plugins/org.eclipse.sirius.diagram/model/DiagramEnvironment.odesign
+++ b/plugins/org.eclipse.sirius.diagram/model/DiagramEnvironment.odesign
@@ -5,7 +5,7 @@
       <element name="element"/>
       <elementView name="elementView"/>
       <initialOperation>
-        <firstModelOperations xsi:type="tool_1:ExternalJavaAction" name="Pin" id="org.eclipse.sirius.diagram.ui.tools.internal.actions.pinning.pinElementsActionId">
+        <firstModelOperations xsi:type="tool_1:ExternalJavaAction" name="Pin" id="org.eclipse.sirius.diagram.tools.internal.actions.pinning.pinElementsActionId">
           <parameters name="view" value="var:elementView"/>
         </firstModelOperations>
       </initialOperation>
@@ -14,7 +14,7 @@
       <element name="element"/>
       <elementView name="elementView"/>
       <initialOperation>
-        <firstModelOperations xsi:type="tool_1:ExternalJavaAction" name="Unpin" id="org.eclipse.sirius.diagram.ui.tools.internal.actions.pinning.unpinElementsActionId">
+        <firstModelOperations xsi:type="tool_1:ExternalJavaAction" name="Unpin" id="org.eclipse.sirius.diagram.tools.internal.actions.pinning.unpinElementsActionId">
           <parameters name="view" value="var:elementView"/>
         </firstModelOperations>
       </initialOperation>
diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/pinning/actions/PinElementsAction.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/actions/pinning/PinElementsAction.java
index 808db7864b..a1e535eeff 100644
--- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/pinning/actions/PinElementsAction.java
+++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/actions/pinning/PinElementsAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.diagram.tools.internal.pinning.actions;
+package org.eclipse.sirius.diagram.tools.internal.actions.pinning;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/pinning/actions/UnpinElementsAction.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/actions/pinning/UnpinElementsAction.java
index afe9e345f9..f34bc094dd 100644
--- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/pinning/actions/UnpinElementsAction.java
+++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/actions/pinning/UnpinElementsAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.diagram.tools.internal.pinning.actions;
+package org.eclipse.sirius.diagram.tools.internal.actions.pinning;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/PinnedElementsTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/PinnedElementsTest.java
index 2fedb0dc0c..a25d6333f9 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/PinnedElementsTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/PinnedElementsTest.java
@@ -23,6 +23,7 @@ import org.eclipse.sirius.tests.swtbot.sequence.condition.CheckNoOpenedSessionIn
 import org.eclipse.sirius.tests.swtbot.support.api.business.UIResource;
 import org.eclipse.sirius.tests.swtbot.support.api.view.DesignerViews;
 import org.eclipse.sirius.tests.swtbot.support.utils.SWTBotUtils;
+import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart;
 
 /**
  * Tests for the "pin elements" feature.
@@ -31,7 +32,7 @@ import org.eclipse.sirius.tests.swtbot.support.utils.SWTBotUtils;
  */
 public class PinnedElementsTest extends AbstractPinnedElementsTest {
 
-    protected static final String VIEWPOINT_NAME = "Tests Cases for ticket #1825 (partial layout)";
+    private static final String VIEWPOINT_NAME = "Tests Cases for ticket #1825 (partial layout)";
 
     private static final String MODEL = "model/tc1825.ecore";
 
@@ -116,6 +117,28 @@ public class PinnedElementsTest extends AbstractPinnedElementsTest {
      * @throws Exception
      *             if an error occurred.
      */
+    public void testPinUnpinElementFromPalette() throws Exception {
+        openDiagram(VIEWPOINT_NAME, "Nodes, Containers and Lists (flat)", "Flat_All_Unpinned");
+        IDiagramElementEditPart class1 = (IDiagramElementEditPart) editor.getEditPart("Class1").part();
+        assertThat(class1, not(isPinnedMatcher()));
+        SWTBotGefEditPart class1EditPartBot = editor.getSelectableEditPart("Class1");
+        // Test Pin
+        editor.activateTool("Pin");
+        class1EditPartBot.click();
+        bot.waitUntil(waitForPinned(class1));
+        assertThat(class1, isPinnedMatcher());
+
+        // Test Unpin
+        editor.activateTool("Unpin");
+        class1EditPartBot.click();
+        bot.waitUntil(waitForNotPinned(class1));
+        assertThat(class1, not(isPinnedMatcher()));
+    }
+
+    /**
+     * @throws Exception
+     *             if an error occurred.
+     */
     public void testPinnedAttributeIsPersistent() throws Exception {
         openDiagram(VIEWPOINT_NAME, "Nodes, Containers and Lists (flat)", "Flat_All_Unpinned");
         IDiagramElementEditPart class1 = (IDiagramElementEditPart) editor.getEditPart("Class1").part();