Merge branch 'master' into bug/423037_SplitDiagramEPackage

Conflicts:
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/api/diagramtype/SequenceDiagramInterpretedExpressionSwitch.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/api/diagramtype/SequenceDiagramTypeProvider.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/internal/EObjectQuery.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/internal/diagramtype/SequenceCollapseUpdater.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/internal/diagramtype/SequenceToolInterpretedExpressionSwitch.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/internal/migration/SequenceDiagramRepresentationsFileMigrationParticipant.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/command/SequenceEMFCommandFactory.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/operation/ExecutionOperations.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/part/SequenceDiagramEditPart.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/CombinedFragmentResizableEditPolicy.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/EndOfLifeSelectionPolicy.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/ExecutionSelectionEditPolicy.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/InstanceRoleResizableEditPolicy.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/InstanceRoleSiriusGraphicalNodeEditPolicy.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/OperandResizableEditPolicy.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/SequenceContainerCreationPolicy.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/SequenceMessageEditPolicy.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/SequenceNodeCreationPolicy.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/SequenceSiriusGraphicalNodeEditPolicy.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/AbstractNodeEventResizeSelectionValidator.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/AbstractOperandValidator.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/DefaultMessageCreationValidator.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/FrameCreationValidator.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/ISEComplexMoveValidator.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/layout/CombinedFragmentVerticalPositionFunction.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/layout/InstanceUseVerticalPositionFunction.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/layout/SequenceGraphicalHelper.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/util/FinalParentHelper.java
	plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/util/RequestQuery.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/VerticalRangeFunction.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/AbstractNodeEvent.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/AbstractSequenceElement.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/CombinedFragment.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/EndOfLife.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/Execution.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/ISequenceElement.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/ISequenceElementAccessor.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/ISequenceEvent.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/InstanceRole.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/Lifeline.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/LostMessageEnd.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/Message.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/ObservationPoint.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/Operand.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/SequenceDiagram.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/State.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/AbstractSequenceLayout.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/EventEndToPositionFunction.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/SequenceLayout.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/horizontal/LostMessageEndHorizontalLayoutHelper.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/horizontal/SequenceHorizontalLayout.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/observation/SequenceObservationLayout.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/vertical/SequenceVerticalLayout.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/operation/SequenceMessageRangeHelper.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/operation/ShiftDirectSubExecutionsOperation.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/operation/SynchronizeGraphicalOrderingOperation.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/operation/SynchronizeInstanceRoleSemanticOrderingOperation.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/operation/VerticalSpaceExpansion.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/ordering/EventEndHelper.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/ordering/RefreshOrderingHelper.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/query/InstanceRoleQuery.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/query/SequenceDiagramQuery.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/query/SequenceMessageViewQuery.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/refresh/RefreshLayoutTrigger.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/refresh/SequenceCanonicalSynchronizerAdapter.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/util/EventFinder.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/util/ParentOperandFinder.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/util/RangeSetter.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/util/SameLifelinePredicate.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/FrameCreationCommandBuilder.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/OperandCreationCommandBuilder.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/SequenceCreatedEventsFlaggingSiriusCommand.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/SequenceGenericToolCommandBuilder.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/SequencePaneBasedSelectionWizardCommandBuilder.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/SequenceSelectionWizardCommandBuilder.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/StateCreationCommandBuilder.java
	plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/tool/internal/action/repair/SequenceDiagramRepairParticipant.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/helper/graphicalfilters/CollapseUpdater.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/helper/graphicalfilters/CompositeFilterApplicationBuilder.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/query/ConnectionQuery.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/query/DDiagramGraphicalQuery.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/query/EdgeQuery.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/query/NodeQuery.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/view/SiriusLayoutDataManager.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/command/SiriusSetConnectionAnchorsCommand.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/command/TreeLayoutSetConnectionAnchorsCommand.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/command/TreeLayoutSetConnectionBendpointsCommand.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/dialect/description/DiagramInterpretedExpressionQuery.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/dialect/description/DiagramInterpretedExpressionTargetSwitch.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/image/refresh/WorkspaceImageChangeDetector.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/migration/DiagramRepresentationsFileMigrationParticipant.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV650.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV670.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/query/DNodeQuery.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/query/RequestQuery.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/view/SiriusLayoutDataManagerImpl.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/edit/api/part/AbstractDDiagramEditPart.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/edit/api/part/AbstractDiagramContainerEditPart.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/edit/api/part/DiagramNameEditPartOperation.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/edit/api/part/IDDiagramEditPart.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/edit/internal/part/AbstractDiagramNodeEditPartRefreshVisualsOperation.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/edit/internal/part/DiagramContainerEditPartOperation.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/edit/internal/part/DiagramEdgeEditPartOperation.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/edit/internal/part/listener/VisibilityPostCommitListener.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/graphical/edit/policies/AirResizableEditPolicy.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/graphical/edit/policies/RegionContainerResizableEditPolicy.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/graphical/edit/policies/RegionResizableEditPolicy.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/edit/parts/AbstractDEdgeNameEditPart.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/edit/parts/AbstractDNodeContainerCompartmentEditPart.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/edit/parts/WorkspaceImageEditPart.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/refresh/AbstractCanonicalSynchronizer.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/refresh/GMFHelper.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/refresh/SiriusDiagramSessionEventBroker.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/refresh/borderednode/CanonicalDBorderItemLocator.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/refresh/diagram/ConnectionsFactory.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/refresh/diagram/DDiagramCanonicalSynchronizer.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/refresh/edge/SlidableAnchor.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/refresh/listeners/FilterListener.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/part/ValidateAction.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/api/permission/EditPartAuthorityListener.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/actions/SaveAsImageFileAction.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/actions/SelectHiddenElementsAction.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/actions/layout/CopyLayoutAction.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/actions/layout/PasteLayoutAction.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/actions/refresh/RefreshRunnableWithProgress.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/actions/repair/DiagramElementStateFactory.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/actions/style/SetStyleToWorkspaceImageAction.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/actions/visibility/HideDDiagramElementLabelAction.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/actions/visibility/RevealOutlineElementsAction.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/actions/visibility/RevealOutlineLabelsAction.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/clipboard/SiriusClipboardGlobalActionHandler.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/editor/DDiagramEditorImpl.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/graphical/edit/part/SiriusScroller.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/graphical/edit/policies/SiriusConnectionEndPointEditPolicy.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/menu/DiagramMenuUpdater.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/menu/PopupMenuContribution.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/menu/SubDiagramMenu.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/palette/PaletteManagerImpl.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/part/SiriusFileFormat.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/providers/decorators/SubDiagramDecorator.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/util/GMFNotationUtilities.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/api/figure/FigureQuery.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/api/figure/FoldingToggleImageFigure.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/api/figure/SVGWorkspaceImageFigure.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/api/figure/locator/DBorderItemLocator.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/internal/dialogs/DiagramElementsSelectionDialog.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/internal/figure/locator/FeedbackDBorderItemLocator.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/internal/layout/AutoSizeAndRegionAwareGraphLayout.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/internal/layout/LayoutDataHelperImpl.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/internal/properties/DiagramShapeColorAndFontPropertySection.java
	plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/internal/views/providers/outline/OutlineLabelProvider.java
	plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF
	plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/common/AbstractSiriusPropertySection.java
	plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/contribution/ContributionTargetPropertySection.java
	plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/vsmelementcustomization/VSMElementCustomizationPropertySection.java
	plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/api/menu/AbstractEObjectRefactoringAction.java
	plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/property/section/SiriusPropertySectionHelper.java
	plugins/org.eclipse.sirius.ext.draw2d/src/org/eclipse/sirius/ext/draw2d/figure/ActionTriggerImageFigure.java
	plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableMenuListener.java
	plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF
	plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/AdditionalLayerItemProvider.java
	plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/LayerItemProvider.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/editor/SpecificEditorInputTranformer.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/provider/AbstractDDiagramElementLabelItemProvider.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/actions/export/ExportAction.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/assist/TextContentProposalProvider.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/color/VisualBindingManager.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/dialogs/ExportRepresentationsAsImagesDialog.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/views/common/item/CommonSessionItem.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/views/modelexplorerview/resourcelistener/DefaultModelingProjectResourceListener.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/views/modelexplorerview/resourcelistener/ResourceDeltaVisitor.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/export/AbstractExportRepresentationsAction.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/util/EMFCoreUtil.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/ContextMenuFiller.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/item/AbstractFolderItem.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/item/ControlledRoot.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/item/ProjectDependenciesItemImpl.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/item/RepresentationDescriptionItemImpl.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/item/RepresentationItemImpl.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/item/ViewpointItemImpl.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/OpenRepresentationsFileJob.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/model/ModelingModelProvider.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/ManageSessionActionProvider.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/OpenSessionOnExpandListener.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/SiriusCommonLabelProvider.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/interpreterview/DesignerInterpreterView.java
	plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/modelexplorer/ModelExplorerView.java
	plugins/org.eclipse.sirius/META-INF/MANIFEST.MF
	plugins/org.eclipse.sirius/model/viewpoint.ecore
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/componentization/ViewpointRegistryImpl.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/diagramtype/IDiagramDescriptionProvider.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/description/AbstractInterpretedExpressionQuery.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/description/DefaultInterpretedExpressionTargetSwitch.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/description/IInterpretedExpressionQuery.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/description/IInterpretedExpressionTargetSwitch.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/SiriusHelper.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/SiriusResourceHelper.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/migration/AbstractRepresentationsFileMigrationParticipant.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/modelingproject/ModelingProject.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/AirDResouceQuery.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/DAnalysisQuery.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/DDiagramElementQuery.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/DEdgeQuery.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/DRepresentationQuery.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/DiagramDescriptionQuery.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/DiagramElementMappingQuery.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/DragAndDropTargetQuery.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/EObjectQuery.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/GroupQuery.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/IEdgeMappingQuery.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/NodeStyleQuery.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/URIQuery.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/ViewpointQuery.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/ViewpointURIQuery.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/ModelChangeTrigger.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/danalysis/DAnalysisSessionHelper.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/color/DiagramStyleColorUpdater.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/componentization/mappings/table/CandidateMappingManager.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/ContributionBuilder.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/ContributionFinder.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/FeatureContributor.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/IncrementalModelContributor.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/ModelContributor.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/RepresentationExtensionsFinder.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/ReuseHelper.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/Updater.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/dialect/description/DescriptionInterpretedExpressionTargetSwitch.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/dialect/description/FilterInterpretedExpressionTargetSwitch.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/dialect/description/StyleInterpretedExpressionTargetSwitch.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/dialect/description/ToolInterpretedExpressionTargetSwitch.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/dialect/description/ValidationInterpretedExpressionTargetSwitch.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/AbstractSynchronizerHelper.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/DDiagramElementSynchronizer.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/DDiagramSynchronizer.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/DEdgeCandidate.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/DEdgeSynchronizerHelper.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/CreateContainerTask.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/CreateDEdgeTask.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/DnDTasksOperations.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/layers/MappingTableEntry.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/layers/MappingsTable.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/helper/ContainerMappingHelper.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/helper/EdgeMappingHelper.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/helper/GetConditionalStyle.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/helper/GetDefaultStyle.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/helper/NodeMappingHelper.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/helper/StyleHelper.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/spec/DEdgeSpec.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/DefaultRepresentationsFileMigrationParticipant.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/description/DefaultVSMMigrationParticipant.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/description/OptionalLayersVSMMigrationParticipant.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/resource/ColorsMigrationHelper.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/resource/session/SaxParser.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/resource/session/diagram/data/LostElementDataWithMapping.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/resource/session/diagram/data/LostElementFactory.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/modelingproject/manager/InitializeModelingProjectJob.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/DynamicVSMLoader.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/VSMResolver.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/ViewpointDependenciesTracker.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/Entry.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/MaskingPolicy.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/ViewpointRegistry.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/ViewpointRelations.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/ViewpointURIConverter.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/ViewpointURIHandler.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/monitoring/LegacyPluginMonitor.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/query/ModelingProjectQuery.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/query/ResourceDeltaQuery.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/RepresentationNameListener.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/SessionEventBrokerImpl.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/SessionTransientAttachment.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/MovidaSupport.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/interpreter/context/SiriusInterpreterContextFactory.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/ui/RefreshEditorsPrecommitListener.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/command/builders/ContainerCreationCommandBuilder.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/command/builders/DeletionCommandBuilder.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/command/builders/DirectEditCommandBuilder.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/command/builders/DoubleClickCommandBuilder.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/command/builders/DragAndDropCommandBuilder.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/command/builders/EdgeCreationCommandBuilder.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/command/builders/GenericToolCommandBuilder.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/command/builders/NodeCreationCommandBuilder.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/command/builders/PaneBasedSelectionWizardCommandBuilder.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/command/builders/PasteCommandBuilder.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/command/builders/ReconnectionCommandBuilder.java
	plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/command/builders/SelectionWizardCommandBuilder.java

