[517504] Remove viewpoints selection from model dependency loading

Loading a model dependency from "Add" button of the models block of aird
editor will no more open the viewpoint selection dialog after the
loading.

Bug: 517504
Change-Id: I06ff3a642d2408aa22f3b621773bccf79e20873f
Signed-off-by: pguilet <pierre.guilet@obeo.fr>

2 files changed, 22 insertions, 2 deletions

diff --git a/plugins/org.eclipse.sirius.ui.editor/src/org/eclipse/sirius/ui/editor/internal/graphicalcomponents/GraphicalSemanticModelsHandler.java b/plugins/org.eclipse.sirius.ui.editor/src/org/eclipse/sirius/ui/editor/internal/graphicalcomponents/GraphicalSemanticModelsHandler.java
index e83687ff7e..e15e2af723 100644
--- a/plugins/org.eclipse.sirius.ui.editor/src/org/eclipse/sirius/ui/editor/internal/graphicalcomponents/GraphicalSemanticModelsHandler.java
+++ b/plugins/org.eclipse.sirius.ui.editor/src/org/eclipse/sirius/ui/editor/internal/graphicalcomponents/GraphicalSemanticModelsHandler.java
@@ -320,7 +320,7 @@ public class GraphicalSemanticModelsHandler implements SessionListener, SessionM
             createAndRegisterNewSemanticModel();
         });
         addButton(buttonsComposite, Messages.UI_SessionEditor_models_button_newSemanticModel, () -> {
-            AddModelDependencyAction addModelDependencyAction = new AddModelDependencyAction(session);
+            AddModelDependencyAction addModelDependencyAction = new AddModelDependencyAction(session, false);
             addModelDependencyAction.run();
         });
         removeSemanticModelOrRepresentationButton = addButton(buttonsComposite, Messages.UI_SessionEditor_models_button_removeSemanticModel, () -> {
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/analysis/AddModelDependencyAction.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/analysis/AddModelDependencyAction.java
index 179197e21b..d714f156d3 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/analysis/AddModelDependencyAction.java
+++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/analysis/AddModelDependencyAction.java
@@ -47,16 +47,36 @@ public class AddModelDependencyAction extends Action {
     Session session;
 
     /**
+     * True if the viewpoints selection windows should be open after adding the model dependency to the session. False
+     * otherwise.
+     */
+    private boolean openViewpointSelectionAfterAddition;
+
+    /**
      * Creates a new instance of this action.
      * 
      * @param session
      *            the session for which we will add a model dependency
      */
     public AddModelDependencyAction(Session session) {
+        this(session, true);
+    }
+
+    /**
+     * Creates a new instance of this action.
+     * 
+     * @param session
+     *            the session for which we will add a model dependency
+     * @param openViewpointSelectionAfterAddition
+     *            true if the viewpoints selection windows should be open after adding the model dependency to the
+     *            session. False otherwise.
+     */
+    public AddModelDependencyAction(Session session, boolean openViewpointSelectionAfterAddition) {
         super(Messages.AddModelDependencyAction_title);
         final ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/others/add.gif"); //$NON-NLS-1$
         setImageDescriptor(descriptor);
         this.session = session;
+        this.openViewpointSelectionAfterAddition = openViewpointSelectionAfterAddition;
     }
 
     @Override
@@ -88,7 +108,7 @@ public class AddModelDependencyAction extends Action {
                     new ProgressMonitorDialog(PlatformUI.getWorkbench().getDisplay().getActiveShell()).run(true, false, semanticResourceAdditionOperation);
                     Collection<Object> results = semanticResourceAdditionOperation.getResults();
                     for (Object result : results) {
-                        if (result instanceof Session) {
+                        if (result instanceof Session && openViewpointSelectionAfterAddition) {
                             // We open a viewpoint selection dialog
                             ViewpointSelection.openViewpointsSelectionDialog((Session) result);
                         }