[472051] Clean up

* Remove TabbarFillerWithoutContributions as it is not used anymore
** Remove also all factories that are not needed anymore as contribution
are statically added (except for
DiagramElementHideDeleteExtensionContributionFactory as explained in
previous commit).
* Remove check if the tabbar can be dynamic or not
* ZoomContributionItem has been extracted from
ZoomExtensionContributionFactory that is no longer needed.

Bug: 472051
Change-Id: I05ac7ede42dcc6002145b0b30de0ad82ca10021a
Signed-off-by: Laurent Fasani <laurent.fasani@obeo.fr>

39 files changed, 168 insertions, 1449 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui/plugin.xml b/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
index 1b1a98235e..d77e871f36 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
+++ b/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
@@ -1085,84 +1085,9 @@
          point="org.eclipse.ui.menus">
       <menuContribution
             allPopups="false"
-            class="org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.DistributeMenuExtensionContributionFactory"
-            locationURI="toolbar:org.eclipse.sirius.diagram.ui.tabbar.fixed?after=org.eclipse.sirius.diagram.ui.tabbar.arrangeselection">
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            class="org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.AlignMenutExtensionContributionFactory"
-            locationURI="toolbar:org.eclipse.sirius.diagram.ui.tabbar.fixed?after=org.eclipse.sirius.diagram.ui.tabbar.arrangeselection">
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            class="org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.DiagramElementPinUnPinExtensionContributionFactory"
-            locationURI="toolbar:org.eclipse.sirius.diagram.ui.tabbar.fixed?after=org.eclipse.sirius.diagram.ui.tabbar.hidepin">
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            class="org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.DiagramElementCopyExtensionContributionFactory"
-            locationURI="toolbar:org.eclipse.sirius.diagram.ui.tabbar.fixed?after=org.eclipse.sirius.diagram.ui.tabbar.past">
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
             class="org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.DiagramElementHideDeleteExtensionContributionFactory"
             locationURI="toolbar:org.eclipse.sirius.diagram.ui.tabbar?after=org.eclipse.sirius.diagram.ui.tabbar.hideelement">
       </menuContribution>
-      <menuContribution
-            allPopups="false"
-            class="org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.DiagramElementHideDeleteExtensionContributionFactory"
-            locationURI="toolbar:org.eclipse.sirius.diagram.ui.tabbar.fixed?after=org.eclipse.sirius.diagram.ui.tabbar.hideelement">
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            class="org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.DiagramElementFontExtensionContributionFactory"
-            locationURI="toolbar:org.eclipse.sirius.diagram.ui.tabbar.fixed?after=org.eclipse.sirius.diagram.ui.tabbar.font">
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            class="org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.DiagramElementStyleExtensionContributionFactory"
-            locationURI="toolbar:org.eclipse.sirius.diagram.ui.tabbar.fixed?after=org.eclipse.sirius.diagram.ui.tabbar.style">
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            class="org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.DiagramElementSizeExtensionContributionFactory"
-            locationURI="toolbar:org.eclipse.sirius.diagram.ui.tabbar.fixed?after=org.eclipse.sirius.diagram.ui.tabbar.size">
-      </menuContribution>
-      <menuContribution
-         allPopups="false"
-         class="org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.ArrangeAllContributionFactory"
-         locationURI="toolbar:org.eclipse.sirius.diagram.ui.tabbar.fixed?after=org.eclipse.sirius.diagram.ui.tabbar.arrangeselection">
-      </menuContribution>
-      <menuContribution
-         allPopups="false"
-         class="org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.LayerFilterExtensionContributionFactory"
-         locationURI="toolbar:org.eclipse.sirius.diagram.ui.tabbar.fixed?after=org.eclipse.sirius.diagram.ui.tabbar.layerfilter">
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            class="org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.RefreshExtensionContributionFactory"
-            locationURI="toolbar:org.eclipse.sirius.diagram.ui.tabbar.fixed?after=org.eclipse.sirius.diagram.ui.tabbar.refresh">
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            class="org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.ShowHidePinUnPinExtensionContributionFactory"
-            locationURI="toolbar:org.eclipse.sirius.diagram.ui.tabbar.fixed?after=org.eclipse.sirius.diagram.ui.tabbar.hidepin">
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            class="org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.PasteExtensionContributionFactory"
-            locationURI="toolbar:org.eclipse.sirius.diagram.ui.tabbar.fixed?after=org.eclipse.sirius.diagram.ui.tabbar.past">
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            class="org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.ZoomExtensionContributionFactory"
-            locationURI="toolbar:org.eclipse.sirius.diagram.ui.tabbar.fixed?after=org.eclipse.sirius.diagram.ui.tabbar.zoom">
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            class="org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.ExportExtensionContributionFactory"
-            locationURI="toolbar:org.eclipse.sirius.diagram.ui.tabbar.fixed?after=org.eclipse.sirius.diagram.ui.tabbar.export">
-      </menuContribution>
    </extension>
 
    <extension
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/Tabbar.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/Tabbar.java
index 824ced3a01..9e9d777609 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/Tabbar.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/Tabbar.java
@@ -14,7 +14,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
 import org.eclipse.jface.action.IContributionItem;
@@ -36,8 +35,6 @@ import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.ui.ISelectionListener;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Version;
 
 /**
  * A beautiful tab bar.
@@ -52,11 +49,6 @@ public class Tabbar extends Composite implements ISelectionListener, IAuthorityL
      */
     public static final String TABBAR_ID = "org.eclipse.sirius.diagram.ui.tabbar"; //$NON-NLS-1$
 
-    /**
-     * Specific id for fixed tabbar ({@link #canBeDynamic()}.
-     */
-    public static final String FIXED_TABBAR_ID = "org.eclipse.sirius.diagram.ui.tabbar.fixed"; //$NON-NLS-1$
-
     private IDiagramWorkbenchPart part;
 
     private IWorkbenchPage page;
@@ -131,44 +123,16 @@ public class Tabbar extends Composite implements ISelectionListener, IAuthorityL
         if (tabbarContributorProvider.hasContributor()) {
             diagramFiller = new TabbarFillerWithContributor(manager, page, tabbarContributorProvider);
         } else {
-            if (canBeDynamic()) {
-                diagramFiller = new TabbarFillerWithContributions(manager, page);
-            } else {
-                diagramFiller = new TabbarFillerWithoutContributions(manager, page);
-            }
+            diagramFiller = new TabbarFillerWithContributions(manager, page);
         }
         diagramFiller.setPart(part);
         diagramFiller.fill();
     }
 