Change-Id: Ia926bb4d620ff99eae5ff117a0b68f748351943a
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>

7 files changed, 8 insertions, 8 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/AbstractSequenceLayout.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/AbstractSequenceLayout.java
index ffb952c422..0068adc98c 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/AbstractSequenceLayout.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/AbstractSequenceLayout.java
@@ -12,7 +12,6 @@ package org.eclipse.sirius.diagram.sequence.business.internal.layout;
 
 import java.util.Map;
 
-import org.eclipse.sirius.common.tools.api.util.Option;
 import org.eclipse.sirius.diagram.sequence.business.internal.elements.EndOfLife;
 import org.eclipse.sirius.diagram.sequence.business.internal.elements.ISequenceElement;
 import org.eclipse.sirius.diagram.sequence.business.internal.elements.InstanceRole;
@@ -21,6 +20,7 @@ import org.eclipse.sirius.diagram.sequence.business.internal.elements.LostMessag
 import org.eclipse.sirius.diagram.sequence.business.internal.elements.Message;
 import org.eclipse.sirius.diagram.sequence.business.internal.elements.SequenceDiagram;
 import org.eclipse.sirius.diagram.sequence.business.internal.query.ISequenceElementQuery;
+import org.eclipse.sirius.ext.base.Option;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/EventEndToPositionFunction.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/EventEndToPositionFunction.java
index 5d14fd7f8e..f6097b8b45 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/EventEndToPositionFunction.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/EventEndToPositionFunction.java
@@ -13,7 +13,6 @@ package org.eclipse.sirius.diagram.sequence.business.internal.layout;
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.eclipse.sirius.common.tools.api.util.Option;
 import org.eclipse.sirius.diagram.DDiagramElement;
 import org.eclipse.sirius.diagram.sequence.business.internal.elements.AbstractFrame;
 import org.eclipse.sirius.diagram.sequence.business.internal.elements.AbstractNodeEvent;
