[cleanup] Remove dead code

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

6 files changed, 2 insertions, 125 deletions

diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/session/ResourceVersionMismatchTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/session/ResourceVersionMismatchTest.java
index 8c73b0845e..3f72b75d22 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/session/ResourceVersionMismatchTest.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/session/ResourceVersionMismatchTest.java
@@ -180,10 +180,9 @@ public class ResourceVersionMismatchTest extends SiriusTestCase {
         setupFileVersionMismatch(true, false, false);
 
         // Test
-        Session session = null;
         try {
             clearErrors();
-            session = SessionManager.INSTANCE.openSession(sessionResourceURI, new NullProgressMonitor(), SiriusEditPlugin.getPlugin().getUiCallback());
+            SessionManager.INSTANCE.openSession(sessionResourceURI, new NullProgressMonitor(), SiriusEditPlugin.getPlugin().getUiCallback());
             fail(Messages.format(THROWN_EXCEPTION, new String[] { RuntimeException.class.getName(), "VSM" }));
         } catch (RuntimeException e) {
         }
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/EdgeSelectionTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/EdgeSelectionTest.java
index 781158dda9..e46f0b48fa 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/EdgeSelectionTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/EdgeSelectionTest.java
@@ -56,8 +56,6 @@ public class EdgeSelectionTest extends AbstractSiriusSwtBotGefTestCase {
 
     private static final String FILE_DIR = "/";
 
-    private static final String VIEWPOINT_NAME = "3358";
-
     private static final String DIAGRAM_INSTANCE_NAME = "diagram_3358";
 
     private static final String DIAGRAM_DESCRIPTION = "diagram_3358";
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/ExecutionMove2Tests.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/ExecutionMove2Tests.java
index 11d1b7e431..c2b3e9404f 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/ExecutionMove2Tests.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/ExecutionMove2Tests.java
@@ -18,7 +18,6 @@ import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.part.LifelineEd
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.part.SequenceMessageEditPart;
 import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.ext.base.Options;
-import org.eclipse.sirius.tests.swtbot.sequence.condition.CheckSequenceMessageEditPartMoved;
 import org.eclipse.sirius.tests.swtbot.support.api.condition.CheckEditPartMoved;
 import org.eclipse.swtbot.eclipse.gef.finder.matchers.IsInstanceOf;
 import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefConnectionEditPart;
@@ -180,14 +179,6 @@ public class ExecutionMove2Tests extends AbstractDefaultModelSequenceTests {
         ICondition conditionE3 = new CheckEditPartMoved(e3Bot);
         ICondition conditionE4 = new CheckEditPartMoved(e4Bot);
         ICondition conditionE5 = new CheckEditPartMoved(e5Bot);
-        
-        ICondition conditionReadMessage2 = new CheckSequenceMessageEditPartMoved(readMessage2Bot);
-        ICondition conditionReadMessage3 = new CheckSequenceMessageEditPartMoved(readMessage3Bot);
-        ICondition conditionReadMessage4 = new CheckSequenceMessageEditPartMoved(readMessage4Bot);
-        ICondition conditionReadMessage5 = new CheckSequenceMessageEditPartMoved(readMessage5Bot);
-        ICondition conditionReadMessage6 = new CheckSequenceMessageEditPartMoved(readMessage6Bot);
-        ICondition conditionReadMessage7 = new CheckSequenceMessageEditPartMoved(readMessage7Bot);
-        
         editor.drag(e3Bot, e3Bounds.x, newY);
         
         bot.waitUntil(conditionE1);
@@ -195,18 +186,6 @@ public class ExecutionMove2Tests extends AbstractDefaultModelSequenceTests {
         bot.waitUntil(conditionE3);
         bot.waitUntil(conditionE4);
         bot.waitUntil(conditionE5);
-        
-        /*
-         * Waiting conditions about MessageEditPart don't work correctly.
-         */
-        
-//        bot.waitUntil(conditionReadMessage2);
-//        bot.waitUntil(conditionReadMessage3);
-//        bot.waitUntil(conditionReadMessage4);
-//        bot.waitUntil(conditionReadMessage5);
-//        bot.waitUntil(conditionReadMessage6);
-//        bot.waitUntil(conditionReadMessage7);
-        
 
         // On lifeline 'a'
         int dyShift = e3Bounds.height;
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/ExecutionMove4Tests.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/ExecutionMove4Tests.java
index 7670549c39..bcbdd7c530 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/ExecutionMove4Tests.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/ExecutionMove4Tests.java
@@ -21,7 +21,6 @@ import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.part.SequenceDi
 import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.ext.base.Options;
 import org.eclipse.sirius.sample.interactions.Interaction;
-import org.eclipse.sirius.tests.swtbot.sequence.condition.CheckSequenceMessageEditPartMoved;
 import org.eclipse.sirius.tests.swtbot.support.api.condition.CheckEditPartMoved;
 import org.eclipse.sirius.tests.swtbot.support.api.condition.CheckEditPartResized;
 import org.eclipse.sirius.tests.swtbot.support.api.matcher.WithSemantic;
@@ -194,31 +193,11 @@ public class ExecutionMove4Tests extends AbstractDefaultModelSequenceTests {
         
         ICondition conditionE2 = new CheckEditPartMoved(e2Bot);
         ICondition conditionE3 = new CheckEditPartResized(e3Bot);
-        
-        ICondition conditionCreateMessageOfBBot = new CheckSequenceMessageEditPartMoved(createMessageOfBBot);
-        ICondition conditionCreateMessageOfDBot = new CheckSequenceMessageEditPartMoved(createMessageOfDBot);
-        ICondition conditionReadMessageM5Bot = new CheckSequenceMessageEditPartMoved(readMessageM5Bot);
-        ICondition conditionReadMessageM6Bot = new CheckSequenceMessageEditPartMoved(readMessageM6Bot);
-        ICondition conditionReadMessageM7Bot = new CheckSequenceMessageEditPartMoved(readMessageM7Bot);
-        ICondition conditionDestroyMessageOfBBot = new CheckSequenceMessageEditPartMoved(destroyMessageOfBBot);
-        ICondition conditionDestroyMessageOfDBot = new CheckSequenceMessageEditPartMoved(destroyMessageOfDBot);
-        
+
         editor.drag(e1Bot, e1Bounds.x, newY);
         
         bot.waitUntil(conditionE2);
         bot.waitUntil(conditionE3);
-        
-        /*
-         * Waiting conditions about MessageEditPart don't work correctly.
-         */
-        
-//        bot.waitUntil(conditionCreateMessageOfBBot);
-//        bot.waitUntil(conditionCreateMessageOfDBot);
-//        bot.waitUntil(conditionReadMessageM5Bot);
-//        bot.waitUntil(conditionReadMessageM6Bot);
-//        bot.waitUntil(conditionReadMessageM7Bot);
-//        bot.waitUntil(conditionDestroyMessageOfBBot);
-//        bot.waitUntil(conditionDestroyMessageOfDBot);
 
         e1Bot = e3Bot.descendants(WithSemantic.withSemantic(e1)).get(0);
 
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/ExecutionMove5Tests.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/ExecutionMove5Tests.java
index 72dcfcc81c..df0aae3afd 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/ExecutionMove5Tests.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/ExecutionMove5Tests.java
@@ -21,8 +21,6 @@ import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.part.SequenceMe
 import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.ext.base.Options;
 import org.eclipse.sirius.sample.interactions.Interaction;
-import org.eclipse.sirius.tests.swtbot.sequence.condition.CheckSequenceMessageEditPartMoved;
-import org.eclipse.sirius.tests.swtbot.sequence.condition.CheckSequenceMessageEditPartResized;
 import org.eclipse.sirius.tests.swtbot.support.api.condition.CheckEditPartMoved;
 import org.eclipse.sirius.tests.swtbot.support.api.condition.CheckEditPartResized;
 import org.eclipse.sirius.tests.swtbot.support.api.matcher.WithSemantic;
@@ -245,20 +243,6 @@ public class ExecutionMove5Tests extends AbstractDefaultModelSequenceTests {
         ICondition conditionE5 = new CheckEditPartMoved(e5Bot);
         ICondition conditionE6 = new CheckEditPartMoved(e6Bot);
 
-        ICondition conditionCallMessageOnE1 = new CheckSequenceMessageEditPartMoved(callMessageOnE1Bot);
-        ICondition conditionCallMessageOnE2 = new CheckSequenceMessageEditPartMoved(callMessageOnE2Bot);
-        ICondition conditionCallMessageOnE3 = new CheckSequenceMessageEditPartMoved(callMessageOnE3Bot);
-        ICondition conditionCallMessageOnE4 = new CheckSequenceMessageEditPartMoved(callMessageOnE4Bot);
-        ICondition conditionCallMessageOnE5 = new CheckSequenceMessageEditPartMoved(callMessageOnE5Bot);
-        ICondition conditionCallMessageOnE6 = new CheckSequenceMessageEditPartMoved(callMessageOnE6Bot);
-
-        ICondition conditionReturnMessageOfE1 = new CheckSequenceMessageEditPartMoved(returnMessageOfE1Bot);
-        ICondition conditionReturnMessageOfE2 = new CheckSequenceMessageEditPartMoved(returnMessageOfE2Bot);
-        ICondition conditionReturnMessageOfE3 = new CheckSequenceMessageEditPartMoved(returnMessageOfE3Bot);
-        ICondition conditionReturnMessageOfE4 = new CheckSequenceMessageEditPartMoved(returnMessageOfE4Bot);
-        ICondition conditionReturnMessageOfE5 = new CheckSequenceMessageEditPartMoved(returnMessageOfE5Bot);
-        ICondition conditionReturnMessageOfE6 = new CheckSequenceMessageEditPartMoved(returnMessageOfE6Bot);
-
         editor.drag(e2Bot, e2Bounds.x, newY);
 
         bot.waitUntil(conditionE1);
@@ -268,24 +252,6 @@ public class ExecutionMove5Tests extends AbstractDefaultModelSequenceTests {
         bot.waitUntil(conditionE5);
         bot.waitUntil(conditionE6);
 
-        /*
-         * Waiting conditions about MessageEditPart don't work correctly.
-         */
-
-        // bot.waitUntil(conditionCallMessageOnE1);
-        // bot.waitUntil(conditionCallMessageOnE2);
-        // bot.waitUntil(conditionCallMessageOnE3);
-        // bot.waitUntil(conditionCallMessageOnE4);
-        // bot.waitUntil(conditionCallMessageOnE5);
-        // bot.waitUntil(conditionCallMessageOnE6);
-
-        // bot.waitUntil(conditionReturnMessageOfE1);
-        // bot.waitUntil(conditionReturnMessageOfE2);
-        // bot.waitUntil(conditionReturnMessageOfE3);
-        // bot.waitUntil(conditionReturnMessageOfE4);
-        // bot.waitUntil(conditionReturnMessageOfE5);
-        // bot.waitUntil(conditionReturnMessageOfE6);
-
         int dyShift = e2Bounds.height;
         assertEquals(e1Bounds.getTranslated(0, dyShift), editor.getBounds(e1Bot));
         assertEquals(e2Bounds.getTranslated(0, dy), editor.getBounds(e2Bot));
@@ -324,19 +290,6 @@ public class ExecutionMove5Tests extends AbstractDefaultModelSequenceTests {
         ICondition conditionE5 = new CheckEditPartMoved(e5Bot);
         ICondition conditionE6 = new CheckEditPartMoved(e6Bot);
 
-        ICondition conditionCallMessageOnE2 = new CheckSequenceMessageEditPartMoved(callMessageOnE2Bot);
-        ICondition conditionCallMessageOnE3 = new CheckSequenceMessageEditPartMoved(callMessageOnE3Bot);
-        ICondition conditionCallMessageOnE4 = new CheckSequenceMessageEditPartMoved(callMessageOnE4Bot);
-        ICondition conditionCallMessageOnE5 = new CheckSequenceMessageEditPartMoved(callMessageOnE5Bot);
-        ICondition conditionCallMessageOnE6 = new CheckSequenceMessageEditPartMoved(callMessageOnE6Bot);
-
-        ICondition conditionReturnMessageOfE1 = new CheckSequenceMessageEditPartMoved(returnMessageOfE1Bot);
-        ICondition conditionReturnMessageOfE2 = new CheckSequenceMessageEditPartMoved(returnMessageOfE2Bot);
-        ICondition conditionReturnMessageOfE3 = new CheckSequenceMessageEditPartMoved(returnMessageOfE3Bot);
-        ICondition conditionReturnMessageOfE4 = new CheckSequenceMessageEditPartMoved(returnMessageOfE4Bot);
-        ICondition conditionReturnMessageOfE5 = new CheckSequenceMessageEditPartMoved(returnMessageOfE5Bot);
-        ICondition conditionReturnMessageOfE6 = new CheckSequenceMessageEditPartMoved(returnMessageOfE6Bot);
-
         editor.drag(e2Bot, e2Bounds.x, newY);
 
         bot.waitUntil(conditionE1);
@@ -345,22 +298,6 @@ public class ExecutionMove5Tests extends AbstractDefaultModelSequenceTests {
         bot.waitUntil(conditionE5);
         bot.waitUntil(conditionE6);
 
-        /*
-         * Waiting conditions about MessageEditPart don't work correctly.
-         */
-        // bot.waitUntil(conditionCallMessageOnE2);
-        // bot.waitUntil(conditionCallMessageOnE3);
-        // bot.waitUntil(conditionCallMessageOnE4);
-        // bot.waitUntil(conditionCallMessageOnE5);
-        // bot.waitUntil(conditionCallMessageOnE6);
-
-        // bot.waitUntil(conditionReturnMessageOfE1);
-        // bot.waitUntil(conditionReturnMessageOfE2);
-        // bot.waitUntil(conditionReturnMessageOfE3);
-        // bot.waitUntil(conditionReturnMessageOfE4);
-        // bot.waitUntil(conditionReturnMessageOfE5);
-        // bot.waitUntil(conditionReturnMessageOfE6);
-
         e2Bot = e1Bot.descendants(WithSemantic.withSemantic(e2)).get(0);
 
         // On lifeline 'a'
@@ -401,23 +338,10 @@ public class ExecutionMove5Tests extends AbstractDefaultModelSequenceTests {
 
         ICondition conditionE3 = new CheckEditPartMoved(e3Bot);
 
-        ICondition conditionCallMessageOnE1Bot = new CheckSequenceMessageEditPartResized(callMessageOnE1Bot);
-        ICondition conditionCallMessageOnE3Bot = new CheckSequenceMessageEditPartMoved(callMessageOnE3Bot);
-        ICondition conditionReturnMessageOfE1Bot = new CheckSequenceMessageEditPartResized(returnMessageOfE1Bot);
-        ICondition conditionReturnMessageOfE3Bot = new CheckSequenceMessageEditPartMoved(returnMessageOfE3Bot);
-
         editor.drag(e3Bot, e3Bounds.x, newY);
 
         bot.waitUntil(conditionE3);
 
-        /*
-         * Waiting conditions about MessageEditPart don't work correctly.
-         */
-        // bot.waitUntil(conditionCallMessageOnE1Bot);
-        // bot.waitUntil(conditionCallMessageOnE3Bot);
-        // bot.waitUntil(conditionReturnMessageOfE1Bot);
-        // bot.waitUntil(conditionReturnMessageOfE3Bot);
-
         assertEquals(e1Bounds, editor.getBounds(e1Bot));
         assertEquals(e2Bounds, editor.getBounds(e2Bot));
         assertEquals(e3Bounds.getTranslated(0, dy), editor.getBounds(e3Bot));
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/description/AbstractInterpretedExpressionQuery.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/description/AbstractInterpretedExpressionQuery.java
index a87578d0fd..ebc7d609bf 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/description/AbstractInterpretedExpressionQuery.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/description/AbstractInterpretedExpressionQuery.java
@@ -152,8 +152,6 @@ public abstract class AbstractInterpretedExpressionQuery implements IInterpreted
      */
     protected IInterpretedExpressionTargetSwitch targetSwitch;
 
-    private boolean subvariablesBrowsingAuthorized = true;;
-
     /**
      * Default constructor.
      *