-    /**
-     * Indicates if the tabbar can be dynamic (if the workbench version supports
-     * it). Issues exist with visibleWhen and contributions in Juno and Kepler.
-     * 
-     * @return true if the tabbar can be dynamic.
-     */
-    public static boolean canBeDynamic() {
-        boolean canBeDynamic = false;
-
-        // The check is done on org.eclipse.ui.workbench and not on
-        // org.eclipse.core.runtime to be able to differentiate juno3 and juno
-        // (both have 3.8 as version on the org.eclipse.core.runtime plugin).
-        Bundle uiWorkbenchBundle = Platform.getBundle("org.eclipse.ui.workbench"); //$NON-NLS-1$
-        if (uiWorkbenchBundle != null) {
-            Version junoStart = Version.parseVersion("3.103"); //$NON-NLS-1$
-            Version lunaStart = Version.parseVersion("3.106"); //$NON-NLS-1$
-            Version currentVersion = uiWorkbenchBundle.getVersion();
-
-            // Range must not be in [3.103..3.106)
-            canBeDynamic = currentVersion.compareTo(junoStart) < 0 || currentVersion.compareTo(lunaStart) >= 0;
-        }
-        return canBeDynamic;
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public void selectionChanged(IWorkbenchPart partSelected, ISelection selection) {
-        if (!(diagramFiller instanceof TabbarFillerWithoutContributions) && partSelected == this.part) {
+        if (partSelected == this.part) {
             if (currentSelection == null || !sameSelection(selection)) {
                 if (selection instanceof StructuredSelection) {
                     currentSelection = ((StructuredSelection) selection).toList();
@@ -196,9 +160,7 @@ public class Tabbar extends Composite implements ISelectionListener, IAuthorityL
      *            the selection
      */
     public void reinitToolBar(ISelection iSelection) {
-        if (!(diagramFiller instanceof TabbarFillerWithoutContributions)) {
-            diagramFiller.update(iSelection);
-        }
+        diagramFiller.update(iSelection);
 
         updateAllItems();
     }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/TabbarFillerWithoutContributions.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/TabbarFillerWithoutContributions.java
deleted file mode 100644
index 006eb2ea2d..0000000000
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/TabbarFillerWithoutContributions.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013, 2016 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.diagram.ui.tools.internal.editor.tabbar;
-
-import org.eclipse.gef.ui.actions.ZoomComboContributionItem;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.AutoSizeAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.CopyAppearancePropertiesAction;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.jface.action.ContributionItem;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.diagram.description.DiagramDescription;
-import org.eclipse.sirius.diagram.ui.part.SiriusDiagramActionBarContributor;
-import org.eclipse.sirius.diagram.ui.tools.api.action.ConcernComboContributionItem;
-import org.eclipse.sirius.diagram.ui.tools.api.editor.DDiagramEditor;
-import org.eclipse.sirius.diagram.ui.tools.internal.actions.SelectHiddenElementsAction;
-import org.eclipse.sirius.diagram.ui.tools.internal.actions.SelectPinnedElementsAction;
-import org.eclipse.sirius.diagram.ui.tools.internal.actions.SizeBothAction;
-import org.eclipse.sirius.diagram.ui.tools.internal.actions.style.ResetStylePropertiesToDefaultValuesAction;
-import org.eclipse.sirius.diagram.ui.tools.internal.actions.visibility.HideDDiagramElementAction;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.HideDDiagramElementLabelActionContributionItem;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.TabbarAlignMenuManager;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.TabbarArrangeMenuManager;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.TabbarColorPropertyContributionItem;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.TabbarSelectMenuManager;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.SiriusTabbarExtensionContributionFactory.TabbarActionContributionItem;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.menus.IMenuService;
-
-/**
- * Directly fill the tabbar. This filler does not allows extension and does not
- * use the {@link org.eclipse.ui.menus.IMenuService} to populate the tabbar
- * (toolbar contribution support is broken on Juno and Kepler).
- * 
- * @author mporhel
- */
-@SuppressWarnings("restriction")
-public class TabbarFillerWithoutContributions extends AbstractTabbarFiller {
-
-    /**
-     * Construct a new instance.
-     * 
-     * @param manager
-     *            the toolbar manager
-     * @param page
-     *            the workbench page
-     */
-    public TabbarFillerWithoutContributions(ToolBarManager manager, IWorkbenchPage page) {
-        super(manager, page);
-    }
-
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.sirius.diagram.tools.internal.editor.tabbar.AbstractTabbarFiller#doFill()
-     */
-    @Override
-    protected void doFill() {
-        createSelectArrangeAlignActions();
-
-        manager.add(new Separator());
-
-        createLayerFilterActions();
-
-        manager.add(new Separator());
-
-        createHideAndDeleteActions();
-
-        createZoomActions();
-
-        createExtraDiagramActions();
-
-        manager.add(new Separator());
-
-        createStyleActions();
-
-        manager.add(new Separator());
-
-        createSizeActions();
-    }
-
-    private void createSelectArrangeAlignActions() {
-        TabbarArrangeMenuManager arrangeMenu = new TabbarArrangeMenuManager(part);
-        arrangeMenu.setVisible(true);
-        manager.add(arrangeMenu);
-
-        TabbarSelectMenuManager selectMenu = new TabbarSelectMenuManager();
-        selectMenu.setVisible(true);
-        manager.add(selectMenu);
-
-        TabbarAlignMenuManager alignMenu = new TabbarAlignMenuManager();
-        alignMenu.setVisible(true);
-        manager.add(alignMenu);
-    }
-
-    private void createLayerFilterActions() {
-        LayersContribution layersContribution = new LayersContribution();
-        ContributionItem layerItem = layersContribution.createContributionItem(manager);
-        layersContribution.setPart(part);
-        manager.add(layerItem);
-
-        FiltersContributionItem filtersContribution = new FiltersContributionItem();
-        ContributionItem filterItem = filtersContribution.createContributionItem(manager);
-        filtersContribution.setPart(part);
-        manager.add(filterItem);
-
-        // Concern ?
-        if (part instanceof DDiagramEditor) {
-            final DDiagram diagram = (DDiagram) ((DDiagramEditor) part).getRepresentation();
-            if (diagram != null) {
-                DiagramDescription description = diagram.getDescription();
-                if (description != null && description.getConcerns() != null && description.getConcerns().getOwnedConcernDescriptions().size() > 1) {
-                    ConcernComboContributionItem item = new ConcernComboContributionItem(page, ""); //$NON-NLS-1$
-                    item.setDiagram(diagram);
-                    manager.add(item);
-                }
-            }
-        }
-    }
-
-    private void createHideAndDeleteActions() {
-        SelectHiddenElementsAction selectHiddenElementsAction = new SelectHiddenElementsAction(page, part);
-        manager.add(selectHiddenElementsAction);
-
-        HideDDiagramElementAction hideDDiagramElementAction = new HideDDiagramElementAction(SiriusDiagramActionBarContributor.HIDE_ELEMENT);
-        hideDDiagramElementAction.setActionPart(part);
-        manager.add(new TabbarActionContributionItem(hideDDiagramElementAction, part));
-
-        HideDDiagramElementLabelActionContributionItem contributionItem = new HideDDiagramElementLabelActionContributionItem(part);
-        manager.add(contributionItem);
-
-        SelectPinnedElementsAction pinnedElementsAction = new SelectPinnedElementsAction(page, part);
-        manager.add(pinnedElementsAction);
-    }
-
-    private void createZoomActions() {
-        ZoomComboContributionItem zoomItem = new ZoomComboContributionItem(page) {
-
-            @Override
-            public void fill(ToolBar parent, int index) {
-                super.fill(parent, index);
-                ToolItem addedItem = parent.getItem(parent.getItemCount() - 1);
-                addedItem.setToolTipText(DiagramUIMessages.ZoomActionMenu_ZoomLabel);
-            }
-
-        };
-        manager.add(zoomItem);
-    }
-
-    private void createExtraDiagramActions() {
-        if (part instanceof DDiagramEditor) {
-            DDiagram editorDiagram = (DDiagram) ((DDiagramEditor) part).getRepresentation();
-            if (LayoutingModeSwitchingAction.diagramAllowsLayoutingMode(editorDiagram)) {
-                LayoutingModeSwitchingAction layoutingModeSwitchingAction = new LayoutingModeSwitchingAction(page, editorDiagram);
-                manager.add(new TabbarActionContributionItem(layoutingModeSwitchingAction));
-            }
-        }
-    }
-
-    private void createStyleActions() {
-        TabbarColorPropertyContributionItem fontColorMenu = TabbarColorPropertyContributionItem.createFontColorContributionItem(page);
-        fontColorMenu.setActionWorkbenchPart(part);
-        manager.add(fontColorMenu);
-
-        TabbarColorPropertyContributionItem fillColorMenu = TabbarColorPropertyContributionItem.createFillColorContributionItem(page);
-        fillColorMenu.setActionWorkbenchPart(part);
-        manager.add(fillColorMenu);
-
-        TabbarColorPropertyContributionItem lineColorMenu = TabbarColorPropertyContributionItem.createLineColorContributionItem(page);
-        lineColorMenu.setActionWorkbenchPart(part);
-        manager.add(lineColorMenu);
-
-        ResetStylePropertiesToDefaultValuesAction resetStylePropertiesToDefaultValuesAction = new ResetStylePropertiesToDefaultValuesAction(page);
-        manager.add(new TabbarActionContributionItem(resetStylePropertiesToDefaultValuesAction, part));
-
-        CopyAppearancePropertiesAction copyAppearancePropertiesAction = new CopyAppearancePropertiesAction(page);
-        manager.add(copyAppearancePropertiesAction);
-    }
-
-    private void createSizeActions() {
-        SizeBothAction sizeBothAction = new SizeBothAction(page);
-        sizeBothAction.init();
-        manager.add(sizeBothAction);
-
-        AutoSizeAction autoSizeAction = new AutoSizeAction(page);
-        manager.add(autoSizeAction);
-    }
-
-    /**
-     * Add the additions group and ask the menu service to populate the tabbar
-     * with contributions regarding the toolbar scheme with
-     * {@link Tabbar#FIXED_TABBAR_ID} id.
-     */
-    @Override
-    protected void addTabbarContributions() {
-        addSeparator("additions"); //$NON-NLS-1$
-        ((ToolBarContextService) IToolBarContextService.INSTANCE).setMenuManager(manager);
-        ((ToolBarContextService) IToolBarContextService.INSTANCE).setPage(page);
-        ((ToolBarContextService) IToolBarContextService.INSTANCE).setPart(part);
-
-        // Get the menu service corresponding to the current site (and not the
-        // current workbench window).
-        IMenuService menuService = (IMenuService) part.getSite().getService(IMenuService.class);
-        menuService.populateContributionManager(manager, "toolbar:" + Tabbar.FIXED_TABBAR_ID); //$NON-NLS-1$
-
-        IToolBarContextService.INSTANCE.dispose();
-    }
-}
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/ZoomContributionItem.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/ZoomContributionItem.java
new file mode 100644
index 0000000000..00713d55c5
--- /dev/null
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/ZoomContributionItem.java
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2014 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.diagram.ui.tools.internal.editor.tabbar.actions;
+
+import org.eclipse.gef.editparts.ZoomManager;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.sirius.diagram.ui.tools.api.editor.DDiagramEditor;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+
+/**
+ * ActionContributionItem implementation for zoom actions. Create a part
+ * listener to set zoom manager.
+ * 
+ * @author fbarbin
+ * 
+ */
+public class ZoomContributionItem extends ActionContributionItem {
+    private IPartListener listener;
+
+    private IWorkbenchPage page;
+
+    /**
+     * Constructor.
+     * 
+     * @param action
+     *            The action to wrap
+     * @param page
+     *            the workbench page
+     */
+    public ZoomContributionItem(final IAction action, IWorkbenchPage page) {
+        super(action);
+        this.page = page;
+        listener = new IPartListener() {
+            @Override
+            public void partActivated(IWorkbenchPart part) {
+                if (part instanceof DDiagramEditor) {
+                    final ZoomManager zoomManager = (ZoomManager) part.getAdapter(ZoomManager.class);
+                    if (action instanceof TabbarZoomAction) {
+                        ((TabbarZoomAction) action).setZoomManager(zoomManager);
+                    }
+                }
+            }
+
+            @Override
+            public void partBroughtToTop(IWorkbenchPart p) {
+            }
+
+            @Override
+            public void partClosed(IWorkbenchPart p) {
+            }
+
+            @Override
+            public void partDeactivated(IWorkbenchPart p) {
+            }
+
+            @Override
+            public void partOpened(IWorkbenchPart p) {
+            }
+        };
+        page.addPartListener(listener);
+    }
+
+    @Override
+    public void dispose() {
+        super.dispose();
+        if (page != null) {
+            page.removePartListener(listener);
+            page = null;
+        }
+        listener = null;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/AlignMenutExtensionContributionFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/AlignMenutExtensionContributionFactory.java
deleted file mode 100644
index 51f498d2c6..0000000000
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/AlignMenutExtensionContributionFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012, 2014 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.diagram.ui.tools.internal.editor.tabbar.contributions;
-
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.TabbarAlignMenuManager;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.expressions.DDiagramElementTabbarExpression;
-import org.eclipse.ui.menus.IContributionRoot;
-import org.eclipse.ui.services.IServiceLocator;
-
-/**
- * ExtensionContributionFactory responsible for Align menu tabbar item creation.
- * 
- * @author fbarbin
- */
-public class AlignMenutExtensionContributionFactory extends SiriusTabbarExtensionContributionFactory {
-
-    @Override
-    public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {
-
-        super.createContributionItems(serviceLocator, additions);
-        TabbarAlignMenuManager alignMenu = new TabbarAlignMenuManager();
-        alignMenu.setDefaultAction("org.eclipse.gef.align_left"); //$NON-NLS-1$
-
-        additions.addContributionItem(alignMenu, new DDiagramElementTabbarExpression());
-    }
-
-}
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/ArrangeAllContributionFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/ArrangeAllContributionFactory.java
deleted file mode 100644
index 0b85ef0a3b..0000000000
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/ArrangeAllContributionFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012, 2014 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.diagram.ui.tools.internal.editor.tabbar.contributions;
-
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.TabbarArrangeMenuManager;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.TabbarSelectMenuManager;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.expressions.DDiagramAndDDiagramElementTabbarExpression;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.expressions.DDiagramTabbarExpression;
-import org.eclipse.ui.menus.IContributionRoot;
-import org.eclipse.ui.services.IServiceLocator;
-
-/**
- * ExtensionContributionFactory responsible for Arrange all tabbar item
- * creation.
- * 
- * @author fbarbin
- */
-public class ArrangeAllContributionFactory extends SiriusTabbarExtensionContributionFactory {
-
-    @Override
-    public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {
-
-        super.createContributionItems(serviceLocator, additions);
-        TabbarArrangeMenuManager arrangeMenu = new TabbarArrangeMenuManager(getPart());
-
-        additions.addContributionItem(arrangeMenu, new DDiagramAndDDiagramElementTabbarExpression());
-
-        TabbarSelectMenuManager selectMenu = new TabbarSelectMenuManager();
-        selectMenu.setDefaultAction("toolbarSelectAllAction"); //$NON-NLS-1$
-
-        additions.addContributionItem(selectMenu, new DDiagramTabbarExpression());
-
-    }
-
-}
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/DiagramElementCopyExtensionContributionFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/DiagramElementCopyExtensionContributionFactory.java
deleted file mode 100644
index 497b070de5..0000000000
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/DiagramElementCopyExtensionContributionFactory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 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.diagram.ui.tools.internal.editor.tabbar.contributions;
-
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.sirius.diagram.ui.tools.internal.actions.layout.CopyLayoutAction;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.expressions.DDiagramElementTabbarExpression;
-import org.eclipse.ui.menus.IContributionRoot;
-import org.eclipse.ui.services.IServiceLocator;
-
-/**
- * ExtensionContributionFactory responsible for Copy layout action tabbar item
- * creation.
- * 
- * @author fbarbin
- */
-public class DiagramElementCopyExtensionContributionFactory extends SiriusTabbarExtensionContributionFactory {
-
-    @Override
-    public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {
-
-        super.createContributionItems(serviceLocator, additions);
-        CopyLayoutAction copyLayoutAction = new CopyLayoutAction(getPage(), getPart());
-        additions.addContributionItem(new ActionContributionItem(copyLayoutAction), new DDiagramElementTabbarExpression());
-
-    }
-
-}
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/DiagramElementFontExtensionContributionFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/DiagramElementFontExtensionContributionFactory.java
deleted file mode 100644
index 659f78bc34..0000000000
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/DiagramElementFontExtensionContributionFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012, 2013 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.diagram.ui.tools.internal.editor.tabbar.contributions;
-
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.FontDialogAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.FontStyleAction;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
-import org.eclipse.sirius.diagram.ui.tools.api.image.DiagramImagesPath;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.TabbarColorPropertyContributionItem;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.expressions.DDiagramElementTabbarExpression;
-import org.eclipse.ui.menus.IContributionRoot;
-import org.eclipse.ui.services.IServiceLocator;
-
-/**
- * ExtensionContributionFactory responsible for font actions tabbar item
- * creation.
- * 
- * @author fbarbin
- */
-public class DiagramElementFontExtensionContributionFactory extends SiriusTabbarExtensionContributionFactory {
-
-    @Override
-    public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {
-
-        super.createContributionItems(serviceLocator, additions);
-        FontStyleAction fontStyleBoldAction = FontStyleAction.createBoldFontStyleAction(getPage());
-        FontStyleAction fontStyleItalicAction = FontStyleAction.createItalicFontStyleAction(getPage());
-        additions.addContributionItem(new ActionContributionItem(fontStyleBoldAction), new DDiagramElementTabbarExpression());
-        additions.addContributionItem(new ActionContributionItem(fontStyleItalicAction), new DDiagramElementTabbarExpression());
-
-        createFontColorMenu(additions);
-
-        IAction fontDialogAction = new FontDialogAction(getPage());
-        fontDialogAction.setImageDescriptor(DiagramUIPlugin.Implementation.getBundledImageDescriptor(DiagramImagesPath.FONT_WIZARD));
-
-        additions.addContributionItem(new ActionContributionItem(fontDialogAction), new DDiagramElementTabbarExpression());
-
-    }
-
-    private void createFontColorMenu(IContributionRoot additions) {
-        TabbarColorPropertyContributionItem fontColorMenu = TabbarColorPropertyContributionItem.createFontColorContributionItem(getPage());
-        fontColorMenu.setActionWorkbenchPart(getPart());
-        additions.addContributionItem(fontColorMenu, new DDiagramElementTabbarExpression());
-    }
-
-}
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/DiagramElementPinUnPinExtensionContributionFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/DiagramElementPinUnPinExtensionContributionFactory.java
deleted file mode 100644
index 8f4ab2cc25..0000000000
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/DiagramElementPinUnPinExtensionContributionFactory.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012, 2013 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.diagram.ui.tools.internal.editor.tabbar.contributions;
-
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.TabbarPinElementsEclipseAction;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.TabbarUnpinElementsEclipseAction;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.expressions.DDiagramElementTabbarExpression;
-import org.eclipse.ui.menus.IContributionRoot;
-import org.eclipse.ui.services.IServiceLocator;
-
-/**
- * ExtensionContributionFactory responsible for pin/unpin tabbar item creation.
- * 
- * @author fbarbin
- */
-public class DiagramElementPinUnPinExtensionContributionFactory extends SiriusTabbarExtensionContributionFactory {
-
-    @Override
-    public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {
-
-        super.createContributionItems(serviceLocator, additions);
-        TabbarPinElementsEclipseAction pinAction = new TabbarPinElementsEclipseAction();
-        TabbarUnpinElementsEclipseAction unpinAction = new TabbarUnpinElementsEclipseAction();
-        pinAction.setOppositePinAction(unpinAction);
-        unpinAction.setOppositePinAction(pinAction);
-        additions.addContributionItem(new TabbarActionContributionItem(pinAction, getPart()), new DDiagramElementTabbarExpression());
-        additions.addContributionItem(new TabbarActionContributionItem(unpinAction, getPart()), new DDiagramElementTabbarExpression());
-
-    }
-}
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/DiagramElementSizeExtensionContributionFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/DiagramElementSizeExtensionContributionFactory.java
deleted file mode 100644
index cb66d6121b..0000000000
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/DiagramElementSizeExtensionContributionFactory.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 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.diagram.ui.tools.internal.editor.tabbar.contributions;
-
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.AutoSizeAction;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.sirius.diagram.ui.tools.internal.actions.SizeBothAction;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.expressions.DDiagramElementTabbarExpression;
-import org.eclipse.ui.menus.IContributionRoot;
-import org.eclipse.ui.services.IServiceLocator;
-
-/**
- * 
- * ExtensionContributionFactory responsible for size tabbar item creation.
- * 
- * @author fbarbin
- */
-public class DiagramElementSizeExtensionContributionFactory extends SiriusTabbarExtensionContributionFactory {
-
-    @Override
-    public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {
-
-        super.createContributionItems(serviceLocator, additions);
-        SizeBothAction sizeBothAction = new SizeBothAction(getPage());
-        sizeBothAction.init();
-        AutoSizeAction autoSizeAction = new AutoSizeAction(getPage());
-        additions.addContributionItem(new ActionContributionItem(sizeBothAction), new DDiagramElementTabbarExpression());
-        additions.addContributionItem(new ActionContributionItem(autoSizeAction), new DDiagramElementTabbarExpression());
-
-    }
-
-}
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/DiagramElementStyleExtensionContributionFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/DiagramElementStyleExtensionContributionFactory.java
deleted file mode 100644
index 42ee3aec08..0000000000
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/DiagramElementStyleExtensionContributionFactory.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012, 2014 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.diagram.ui.tools.internal.editor.tabbar.contributions;
-
-import java.util.Collection;
-
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.CopyAppearancePropertiesAction;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.sirius.diagram.ui.graphical.edit.part.specific.BracketEdgeEditPart;
-import org.eclipse.sirius.diagram.ui.tools.internal.actions.style.ResetStylePropertiesToDefaultValuesAction;
-import org.eclipse.sirius.diagram.ui.tools.internal.actions.style.SetStyleToWorkspaceImageAction;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.TabbarColorPropertyContributionItem;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.TabbarRouterMenuManager;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.expressions.DDiagramElementTabbarExpression;
-import org.eclipse.ui.menus.IContributionRoot;
-import org.eclipse.ui.services.IServiceLocator;
-
-/**
- * 
- * ExtensionContributionFactory responsible for style tabbar item creation.
- * 
- * @author fbarbin
- */
-public class DiagramElementStyleExtensionContributionFactory extends SiriusTabbarExtensionContributionFactory {
-
-    @Override
-    public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {
-
-        super.createContributionItems(serviceLocator, additions);
-        createFillColorMenu(additions);
-        createLineColorMenu(additions);
-
-        createRouterManagerMenu(additions);
-
-        additions.addContributionItem(new TabbarActionContributionItem(new SetStyleToWorkspaceImageAction(), getPart()), new DDiagramElementTabbarExpression());
-        ResetStylePropertiesToDefaultValuesAction resetStylePropertiesToDefaultValuesAction = new ResetStylePropertiesToDefaultValuesAction(getPage());
-        additions.addContributionItem(new TabbarActionContributionItem(resetStylePropertiesToDefaultValuesAction, getPart()), new DDiagramElementTabbarExpression());
-
-        CopyAppearancePropertiesAction copyAppearancePropertiesAction = new CopyAppearancePropertiesAction(getPage());
-        additions.addContributionItem(new TabbarActionContributionItem(copyAppearancePropertiesAction), new DDiagramElementTabbarExpression());
-
-    }
-
-    private void createRouterManagerMenu(IContributionRoot additions) {
-        MenuManager routerManager = new TabbarRouterMenuManager();
-        additions.addContributionItem(routerManager, new RouterManagerMenuTestExpression());
-    }
-
-    private void createFillColorMenu(IContributionRoot additions) {
-        TabbarColorPropertyContributionItem fillColorMenu = TabbarColorPropertyContributionItem.createFillColorContributionItem(getPage());
-        fillColorMenu.setActionWorkbenchPart(getPart());
-        additions.addContributionItem(fillColorMenu, new DDiagramElementTabbarExpression());
-    }
-
-    private void createLineColorMenu(IContributionRoot additions) {
-        TabbarColorPropertyContributionItem lineColorMenu = TabbarColorPropertyContributionItem.createLineColorContributionItem(getPage());
-        lineColorMenu.setActionWorkbenchPart(getPart());
-        additions.addContributionItem(lineColorMenu, new DDiagramElementTabbarExpression());
-    }
-
-    /**
-     * Test expression to display or not router menu.
-     * 
-     * @author fbarbin
-     * 
-     */
-    private class RouterManagerMenuTestExpression extends DDiagramElementTabbarExpression {
-
-        @Override
-        protected boolean isVisible(IStructuredSelection selection) {
-            Collection<Object> selectedElements = selection.toList();
-            boolean hasBracketEdgeSelected = false;
-            for (Object selectedElt : selectedElements) {
-                if (selectedElt instanceof BracketEdgeEditPart) {
-                    hasBracketEdgeSelected = true;
-                    break;
-                }
-            }
-            return super.isVisible(selection) && !hasBracketEdgeSelected;
-        }
-
-    }
-}
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/DistributeMenuExtensionContributionFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/DistributeMenuExtensionContributionFactory.java
deleted file mode 100644
index 0ba9ddc94f..0000000000
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/DistributeMenuExtensionContributionFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 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.diagram.ui.tools.internal.editor.tabbar.contributions;
-
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.TabbarDistributeMenuManager;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.expressions.DDiagramElementTabbarExpression;
-import org.eclipse.ui.menus.IContributionRoot;
-import org.eclipse.ui.services.IServiceLocator;
-
-/**
- * {@link SiriusTabbarExtensionContributionFactory} to contribute
- * {@link TabbarDistributeMenuManager}.
- * 
- * @author <a href="mailto:esteban.dugueperoux@obeo.fr">Esteban Dugueperoux</a>
- */
-public class DistributeMenuExtensionContributionFactory extends SiriusTabbarExtensionContributionFactory {
-
-    @Override
-    public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {
-        super.createContributionItems(serviceLocator, additions);
-        TabbarDistributeMenuManager distributeMenu = new TabbarDistributeMenuManager();
-        additions.addContributionItem(distributeMenu, new DDiagramElementTabbarExpression());
-    }
-
-}
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/ExportExtensionContributionFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/ExportExtensionContributionFactory.java
deleted file mode 100644
index 090e067910..0000000000
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/ExportExtensionContributionFactory.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012, 2013 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.diagram.ui.tools.internal.editor.tabbar.contributions;
-
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.diagram.ui.tools.api.editor.DDiagramEditor;
-import org.eclipse.sirius.diagram.ui.tools.internal.actions.SaveAsImageFileAction;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.LayoutingModeSwitchingAction;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.expressions.DDiagramTabbarExpression;
-import org.eclipse.ui.menus.IContributionRoot;
-import org.eclipse.ui.services.IServiceLocator;
-
-/**
- * 
- * ExtensionContributionFactory responsible for "Save As Image" tabbar item
- * creation.
- * 
- * @author fbarbin
- */
-public class ExportExtensionContributionFactory extends SiriusTabbarExtensionContributionFactory {
-
-    @Override
-    public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {
-
-        super.createContributionItems(serviceLocator, additions);
-        final DDiagramEditor editor = (DDiagramEditor) getPart();
-        DDiagram editorDiagram = (DDiagram) editor.getRepresentation();
-        SaveAsImageFileAction saveAsImageFileAction = new SaveAsImageFileAction();
-
-        additions.addContributionItem(new ActionContributionItem(saveAsImageFileAction), new DDiagramTabbarExpression());
-        if (LayoutingModeSwitchingAction.diagramAllowsLayoutingMode(editorDiagram)) {
-            LayoutingModeSwitchingAction layoutingModeSwitchingAction = new LayoutingModeSwitchingAction(getPage(), editorDiagram);
-            additions.addContributionItem(new TabbarActionContributionItem(layoutingModeSwitchingAction), new DDiagramTabbarExpression());
-        }
-    }
-}
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/LayerFilterExtensionContributionFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/LayerFilterExtensionContributionFactory.java
deleted file mode 100644
index 7e86f56ae0..0000000000
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/LayerFilterExtensionContributionFactory.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 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.diagram.ui.tools.internal.editor.tabbar.contributions;
-
-import org.eclipse.jface.action.ContributionItem;
-import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.diagram.description.DiagramDescription;
-import org.eclipse.sirius.diagram.ui.tools.api.action.ConcernComboContributionItem;
-import org.eclipse.sirius.diagram.ui.tools.api.editor.DDiagramEditor;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.FiltersContributionItem;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.LayersContribution;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.expressions.DDiagramTabbarExpression;
-import org.eclipse.ui.menus.IContributionRoot;
-import org.eclipse.ui.services.IServiceLocator;
-
-/**
- * 
- * ExtensionContributionFactory responsible for layer and filter tabbar item
- * creation.
- * 
- * @author fbarbin
- */
-public class LayerFilterExtensionContributionFactory extends SiriusTabbarExtensionContributionFactory {
-
-    @Override
-    public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {
-        super.createContributionItems(serviceLocator, additions);
-        FiltersContributionItem filtersContribution = new FiltersContributionItem();
-        ContributionItem filterItem = filtersContribution.createContributionItem(getManager());
-        filtersContribution.setPart(getPart());
-
-        LayersContribution layersContribution = new LayersContribution();
-        ContributionItem layerItem = layersContribution.createContributionItem(getManager());
-        layersContribution.setPart(getPart());
-
-        additions.addContributionItem(layerItem, new DDiagramTabbarExpression());
-        additions.addContributionItem(filterItem, new DDiagramTabbarExpression());
-
-        if (getPart() instanceof DDiagramEditor) {
-            final DDiagram editorDiagram = (DDiagram) ((DDiagramEditor) getPart()).getRepresentation();
-            DiagramDescription description = null;
-            if (editorDiagram != null) {
-                description = editorDiagram.getDescription();
-            }
-
-            if (description != null) {
-                addConcernItem(editorDiagram, description, additions);
-            }
-        }
-
-    }
-
-    private void addConcernItem(final DDiagram diagram, final DiagramDescription description, IContributionRoot additions) {
-        if (description.getConcerns() != null && !description.getConcerns().getOwnedConcernDescriptions().isEmpty() && description.getConcerns().getOwnedConcernDescriptions().size() != 1) {
-            ConcernComboContributionItem item = new ConcernComboContributionItem(getPage(), ""); //$NON-NLS-1$
-            if (diagram != null) {
-                item.setDiagram(diagram);
-            }
-            additions.addContributionItem(item, new DDiagramTabbarExpression());
-        }
-    }
-
-}
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/PasteExtensionContributionFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/PasteExtensionContributionFactory.java
deleted file mode 100644
index fbf43937ce..0000000000
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/PasteExtensionContributionFactory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012, 2013 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.diagram.ui.tools.internal.editor.tabbar.contributions;
-
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.sirius.diagram.ui.tools.internal.actions.layout.PasteLayoutAction;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.expressions.DDiagramTabbarExpression;
-import org.eclipse.ui.menus.IContributionRoot;
-import org.eclipse.ui.services.IServiceLocator;
-
-/**
- * 
- * ExtensionContributionFactory responsible for "Past Layout" tabbar item
- * creation.
- * 
- * @author fbarbin
- */
-public class PasteExtensionContributionFactory extends SiriusTabbarExtensionContributionFactory {
-
-    @Override
-    public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {
-
-        super.createContributionItems(serviceLocator, additions);
-        PasteLayoutAction pasteLayoutAction = new PasteLayoutAction(getPage(), getPart());
-
-        additions.addContributionItem(new ActionContributionItem(pasteLayoutAction), new DDiagramTabbarExpression());
-    }
-}
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/RefreshExtensionContributionFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/RefreshExtensionContributionFactory.java
deleted file mode 100644
index 310cfb550b..0000000000
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/RefreshExtensionContributionFactory.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 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.diagram.ui.tools.internal.editor.tabbar.contributions;
-
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.sirius.diagram.ui.part.SiriusDiagramActionBarContributor;
-import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
-import org.eclipse.sirius.diagram.ui.tools.api.image.DiagramImagesPath;
-import org.eclipse.sirius.diagram.ui.tools.internal.actions.refresh.RefreshDiagramAction;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.expressions.DDiagramTabbarExpression;
-import org.eclipse.ui.menus.IContributionRoot;
-import org.eclipse.ui.services.IServiceLocator;
-
-/**
- * 
- * ExtensionContributionFactory responsible for "refresh action" tabbar item
- * creation.
- * 
- * @author fbarbin
- */
-public class RefreshExtensionContributionFactory extends SiriusTabbarExtensionContributionFactory {
-
-    @Override
-    public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {
-
-        super.createContributionItems(serviceLocator, additions);
-        RefreshDiagramAction action = new RefreshDiagramAction(SiriusDiagramActionBarContributor.REFRESH_DIAGRAM, DiagramUIPlugin.Implementation.getBundledImageDescriptor(DiagramImagesPath.REFRESH_IMG));
-
-        additions.addContributionItem(new ActionContributionItem(action), new DDiagramTabbarExpression());
-    }
-
-}
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/ShowHidePinUnPinExtensionContributionFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/ShowHidePinUnPinExtensionContributionFactory.java
deleted file mode 100644
index fbe1a5ed0a..0000000000
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/ShowHidePinUnPinExtensionContributionFactory.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 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.diagram.ui.tools.internal.editor.tabbar.contributions;
-
-import org.eclipse.sirius.diagram.ui.tools.internal.actions.SelectHiddenElementsAction;
-import org.eclipse.sirius.diagram.ui.tools.internal.actions.SelectPinnedElementsAction;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.DiagramActionContributionItem;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.expressions.DDiagramTabbarExpression;
-import org.eclipse.ui.menus.IContributionRoot;
-import org.eclipse.ui.services.IServiceLocator;
-
-/**
- * 
- * ExtensionContributionFactory responsible for Show/Hide and Pin/Unpin tabbar
- * item creation.
- * 
- * @author fbarbin
- */
-public class ShowHidePinUnPinExtensionContributionFactory extends SiriusTabbarExtensionContributionFactory {
-
-    @Override
-    public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {
-
-        super.createContributionItems(serviceLocator, additions);
-        SelectPinnedElementsAction pinnedElementsAction = new SelectPinnedElementsAction(getPage(), getPart());
-        SelectHiddenElementsAction selectHiddenElementsAction = new SelectHiddenElementsAction(getPage(), getPart());
-
-        additions.addContributionItem(new DiagramActionContributionItem(selectHiddenElementsAction), new DDiagramTabbarExpression());
-        additions.addContributionItem(new DiagramActionContributionItem(pinnedElementsAction), new DDiagramTabbarExpression());
-
-    }
-
-}
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/TabbarContributionFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/TabbarContributionFactory.java
index 7d8a1700a3..50c8b0f291 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/TabbarContributionFactory.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/TabbarContributionFactory.java
@@ -57,8 +57,8 @@ import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.Tabbar
 import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.TabbarZoomAction;
 import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.TabbarZoomInAction;
 import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.TabbarZoomOutAction;
+import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.ZoomContributionItem;
 import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.SiriusTabbarExtensionContributionFactory.TabbarActionContributionItem;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.ZoomExtensionContributionFactory.ZoomContributionItem;
 import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.swt.widgets.ToolItem;
 import org.eclipse.ui.IWorkbenchPartSite;
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/ZoomExtensionContributionFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/ZoomExtensionContributionFactory.java
deleted file mode 100644
index bfb1a49289..0000000000
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/ZoomExtensionContributionFactory.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012, 2014 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.diagram.ui.tools.internal.editor.tabbar.contributions;
-
-import org.eclipse.gef.editparts.ZoomManager;
-import org.eclipse.gef.ui.actions.ZoomComboContributionItem;
-import org.eclipse.gmf.runtime.diagram.ui.internal.l10n.DiagramUIPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.sirius.diagram.ui.tools.api.editor.DDiagramEditor;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.TabbarZoomAction;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.TabbarZoomInAction;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.TabbarZoomOutAction;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.contributions.expressions.DDiagramTabbarExpression;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.menus.IContributionRoot;
-import org.eclipse.ui.services.IServiceLocator;
-
-/**
- * 
- * ExtensionContributionFactory responsible for Zoom actions tabbar item
- * creation.
- * 
- * @author fbarbin
- */
-public class ZoomExtensionContributionFactory extends SiriusTabbarExtensionContributionFactory {
-
-    @Override
-    public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {
-
-        super.createContributionItems(serviceLocator, additions);
-
-        addZoomInZoomOut(additions);
-
-        ZoomComboContributionItem zoomItem = new ZoomComboContributionItem(getPage()) {
-
-            @Override
-            public void fill(ToolBar parent, int index) {
-                super.fill(parent, index);
-                // Use the index where the item has just been added.
-                ToolItem addedItem = parent.getItem(index);
-                addedItem.setToolTipText(DiagramUIMessages.ZoomActionMenu_ZoomLabel);
-            }
-
-        };
-        additions.addContributionItem(zoomItem, new DDiagramTabbarExpression());
-    }
-
-    private void addZoomInZoomOut(IContributionRoot additions) {
-
-        TabbarZoomAction zoomIn = new TabbarZoomInAction();
-        zoomIn.setImageDescriptor(DiagramUIPluginImages.DESC_ZOOM_IN);
-        zoomIn.setText(DiagramUIMessages.ZoomAction_ZoomIn);
-        TabbarZoomAction zoomOut = new TabbarZoomOutAction();
-        zoomOut.setImageDescriptor(DiagramUIPluginImages.DESC_ZOOM_OUT);
-        zoomOut.setText(DiagramUIMessages.ZoomAction_ZoomOut);
-
-        additions.addContributionItem(new ZoomContributionItem(zoomIn, getPage()), new DDiagramTabbarExpression());
-        additions.addContributionItem(new ZoomContributionItem(zoomOut, getPage()), new DDiagramTabbarExpression());
-
-    }
-
-    /**
-     * ActionContributionItem implementation for zoom actions. Create a part
-     * listener to set zoom manager.
-     * 
-     * @author fbarbin
-     * 
-     */
-    public static class ZoomContributionItem extends ActionContributionItem {
-        private IPartListener listener;
-
-        private IWorkbenchPage page;
-
-        /**
-         * Constructor.
-         * 
-         * @param action
-         *            The action to wrap
-         * @param page
-         *            the workbench page
-         */
-        public ZoomContributionItem(final IAction action, IWorkbenchPage page) {
-            super(action);
-            this.page = page;
-            listener = new IPartListener() {
-                @Override
-                public void partActivated(IWorkbenchPart part) {
-                    if (part instanceof DDiagramEditor) {
-                        final ZoomManager zoomManager = (ZoomManager) part.getAdapter(ZoomManager.class);
-                        if (action instanceof TabbarZoomAction) {
-                            ((TabbarZoomAction) action).setZoomManager(zoomManager);
-                        }
-                    }
-                }
-
-                @Override
-                public void partBroughtToTop(IWorkbenchPart p) {
-                }
-
-                @Override
-                public void partClosed(IWorkbenchPart p) {
-                }
-
-                @Override
-                public void partDeactivated(IWorkbenchPart p) {
-                }
-
-                @Override
-                public void partOpened(IWorkbenchPart p) {
-                }
-            };
-            page.addPartListener(listener);
-        }
-
-        @Override
-        public void dispose() {
-            super.dispose();
-            if (page != null) {
-                page.removePartListener(listener);
-                page = null;
-            }
-            listener = null;
-        }
-    }
-
-}
diff --git a/plugins/org.eclipse.sirius.tests.junit.support/src/org/eclipse/sirius/tests/support/api/TestsUtil.java b/plugins/org.eclipse.sirius.tests.junit.support/src/org/eclipse/sirius/tests/support/api/TestsUtil.java
index 9ec96b7e55..27f7ef54d2 100644
--- a/plugins/org.eclipse.sirius.tests.junit.support/src/org/eclipse/sirius/tests/support/api/TestsUtil.java
+++ b/plugins/org.eclipse.sirius.tests.junit.support/src/org/eclipse/sirius/tests/support/api/TestsUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES
+ * Copyright (c) 2010, 2016 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
@@ -13,7 +13,6 @@
 package org.eclipse.sirius.tests.support.api;
 
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.Tabbar;
 import org.eclipse.ui.PlatformUI;
 import org.junit.Assert;
 import org.osgi.framework.Bundle;
@@ -275,15 +274,4 @@ public final class TestsUtil {
     public static void waitUntil(ICondition condition) {
         TestsUtil.waitUntil(condition, 5000, 500);
     }
-
-    /**
-     * Indicates if the tabbar can be dynamic (ie: is contextual and can receive
-     * contributions). Some issues were detected on Juno and Kepler.
-     * 
-     * @See {@link Tabbar#canBeDynamic()}
-     * @return true if the tabbar is dynamic.
-     */
-    public static boolean isDynamicTabbar() {
-        return Tabbar.canBeDynamic();
-    }
 }
diff --git a/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/AbstractSiriusSwtBotGefTestCase.java b/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/AbstractSiriusSwtBotGefTestCase.java
index 1d0bb2ac91..5d1d5e5add 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/AbstractSiriusSwtBotGefTestCase.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/AbstractSiriusSwtBotGefTestCase.java
@@ -39,7 +39,6 @@ import org.eclipse.draw2d.Figure;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.DescriptionCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.TextEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
@@ -62,12 +61,10 @@ import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
 import org.eclipse.sirius.diagram.ui.tools.api.preferences.SiriusDiagramUiPreferencesKeys;
 import org.eclipse.sirius.diagram.ui.tools.internal.actions.style.ResetStylePropertiesToDefaultValuesAction;
 import org.eclipse.sirius.diagram.ui.tools.internal.preferences.SiriusDiagramUiInternalPreferencesKeys;
-import org.eclipse.sirius.ext.gmf.runtime.editparts.GraphicalHelper;
 import org.eclipse.sirius.tests.support.api.EclipseTestsSupportHelper;
 import org.eclipse.sirius.tests.support.api.TestCaseCleaner;
 import org.eclipse.sirius.tests.support.api.TestsUtil;
 import org.eclipse.sirius.tests.support.internal.helper.CrossReferenceAdapterDetector;
-import org.eclipse.sirius.tests.swtbot.support.api.business.UIDiagramRepresentation.ZoomLevel;
 import org.eclipse.sirius.tests.swtbot.support.api.business.UILocalSession;
 import org.eclipse.sirius.tests.swtbot.support.api.business.UIPerspective;
 import org.eclipse.sirius.tests.swtbot.support.api.business.UIProject;
@@ -451,12 +448,7 @@ public abstract class AbstractSiriusSwtBotGefTestCase extends SWTBotGefTestCase
      * Request an explicit refresh of the current diagram.
      */
     protected void manualRefresh() {
-        if (TestsUtil.isDynamicTabbar()) {
-            bot.toolbarButtonWithTooltip(DiagramDialectUIServices.REFRESH_DIAGRAM).click();
-        } else {
-            // Use context menu instead of tabbar
-            new SWTBotSiriusDiagramEditor(bot.activeEditor().getReference(), bot).clickContextMenu("Refresh");
-        }
+        bot.toolbarButtonWithTooltip(DiagramDialectUIServices.REFRESH_DIAGRAM).click();
         SWTBotUtils.waitProgressMonitorClose("Progress Information");
     }
 
@@ -912,19 +904,14 @@ public abstract class AbstractSiriusSwtBotGefTestCase extends SWTBotGefTestCase
      */
     protected void pressZoomInButton(SWTBotSiriusDiagramEditor swtBotDesignerEditor, int pressCount) {
         for (int i = 1; i <= pressCount; i++) {
-            if (TestsUtil.isDynamicTabbar()) {
-                // 2 possible values for this tooltip according to the target
-                // platform
-                // No common constant was found, so we try with both possible
-                // values
-                try {
-                    swtBotDesignerEditor.bot().toolbarButtonWithTooltip("Zoom In (Ctrl++)").click();
-                } catch (WidgetNotFoundException e) {
-                    swtBotDesignerEditor.bot().toolbarButtonWithTooltip("Zoom In (Ctrl+=)").click();
-                }
-            } else {
-                double currentZoom = GraphicalHelper.getZoom(((DiagramRootEditPart) swtBotDesignerEditor.rootEditPart().part()).getContents());
-                swtBotDesignerEditor.zoom(ZoomLevel.createNextZoomInLevel(currentZoom));
+            // 2 possible values for this tooltip according to the target
+            // platform
+            // No common constant was found, so we try with both possible
+            // values
+            try {
+                swtBotDesignerEditor.bot().toolbarButtonWithTooltip("Zoom In (Ctrl++)").click();
+            } catch (WidgetNotFoundException e) {
+                swtBotDesignerEditor.bot().toolbarButtonWithTooltip("Zoom In (Ctrl+=)").click();
             }
         }
     }
@@ -949,12 +936,7 @@ public abstract class AbstractSiriusSwtBotGefTestCase extends SWTBotGefTestCase
      */
     protected void pressZoomOutButton(SWTBotSiriusDiagramEditor swtBotDesignerEditor, int pressCount) {
         for (int i = 1; i <= pressCount; i++) {
-            if (TestsUtil.isDynamicTabbar()) {
-                swtBotDesignerEditor.bot().toolbarButtonWithTooltip("Zoom Out (Ctrl+-)").click();
-            } else {
-                double currentZoom = GraphicalHelper.getZoom(((DiagramRootEditPart) swtBotDesignerEditor.rootEditPart().part()).getContents());
-                swtBotDesignerEditor.zoom(ZoomLevel.createNextZoomOutLevel(currentZoom));
-            }
+            swtBotDesignerEditor.bot().toolbarButtonWithTooltip("Zoom Out (Ctrl+-)").click();
         }
     }
 
diff --git a/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/editor/SWTBotSiriusDiagramEditor.java b/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/editor/SWTBotSiriusDiagramEditor.java
index ae535ac36e..9ae759f8b8 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/editor/SWTBotSiriusDiagramEditor.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/editor/SWTBotSiriusDiagramEditor.java
@@ -60,7 +60,6 @@ import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
 import org.eclipse.sirius.diagram.ui.tools.api.preferences.SiriusDiagramUiPreferencesKeys;
 import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.ext.draw2d.figure.FigureUtilities;
-import org.eclipse.sirius.tests.support.api.TestsUtil;
 import org.eclipse.sirius.tests.swtbot.support.api.bot.SWTDesignerBot;
 import org.eclipse.sirius.tests.swtbot.support.api.business.UIDiagramRepresentation;
 import org.eclipse.sirius.tests.swtbot.support.api.business.UIDiagramRepresentation.ZoomLevel;
@@ -887,11 +886,7 @@ public class SWTBotSiriusDiagramEditor extends SWTBotGefEditor {
      *             if an exception occurs
      */
     public void refresh() throws WidgetNotFoundException {
-        if (TestsUtil.isDynamicTabbar()) {
-            bot.toolbarButtonWithTooltip(DiagramDialectUIServices.REFRESH_DIAGRAM).click();
-        } else {
-            clickContextMenu("Refresh");
-        }
+        bot.toolbarButtonWithTooltip(DiagramDialectUIServices.REFRESH_DIAGRAM).click();
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/BoldItalicFontSynchronizationTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/BoldItalicFontSynchronizationTest.java
index e130b31ed2..fb79cea70e 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/BoldItalicFontSynchronizationTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/BoldItalicFontSynchronizationTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010-2015 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2016 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
@@ -17,7 +17,6 @@ import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeContainerEditPart;
 import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeList2EditPart;
 import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeListEditPart;
 import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeListElementEditPart;
-import org.eclipse.sirius.tests.support.api.TestsUtil;
 import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart;
 import org.eclipse.swtbot.swt.finder.SWTBot;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotButton;
@@ -63,10 +62,6 @@ public class BoldItalicFontSynchronizationTest extends AbstractFontModificationT
      *            the expected editpart type.
      */
     public void doTestBoldItalicSynchronizationFromTabbar(String name, Class<? extends EditPart> type) {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         editor.click(new Point(0, 0));
         SWTBotGefEditPart selectedEditPart = selectAndCheckEditPart(name, type);
 
@@ -158,11 +153,6 @@ public class BoldItalicFontSynchronizationTest extends AbstractFontModificationT
         editor.click(new Point(0, 0));
         selectAndCheckEditPart(name, type);
 
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         // Verify that buttons italic and bold is also selected on tabbar
         SWTBotToolbarToggleButton boldButtonTabbar = getTabbarBoldButton();
         SWTBotToolbarToggleButton italicButtonTabbar = getTabbarItalicButton();
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/BracketEdgeTests.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/BracketEdgeTests.java
index 39c3c57f8c..f810717ec2 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/BracketEdgeTests.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/BracketEdgeTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2016 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
@@ -31,7 +31,6 @@ import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramNodeEditPart;
 import org.eclipse.sirius.diagram.ui.graphical.edit.part.specific.BracketEdgeEditPart;
 import org.eclipse.sirius.diagram.ui.graphical.edit.policies.BracketBendpointEditPolicy;
 import org.eclipse.sirius.ext.gmf.runtime.editparts.GraphicalHelper;
-import org.eclipse.sirius.tests.support.api.TestsUtil;
 import org.eclipse.sirius.tests.swtbot.support.api.AbstractSiriusSwtBotGefTestCase;
 import org.eclipse.sirius.tests.swtbot.support.api.business.UIDiagramRepresentation;
 import org.eclipse.sirius.tests.swtbot.support.api.business.UIDiagramRepresentation.ZoomLevel;
@@ -42,7 +41,6 @@ import org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusDiagramEdi
 import org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusHelper;
 import org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotVSMEditor;
 import org.eclipse.sirius.tests.swtbot.support.utils.SWTBotUtils;
-import org.eclipse.swt.SWT;
 import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
 import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefConnectionEditPart;
 import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart;
@@ -855,10 +853,6 @@ public class BracketEdgeTests extends AbstractSiriusSwtBotGefTestCase {
      * modifications are changed in representation
      */
     public void testChangeDecoratorsInOdesign() {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         changeDecorators(EdgeArrows.INPUT_FILL_CLOSED_ARROW_LITERAL);
         // Open representation
         editor = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), REPRESENTATION_NAME, REPRESENTATION_INSTANCE_NAME, DDiagram.class);
@@ -997,10 +991,6 @@ public class BracketEdgeTests extends AbstractSiriusSwtBotGefTestCase {
      * representation and in properties view
      */
     public void testChangeLineStyleInOdesign() {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         SWTBotVSMEditor odesignEditor = openViewpointSpecificationModel(MODELER_RESOURCE_NAME);
         // expand the tree : EReference Mapping
         SWTBotTree tree = odesignEditor.bot().tree();
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/DeleteHookTests.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/DeleteHookTests.java
index 8ed1e6fd64..d9c9e0cd7d 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/DeleteHookTests.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/DeleteHookTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2016 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
@@ -173,10 +173,6 @@ public class DeleteHookTests extends AbstractSiriusSwtBotGefTestCase {
      * button.
      */
     public void testDeleteHookOnDeleteFromModelTabbarButton() {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         eClassBot.select();
         SWTBotUtils.waitAllUiEvents();
         deleteFromModelWithTabbarButton();
@@ -202,9 +198,8 @@ public class DeleteHookTests extends AbstractSiriusSwtBotGefTestCase {
              * .getNode(SWTBotTreeItem.java:308) at
              * org.eclipse.swtbot.swt.finder
              * .widgets.SWTBotTreeItem.getNode(SWTBotTreeItem.java:346) at
-             * org.eclipse
-             * .swtbot.swt.finder.widgets.SWTBotTreeItem.expandNode(SWTBotTreeItem
-             * .java:283) at
+             * org.eclipse .swtbot.swt.finder.widgets.SWTBotTreeItem.expandNode(
+             * SWTBotTreeItem .java:283) at
              * org.eclipse.sirius.tests.swtbot.support.api.business
              * .sessionbrowser.AbstractUIElementWithNextTreeItem.getNextNode(
              * AbstractUIElementWithNextTreeItem.java:42) at
@@ -256,10 +251,6 @@ public class DeleteHookTests extends AbstractSiriusSwtBotGefTestCase {
      * tabbar button.
      */
     public void testDeleteHookOnDeleteFromModelTabbarButtonCancel() {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         ePackageBot.select();
         SWTBotUtils.waitAllUiEvents();
         deleteFromModelWithTabbarButton();
@@ -336,6 +327,7 @@ public class DeleteHookTests extends AbstractSiriusSwtBotGefTestCase {
             return calledCorrectly;
         }
 
+        @Override
         public IStatus beforeDeleteCommandExecution(Collection<DSemanticDecorator> selections, Map<String, Object> parameters) {
             calledCorrectly = selections.contains(dDiagramElementOfEClassToDelete);
             return Status.OK_STATUS;
@@ -351,6 +343,7 @@ public class DeleteHookTests extends AbstractSiriusSwtBotGefTestCase {
             return calledCorrectly;
         }
 
+        @Override
         public IStatus beforeDeleteCommandExecution(Collection<DSemanticDecorator> selections, Map<String, Object> parameters) {
             calledCorrectly = selections.contains(dDiagramElementOfEPackageToDelete);
             return Status.CANCEL_STATUS;
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ExportDiagramAsImageWhenManyRepresentationsHaveSameNameTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ExportDiagramAsImageWhenManyRepresentationsHaveSameNameTest.java
index 1afa90b09b..78d4441a26 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ExportDiagramAsImageWhenManyRepresentationsHaveSameNameTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ExportDiagramAsImageWhenManyRepresentationsHaveSameNameTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2016 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
@@ -109,18 +109,13 @@ public class ExportDiagramAsImageWhenManyRepresentationsHaveSameNameTest extends
             return;
         }
 
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         copyFileToTestProject(Activator.PLUGIN_ID, DATA_UNIT_DIR, MODEL, SESSION_FILE);
 
         // Copy all files necessary for test
-        EclipseTestsSupportHelper.INSTANCE.copyFile(Activator.PLUGIN_ID, DATA_UNIT_DIR_FOR_TRANSIENT_SESSION + MODEL_FOR_TRANSIENT_SESSION, getProjectName() + "/" + "sub" + "/"
-                + MODEL_FOR_TRANSIENT_SESSION);
-        EclipseTestsSupportHelper.INSTANCE.copyFile(Activator.PLUGIN_ID, DATA_UNIT_DIR_FOR_TRANSIENT_SESSION + MODEL_FOR_TRANSIENT_SESSION2, getProjectName() + "/" + "sub" + "/"
-                + MODEL_FOR_TRANSIENT_SESSION2);
+        EclipseTestsSupportHelper.INSTANCE.copyFile(Activator.PLUGIN_ID, DATA_UNIT_DIR_FOR_TRANSIENT_SESSION + MODEL_FOR_TRANSIENT_SESSION,
+                getProjectName() + "/" + "sub" + "/" + MODEL_FOR_TRANSIENT_SESSION);
+        EclipseTestsSupportHelper.INSTANCE.copyFile(Activator.PLUGIN_ID, DATA_UNIT_DIR_FOR_TRANSIENT_SESSION + MODEL_FOR_TRANSIENT_SESSION2,
+                getProjectName() + "/" + "sub" + "/" + MODEL_FOR_TRANSIENT_SESSION2);
         EclipseTestsSupportHelper.INSTANCE.copyFile(Activator.PLUGIN_ID, DATA_UNIT_DIR_FOR_TRANSIENT_SESSION + TRANSIENT_SESSION, getProjectName() + "/" + "sub" + "/" + TRANSIENT_SESSION);
         EclipseTestsSupportHelper.INSTANCE.copyFile(Activator.PLUGIN_ID, DATA_UNIT_DIR_FOR_TRANSIENT_SESSION + TRANSIENT_SESSION2, getProjectName() + "/" + "sub" + "/" + TRANSIENT_SESSION2);
         Job.getJobManager().join(ResourceSyncClientNotifier.FAMILY, new NullProgressMonitor());
@@ -169,6 +164,7 @@ public class ExportDiagramAsImageWhenManyRepresentationsHaveSameNameTest extends
         }
         // Check that files exists
         File filesWithExpectedExtension[] = destinationFolder.listFiles(new FilenameFilter() {
+            @Override
             public boolean accept(File dir, String name) {
                 boolean result = false;
                 for (String filename : expectedFileNames) {
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ExportDiagramsAsImagesAndHtmlTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ExportDiagramsAsImagesAndHtmlTest.java
index cf355907f7..97eb4d7bbb 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ExportDiagramsAsImagesAndHtmlTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ExportDiagramsAsImagesAndHtmlTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2016 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
@@ -32,7 +32,6 @@ import org.eclipse.sirius.tests.swtbot.support.api.business.UIResource;
 import org.eclipse.sirius.tests.swtbot.support.api.dialog.ExportAsImageHelper;
 import org.eclipse.sirius.tests.swtbot.support.utils.SWTBotUtils;
 import org.eclipse.sirius.viewpoint.provider.Messages;
-import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
 import org.eclipse.swtbot.swt.finder.waits.Conditions;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
@@ -231,11 +230,6 @@ public class ExportDiagramsAsImagesAndHtmlTest extends AbstractSiriusSwtBotGefTe
      *             Test error.
      */
     public void testExportDiagramsOfTransientSessionAsJPGFromTabBar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         /* Open a transient session on an ecore file */
         EclipseTestsSupportHelper.INSTANCE.copyFile(Activator.PLUGIN_ID, DATA_UNIT_DIR_FOR_TRANSIENT_SESSION + MODEL_FOR_TRANSIENT_SESSION, getProjectName() + "/" + MODEL_FOR_TRANSIENT_SESSION);
 
@@ -274,11 +268,6 @@ public class ExportDiagramsAsImagesAndHtmlTest extends AbstractSiriusSwtBotGefTe
      *             Test error.
      */
     public void testExportDiagramsOfTransientSessionAsPNGFromTabBar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         /* Open a transient session on an ecore file */
         EclipseTestsSupportHelper.INSTANCE.copyFile(Activator.PLUGIN_ID, DATA_UNIT_DIR_FOR_TRANSIENT_SESSION + MODEL_FOR_TRANSIENT_SESSION, getProjectName() + "/" + MODEL_FOR_TRANSIENT_SESSION);
 
@@ -297,11 +286,6 @@ public class ExportDiagramsAsImagesAndHtmlTest extends AbstractSiriusSwtBotGefTe
      *             Test error.
      */
     public void testExportDiagramsOfTransientSessionAsSVGFromTabBar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         /* Open a transient session on an ecore file */
         EclipseTestsSupportHelper.INSTANCE.copyFile(Activator.PLUGIN_ID, DATA_UNIT_DIR_FOR_TRANSIENT_SESSION + MODEL_FOR_TRANSIENT_SESSION, getProjectName() + "/" + MODEL_FOR_TRANSIENT_SESSION);
 
@@ -368,15 +352,25 @@ public class ExportDiagramsAsImagesAndHtmlTest extends AbstractSiriusSwtBotGefTe
     public void testExportDiagramsOfTransientSessionAsSVGFromModelContentView() throws Exception {
         if (TestsUtil.shouldSkipUnreliableTests()) {
             /*
-            org.eclipse.swtbot.swt.finder.widgets.TimeoutException: Timeout after: 10000 ms.: tree item with text DesignerTestProject is not expanded
-            at org.eclipse.swtbot.swt.finder.SWTBotFactory.waitUntil(SWTBotFactory.java:407)
-            at org.eclipse.swtbot.swt.finder.SWTBotFactory.waitUntil(SWTBotFactory.java:381)
-            at org.eclipse.swtbot.swt.finder.SWTBotFactory.waitUntil(SWTBotFactory.java:369)
-            at org.eclipse.sirius.tests.swtbot.support.api.business.UIProject.getProjectTreeItem(UIProject.java:108)
-            at org.eclipse.sirius.tests.swtbot.support.api.business.UIProject.getUIItemFromResource(UIProject.java:137)
-            at org.eclipse.sirius.tests.swtbot.support.api.business.UIProject.mouseRigthClickOnResource(UIProject.java:171)
-            at org.eclipse.sirius.tests.swtbot.ExportDiagramsAsImagesAndHtmlTest.testExportDiagramsOfTransientSessionAsSVGFromModelContentView(ExportDiagramsAsImagesAndHtmlTest.java:371)
-            */
+             * org.eclipse.swtbot.swt.finder.widgets.TimeoutException: Timeout
+             * after: 10000 ms.: tree item with text DesignerTestProject is not
+             * expanded at
+             * org.eclipse.swtbot.swt.finder.SWTBotFactory.waitUntil(
+             * SWTBotFactory.java:407) at
+             * org.eclipse.swtbot.swt.finder.SWTBotFactory.waitUntil(
+             * SWTBotFactory.java:381) at
+             * org.eclipse.swtbot.swt.finder.SWTBotFactory.waitUntil(
+             * SWTBotFactory.java:369) at
+             * org.eclipse.sirius.tests.swtbot.support.api.business.UIProject.
+             * getProjectTreeItem(UIProject.java:108) at
+             * org.eclipse.sirius.tests.swtbot.support.api.business.UIProject.
+             * getUIItemFromResource(UIProject.java:137) at
+             * org.eclipse.sirius.tests.swtbot.support.api.business.UIProject.
+             * mouseRigthClickOnResource(UIProject.java:171) at
+             * org.eclipse.sirius.tests.swtbot.ExportDiagramsAsImagesAndHtmlTest
+             * .testExportDiagramsOfTransientSessionAsSVGFromModelContentView(
+             * ExportDiagramsAsImagesAndHtmlTest.java:371)
+             */
             return;
         }
 
@@ -563,6 +557,7 @@ public class ExportDiagramsAsImagesAndHtmlTest extends AbstractSiriusSwtBotGefTe
             destinationFolder = new File(destinationFolder.getAbsolutePath() + File.separator + newFolderName);
         }
         File filesWithExpectedExtension[] = destinationFolder.listFiles(new FilenameFilter() {
+            @Override
             public boolean accept(File dir, String name) {
                 boolean result = false;
                 for (String filename : expectedFileNames) {
@@ -573,6 +568,7 @@ public class ExportDiagramsAsImagesAndHtmlTest extends AbstractSiriusSwtBotGefTe
         });
         assertEquals("Wrong number of file created with the \"" + imageExtension + "\" extension.", expectedFileNames.length, filesWithExpectedExtension.length);
         File filesWithHTMLExtension[] = destinationFolder.listFiles(new FilenameFilter() {
+            @Override
             public boolean accept(File dir, String name) {
                 boolean result = false;
                 for (String filename : expectedFileNames) {
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ExportDiagramsAsImagesTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ExportDiagramsAsImagesTest.java
index 066da41d1a..8e8973bb6e 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ExportDiagramsAsImagesTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ExportDiagramsAsImagesTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2016 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
@@ -23,7 +23,6 @@ import org.eclipse.sirius.tests.swtbot.support.api.condition.CheckTreeItemEnable
 import org.eclipse.sirius.tests.swtbot.support.api.dialog.ExportAsImageHelper;
 import org.eclipse.sirius.tests.swtbot.support.utils.SWTBotUtils;
 import org.eclipse.sirius.viewpoint.provider.Messages;
-import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 import org.eclipse.swtbot.eclipse.finder.waits.Conditions;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
@@ -184,10 +183,6 @@ public class ExportDiagramsAsImagesTest extends AbstractSiriusSwtBotGefTestCase
      *             Test error.
      */
     public void testExportBigRepresesntationAsJPGFromTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         try {
             setErrorCatchActive(false);
             EclipseTestsSupportHelper.INSTANCE.copyFile(Activator.PLUGIN_ID, DATA_UNIT_DIR_FOR_BIG_MODEL + BIG_MODEL, getProjectName() + "/" + BIG_MODEL);
@@ -217,11 +212,6 @@ public class ExportDiagramsAsImagesTest extends AbstractSiriusSwtBotGefTestCase
      *             Test error.
      */
     public void testExportBigRepresesntationAsPNGFromTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         try {
             setErrorCatchActive(false);
             EclipseTestsSupportHelper.INSTANCE.copyFile(Activator.PLUGIN_ID, DATA_UNIT_DIR_FOR_BIG_MODEL + BIG_MODEL, getProjectName() + "/" + BIG_MODEL);
@@ -245,10 +235,6 @@ public class ExportDiagramsAsImagesTest extends AbstractSiriusSwtBotGefTestCase
      *             Test error.
      */
     public void testExportBigRepresesntationAsSVGFromTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         try {
             setErrorCatchActive(true);
             EclipseTestsSupportHelper.INSTANCE.copyFile(Activator.PLUGIN_ID, DATA_UNIT_DIR_FOR_BIG_MODEL + BIG_MODEL, getProjectName() + "/" + BIG_MODEL);
@@ -341,11 +327,6 @@ public class ExportDiagramsAsImagesTest extends AbstractSiriusSwtBotGefTestCase
      *             Test error.
      */
     public void testExportDiagramsOfTransientSessionAsJPGFromTabBar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         /* Open a transient session on an ecore file */
         EclipseTestsSupportHelper.INSTANCE.copyFile(Activator.PLUGIN_ID, DATA_UNIT_DIR_FOR_TRANSIENT_SESSION + MODEL_FOR_TRANSIENT_SESSION, getProjectName() + "/" + MODEL_FOR_TRANSIENT_SESSION);
 
@@ -364,11 +345,6 @@ public class ExportDiagramsAsImagesTest extends AbstractSiriusSwtBotGefTestCase
      *             Test error.
      */
     public void testExportDiagramsOfTransientSessionAsPNGFromTabBar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         if (TestsUtil.shouldSkipUnreliableTests()) {
             /*
              * org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException:
@@ -379,9 +355,8 @@ public class ExportDiagramsAsImagesTest extends AbstractSiriusSwtBotGefTestCase
              * SWTBotTreeItem.java:308) at
              * org.eclipse.swtbot.swt.finder.widgets.
              * SWTBotTreeItem.getNode(SWTBotTreeItem.java:346) at
-             * org.eclipse.sirius
-             * .tests.swtbot.support.api.business.UIProject.getUIItemFromResource
-             * (UIProject.java:152) at
+             * org.eclipse.sirius .tests.swtbot.support.api.business.UIProject.
+             * getUIItemFromResource (UIProject.java:152) at
              * org.eclipse.sirius.tests.swtbot.support.api
              * .business.UIProject.mouseRigthClickOnResource(UIProject.java:171)
              * at org.eclipse.sirius.tests.swtbot.ExportDiagramsAsImagesTest.
@@ -409,11 +384,6 @@ public class ExportDiagramsAsImagesTest extends AbstractSiriusSwtBotGefTestCase
      *             Test error.
      */
     public void testExportDiagramsOfTransientSessionAsSVGFromTabBar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         if (TestsUtil.shouldSkipUnreliableTests()) {
             /*
              * org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException:
@@ -424,9 +394,8 @@ public class ExportDiagramsAsImagesTest extends AbstractSiriusSwtBotGefTestCase
              * SWTBotTreeItem.java:308) at
              * org.eclipse.swtbot.swt.finder.widgets.
              * SWTBotTreeItem.getNode(SWTBotTreeItem.java:346) at
-             * org.eclipse.sirius
-             * .tests.swtbot.support.api.business.UIProject.getUIItemFromResource
-             * (UIProject.java:152) at
+             * org.eclipse.sirius .tests.swtbot.support.api.business.UIProject.
+             * getUIItemFromResource (UIProject.java:152) at
              * org.eclipse.sirius.tests.swtbot.support.api
              * .business.UIProject.mouseRigthClickOnResource(UIProject.java:171)
              * at
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/LabelFontModificationsTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/LabelFontModificationsTest.java
index 7593a3e6c6..97e5802b88 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/LabelFontModificationsTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/LabelFontModificationsTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010-2015 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2016 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
@@ -186,11 +186,6 @@ public class LabelFontModificationsTest extends AbstractFontModificationTest {
      * also tests that the style is considered as custom).
      */
     public void testBoldFromToolbar() {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         doTestBoldFromToolbar("myEClass", DNodeList2EditPart.class);
         doTestBoldFromToolbar("myEClass3", DNodeListEditPart.class);
         doTestBoldFromToolbar("myAttribute", DNodeListElementEditPart.class);
@@ -217,11 +212,6 @@ public class LabelFontModificationsTest extends AbstractFontModificationTest {
      * (and also tests that the style is considered as custom).
      */
     public void testItalicFromToolbar() {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         doTestItalicFromToolbar("myEClass", DNodeList2EditPart.class);
         doTestItalicFromToolbar("myEClass3", DNodeListEditPart.class);
         doTestItalicFromToolbar("myAttribute", DNodeListElementEditPart.class);
@@ -537,11 +527,6 @@ public class LabelFontModificationsTest extends AbstractFontModificationTest {
      * Test change to bold for all selected elements, with undo/redo.
      */
     public void testBoldAllSelectedElementsFromToolBarWithUndoRedo() {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         // Wait all UI events to ensure that the tabbar is correctly refreshed.
         SWTBotUtils.waitAllUiEvents();
 
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/LayoutingModeTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/LayoutingModeTest.java
index 50cdcd6969..fad6dff90b 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/LayoutingModeTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/LayoutingModeTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2016 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
@@ -17,7 +17,6 @@ import org.eclipse.jface.action.IStatusLineManager;
 import org.eclipse.sirius.business.api.session.Session;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.DDiagramElement;
-import org.eclipse.sirius.tests.support.api.TestsUtil;
 import org.eclipse.sirius.tests.swtbot.support.api.AbstractSiriusSwtBotGefTestCase;
 import org.eclipse.sirius.tests.swtbot.support.api.business.UIResource;
 import org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusDiagramEditor;
@@ -79,7 +78,8 @@ public class LayoutingModeTest extends AbstractSiriusSwtBotGefTestCase {
      * <ul>
      * <li>it is possible to activate/deactivate the LayoutingMode through the
      * Tabbar</li>
-     * <li>when activated, the Layouting mode forbids Drag and Drop operations</li>
+     * <li>when activated, the Layouting mode forbids Drag and Drop operations
+     * </li>
      * <li>when activate, the diagram's status line indicates that Layouting
      * mode is on</li>
      * </ul>
@@ -87,10 +87,6 @@ public class LayoutingModeTest extends AbstractSiriusSwtBotGefTestCase {
      * @throws Exception
      */
     public void testLayoutingModeActivationThroughTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         // Step 1 : layouting should be off
         checkLayoutingModeisInExpectedState(false);
 
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RefreshWithCustomizedStyleFromTabbarTests.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RefreshWithCustomizedStyleFromTabbarTests.java
index cddc7c406c..0aaa23407b 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RefreshWithCustomizedStyleFromTabbarTests.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RefreshWithCustomizedStyleFromTabbarTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2016 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
@@ -12,7 +12,6 @@ package org.eclipse.sirius.tests.swtbot;
 
 import org.eclipse.gmf.runtime.notation.Routing;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.sirius.tests.support.api.TestsUtil;
 import org.eclipse.sirius.tests.swtbot.support.utils.SWTBotUtils;
 import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart;
 
@@ -35,11 +34,6 @@ public class RefreshWithCustomizedStyleFromTabbarTests extends AbstractRefreshWi
      *             Test error.
      */
     public void testChangeRoutingStyleFromTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         editor.reveal(referenceEditPartBot.part());
         referenceEditPartBot.select();
 
@@ -64,10 +58,6 @@ public class RefreshWithCustomizedStyleFromTabbarTests extends AbstractRefreshWi
      *             Test error.
      */
     public void testChangeBackgroundImageFromTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         editor.reveal(eClass1WithSquareStyleBot.part());
         eClass1WithSquareStyleBot.select();
 
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RefreshWithCustomizedStyleTests.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RefreshWithCustomizedStyleTests.java
index 06b9777238..95f18712ad 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RefreshWithCustomizedStyleTests.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RefreshWithCustomizedStyleTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2016 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
@@ -36,7 +36,6 @@ import org.eclipse.sirius.diagram.ui.business.api.query.ViewQuery;
 import org.eclipse.sirius.diagram.ui.business.internal.query.CustomizableQuery;
 import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeEditPart;
 import org.eclipse.sirius.diagram.ui.internal.refresh.diagram.ViewPropertiesSynchronizer;
-import org.eclipse.sirius.tests.support.api.TestsUtil;
 import org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusHelper;
 import org.eclipse.sirius.viewpoint.FontFormat;
 import org.eclipse.sirius.viewpoint.RGBValues;
@@ -143,11 +142,6 @@ public class RefreshWithCustomizedStyleTests extends AbstractRefreshWithCustomiz
      *             thrown cause failure
      */
     public void testSetWorkspaceImageStyleCustomization() throws Exception {
-        // Not available in 4.x specific Tabbar
-        if (TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         editor.reveal(eClass1WithSquareStyleBot.part());
         eClass1WithSquareStyleBot.select();
         AbstractSWTBot<? extends Widget> setStyleToWorkspaceImageButtonFromTabbar = getSetStyleToWorkspaceImageButton(true, true);
@@ -458,11 +452,6 @@ public class RefreshWithCustomizedStyleTests extends AbstractRefreshWithCustomiz
     }
 
     private void testStyleCustomization(SWTBotGefEditPart swtBotGefEditPart) throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         // Launch tests from properties view (style tab) and cancel
         // customization from Appearance tab
         if (isSiriusElt(swtBotGefEditPart)) {
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RemoveNoteTextTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RemoveNoteTextTest.java
index 268ec91e29..fbd81ec7d0 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RemoveNoteTextTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RemoveNoteTextTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2016 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
@@ -14,7 +14,6 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.NoteEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.NoteAttachmentEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.TextEditPart;
 import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.tests.support.api.TestsUtil;
 import org.eclipse.sirius.tests.swtbot.support.api.AbstractSiriusSwtBotGefTestCase;
 import org.eclipse.sirius.tests.swtbot.support.api.business.UIResource;
 import org.eclipse.swtbot.eclipse.gef.finder.matchers.IsInstanceOf;
@@ -119,11 +118,6 @@ public class RemoveNoteTextTest extends AbstractSiriusSwtBotGefTestCase {
      * tabbar.
      */
     public void testRemoveNoteFromTabbarAction() {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         // Select note
         editor.click(NOTE);
         SWTBotGefEditPart noteEditPart = editor.getEditPart(NOTE);
@@ -139,11 +133,6 @@ public class RemoveNoteTextTest extends AbstractSiriusSwtBotGefTestCase {
      * Diagram' action of tabbar.
      */
     public void testRemoveNoteAttachmentFromTabbarAction() {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         // Select note
         editor.click(NOTE);
         SWTBotGefEditPart noteEditPart = editor.getEditPart(NOTE).parent();
@@ -161,11 +150,6 @@ public class RemoveNoteTextTest extends AbstractSiriusSwtBotGefTestCase {
      * tabbar.
      */
     public void testRemoveTextFromTabbarAction() {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         // Select text
         editor.click(TEXT);
         SWTBotGefEditPart noteEditPart = editor.getEditPart(TEXT);
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RoutingStyleTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RoutingStyleTest.java
index e3c390480e..150e050d77 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RoutingStyleTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RoutingStyleTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2016 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
@@ -13,7 +13,6 @@ package org.eclipse.sirius.tests.swtbot;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.ui.internal.edit.parts.DEdgeEditPart;
 import org.eclipse.sirius.diagram.ui.tools.api.preferences.SiriusDiagramUiPreferencesKeys;
-import org.eclipse.sirius.tests.support.api.TestsUtil;
 import org.eclipse.sirius.tests.swtbot.support.api.AbstractSiriusSwtBotGefTestCase;
 import org.eclipse.sirius.tests.swtbot.support.api.business.UILocalSession;
 import org.eclipse.sirius.tests.swtbot.support.api.business.UIResource;
@@ -122,11 +121,6 @@ public class RoutingStyleTest extends AbstractSiriusSwtBotGefTestCase {
      *             Test error.
      */
     public void testTabBarRoutingStyle() throws Exception {
-        // Not available in 4.x specific Tabbar
-        if (TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         // Select a diagram element named "ref"
         CheckSelectedCondition cS = new CheckSelectedCondition(editor, REF, DEdgeEditPart.class);
         editor.reveal(REF);
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/SetStyleToWorkspaceImageTests.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/SetStyleToWorkspaceImageTests.java
index 2aaf9f85d2..86c7cfa4fc 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/SetStyleToWorkspaceImageTests.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/SetStyleToWorkspaceImageTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2016 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
@@ -201,11 +201,6 @@ public class SetStyleToWorkspaceImageTests extends AbstractSiriusSwtBotGefTestCa
      *             Test error.
      */
     public void testSetWkpImageStyleCancelFromTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         // Tabbar tests
         testSetWkpImageStyleCancel(C1_NODE, AbstractDiagramNodeEditPart.class, true);
         testSetWkpImageStyleCancel(C1_LIST, AbstractDiagramListEditPart.class, true);
@@ -231,10 +226,6 @@ public class SetStyleToWorkspaceImageTests extends AbstractSiriusSwtBotGefTestCa
      *             Test error.
      */
     public void testSetWkpImageStyleDisabledOnListElementFromTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         testSetWkpImageStyleDisabled(A1C1_LIST, AbstractDiagramNameEditPart.class, true);
     }
 
@@ -245,11 +236,6 @@ public class SetStyleToWorkspaceImageTests extends AbstractSiriusSwtBotGefTestCa
      *             Test error.
      */
     public void testSetWkpImageStyleOnNodeFromTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         testSetWkpImageStyleApplicationAndCancel(C1_NODE, AbstractDiagramNodeEditPart.class, true, getJpgImagePath());
     }
 
@@ -260,10 +246,6 @@ public class SetStyleToWorkspaceImageTests extends AbstractSiriusSwtBotGefTestCa
      *             Test error.
      */
     public void testSetWkpImageStyleOnListFromTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         testSetWkpImageStyleApplicationAndCancel(C1_LIST, AbstractDiagramListEditPart.class, true, getJpgImagePath());
     }
 
@@ -274,10 +256,6 @@ public class SetStyleToWorkspaceImageTests extends AbstractSiriusSwtBotGefTestCa
      *             Test error.
      */
     public void testSetWkpImageStyleOnContainerFromTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         testSetWkpImageStyleApplicationAndCancel(C1_CONTAINER, AbstractDiagramContainerEditPart.class, true, getJpgImagePath());
     }
 
@@ -288,11 +266,6 @@ public class SetStyleToWorkspaceImageTests extends AbstractSiriusSwtBotGefTestCa
      *             Test error.
      */
     public void testSetWkpImageStyleOnBorderedNodeFromTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         testSetWkpImageStyleApplicationAndCancel(A1C1_NODE, AbstractDiagramBorderNodeEditPart.class, true, getJpgImagePath());
     }
 
@@ -303,11 +276,6 @@ public class SetStyleToWorkspaceImageTests extends AbstractSiriusSwtBotGefTestCa
      *             Test error.
      */
     public void testSetWkpImageStyleOnContainedNodeFromTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         testSetWkpImageStyleApplicationAndCancel(A1C1_CONTAINER, AbstractDiagramNodeEditPart.class, true, getJpgImagePath());
     }
 
@@ -318,10 +286,6 @@ public class SetStyleToWorkspaceImageTests extends AbstractSiriusSwtBotGefTestCa
      *             Test error.
      */
     public void testChangeWkpImageStyleFromJpgToSvgOnNodeFromTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         testChangeWkpImageStyle(C1_NODE, AbstractDiagramNodeEditPart.class, true, getJpgImagePath());
         testChangeWkpImageStyle(C1_NODE, AbstractDiagramNodeEditPart.class, true, getSvgImagePath());
 
@@ -336,10 +300,6 @@ public class SetStyleToWorkspaceImageTests extends AbstractSiriusSwtBotGefTestCa
      *             Test error.
      */
     public void testChangeWkpImageStyleFromJpgToSvgOnListFromTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         testChangeWkpImageStyle(C1_LIST, AbstractDiagramListEditPart.class, true, getJpgImagePath());
         testChangeWkpImageStyle(C1_LIST, AbstractDiagramListEditPart.class, true, getSvgImagePath());
 
@@ -354,10 +314,6 @@ public class SetStyleToWorkspaceImageTests extends AbstractSiriusSwtBotGefTestCa
      *             Test error.
      */
     public void testChangeWkpImageStyleFromJpgToSvgOnContainerFromTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         testChangeWkpImageStyle(C1_CONTAINER, AbstractDiagramContainerEditPart.class, true, getJpgImagePath());
         testChangeWkpImageStyle(C1_CONTAINER, AbstractDiagramContainerEditPart.class, true, getSvgImagePath());
 
@@ -372,10 +328,6 @@ public class SetStyleToWorkspaceImageTests extends AbstractSiriusSwtBotGefTestCa
      *             Test error.
      */
     public void testChangeWkpImageStyleFromJpgToSvgOnBorderedNodeFromTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         testChangeWkpImageStyle(A1C1_NODE, AbstractDiagramBorderNodeEditPart.class, true, getJpgImagePath());
         testChangeWkpImageStyle(A1C1_NODE, AbstractDiagramBorderNodeEditPart.class, true, getSvgImagePath());
 
@@ -390,10 +342,6 @@ public class SetStyleToWorkspaceImageTests extends AbstractSiriusSwtBotGefTestCa
      *             Test error.
      */
     public void testChangeWkpImageStyleFromJpgToSvgOnContainedNodeFromTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         testChangeWkpImageStyle(A1C1_CONTAINER, AbstractDiagramNodeEditPart.class, true, getJpgImagePath());
         testChangeWkpImageStyle(A1C1_CONTAINER, AbstractDiagramNodeEditPart.class, true, getSvgImagePath());
 
@@ -408,10 +356,6 @@ public class SetStyleToWorkspaceImageTests extends AbstractSiriusSwtBotGefTestCa
      *             Test error.
      */
     public void testChangeWkpImageStyleFromSvgToJpgOnNodeFromTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         testChangeWkpImageStyle(C1_NODE, AbstractDiagramNodeEditPart.class, true, getSvgImagePath());
         testChangeWkpImageStyle(C1_NODE, AbstractDiagramNodeEditPart.class, true, getJpgImagePath());
 
@@ -426,10 +370,6 @@ public class SetStyleToWorkspaceImageTests extends AbstractSiriusSwtBotGefTestCa
      *             Test error.
      */
     public void testChangeWkpImageStyleFromSvgToJpgOnListFromTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         testChangeWkpImageStyle(C1_LIST, AbstractDiagramListEditPart.class, true, getSvgImagePath());
         testChangeWkpImageStyle(C1_LIST, AbstractDiagramListEditPart.class, true, getJpgImagePath());
 
@@ -444,10 +384,6 @@ public class SetStyleToWorkspaceImageTests extends AbstractSiriusSwtBotGefTestCa
      *             Test error.
      */
     public void testChangeWkpImageStyleFromSvgToJpgOnContainerFromTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         testChangeWkpImageStyle(C1_CONTAINER, AbstractDiagramContainerEditPart.class, true, getSvgImagePath());
         testChangeWkpImageStyle(C1_CONTAINER, AbstractDiagramContainerEditPart.class, true, getJpgImagePath());
 
@@ -462,10 +398,6 @@ public class SetStyleToWorkspaceImageTests extends AbstractSiriusSwtBotGefTestCa
      *             Test error.
      */
     public void testChangeWkpImageStyleFromSvgToJpgOnBorderedNodeFromTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         testChangeWkpImageStyle(A1C1_NODE, AbstractDiagramBorderNodeEditPart.class, true, getSvgImagePath());
         testChangeWkpImageStyle(A1C1_NODE, AbstractDiagramBorderNodeEditPart.class, true, getJpgImagePath());
 
@@ -480,10 +412,6 @@ public class SetStyleToWorkspaceImageTests extends AbstractSiriusSwtBotGefTestCa
      *             Test error.
      */
     public void testChangeWkpImageStyleFromSvgToJpgOnContainedNodeFromTabbar() throws Exception {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         testChangeWkpImageStyle(A1C1_CONTAINER, AbstractDiagramNodeEditPart.class, true, getSvgImagePath());
         testChangeWkpImageStyle(A1C1_CONTAINER, AbstractDiagramNodeEditPart.class, true, getJpgImagePath());
 
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/VSMAndDiagramEditorSynchronisationTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/VSMAndDiagramEditorSynchronisationTest.java
index bfca7537b9..2f86b953ce 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/VSMAndDiagramEditorSynchronisationTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/VSMAndDiagramEditorSynchronisationTest.java
@@ -18,7 +18,6 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramListEditPart;
-import org.eclipse.sirius.tests.support.api.TestsUtil;
 import org.eclipse.sirius.tests.swtbot.support.api.AbstractSiriusSwtBotGefTestCase;
 import org.eclipse.sirius.tests.swtbot.support.api.business.UIDiagramRepresentation;
 import org.eclipse.sirius.tests.swtbot.support.api.business.UILocalSession;
@@ -181,10 +180,6 @@ public class VSMAndDiagramEditorSynchronisationTest extends AbstractSiriusSwtBot
      * Test with opened session. - open and modify VSM with opened editors
      */
     public void testVSMChangesWithOpenedEditor() {
-        // Not available in 4.x specific Tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         // Open diagram editor
         openDiagramEditor();
 
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/AbstractActionDisabledOnSequenceDiagramTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/AbstractActionDisabledOnSequenceDiagramTest.java
index ddcf52db25..6fb1f26034 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/AbstractActionDisabledOnSequenceDiagramTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/AbstractActionDisabledOnSequenceDiagramTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2016 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
@@ -16,7 +16,6 @@ import java.util.List;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.ui.tools.api.preferences.SiriusDiagramUiPreferencesKeys;
 import org.eclipse.sirius.ext.base.Option;
-import org.eclipse.sirius.tests.support.api.TestsUtil;
 import org.eclipse.sirius.tests.swtbot.support.api.business.UIResource;
 import org.eclipse.sirius.tests.swtbot.support.api.condition.CheckSelectedCondition;
 import org.eclipse.sirius.tests.swtbot.support.utils.SWTBotUtils;
@@ -94,10 +93,6 @@ public abstract class AbstractActionDisabledOnSequenceDiagramTest extends Abstra
      * interactionUses, combinedFragments, Lost messages and found messages.
      */
     public void testPinFromTabbarOnSequenceDiagramsComponents() {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         testActionFromTabbarOnSequenceDiagramComponents("The pin action in tabbar should not be enabled", PIN);
     }
 
@@ -106,10 +101,6 @@ public abstract class AbstractActionDisabledOnSequenceDiagramTest extends Abstra
      * interactionUses, combinedFragments, Lost messages and found messages.
      */
     public void testUnpinFromTabbarOnSequenceDiagramsComponents() {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         testActionFromTabbarOnSequenceDiagramComponents("The unPin action in tabbar should not be enabled", UNPIN);
     }
 
@@ -127,10 +118,6 @@ public abstract class AbstractActionDisabledOnSequenceDiagramTest extends Abstra
      * messages.
      */
     public void testCopyLayoutFromTabbarOnSequenceDiagramsComponents() {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         testActionFromTabbarOnSequenceDiagramComponents("The Copy Layout action in tabbar should not be enabled", COPY_LAYOUT);
     }
 
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/ExecutionTests.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/ExecutionTests.java
index a740bd1264..1e99b37e38 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/ExecutionTests.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/ExecutionTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2016 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
@@ -19,7 +19,6 @@ import org.eclipse.sirius.diagram.sequence.business.internal.layout.LayoutConsta
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.part.ExecutionEditPart;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.part.SequenceDiagramEditPart;
 import org.eclipse.sirius.diagram.sequence.util.Range;
-import org.eclipse.sirius.tests.support.api.TestsUtil;
 import org.eclipse.sirius.tests.swtbot.sequence.condition.CheckResize;
 import org.eclipse.sirius.tests.swtbot.support.api.business.UIDiagramRepresentation.ZoomLevel;
 import org.eclipse.sirius.tests.swtbot.support.api.condition.CheckSelectedCondition;
@@ -68,10 +67,6 @@ public class ExecutionTests extends AbstractDefaultModelSequenceTests {
      * Test method.
      */
     public void test_Zoom() {
-        // Not available in 4.x specific Tabbar
-        if (TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         try {
             ZoomLevel zoom50 = ZoomLevel.ZOOM_50;
             editor.zoom(ZoomLevel.ZOOM_50);
@@ -617,8 +612,8 @@ public class ExecutionTests extends AbstractDefaultModelSequenceTests {
         createExecution(lifelineAPosition, yScreenExecA0);
 
         // Validates the position of the execution
-        Rectangle execA0ScreenBounds = assertExecutionHasValidScreenBounds(LIFELINE_A, 0, new Rectangle(0, yScreenExecA0, LayoutConstants.DEFAULT_EXECUTION_WIDTH,
-                (int) (LayoutConstants.DEFAULT_EXECUTION_HEIGHT * zoom)), false);
+        Rectangle execA0ScreenBounds = assertExecutionHasValidScreenBounds(LIFELINE_A, 0,
+                new Rectangle(0, yScreenExecA0, LayoutConstants.DEFAULT_EXECUTION_WIDTH, (int) (LayoutConstants.DEFAULT_EXECUTION_HEIGHT * zoom)), false);
 
         // Creation of an execution
         int yExecA1 = execA0ScreenBounds.getCenter().y;
@@ -639,8 +634,8 @@ public class ExecutionTests extends AbstractDefaultModelSequenceTests {
         // Creation of an execution on lifeline B
         createExecution(lifelineBPosition, yScreenExecB0);
 
-        assertExecutionHasValidScreenBounds(LIFELINE_B, 0, new Rectangle(0, yScreenExecB0, (int) (LayoutConstants.DEFAULT_EXECUTION_WIDTH * zoom),
-                (int) (LayoutConstants.DEFAULT_EXECUTION_HEIGHT * zoom)), false);
+        assertExecutionHasValidScreenBounds(LIFELINE_B, 0,
+                new Rectangle(0, yScreenExecB0, (int) (LayoutConstants.DEFAULT_EXECUTION_WIDTH * zoom), (int) (LayoutConstants.DEFAULT_EXECUTION_HEIGHT * zoom)), false);
     }
 
     /**
@@ -849,8 +844,8 @@ public class ExecutionTests extends AbstractDefaultModelSequenceTests {
         bot.waitUntil(done);
 
         Rectangle firstExecutionBoundsAResize = new Rectangle(firstExecutionBoundsA.x + 15, firstExecutionBoundsA.y, firstExecutionBoundsA.width, firstExecutionBoundsA.height);
-        Rectangle secondExecutionBoundsAResize = new Rectangle(secondExecutionBoundsA.x, firstExecutionBoundsA.y - 15, secondExecutionBoundsA.width, secondExecutionBoundsA.getBottom().y
-                - (firstExecutionBoundsA.getTop().y - 15));
+        Rectangle secondExecutionBoundsAResize = new Rectangle(secondExecutionBoundsA.x, firstExecutionBoundsA.y - 15, secondExecutionBoundsA.width,
+                secondExecutionBoundsA.getBottom().y - (firstExecutionBoundsA.getTop().y - 15));
         assertExecutionHasValidScreenBounds(LIFELINE_A, 1, firstExecutionBoundsAResize, true);
         assertExecutionHasValidScreenBounds(LIFELINE_A, 0, secondExecutionBoundsAResize, true);
 
@@ -864,8 +859,8 @@ public class ExecutionTests extends AbstractDefaultModelSequenceTests {
         bot.waitUntil(done);
 
         Rectangle thirdExecutionBoundsAResize = new Rectangle(thirdExecutionBoundsA.x + 15, thirdExecutionBoundsA.y, thirdExecutionBoundsA.width, thirdExecutionBoundsA.height);
-        secondExecutionBoundsAResize = new Rectangle(secondExecutionBoundsA.x, secondExecutionBoundsA.y, secondExecutionBoundsA.width, (thirdExecutionBoundsA.getBottom().y + 15)
-                - secondExecutionBoundsA.getTop().y);
+        secondExecutionBoundsAResize = new Rectangle(secondExecutionBoundsA.x, secondExecutionBoundsA.y, secondExecutionBoundsA.width,
+                (thirdExecutionBoundsA.getBottom().y + 15) - secondExecutionBoundsA.getTop().y);
         assertExecutionHasValidScreenBounds(LIFELINE_A, 2, thirdExecutionBoundsAResize, true);
         assertExecutionHasValidScreenBounds(LIFELINE_A, 1, secondExecutionBoundsAResize, true);
 
@@ -899,8 +894,8 @@ public class ExecutionTests extends AbstractDefaultModelSequenceTests {
 
         // The value 20 correspond to half part execution + 5
         thirdExecutionBoundsAResize = new Rectangle(thirdExecutionBoundsA.x, thirdExecutionBoundsA.y + 20, thirdExecutionBoundsA.width, thirdExecutionBoundsA.height);
-        secondExecutionBoundsAResize = new Rectangle(secondExecutionBoundsA.x, secondExecutionBoundsA.y, secondExecutionBoundsA.width, (thirdExecutionBoundsA.getCenter().y)
-                - secondExecutionBoundsA.getTop().y);
+        secondExecutionBoundsAResize = new Rectangle(secondExecutionBoundsA.x, secondExecutionBoundsA.y, secondExecutionBoundsA.width,
+                (thirdExecutionBoundsA.getCenter().y) - secondExecutionBoundsA.getTop().y);
         assertExecutionHasValidScreenBounds(LIFELINE_A, 2, thirdExecutionBoundsAResize, true);
         assertExecutionHasValidScreenBounds(LIFELINE_A, 1, secondExecutionBoundsAResize, true);
 
@@ -965,8 +960,8 @@ public class ExecutionTests extends AbstractDefaultModelSequenceTests {
         editor.drag(firstExecutionBoundsA.getTop(), firstSyncCall.getCenter().x, firstSyncCall.getTop().y - 15);
         bot.waitUntil(done);
 
-        Rectangle firstExecutionBoundsAResize = new Rectangle(firstExecutionBoundsA.x, firstSyncCall.y - 15, firstExecutionBoundsA.width, firstExecutionBoundsA.getBottom().y
-                - (firstSyncCall.getTop().y - 15));
+        Rectangle firstExecutionBoundsAResize = new Rectangle(firstExecutionBoundsA.x, firstSyncCall.y - 15, firstExecutionBoundsA.width,
+                firstExecutionBoundsA.getBottom().y - (firstSyncCall.getTop().y - 15));
         Rectangle firstExecutionSyncCall = new Rectangle(firstSyncCall.x, firstSyncCall.y, firstSyncCall.width, firstSyncCall.height);
         assertExecutionHasValidScreenBounds(LIFELINE_A, 0, firstExecutionBoundsAResize, true);
         assertExecutionHasValidScreenBounds(LIFELINE_B, 0, firstExecutionSyncCall, true);
@@ -1011,8 +1006,8 @@ public class ExecutionTests extends AbstractDefaultModelSequenceTests {
         editor.drag(firstExecutionBoundsA.getBottom(), secondSyncCall.getCenter().x, secondSyncCall.getBottom().y + 15);
         bot.waitUntil(done);
 
-        firstExecutionBoundsAResize = new Rectangle(firstExecutionBoundsA.x, firstExecutionBoundsA.y, firstExecutionBoundsA.width, (secondSyncCall.getBottom().y + 15)
-                - firstExecutionBoundsA.getTop().y);
+        firstExecutionBoundsAResize = new Rectangle(firstExecutionBoundsA.x, firstExecutionBoundsA.y, firstExecutionBoundsA.width,
+                (secondSyncCall.getBottom().y + 15) - firstExecutionBoundsA.getTop().y);
         secondExecutionSyncCall = new Rectangle(secondSyncCall.x, secondSyncCall.y, secondSyncCall.width, secondSyncCall.height);
         assertExecutionHasValidScreenBounds(LIFELINE_A, 0, firstExecutionBoundsAResize, true);
         assertExecutionHasValidScreenBounds(LIFELINE_B, 1, secondExecutionSyncCall, true);
@@ -1064,8 +1059,8 @@ public class ExecutionTests extends AbstractDefaultModelSequenceTests {
         editor.drag(firstExecutionBoundsA.getTop(), firstAsyncCall.getCenter().x, firstAsyncCall.getCenter().y);
         bot.waitUntil(done);
 
-        Rectangle firstExecutionBoundsAResize = new Rectangle(firstExecutionBoundsA.x, firstAsyncCall.getCenter().y, firstExecutionBoundsA.width, firstExecutionBoundsA.getBottom().y
-                - (firstAsyncCall.getCenter().y));
+        Rectangle firstExecutionBoundsAResize = new Rectangle(firstExecutionBoundsA.x, firstAsyncCall.getCenter().y, firstExecutionBoundsA.width,
+                firstExecutionBoundsA.getBottom().y - (firstAsyncCall.getCenter().y));
         Rectangle firstExecutionSyncCall = new Rectangle(firstAsyncCall.x, firstAsyncCall.y, firstAsyncCall.width, firstAsyncCall.height);
         assertExecutionHasValidScreenBounds(LIFELINE_A, 0, firstExecutionBoundsAResize, true);
         assertExecutionHasValidScreenBounds(LIFELINE_B, 0, firstExecutionSyncCall, true);
@@ -1149,8 +1144,8 @@ public class ExecutionTests extends AbstractDefaultModelSequenceTests {
         editor.drag(firstSyncCall.getTop(), firstExecutionBoundsA.getCenter().x, firstExecutionBoundsA.getTop().y - 15);
         bot.waitUntil(done);
 
-        Rectangle firstSyncCallBoundsAResize = new Rectangle(firstSyncCall.x, firstExecutionBoundsA.getTop().y - 15, firstExecutionBoundsA.width, firstSyncCall.getBottom().y
-                - (firstExecutionBoundsA.getTop().y - 15));
+        Rectangle firstSyncCallBoundsAResize = new Rectangle(firstSyncCall.x, firstExecutionBoundsA.getTop().y - 15, firstExecutionBoundsA.width,
+                firstSyncCall.getBottom().y - (firstExecutionBoundsA.getTop().y - 15));
         Rectangle firstExecution = new Rectangle(firstExecutionBoundsA.x, firstExecutionBoundsA.y, firstExecutionBoundsA.width, firstExecutionBoundsA.height);
         assertExecutionHasValidScreenBounds(LIFELINE_B, 0, firstSyncCallBoundsAResize, true);
         assertExecutionHasValidScreenBounds(LIFELINE_A, 0, firstExecution, true);
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/tabbar/TabBarTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/tabbar/TabBarTest.java
index 14b9c2ef9d..dc96521cd9 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/tabbar/TabBarTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/tabbar/TabBarTest.java
@@ -30,7 +30,6 @@ import org.eclipse.sirius.diagram.ui.tools.api.preferences.SiriusDiagramUiPrefer
 import org.eclipse.sirius.diagram.ui.tools.internal.actions.distribute.DistributeAction;
 import org.eclipse.sirius.diagram.ui.tools.internal.actions.style.ResetStylePropertiesToDefaultValuesAction;
 import org.eclipse.sirius.diagram.ui.tools.internal.editor.DDiagramEditorImpl;
-import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.Tabbar;
 import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.tests.support.api.TestsUtil;
 import org.eclipse.sirius.tests.swtbot.Activator;
@@ -185,11 +184,6 @@ public class TabBarTest extends AbstractSiriusSwtBotGefTestCase {
             return;
         }
 
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         // Select an element on diagram and validate Tabbar tools
         selectDiagramElement0();
         checkDiagramElementTabbarButtons(false);
@@ -255,10 +249,6 @@ public class TabBarTest extends AbstractSiriusSwtBotGefTestCase {
     }
 
     private void doTestToolbarButtonInitialization(boolean activeExtensions) {
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
         // Validate tools of the tab bar without any diagram element selected
         checkDiagramTabbarButtons(activeExtensions);
 
@@ -473,11 +463,6 @@ public class TabBarTest extends AbstractSiriusSwtBotGefTestCase {
         if (TestsUtil.shouldSkipUnreliableTests()) {
             return;
         }
-        // Not available in fixed tabbar
-        if (!TestsUtil.isDynamicTabbar()) {
-            return;
-        }
-
         // close the current editor
         editor.close();
 
@@ -555,17 +540,4 @@ public class TabBarTest extends AbstractSiriusSwtBotGefTestCase {
         }
         checkButtonNotPresent(TABBAR_EXTENSION_ON_DIAGRAM_ELEMENT);
     }
-
-    /**
-     * This test checks the behavior of Tabbar.canBeDynamic() and
-     * TestsUtil.isDynamicTabbar().
-     */
-    public void testDynamicTabbarEnablement() {
-        boolean tabbarShouldBeDynamic = true;
-        if (TestsUtil.isJuno4Platform() || TestsUtil.isKeplerPlatform()) {
-            tabbarShouldBeDynamic = false;
-        }
-        assertEquals("Check the tabbar dynamic condition.", tabbarShouldBeDynamic, Tabbar.canBeDynamic());
-        assertEquals("Check the tabbar dynamic condition.", tabbarShouldBeDynamic, TestsUtil.isDynamicTabbar());
-    }
 }