@@ -25,6 +24,7 @@ import org.eclipse.sirius.diagram.sequence.ordering.CompoundEventEnd;
 import org.eclipse.sirius.diagram.sequence.ordering.EventEnd;
 import org.eclipse.sirius.diagram.sequence.ordering.SingleEventEnd;
 import org.eclipse.sirius.diagram.sequence.util.Range;
+import org.eclipse.sirius.ext.base.Option;
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/SequenceLayout.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/SequenceLayout.java
index a95f8a3161..81ff3873d8 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/SequenceLayout.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/SequenceLayout.java
@@ -13,7 +13,6 @@ package org.eclipse.sirius.diagram.sequence.business.internal.layout;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.Size;
-import org.eclipse.sirius.common.tools.api.util.Option;
 import org.eclipse.sirius.diagram.CollapseFilter;
 import org.eclipse.sirius.diagram.DDiagramElement;
 import org.eclipse.sirius.diagram.business.api.query.NodeQuery;
@@ -24,6 +23,7 @@ import org.eclipse.sirius.diagram.sequence.business.internal.layout.flag.Sequenc
 import org.eclipse.sirius.diagram.sequence.business.internal.layout.horizontal.SequenceHorizontalLayout;
 import org.eclipse.sirius.diagram.sequence.business.internal.layout.observation.SequenceObservationLayout;
 import org.eclipse.sirius.diagram.sequence.business.internal.layout.vertical.SequenceVerticalLayout;
