[441666] Always use the 'Interpreter' view

The code for the old "Model Request Interpreter" view is still
available if really needed, but not declared as a view or used by
Sirius itself. Users that want to continue using it will need to
register it themselves.

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

3 files changed, 3 insertions, 16 deletions

diff --git a/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF
index 6aa423a45b..b4724730a1 100644
--- a/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF
@@ -20,7 +20,8 @@ Require-Bundle: org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",
  org.eclipse.jface.text;bundle-version="3.8.2",
  org.eclipse.equinox.frameworkadmin;bundle-version="2.0.100",
  org.eclipse.pde.core;bundle-version="3.8.1",
- org.eclipse.emf.edit.ui;bundle-version="2.8.0"
+ org.eclipse.emf.edit.ui;bundle-version="2.8.0",
+ org.eclipse.acceleo.ui.interpreter;bundle-version="3.7.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.sirius.editor.assist.content;version="2.0.4",
diff --git a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/perspectives/DesignerDesignPerspective.java b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/perspectives/DesignerDesignPerspective.java
index e79839d426..3a87397c47 100644
--- a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/perspectives/DesignerDesignPerspective.java
+++ b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/perspectives/DesignerDesignPerspective.java
@@ -11,14 +11,12 @@
 package org.eclipse.sirius.editor.tools.internal.perspectives;
 
 import org.eclipse.sirius.editor.tools.api.perspectives.DesignPerspective;
-import org.eclipse.sirius.ui.tools.api.views.interpreterview.InterpreterView;
 import org.eclipse.sirius.ui.tools.api.views.modelexplorerview.IModelExplorerView;
 import org.eclipse.sirius.ui.tools.internal.wizards.ModelingProjectWizard;
 import org.eclipse.sirius.ui.tools.internal.wizards.NewSessionWizard;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
-import org.eclipse.ui.PlatformUI;
 
 /**
  * A perspective for design.
@@ -76,12 +74,6 @@ public class DesignerDesignPerspective implements IPerspectiveFactory, DesignPer
     }
 
     private String getInterpreterViewID() {
-        // If acceleo 3 is present, the interpreter view is replaced by the
-        // acceleo one's.
-        if (PlatformUI.getWorkbench().getViewRegistry().find(ORG_ECLIPSE_ACCELEO_UI_INTERPRETER_VIEW) != null) {
-            return ORG_ECLIPSE_ACCELEO_UI_INTERPRETER_VIEW;
-        } else {
-            return InterpreterView.ID;
-        }
+        return ORG_ECLIPSE_ACCELEO_UI_INTERPRETER_VIEW;
     }
 }
diff --git a/plugins/org.eclipse.sirius.ui.ext/plugin.xml b/plugins/org.eclipse.sirius.ui.ext/plugin.xml
index c56ffe85a2..2bb3224172 100644
--- a/plugins/org.eclipse.sirius.ui.ext/plugin.xml
+++ b/plugins/org.eclipse.sirius.ui.ext/plugin.xml
@@ -19,12 +19,6 @@
             name="%category.sirius.name"/>
       <view
             category="org.eclipse.sirius.category"
-            class="org.eclipse.sirius.ui.tools.internal.views.interpreterview.DesignerInterpreterView"
-            icon="icons/full/others/information.gif"
-            id="org.eclipse.sirius.ui.tools.views.interpreterview"
-            name="%view.legacyInterpreter.name"/>
-      <view
-            category="org.eclipse.sirius.category"
             class="org.eclipse.sirius.ui.tools.internal.views.modelexplorer.ModelExplorerView"
             icon="icons/full/others/ModelExplorer.gif"
             id="org.eclipse.sirius.ui.tools.views.model.explorer"