[516516] Remove implementation of the old interpreter view

The old "Model Request Interpreter" view has been superseded by the
"Interpreter" view from Acceleo 3, which now supports all the features
of the old (at least the ones that are actually used).

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

3 files changed, 0 insertions, 662 deletions

diff --git a/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF
index 3f8769a397..8d6fe3689c 100644
--- a/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF
@@ -83,7 +83,6 @@ Export-Package: org.eclipse.sirius.description.contribution.provider;version="2.
  org.eclipse.sirius.ui.tools.internal.views.common.navigator.adapters;version="2.0.4";x-internal:=true,
  org.eclipse.sirius.ui.tools.internal.views.common.navigator.filter;version="2.0.4";x-internal:=true,
  org.eclipse.sirius.ui.tools.internal.views.common.navigator.sorter;version="2.0.4";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.views.interpreterview;version="2.0.4";x-internal:=true,
  org.eclipse.sirius.ui.tools.internal.views.modelexplorer;version="2.2.0";x-internal:=true,
  org.eclipse.sirius.ui.tools.internal.views.modelexplorer.extension;version="2.0.4";x-internal:=true,
  org.eclipse.sirius.ui.tools.internal.views.modelexplorer.extension.tab;version="2.0.4";x-internal:=true,
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/interpreterview/DesignerInterpreterView.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/interpreterview/DesignerInterpreterView.java
deleted file mode 100644
index a29cbe1416..0000000000
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/interpreterview/DesignerInterpreterView.java
+++ /dev/null
@@ -1,603 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2015 THALES GLOBAL SERVICES and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.sirius.ui.tools.internal.views.interpreterview;
-
-import java.text.DecimalFormat;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.bindings.Trigger;
-import org.eclipse.jface.bindings.TriggerSequence;
-import org.eclipse.jface.bindings.keys.KeyStroke;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.fieldassist.ContentProposalAdapter;
-import org.eclipse.jface.fieldassist.TextContentAdapter;
-import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.sirius.business.api.componentization.ViewpointRegistry;
-import org.eclipse.sirius.business.api.session.Session;
-import org.eclipse.sirius.business.api.session.SessionManager;
-import org.eclipse.sirius.common.tools.api.interpreter.CompoundInterpreter;
-import org.eclipse.sirius.common.tools.api.interpreter.EvaluationException;
-import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter;
-import org.eclipse.sirius.common.tools.api.interpreter.IInterpreterSiriusVariables;
-import org.eclipse.sirius.common.tools.api.interpreter.IVariableStatusListener;
-import org.eclipse.sirius.common.tools.api.util.StringUtil;
-import org.eclipse.sirius.common.ui.tools.api.contentassist.ContentInstanceProposalProvider;
-import org.eclipse.sirius.ui.tools.internal.views.common.navigator.adapters.ModelDragTargetAdapter;
-import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.description.Viewpoint;
-import org.eclipse.sirius.viewpoint.provider.Messages;
-import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.widgets.Form;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.keys.IBindingService;
-import org.eclipse.ui.part.ViewPart;
-
-/**
- * An Eclipse view to launch model requests language requests and see the
- * results.
- *
- * @author cbrun
- */
-public class DesignerInterpreterView extends ViewPart {
-
-    private static final Transfer TRANSFER = LocalSelectionTransfer.getTransfer();
-
-    ITreeContentProvider contentProvider;
-
-    private String contentAssistBinding = "org.eclipse.ui.edit.text.contentAssist.proposals"; //$NON-NLS-1$
-
-    private String variableTag = "$"; //$NON-NLS-1$
-
-    /* user interface */
-    private Composite top;
-
-    private FormToolkit formToolkit;
-
-    private Section intepreterSection;
-
-    private Section variablesSection;
-
-    private Form interpreterForm;
-
-    private Text acceleoExpression;
-
-    private Tree valuesTree;
-
-    private TreeViewer valuesViewer;
-
-    private Form variablesForm;
-
-    private Button setVariableButton;
-
-    private Button unSetVariableButton;
-
-    private Tree variablesTree;
-
-    private TreeViewer variablesViewer;
-
-    private ILabelProvider labelProvider;
-
-    /** Action to add a dependency. */
-    private Action addDependencyAction;
-
-    /* business object */
-    private EObject current;
-
-    private final IInterpreter interpreter = CompoundInterpreter.createGenericInterpreter();
-
-    private ContentInstanceProposalProvider contentInstanceProposalProvider;
-
-    private final IVariableStatusListener variableListener = new IVariableStatusListener() {
-        @Override
-        public void notifyChanged(final Map<?, ?> variables) {
-            refreshVariables(variables);
-        }
-    };
-
-    private final ISelectionListener listener = new ISelectionListener() {
-        @Override
-        public void selectionChanged(final IWorkbenchPart part, final ISelection selection) {
-            if (selection instanceof IStructuredSelection) {
-                final Iterator<?> it = ((IStructuredSelection) selection).iterator();
-                while (it.hasNext()) {
-                    final Object obj = it.next();
-                    EObject foundEObject = null;
-                    if (obj instanceof EObject) {
-                        foundEObject = (EObject) obj;
-                    }
-                    if (foundEObject == null && obj instanceof IAdaptable) {
-                        foundEObject = ((IAdaptable) obj).getAdapter(EObject.class);
-                    }
-                    if (foundEObject != null) {
-                        TransactionalEditingDomain transactionalEditingDomain = TransactionUtil.getEditingDomain(foundEObject);
-                        if (current == null) {
-                            addContentAssist(transactionalEditingDomain);
-                        }
-                        current = foundEObject;
-                        contentInstanceProposalProvider.setCurrentEObject(current);
-                        handleNewExpression();
-                        break;
-                    }
-                }
-            }
-        }
-    };
-
-    private Action copyToClipboardAction;
-
-    ITreeContentProvider getContentProvider() {
-        if (contentProvider == null) {
-            contentProvider = new VariableContentProvider(SiriusEditPlugin.getPlugin().getItemProvidersAdapterFactory());
-        }
-        return contentProvider;
-    }
-
-    @Override
-    public void createPartControl(final Composite parent) {
-        getSite().getPage().addSelectionListener(listener);
-        final GridData gridData7 = new GridData();
-        gridData7.horizontalAlignment = GridData.FILL;
-        gridData7.grabExcessHorizontalSpace = true;
-        gridData7.horizontalSpan = 2;
-        gridData7.verticalAlignment = GridData.CENTER;
-        final GridLayout gridLayout = new GridLayout();
-        gridLayout.numColumns = 2;
-        top = new Composite(parent, SWT.NONE);
-        top.setLayout(gridLayout);
-
-        labelProvider = new AdapterFactoryLabelProvider(SiriusEditPlugin.getPlugin().getItemProvidersAdapterFactory());
-
-        createIntepreterSection();
-        createVariablesSection();
-
-        //
-        // Creates the actions
-        createActions();
-        createToolbarButtons();
-
-        //
-        // Init interpreter
-        interpreter.addVariableStatusListener(this.variableListener);
-    }
-
-    @Override
-    public void setFocus() {
-        if (this.top != null) {
-            this.top.getParent().setFocus();
-        }
-    }
-
-    @Override
-    public void dispose() {
-        getSite().getPage().removeSelectionListener(listener);
-        if (interpreter != null) {
-            interpreter.removeVariableStatusListener(variableListener);
-            interpreter.dispose();
-        }
-        top.dispose();
-        formToolkit.dispose();
-        intepreterSection.dispose();
-        variablesSection.dispose();
-        interpreterForm.dispose();
-        acceleoExpression.dispose();
-        valuesTree.dispose();
-        variablesForm.dispose();
-        setVariableButton.dispose();
-        unSetVariableButton.dispose();
-        variablesTree.dispose();
-        labelProvider.dispose();
-    }
-
-    /**
-     * Creates the action of the view.
-     */
-    private void createActions() {
-        this.addDependencyAction = new Action(Messages.DesignerInterpreterView_addDependencyButton) {
-            @Override
-            public void run() {
-                final InputDialog inputDependency = new InputDialog(getSite().getShell(), Messages.DesignerInterpreterView_addDependencyDialogTitle,
-                        Messages.DesignerInterpreterView_addDependencyDialogMessage, "", null); //$NON-NLS-1$
-                inputDependency.setBlockOnOpen(true);
-                final int result = inputDependency.open();
-                if (result == Window.OK) {
-                    final String dependency = inputDependency.getValue();
-                    if (dependency != null && !StringUtil.isEmpty(dependency)) {
-                        // Look for available odesign file paths, to be able to
-                        // resolve available dependencies.
-                        final List<String> filePaths = new ArrayList<String>();
-                        for (final Viewpoint vp : ViewpointRegistry.getInstance().getViewpoints()) {
-                            Resource vpResource = vp.eResource();
-                            if (vpResource != null) {
-                                filePaths.add(vpResource.getURI().toPlatformString(true));
-                            }
-                        }
-                        interpreter.setProperty(IInterpreter.FILES, filePaths);
-                        interpreter.addImport(dependency);
-                    }
-                }
-            }
-
-        };
-        this.copyToClipboardAction = new Action(Messages.DesignerInterpreterView_copyToClipboardButton) {
-            @Override
-            public void run() {
-                StringBuilder sb = new StringBuilder();
-                sb.append(MessageFormat.format(Messages.DesignerInterpreterView_copyToClipboardResult, acceleoExpression.getText(), valuesTree.getItemCount())).append("\n\n"); //$NON-NLS-1$
-                for (TreeItem item : valuesTree.getItems()) {
-                    sb.append("- ").append(item.getText()).append("\n"); //$NON-NLS-1$ //$NON-NLS-2$
-                }
-                Clipboard cb = new Clipboard(getSite().getShell().getDisplay());
-                TextTransfer textTransfer = TextTransfer.getInstance();
-                cb.setContents(new Object[] { sb.toString() }, new Transfer[] { textTransfer });
-            }
-        };
-    }
-
-    /**
-     * Create toolbar buttons.
-     */
-    private void createToolbarButtons() {
-        getViewSite().getActionBars().getToolBarManager().add(this.addDependencyAction);
-        getViewSite().getActionBars().getToolBarManager().add(this.copyToClipboardAction);
-    }
-
-    /**
-     * This method initializes formToolkit
-     *
-     * @return org.eclipse.ui.forms.widgets.FormToolkit
-     */
-    private FormToolkit getFormToolkit() {
-        if (formToolkit == null) {
-            formToolkit = new FormToolkit(Display.getCurrent());
-        }
-        return formToolkit;
-    }
-
-    /**
-     * This method initializes intepreterSection
-     *
-     */
-    private void createIntepreterSection() {
-        final GridData gridData1 = new GridData();
-        gridData1.horizontalAlignment = GridData.FILL;
-        gridData1.grabExcessHorizontalSpace = true;
-        gridData1.grabExcessVerticalSpace = true;
-        gridData1.verticalAlignment = GridData.FILL;
-        intepreterSection = getFormToolkit().createSection(top, 0);
-        createInterpreterForm();
-        intepreterSection.setLayoutData(gridData1);
-        intepreterSection.setClient(interpreterForm);
-    }
-
-    /**
-     * This method initializes variablesSection
-     *
-     */
-    private void createVariablesSection() {
-        final GridData gridData = new GridData();
-        gridData.grabExcessHorizontalSpace = false;
-        gridData.verticalAlignment = GridData.FILL;
-        gridData.widthHint = 150;
-        gridData.grabExcessVerticalSpace = true;
-        gridData.horizontalAlignment = GridData.FILL;
-        variablesSection = getFormToolkit().createSection(top, 0);
-        variablesSection.setExpanded(true);
-        variablesSection.setText(Messages.DesignerInterpreterView_variablesSection);
-        createVariablesForm();
-        variablesSection.setLayoutData(gridData);
-        variablesSection.setClient(variablesForm);
-    }
-
-    /**
-     * This method initializes interpreterForm
-     */
-    private void createInterpreterForm() {
-        final GridData gridData3 = new GridData();
-        gridData3.grabExcessHorizontalSpace = true;
-        gridData3.horizontalAlignment = GridData.FILL;
-        gridData3.verticalAlignment = GridData.FILL;
-        gridData3.grabExcessVerticalSpace = true;
-        final GridData gridData2 = new GridData();
-        gridData2.grabExcessHorizontalSpace = true;
-        gridData2.verticalAlignment = GridData.CENTER;
-        gridData2.horizontalAlignment = GridData.FILL;
-        interpreterForm = getFormToolkit().createForm(intepreterSection);
-        getFormToolkit().decorateFormHeading(interpreterForm);
-        interpreterForm.setText(Messages.DesignerInterpreterView_requestsInterpreter);
-        acceleoExpression = getFormToolkit().createText(interpreterForm.getBody(), null, SWT.SINGLE | SWT.BORDER);
-        acceleoExpression.setLayoutData(gridData2);
-        acceleoExpression.addModifyListener(new ModifyListener() {
-            @Override
-            public void modifyText(final ModifyEvent e) {
-                handleNewExpression();
-            }
-        });
-
-        valuesTree = new Tree(interpreterForm.getBody(), SWT.NONE | SWT.BORDER | SWT.MULTI);
-        valuesTree.setLayoutData(gridData3);
-        valuesViewer = new TreeViewer(valuesTree);
-        interpreterForm.getBody().setLayout(new GridLayout());
-        valuesViewer.setContentProvider(getContentProvider());
-        valuesViewer.setLabelProvider(labelProvider);
-        valuesViewer.addDoubleClickListener(new IDoubleClickListener() {
-            @Override
-            public void doubleClick(final DoubleClickEvent event) {
-                if (event.getSelection() instanceof IStructuredSelection) {
-                    addVariable(((IStructuredSelection) event.getSelection()).toList());
-                }
-            }
-        });
-
-        /* Configure viewer drag behavior */
-        final Transfer[] transfers = new Transfer[] { DesignerInterpreterView.TRANSFER };
-        final int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
-        valuesViewer.addDragSupport(dndOperations, transfers, new ModelDragTargetAdapter(valuesViewer));
-    }
-
-    private void addVariable(final List<?> list) {
-        if (list.size() > 0 && interpreter != null) {
-            final InputDialog askSiriusName = new InputDialog(Display.getDefault().getActiveShell(), Messages.DesignerInterpreterView_variableName, Messages.DesignerInterpreterView_typeVariableName,
-                    IInterpreterSiriusVariables.ELEMENT, new IInputValidator() {
-                        @Override
-                        public String isValid(final String newText) {
-                            return null;
-                        }
-                    });
-            if (askSiriusName.open() == Window.OK) {
-                if (list.size() == 1) {
-                    if (askSiriusName.getValue().startsWith(variableTag)) {
-                        interpreter.setVariable(askSiriusName.getValue().substring(1), list.get(0));
-                    } else {
-                        interpreter.setVariable(askSiriusName.getValue(), list.get(0));
-                    }
-                } else {
-                    if (askSiriusName.getValue().startsWith(variableTag)) {
-                        interpreter.setVariable(askSiriusName.getValue().substring(1), list);
-                    } else {
-                        interpreter.setVariable(askSiriusName.getValue(), list);
-                    }
-                }
-            }
-        }
-    }
-
-    private void refreshVariables(final Map<?, ?> variables) {
-        variablesViewer.setInput(variables);
-    }
-
-    private void handleNewExpression() {
-        if (interpreter != null && current != null) {
-            try {
-                final ECrossReferenceAdapter crosser = retrieveCrosser(current);
-                if (crosser != null) {
-                    interpreter.setCrossReferencer(crosser);
-                }
-                final Resource resource = current.eResource();
-                if (resource != null) {
-                    final String path = resource.getURI().toPlatformString(true);
-                    interpreter.setProperty("file", path); //$NON-NLS-1$
-                }
-
-                final long now = new Date().getTime();
-
-                final Object result = interpreter.evaluate(current, acceleoExpression.getText());
-                final long ellapseTime = new Date().getTime() - now;
-                final int numberOfResults = handleExpressionResult(result);
-                final DecimalFormat decimalFormat = new DecimalFormat("###,###,###.###"); //$NON-NLS-1$
-                this.interpreterForm.setMessage(MessageFormat.format(Messages.DesignerInterpreterView_evaluationResult, numberOfResults, decimalFormat.format(ellapseTime / (double) 1000)),
-                        IMessageProvider.INFORMATION);
-            } catch (final EvaluationException e) {
-                this.interpreterForm.setMessage(MessageFormat.format(Messages.DesignerInterpreterView_invalidExpressionError, e.getMessage()), IMessageProvider.ERROR);
-            }
-        }
-    }
-
-    private ECrossReferenceAdapter retrieveCrosser(final EObject cur) {
-        ECrossReferenceAdapter result = null;
-        EObject semantic = cur;
-        Session sess = null;
-        if (cur instanceof DSemanticDecorator) {
-            semantic = ((DSemanticDecorator) cur).getTarget();
-        }
-        if (semantic != null) {
-            sess = SessionManager.INSTANCE.getSession(semantic);
-        }
-        if (sess != null) {
-            result = sess.getSemanticCrossReferencer();
-        }
-        if (result == null) {
-            result = ECrossReferenceAdapter.getCrossReferenceAdapter(cur);
-        }
-        return result;
-    }
-
-    private Integer handleExpressionResult(final Object result) {
-        if (result != null) {
-            final Collection<Object> input;
-            if (result instanceof Collection) {
-                input = (Collection) result;
-            } else {
-                input = new ArrayList<Object>(1);
-                input.add(result);
-            }
-            this.valuesViewer.setInput(input);
-            return input.size();
-        } else {
-            this.valuesViewer.setInput(null);
-            return 0;
-        }
-
-    }
-
-    /**
-     * This method initializes variablesForm
-     *
-     */
-    private void createVariablesForm() {
-        final GridData gridData6 = new GridData();
-        gridData6.horizontalAlignment = GridData.FILL;
-        gridData6.grabExcessHorizontalSpace = true;
-        gridData6.grabExcessVerticalSpace = true;
-        gridData6.horizontalSpan = 2;
-        gridData6.verticalAlignment = GridData.FILL;
-        gridData6.widthHint = 150;
-        final GridData gridData5 = new GridData();
-        gridData5.horizontalAlignment = GridData.CENTER;
-        gridData5.verticalAlignment = GridData.CENTER;
-        final GridData gridData4 = new GridData();
-        gridData4.horizontalAlignment = GridData.CENTER;
-        gridData4.verticalAlignment = GridData.CENTER;
-        final GridLayout gridLayout1 = new GridLayout();
-        gridLayout1.numColumns = 2;
-        gridLayout1.makeColumnsEqualWidth = true;
-
-        variablesForm = getFormToolkit().createForm(variablesSection);
-        variablesForm.getBody().setLayout(gridLayout1);
-        variablesForm.setText(Messages.DesignerInterpreterView_variablesSection);
-        getFormToolkit().decorateFormHeading(variablesForm);
-
-        setVariableButton = getFormToolkit().createButton(variablesForm.getBody(), Messages.DesignerInterpreterView_setButton, SWT.PUSH);
-        setVariableButton.setLayoutData(gridData4);
-        setVariableButton.addMouseListener(new MouseListener() {
-            @Override
-            public void mouseDoubleClick(final MouseEvent arg0) {
-                // Nothing happen
-            }
-
-            @Override
-            public void mouseDown(final MouseEvent arg0) {
-                // Nothing happen
-            }
-
-            @Override
-            public void mouseUp(final MouseEvent arg0) {
-                // Behaviour of the Set button is to save as a variable the
-                // selection in the valuesViewer
-                final ISelection selection = valuesViewer.getSelection();
-                if (!selection.isEmpty() && selection instanceof TreeSelection) {
-                    final TreeSelection treeSelection = (TreeSelection) selection;
-                    addVariable(treeSelection.toList());
-                }
-            }
-        });
-        unSetVariableButton = getFormToolkit().createButton(variablesForm.getBody(), Messages.DesignerInterpreterView_unsetButton, SWT.PUSH);
-        unSetVariableButton.setLayoutData(gridData5);
-        unSetVariableButton.addMouseListener(new MouseListener() {
-            @Override
-            public void mouseDoubleClick(final MouseEvent arg0) {
-                // Nothing happens
-            }
-
-            @Override
-            public void mouseDown(final MouseEvent arg0) {
-                // Nothing happens
-            }
-
-            @Override
-            public void mouseUp(final MouseEvent arg0) {
-                // Behaviour of the unSet button is to remove the variable
-                // selected in the variablesViewer
-                final ISelection selection = variablesViewer.getSelection();
-
-                if (!selection.isEmpty() && selection instanceof TreeSelection) {
-                    final TreeSelection treeSelection = (TreeSelection) selection;
-                    final Object[] selections = treeSelection.toArray();
-                    for (Object object : selections) {
-                        if (object instanceof Entry) {
-                            final Entry<?, ?> entry = (Entry<?, ?>) object;
-                            if (entry.getKey().toString().startsWith(variableTag)) {
-                                interpreter.unSetVariable(entry.getKey().toString().substring(1));
-                            } else {
-                                interpreter.unSetVariable(entry.getKey().toString());
-                            }
-                        }
-                    }
-                }
-            }
-
-        });
-        variablesTree = getFormToolkit().createTree(variablesForm.getBody(), SWT.BORDER);
-        variablesTree.setLayoutData(gridData6);
-        variablesViewer = new TreeViewer(variablesTree);
-        variablesViewer.setContentProvider(getContentProvider());
-        variablesViewer.setLabelProvider(labelProvider);
-    }
-
-    private void addContentAssist(TransactionalEditingDomain transactionalEditingDomain) {
-        // Add the completion for OCL and Acceleo expression
-        contentInstanceProposalProvider = new ContentInstanceProposalProvider(interpreter);
-        contentInstanceProposalProvider.setEditingDomain(transactionalEditingDomain);
-
-        final IBindingService bindingService = PlatformUI.getWorkbench().getService(IBindingService.class);
-        if (bindingService.getActiveBindingsFor(contentAssistBinding) != null && bindingService.getActiveBindingsFor(contentAssistBinding).length > 0) {
-            final TriggerSequence sequence = bindingService.getActiveBindingsFor(contentAssistBinding)[0];
-            KeyStroke keyStroke = getKeyStroke(sequence);
-            new ContentProposalAdapter(acceleoExpression, new TextContentAdapter(), contentInstanceProposalProvider, keyStroke, null);
-        }
-    }
-
-    private KeyStroke getKeyStroke(TriggerSequence sequence) {
-        for (Trigger trigger : sequence.getTriggers()) {
-            if (trigger instanceof KeyStroke) {
-                return (KeyStroke) trigger;
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/interpreterview/VariableContentProvider.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/interpreterview/VariableContentProvider.java
deleted file mode 100644
index 7cc88f6eba..0000000000
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/interpreterview/VariableContentProvider.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008, 2009 THALES GLOBAL SERVICES.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.sirius.ui.tools.internal.views.interpreterview;
-
-import java.util.Collection;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.sirius.common.tools.api.util.TreeItemWrapper;
-
-/**
- * The content provider for variables.
- * 
- * @author ymortier
- */
-public class VariableContentProvider extends AdapterFactoryContentProvider {
-
-    /**
-     * Constructor.
-     * 
-     * @param adapterFactory
-     *            is the adapter factory
-     */
-    public VariableContentProvider(final AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Object[] getElements(final Object object) {
-        Object[] elements = null;
-        if (object instanceof Map) {
-            elements = ((Map<?, ?>) object).entrySet().toArray();
-        } else if (object instanceof Map.Entry) {
-            final Object[] result = new Object[1];
-            result[0] = ((Map.Entry<?, ?>) object).getValue();
-            elements = result;
-        } else if (object instanceof Collection) {
-            elements = ((Collection<?>) object).toArray();
-        } else if (object instanceof TreeItemWrapper) {
-            elements = new Object[] { ((TreeItemWrapper) object).getWrappedObject() };
-        } else {
-            elements = super.getElements(object);
-        }
-        return elements;
-    }
-}