+import org.eclipse.sirius.ext.base.Option;
 
 import com.google.common.collect.Iterables;
 
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/horizontal/LostMessageEndHorizontalLayoutHelper.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/horizontal/LostMessageEndHorizontalLayoutHelper.java
index 6d8917c9fe..3cf71c0624 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/horizontal/LostMessageEndHorizontalLayoutHelper.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/horizontal/LostMessageEndHorizontalLayoutHelper.java
@@ -16,7 +16,6 @@ import java.util.Set;
 
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.sirius.common.tools.api.util.Option;
 import org.eclipse.sirius.diagram.DEdge;
 import org.eclipse.sirius.diagram.EdgeTarget;
 import org.eclipse.sirius.diagram.sequence.business.internal.elements.ISequenceEvent;
@@ -31,6 +30,7 @@ import org.eclipse.sirius.diagram.sequence.business.internal.elements.SequenceDi
 import org.eclipse.sirius.diagram.sequence.business.internal.layout.AbstractSequenceLayout;
 import org.eclipse.sirius.diagram.sequence.business.internal.layout.LayoutConstants;
 import org.eclipse.sirius.diagram.sequence.util.Range;
+import org.eclipse.sirius.ext.base.Option;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/horizontal/SequenceHorizontalLayout.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/horizontal/SequenceHorizontalLayout.java
index 8b500137b8..cabfb13621 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/horizontal/SequenceHorizontalLayout.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/horizontal/SequenceHorizontalLayout.java
@@ -28,7 +28,6 @@ import org.eclipse.gmf.runtime.notation.Location;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.RelativeBendpoints;
 import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
-import org.eclipse.sirius.common.tools.api.util.Option;
 import org.eclipse.sirius.diagram.sequence.SequenceDDiagram;
 import org.eclipse.sirius.diagram.sequence.business.internal.elements.AbstractFrame;
 import org.eclipse.sirius.diagram.sequence.business.internal.elements.AbstractNodeEvent;
@@ -45,6 +44,7 @@ import org.eclipse.sirius.diagram.sequence.business.internal.layout.AbstractSequ
 import org.eclipse.sirius.diagram.sequence.business.internal.layout.LayoutConstants;
 import org.eclipse.sirius.diagram.sequence.business.internal.query.ISequenceElementQuery;
 import org.eclipse.sirius.diagram.sequence.util.Range;
+import org.eclipse.sirius.ext.base.Option;
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicates;
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/observation/SequenceObservationLayout.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/observation/SequenceObservationLayout.java
index 9dc2331d85..66146bb78c 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/observation/SequenceObservationLayout.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/observation/SequenceObservationLayout.java
@@ -18,7 +18,6 @@ import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.gmf.runtime.notation.Bounds;
 import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.sirius.common.tools.api.util.Option;
 import org.eclipse.sirius.diagram.DNode;
 import org.eclipse.sirius.diagram.business.internal.query.DNodeQuery;
 import org.eclipse.sirius.diagram.sequence.business.internal.elements.AbstractFrame;
@@ -34,6 +33,7 @@ import org.eclipse.sirius.diagram.sequence.business.internal.ordering.EventEndHe
 import org.eclipse.sirius.diagram.sequence.ordering.CompoundEventEnd;
 import org.eclipse.sirius.diagram.sequence.ordering.EventEnd;
 import org.eclipse.sirius.diagram.sequence.ordering.SingleEventEnd;
+import org.eclipse.sirius.ext.base.Option;
 
 import com.google.common.collect.Maps;
 
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/vertical/SequenceVerticalLayout.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/vertical/SequenceVerticalLayout.java
index 5d40bdee94..f89f0a1465 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/vertical/SequenceVerticalLayout.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/layout/vertical/SequenceVerticalLayout.java
@@ -24,8 +24,6 @@ import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.LayoutConstraint;
 import org.eclipse.gmf.runtime.notation.Location;
 import org.eclipse.gmf.runtime.notation.Size;
-import org.eclipse.sirius.common.tools.api.util.Option;
-import org.eclipse.sirius.common.tools.api.util.Options;
 import org.eclipse.sirius.diagram.DDiagramElement;
 import org.eclipse.sirius.diagram.DNode;
 import org.eclipse.sirius.diagram.business.internal.query.DNodeQuery;
@@ -56,6 +54,8 @@ import org.eclipse.sirius.diagram.sequence.ordering.CompoundEventEnd;
 import org.eclipse.sirius.diagram.sequence.ordering.EventEnd;
 import org.eclipse.sirius.diagram.sequence.ordering.SingleEventEnd;
 import org.eclipse.sirius.diagram.sequence.util.Range;
+import org.eclipse.sirius.ext.base.Option;
+import org.eclipse.sirius.ext.base.Options;
 
 import com.google.common.base.Function;
 import com.google.common.base.Functions;