diff options
| author | Pierre-Charles David | 2015-11-20 09:43:09 +0000 |
|---|---|---|
| committer | Pierre-Charles David | 2015-11-23 10:08:26 +0000 |
| commit | 0b0840cd9edd64fd85ad9663d9e0ebbe595ad37d (patch) | |
| tree | 5b1b3808c6a5dcbdd758b232b9da2ac4862e64c1 | |
| parent | 7b1dcb4598787efdb109118e49756e0305068857 (diff) | |
| download | org.eclipse.sirius-0b0840cd9edd64fd85ad9663d9e0ebbe595ad37d.tar.gz org.eclipse.sirius-0b0840cd9edd64fd85ad9663d9e0ebbe595ad37d.tar.xz org.eclipse.sirius-0b0840cd9edd64fd85ad9663d9e0ebbe595ad37d.zip | |
[482528] Add abstract 'Extension' class under 'Group' in VSMs
This, combined with EMF's support for child extenders, will allow
additional metamodels to contribute top-level extensions inside VSMs
without the core of Sirius explicitly depending on them. In particular
it will allow a separate, optional metamodel to describe properties
views.
Bug: 482528
Change-Id: I54874463085c30d593ba34f3009b133f5e639a7e
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
46 files changed, 406 insertions, 156 deletions
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/BasicMessageMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/BasicMessageMappingItemProvider.java index 3713b2f6a8..d2ce43578d 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/BasicMessageMappingItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/BasicMessageMappingItemProvider.java @@ -17,7 +17,6 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; -import org.eclipse.sirius.diagram.sequence.description.BasicMessageMapping; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; /** diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CombinedFragmentMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CombinedFragmentMappingItemProvider.java index 5bae804871..69f8a705d3 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CombinedFragmentMappingItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CombinedFragmentMappingItemProvider.java @@ -18,7 +18,6 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.diagram.description.DescriptionPackage; -import org.eclipse.sirius.diagram.sequence.description.CombinedFragmentMapping; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; /** diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CreationMessageMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CreationMessageMappingItemProvider.java index 04d6d6de92..57a5728d94 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CreationMessageMappingItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CreationMessageMappingItemProvider.java @@ -17,7 +17,6 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; -import org.eclipse.sirius.diagram.sequence.description.CreationMessageMapping; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; /** diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/DestructionMessageMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/DestructionMessageMappingItemProvider.java index f2d7d8b853..928d07afdc 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/DestructionMessageMappingItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/DestructionMessageMappingItemProvider.java @@ -17,7 +17,6 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; -import org.eclipse.sirius.diagram.sequence.description.DestructionMessageMapping; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; /** diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/EndOfLifeMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/EndOfLifeMappingItemProvider.java index 9af162ca0a..5198885309 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/EndOfLifeMappingItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/EndOfLifeMappingItemProvider.java @@ -22,7 +22,6 @@ import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.diagram.description.DescriptionPackage; import org.eclipse.sirius.diagram.description.provider.NodeMappingItemProvider; import org.eclipse.sirius.diagram.sequence.description.DescriptionFactory; -import org.eclipse.sirius.diagram.sequence.description.EndOfLifeMapping; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; /** diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/InstanceRoleMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/InstanceRoleMappingItemProvider.java index 498ba534ab..533c730a09 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/InstanceRoleMappingItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/InstanceRoleMappingItemProvider.java @@ -22,7 +22,6 @@ import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.diagram.description.DescriptionPackage; import org.eclipse.sirius.diagram.description.provider.NodeMappingItemProvider; import org.eclipse.sirius.diagram.sequence.description.DescriptionFactory; -import org.eclipse.sirius.diagram.sequence.description.InstanceRoleMapping; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; /** diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/InteractionUseMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/InteractionUseMappingItemProvider.java index 89b97e9f10..f98f362d73 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/InteractionUseMappingItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/InteractionUseMappingItemProvider.java @@ -18,7 +18,6 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.diagram.description.DescriptionPackage; -import org.eclipse.sirius.diagram.sequence.description.InteractionUseMapping; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; /** diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/ObservationPointMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/ObservationPointMappingItemProvider.java index 81215e8879..c437fd217e 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/ObservationPointMappingItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/ObservationPointMappingItemProvider.java @@ -21,7 +21,6 @@ import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.diagram.description.DescriptionPackage; import org.eclipse.sirius.diagram.description.provider.NodeMappingItemProvider; import org.eclipse.sirius.diagram.sequence.description.DescriptionFactory; -import org.eclipse.sirius.diagram.sequence.description.ObservationPointMapping; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; /** diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/LifelineCreationToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/LifelineCreationToolItemProvider.java index 4aa93fdb11..9dd13277e8 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/LifelineCreationToolItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/LifelineCreationToolItemProvider.java @@ -20,7 +20,6 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.diagram.description.tool.provider.ContainerCreationDescriptionItemProvider; import org.eclipse.sirius.diagram.sequence.description.provider.SequenceEditPlugin; -import org.eclipse.sirius.diagram.sequence.description.tool.LifelineCreationTool; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramCreationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramCreationDescriptionItemProvider.java index 4ff82c2fc9..d36a66d408 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramCreationDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramCreationDescriptionItemProvider.java @@ -21,7 +21,6 @@ import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.common.tools.api.util.StringUtil; -import org.eclipse.sirius.diagram.description.tool.DiagramCreationDescription; import org.eclipse.sirius.diagram.description.tool.ToolPackage; import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramNavigationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramNavigationDescriptionItemProvider.java index 1eafa3e6b7..ea8b2c7c53 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramNavigationDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramNavigationDescriptionItemProvider.java @@ -21,7 +21,6 @@ import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.common.tools.api.util.StringUtil; -import org.eclipse.sirius.diagram.description.tool.DiagramNavigationDescription; import org.eclipse.sirius.diagram.description.tool.ToolPackage; import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; diff --git a/plugins/org.eclipse.sirius.editor/help/contexts.xml b/plugins/org.eclipse.sirius.editor/help/contexts.xml index 9de4116bec..6cdd0b4401 100644 --- a/plugins/org.eclipse.sirius.editor/help/contexts.xml +++ b/plugins/org.eclipse.sirius.editor/help/contexts.xml @@ -309,6 +309,17 @@ </description> </context> + <context id="Extension"> + <description> + + + + <!-- Start of user code Extension description --> + + <!-- End of user code Extension description --> + + </description> + </context> <context id="Component"> <description> diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateColumnToolItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateColumnToolItemProvider.java index 7d43450c40..92cb6130b9 100644 --- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateColumnToolItemProvider.java +++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateColumnToolItemProvider.java @@ -18,7 +18,6 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.common.tools.api.util.StringUtil; -import org.eclipse.sirius.table.metamodel.table.description.CreateColumnTool; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; /** diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateCrossColumnToolItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateCrossColumnToolItemProvider.java index 6f0698f574..99b1366b5b 100644 --- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateCrossColumnToolItemProvider.java +++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateCrossColumnToolItemProvider.java @@ -19,7 +19,6 @@ import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.common.tools.api.util.StringUtil; -import org.eclipse.sirius.table.metamodel.table.description.CreateCrossColumnTool; import org.eclipse.sirius.table.metamodel.table.description.DescriptionPackage; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateLineToolItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateLineToolItemProvider.java index 91235fbe9b..b77bb5aa50 100644 --- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateLineToolItemProvider.java +++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateLineToolItemProvider.java @@ -19,7 +19,6 @@ import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.common.tools.api.util.StringUtil; -import org.eclipse.sirius.table.metamodel.table.description.CreateLineTool; import org.eclipse.sirius.table.metamodel.table.description.DescriptionPackage; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/DeleteColumnToolItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/DeleteColumnToolItemProvider.java index 54f128a35a..963dc4e737 100644 --- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/DeleteColumnToolItemProvider.java +++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/DeleteColumnToolItemProvider.java @@ -18,7 +18,6 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.common.tools.api.util.StringUtil; -import org.eclipse.sirius.table.metamodel.table.description.DeleteColumnTool; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; /** diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/DeleteLineToolItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/DeleteLineToolItemProvider.java index 41df8dd025..ece7849f76 100644 --- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/DeleteLineToolItemProvider.java +++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/DeleteLineToolItemProvider.java @@ -18,7 +18,6 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.common.tools.api.util.StringUtil; -import org.eclipse.sirius.table.metamodel.table.description.DeleteLineTool; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; /** diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/FeatureColumnMappingItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/FeatureColumnMappingItemProvider.java index 09a0b1db23..dd4e5e01c0 100644 --- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/FeatureColumnMappingItemProvider.java +++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/FeatureColumnMappingItemProvider.java @@ -40,7 +40,7 @@ import org.eclipse.sirius.viewpoint.description.tool.ToolFactory; * This is the item provider adapter for a * {@link org.eclipse.sirius.table.metamodel.table.description.FeatureColumnMapping} * object. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ public class FeatureColumnMappingItemProvider extends ColumnMappingItemProvider { @@ -80,11 +80,11 @@ public class FeatureColumnMappingItemProvider extends ColumnMappingItemProvider * @generated */ protected void addCanEditPropertyDescriptor(Object object) { - itemPropertyDescriptors - .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_CellUpdater_canEdit_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_CellUpdater_canEdit_feature", "_UI_CellUpdater_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - DescriptionPackage.Literals.CELL_UPDATER__CAN_EDIT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BehaviorPropertyCategory"), //$NON-NLS-1$ - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_CellUpdater_canEdit_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_CellUpdater_canEdit_feature", "_UI_CellUpdater_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + DescriptionPackage.Literals.CELL_UPDATER__CAN_EDIT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BehaviorPropertyCategory"), //$NON-NLS-1$ + null)); } /** @@ -94,11 +94,11 @@ public class FeatureColumnMappingItemProvider extends ColumnMappingItemProvider * @generated */ protected void addFeatureNamePropertyDescriptor(Object object) { - itemPropertyDescriptors - .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FeatureColumnMapping_featureName_feature"), //$NON-NLS-1$ - getString("_UI_FeatureColumnMapping_featureName_description"), //$NON-NLS-1$ - DescriptionPackage.Literals.FEATURE_COLUMN_MAPPING__FEATURE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$ - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_FeatureColumnMapping_featureName_feature"), //$NON-NLS-1$ + getString("_UI_FeatureColumnMapping_featureName_description"), //$NON-NLS-1$ + DescriptionPackage.Literals.FEATURE_COLUMN_MAPPING__FEATURE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$ + null)); } /** @@ -108,21 +108,22 @@ public class FeatureColumnMappingItemProvider extends ColumnMappingItemProvider * @generated */ protected void addLabelExpressionPropertyDescriptor(Object object) { - itemPropertyDescriptors.add( - createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FeatureColumnMapping_labelExpression_feature"), //$NON-NLS-1$ - getString("_UI_FeatureColumnMapping_labelExpression_description"), //$NON-NLS-1$ - DescriptionPackage.Literals.FEATURE_COLUMN_MAPPING__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$ - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_FeatureColumnMapping_labelExpression_feature"), //$NON-NLS-1$ + getString("_UI_FeatureColumnMapping_labelExpression_description"), //$NON-NLS-1$ + DescriptionPackage.Literals.FEATURE_COLUMN_MAPPING__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$ + null)); } /** * This adds a property descriptor for the Feature Parent Expression * feature. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected void addFeatureParentExpressionPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_FeatureColumnMapping_featureParentExpression_feature"), //$NON-NLS-1$ getString("_UI_FeatureColumnMapping_featureParentExpression_description"), //$NON-NLS-1$ DescriptionPackage.Literals.FEATURE_COLUMN_MAPPING__FEATURE_PARENT_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, @@ -137,7 +138,7 @@ public class FeatureColumnMappingItemProvider extends ColumnMappingItemProvider * {@link org.eclipse.emf.edit.command.RemoveCommand} or * {@link org.eclipse.emf.edit.command.MoveCommand} in * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ @Override @@ -155,7 +156,7 @@ public class FeatureColumnMappingItemProvider extends ColumnMappingItemProvider /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ @Override @@ -170,7 +171,7 @@ public class FeatureColumnMappingItemProvider extends ColumnMappingItemProvider /** * This returns FeatureColumnMapping.gif. <!-- begin-user-doc --> <!-- * end-user-doc --> - * + * * @generated */ @Override @@ -195,7 +196,7 @@ public class FeatureColumnMappingItemProvider extends ColumnMappingItemProvider * update any cached children and by creating a viewer notification, which * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- * end-user-doc --> - * + * * @generated */ @Override diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/IntersectionMappingItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/IntersectionMappingItemProvider.java index e978bea1b9..ee424113d2 100644 --- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/IntersectionMappingItemProvider.java +++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/IntersectionMappingItemProvider.java @@ -42,7 +42,7 @@ import org.eclipse.sirius.viewpoint.description.tool.ToolFactory; * This is the item provider adapter for a * {@link org.eclipse.sirius.table.metamodel.table.description.IntersectionMapping} * object. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ public class IntersectionMappingItemProvider extends TableMappingItemProvider { @@ -89,11 +89,11 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider { * @generated */ protected void addCanEditPropertyDescriptor(Object object) { - itemPropertyDescriptors - .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_CellUpdater_canEdit_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_CellUpdater_canEdit_feature", "_UI_CellUpdater_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - DescriptionPackage.Literals.CELL_UPDATER__CAN_EDIT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BehaviorPropertyCategory"), //$NON-NLS-1$ - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_CellUpdater_canEdit_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_CellUpdater_canEdit_feature", "_UI_CellUpdater_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + DescriptionPackage.Literals.CELL_UPDATER__CAN_EDIT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BehaviorPropertyCategory"), //$NON-NLS-1$ + null)); } /** @@ -103,11 +103,11 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider { * @generated */ protected void addLineMappingPropertyDescriptor(Object object) { - itemPropertyDescriptors - .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_IntersectionMapping_lineMapping_feature"), //$NON-NLS-1$ - getString("_UI_IntersectionMapping_lineMapping_description"), //$NON-NLS-1$ - DescriptionPackage.Literals.INTERSECTION_MAPPING__LINE_MAPPING, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$ - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_IntersectionMapping_lineMapping_feature"), //$NON-NLS-1$ + getString("_UI_IntersectionMapping_lineMapping_description"), //$NON-NLS-1$ + DescriptionPackage.Literals.INTERSECTION_MAPPING__LINE_MAPPING, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$ + null)); } /** @@ -117,11 +117,11 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider { * @generated */ protected void addColumnMappingPropertyDescriptor(Object object) { - itemPropertyDescriptors.add( - createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_IntersectionMapping_columnMapping_feature"), //$NON-NLS-1$ - getString("_UI_IntersectionMapping_columnMapping_description"), //$NON-NLS-1$ - DescriptionPackage.Literals.INTERSECTION_MAPPING__COLUMN_MAPPING, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$ - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_IntersectionMapping_columnMapping_feature"), //$NON-NLS-1$ + getString("_UI_IntersectionMapping_columnMapping_description"), //$NON-NLS-1$ + DescriptionPackage.Literals.INTERSECTION_MAPPING__COLUMN_MAPPING, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$ + null)); } /** @@ -131,11 +131,11 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider { * @generated */ protected void addLabelExpressionPropertyDescriptor(Object object) { - itemPropertyDescriptors.add( - createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_IntersectionMapping_labelExpression_feature"), //$NON-NLS-1$ - getString("_UI_IntersectionMapping_labelExpression_description"), //$NON-NLS-1$ - DescriptionPackage.Literals.INTERSECTION_MAPPING__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$ - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_IntersectionMapping_labelExpression_feature"), //$NON-NLS-1$ + getString("_UI_IntersectionMapping_labelExpression_description"), //$NON-NLS-1$ + DescriptionPackage.Literals.INTERSECTION_MAPPING__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$ + null)); } /** @@ -155,7 +155,7 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider { /** * This adds a property descriptor for the Column Finder Expression feature. * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected void addColumnFinderExpressionPropertyDescriptor(Object object) { @@ -169,7 +169,7 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider { /** * This adds a property descriptor for the Line Finder Expression feature. * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected void addLineFinderExpressionPropertyDescriptor(Object object) { @@ -183,11 +183,12 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider { /** * This adds a property descriptor for the Semantic Candidates Expression * feature. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected void addSemanticCandidatesExpressionPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_IntersectionMapping_semanticCandidatesExpression_feature"), //$NON-NLS-1$ getString("_UI_IntersectionMapping_semanticCandidatesExpression_description"), //$NON-NLS-1$ DescriptionPackage.Literals.INTERSECTION_MAPPING__SEMANTIC_CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, @@ -202,17 +203,17 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider { * @generated */ protected void addDomainClassPropertyDescriptor(Object object) { - itemPropertyDescriptors - .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_IntersectionMapping_domainClass_feature"), //$NON-NLS-1$ - getString("_UI_IntersectionMapping_domainClass_description"), //$NON-NLS-1$ - DescriptionPackage.Literals.INTERSECTION_MAPPING__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DomainBasedPropertyCategory"), //$NON-NLS-1$ - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_IntersectionMapping_domainClass_feature"), //$NON-NLS-1$ + getString("_UI_IntersectionMapping_domainClass_description"), //$NON-NLS-1$ + DescriptionPackage.Literals.INTERSECTION_MAPPING__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DomainBasedPropertyCategory"), //$NON-NLS-1$ + null)); } /** * This adds a property descriptor for the Precondition Expression feature. * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected void addPreconditionExpressionPropertyDescriptor(Object object) { @@ -230,10 +231,10 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider { * @generated */ protected void addCreatePropertyDescriptor(Object object) { - itemPropertyDescriptors - .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_IntersectionMapping_create_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IntersectionMapping_create_feature", "_UI_IntersectionMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - DescriptionPackage.Literals.INTERSECTION_MAPPING__CREATE, true, false, true, null, null, null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_IntersectionMapping_create_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_IntersectionMapping_create_feature", "_UI_IntersectionMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + DescriptionPackage.Literals.INTERSECTION_MAPPING__CREATE, true, false, true, null, null, null)); } /** @@ -243,7 +244,7 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider { * {@link org.eclipse.emf.edit.command.RemoveCommand} or * {@link org.eclipse.emf.edit.command.MoveCommand} in * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ @Override @@ -262,7 +263,7 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ @Override @@ -277,7 +278,7 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider { /** * This returns IntersectionMapping.gif. <!-- begin-user-doc --> <!-- * end-user-doc --> - * + * * @generated */ @Override @@ -302,7 +303,7 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider { * update any cached children and by creating a viewer notification, which * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- * end-user-doc --> - * + * * @generated */ @Override diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableCreationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableCreationDescriptionItemProvider.java index e149d6b31e..fd0772b3dd 100644 --- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableCreationDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableCreationDescriptionItemProvider.java @@ -21,7 +21,6 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.common.tools.api.util.StringUtil; import org.eclipse.sirius.table.metamodel.table.description.DescriptionPackage; -import org.eclipse.sirius.table.metamodel.table.description.TableCreationDescription; import org.eclipse.sirius.table.metamodel.table.provider.TableUIPlugin; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; import org.eclipse.sirius.viewpoint.description.tool.provider.RepresentationCreationDescriptionItemProvider; diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableNavigationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableNavigationDescriptionItemProvider.java index 953c2c5baf..c1f9624d6b 100644 --- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableNavigationDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableNavigationDescriptionItemProvider.java @@ -21,7 +21,6 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.common.tools.api.util.StringUtil; import org.eclipse.sirius.table.metamodel.table.description.DescriptionPackage; -import org.eclipse.sirius.table.metamodel.table.description.TableNavigationDescription; import org.eclipse.sirius.table.metamodel.table.provider.TableUIPlugin; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; import org.eclipse.sirius.viewpoint.description.tool.provider.RepresentationNavigationDescriptionItemProvider; diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/TableUIPlugin.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/TableUIPlugin.java index 0f5b675e1d..bd482ec1d9 100644 --- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/TableUIPlugin.java +++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/TableUIPlugin.java @@ -122,6 +122,10 @@ public final class TableUIPlugin extends EMFPlugin { * @generated */ public Implementation() { + super(); + + // Remember the static instance. + // TableUIPlugin.plugin = this; } diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeCreationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeCreationDescriptionItemProvider.java index cd1d5bbb88..faeaa72143 100644 --- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeCreationDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeCreationDescriptionItemProvider.java @@ -21,7 +21,6 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.common.tools.api.util.StringUtil; import org.eclipse.sirius.tree.description.DescriptionPackage; -import org.eclipse.sirius.tree.description.TreeCreationDescription; import org.eclipse.sirius.tree.ui.provider.TreeUIPlugin; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; import org.eclipse.sirius.viewpoint.description.tool.provider.RepresentationCreationDescriptionItemProvider; diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemCreationToolItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemCreationToolItemProvider.java index b8aec6c73f..f4900555e8 100644 --- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemCreationToolItemProvider.java +++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemCreationToolItemProvider.java @@ -20,7 +20,6 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.common.tools.api.util.StringUtil; import org.eclipse.sirius.tree.description.DescriptionPackage; -import org.eclipse.sirius.tree.description.TreeItemCreationTool; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; /** diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemDeletionToolItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemDeletionToolItemProvider.java index f0482b37b6..cf5fd698d2 100644 --- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemDeletionToolItemProvider.java +++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemDeletionToolItemProvider.java @@ -18,7 +18,6 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.common.tools.api.util.StringUtil; -import org.eclipse.sirius.tree.description.TreeItemDeletionTool; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; /** diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemMappingItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemMappingItemProvider.java index 1b43a02d4a..940b6ee89f 100644 --- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemMappingItemProvider.java +++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemMappingItemProvider.java @@ -30,7 +30,6 @@ import org.eclipse.sirius.tree.description.TreeItemCreationTool; import org.eclipse.sirius.tree.description.TreeItemDeletionTool; import org.eclipse.sirius.tree.description.TreeItemEditionTool; import org.eclipse.sirius.tree.description.TreeItemMapping; -import org.eclipse.sirius.tree.description.TreeMapping; import org.eclipse.sirius.tree.description.TreePopupMenu; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeNavigationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeNavigationDescriptionItemProvider.java index 77d4e8c2d7..8473fad022 100644 --- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeNavigationDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeNavigationDescriptionItemProvider.java @@ -21,7 +21,6 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.common.tools.api.util.StringUtil; import org.eclipse.sirius.tree.description.DescriptionPackage; -import org.eclipse.sirius.tree.description.TreeNavigationDescription; import org.eclipse.sirius.tree.ui.provider.TreeUIPlugin; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; import org.eclipse.sirius.viewpoint.description.tool.provider.RepresentationNavigationDescriptionItemProvider; diff --git a/plugins/org.eclipse.sirius.ui/plugin.properties b/plugins/org.eclipse.sirius.ui/plugin.properties index 7eb35b6aae..c0ef8fa678 100644 --- a/plugins/org.eclipse.sirius.ui/plugin.properties +++ b/plugins/org.eclipse.sirius.ui/plugin.properties @@ -1402,3 +1402,5 @@ _UI_AbstractToolDescription_elementsToSelect_feature = Elements To Select _UI_AbstractToolDescription_inverseSelectionOrder_feature = Inverse Selection Order _UI_AbstractToolDescription_elementsToSelect_description = An expression used to define the selected elements after the tool execution. _UI_AbstractToolDescription_inverseSelectionOrder_description = By default the elements to select are listed in the creation order. If true, the order is inverted. +_UI_Extension_type = Extension +_UI_Group_extensions_feature = Extensions diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/GroupItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/GroupItemProvider.java index 61845f7a03..c0c5e13d02 100644 --- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/GroupItemProvider.java +++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/GroupItemProvider.java @@ -103,6 +103,7 @@ public class GroupItemProvider extends DModelElementItemProvider { super.getChildrenFeatures(object); childrenFeatures.add(DescriptionPackage.Literals.GROUP__OWNED_VIEWPOINTS); childrenFeatures.add(DescriptionPackage.Literals.GROUP__USER_COLORS_PALETTES); + childrenFeatures.add(DescriptionPackage.Literals.GROUP__EXTENSIONS); } return childrenFeatures; } @@ -164,6 +165,7 @@ public class GroupItemProvider extends DModelElementItemProvider { return; case DescriptionPackage.GROUP__OWNED_VIEWPOINTS: case DescriptionPackage.GROUP__USER_COLORS_PALETTES: + case DescriptionPackage.GROUP__EXTENSIONS: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); return; } diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/RepresentationElementMappingItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/RepresentationElementMappingItemProvider.java index bfb6032fdc..aff54a5d32 100644 --- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/RepresentationElementMappingItemProvider.java +++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/RepresentationElementMappingItemProvider.java @@ -21,7 +21,6 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.viewpoint.description.DescriptionPackage; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; -import org.eclipse.sirius.viewpoint.description.RepresentationElementMapping; /** * This is the item provider adapter for a diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/MappingBasedToolDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/MappingBasedToolDescriptionItemProvider.java index e19ae522c9..ca891eebdb 100644 --- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/MappingBasedToolDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/MappingBasedToolDescriptionItemProvider.java @@ -20,7 +20,6 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.common.tools.api.util.StringUtil; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; -import org.eclipse.sirius.viewpoint.description.tool.MappingBasedToolDescription; /** * This is the item provider adapter for a diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationRuleItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationRuleItemProvider.java index 2c0e43415a..51d78bad0e 100644 --- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationRuleItemProvider.java +++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationRuleItemProvider.java @@ -24,7 +24,6 @@ import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; import org.eclipse.sirius.viewpoint.description.provider.IdentifiedElementItemProvider; -import org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule; import org.eclipse.sirius.viewpoint.description.validation.ValidationFactory; import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage; import org.eclipse.sirius.viewpoint.description.validation.ValidationRule; diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ViewValidationRuleItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ViewValidationRuleItemProvider.java index 45eb6e7734..92ee944a52 100644 --- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ViewValidationRuleItemProvider.java +++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ViewValidationRuleItemProvider.java @@ -20,7 +20,6 @@ import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; -import org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule; import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage; /** diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SiriusEditPlugin.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SiriusEditPlugin.java index b69bccde59..b861672376 100644 --- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SiriusEditPlugin.java +++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SiriusEditPlugin.java @@ -171,6 +171,10 @@ public final class SiriusEditPlugin extends EMFPlugin { * @generated */ public Implementation() { + super(); + + // Remember the static instance. + // SiriusEditPlugin.plugin = this; } diff --git a/plugins/org.eclipse.sirius/model/viewpoint.ecore b/plugins/org.eclipse.sirius/model/viewpoint.ecore index e270a926c7..73fce37a92 100644 --- a/plugins/org.eclipse.sirius/model/viewpoint.ecore +++ b/plugins/org.eclipse.sirius/model/viewpoint.ecore @@ -285,7 +285,10 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="userColorsPalettes" upperBound="-1" eType="#//description/UserColorsPalette" containment="true" eKeys="#//description/UserColorsPalette/name"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="extensions" upperBound="-1" + eType="#//description/Extension" containment="true"/> </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="Extension" abstract="true" interface="true"/> <eClassifiers xsi:type="ecore:EClass" name="Component" abstract="true" interface="true"/> <eClassifiers xsi:type="ecore:EClass" name="Viewpoint" eSuperTypes="#//description/DocumentedElement #//description/Component #//description/EndUserDocumentedElement #//description/IdentifiedElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> diff --git a/plugins/org.eclipse.sirius/model/viewpoint.genmodel b/plugins/org.eclipse.sirius/model/viewpoint.genmodel index 96bae535e6..445460bb9c 100644 --- a/plugins/org.eclipse.sirius/model/viewpoint.genmodel +++ b/plugins/org.eclipse.sirius/model/viewpoint.genmodel @@ -180,7 +180,9 @@ ecoreFeature="ecore:EReference viewpoint.ecore#//description/Group/systemColorsPalette"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference viewpoint.ecore#//description/Group/userColorsPalettes"/> <genFeatures property="None" createChild="false" propertyCategory="" ecoreFeature="ecore:EAttribute viewpoint.ecore#//description/Group/version"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference viewpoint.ecore#//description/Group/extensions"/> </genClasses> + <genClasses image="false" ecoreClass="viewpoint.ecore#//description/Extension"/> <genClasses image="false" ecoreClass="viewpoint.ecore#//description/Component"/> <genClasses ecoreClass="viewpoint.ecore#//description/Viewpoint"> <genFeatures createChild="false" propertyCategory="General" propertyDescription="This field allows to associate this viewpoint to one or more semantic resource file extension(s), for several file extensions, they must be space separeted. For example to associate this viewpoint to uml and ecore metamodels, put \"uml ecore\"." diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java index 65a600f4d1..b1237d17ab 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java @@ -73,7 +73,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getDModelElement() * @generated */ - int DMODEL_ELEMENT = 13; + int DMODEL_ELEMENT = 14; /** * The feature id for the '<em><b>EAnnotations</b></em>' containment @@ -168,13 +168,42 @@ public interface DescriptionPackage extends EPackage { int GROUP__VERSION = DescriptionPackage.DMODEL_ELEMENT_FEATURE_COUNT + 5; /** + * The feature id for the '<em><b>Extensions</b></em>' containment reference + * list. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int GROUP__EXTENSIONS = DescriptionPackage.DMODEL_ELEMENT_FEATURE_COUNT + 6; + + /** * The number of structural features of the '<em>Group</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int GROUP_FEATURE_COUNT = DescriptionPackage.DMODEL_ELEMENT_FEATURE_COUNT + 6; + int GROUP_FEATURE_COUNT = DescriptionPackage.DMODEL_ELEMENT_FEATURE_COUNT + 7; + + /** + * The meta object id for the ' + * {@link org.eclipse.sirius.viewpoint.description.Extension + * <em>Extension</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see org.eclipse.sirius.viewpoint.description.Extension + * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getExtension() + * @generated + */ + int EXTENSION = 1; + + /** + * The number of structural features of the '<em>Extension</em>' class. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int EXTENSION_FEATURE_COUNT = 0; /** * The meta object id for the ' @@ -185,7 +214,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getComponent() * @generated */ - int COMPONENT = 1; + int COMPONENT = 2; /** * The number of structural features of the '<em>Component</em>' class. <!-- @@ -206,7 +235,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getDocumentedElement() * @generated */ - int DOCUMENTED_ELEMENT = 12; + int DOCUMENTED_ELEMENT = 13; /** * The feature id for the '<em><b>Documentation</b></em>' attribute. <!-- @@ -235,7 +264,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getViewpoint() * @generated */ - int VIEWPOINT = 2; + int VIEWPOINT = 3; /** * The feature id for the '<em><b>Documentation</b></em>' attribute. <!-- @@ -400,7 +429,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getFeatureExtensionDescription() * @generated */ - int FEATURE_EXTENSION_DESCRIPTION = 3; + int FEATURE_EXTENSION_DESCRIPTION = 4; /** * The number of structural features of the ' @@ -422,7 +451,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getRepresentationDescription() * @generated */ - int REPRESENTATION_DESCRIPTION = 4; + int REPRESENTATION_DESCRIPTION = 5; /** * The feature id for the '<em><b>Documentation</b></em>' attribute. <!-- @@ -517,7 +546,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getRepresentationTemplate() * @generated */ - int REPRESENTATION_TEMPLATE = 5; + int REPRESENTATION_TEMPLATE = 6; /** * The feature id for the '<em><b>Name</b></em>' attribute. <!-- @@ -557,7 +586,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getRepresentationImportDescription() * @generated */ - int REPRESENTATION_IMPORT_DESCRIPTION = 6; + int REPRESENTATION_IMPORT_DESCRIPTION = 7; /** * The feature id for the '<em><b>Documentation</b></em>' attribute. <!-- @@ -652,7 +681,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getRepresentationExtensionDescription() * @generated */ - int REPRESENTATION_EXTENSION_DESCRIPTION = 7; + int REPRESENTATION_EXTENSION_DESCRIPTION = 8; /** * The feature id for the '<em><b>Name</b></em>' attribute. <!-- @@ -710,7 +739,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getMetamodelExtensionSetting() * @generated */ - int METAMODEL_EXTENSION_SETTING = 8; + int METAMODEL_EXTENSION_SETTING = 9; /** * The feature id for the '<em><b>Extension Group</b></em>' reference. <!-- @@ -741,7 +770,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getJavaExtension() * @generated */ - int JAVA_EXTENSION = 9; + int JAVA_EXTENSION = 10; /** * The feature id for the '<em><b>Qualified Class Name</b></em>' attribute. @@ -771,7 +800,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getIdentifiedElement() * @generated */ - int IDENTIFIED_ELEMENT = 40; + int IDENTIFIED_ELEMENT = 41; /** * The feature id for the '<em><b>Name</b></em>' attribute. <!-- @@ -810,7 +839,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getRepresentationElementMapping() * @generated */ - int REPRESENTATION_ELEMENT_MAPPING = 10; + int REPRESENTATION_ELEMENT_MAPPING = 11; /** * The feature id for the '<em><b>Name</b></em>' attribute. <!-- @@ -868,7 +897,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getAbstractMappingImport() * @generated */ - int ABSTRACT_MAPPING_IMPORT = 11; + int ABSTRACT_MAPPING_IMPORT = 12; /** * The feature id for the '<em><b>Hide Sub Mappings</b></em>' attribute. @@ -908,7 +937,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getDAnnotation() * @generated */ - int DANNOTATION = 14; + int DANNOTATION = 15; /** * The feature id for the '<em><b>Source</b></em>' attribute. <!-- @@ -947,7 +976,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getConditionalStyleDescription() * @generated */ - int CONDITIONAL_STYLE_DESCRIPTION = 15; + int CONDITIONAL_STYLE_DESCRIPTION = 16; /** * The feature id for the '<em><b>Predicate Expression</b></em>' attribute. @@ -978,7 +1007,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getPasteTargetDescription() * @generated */ - int PASTE_TARGET_DESCRIPTION = 16; + int PASTE_TARGET_DESCRIPTION = 17; /** * The feature id for the '<em><b>Paste Descriptions</b></em>' reference @@ -1009,7 +1038,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getDecorationDescriptionsSet() * @generated */ - int DECORATION_DESCRIPTIONS_SET = 17; + int DECORATION_DESCRIPTIONS_SET = 18; /** * The feature id for the '<em><b>Decoration Descriptions</b></em>' @@ -1040,7 +1069,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getDecorationDescription() * @generated */ - int DECORATION_DESCRIPTION = 18; + int DECORATION_DESCRIPTION = 19; /** * The feature id for the '<em><b>Name</b></em>' attribute. <!-- @@ -1097,7 +1126,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getSemanticBasedDecoration() * @generated */ - int SEMANTIC_BASED_DECORATION = 19; + int SEMANTIC_BASED_DECORATION = 20; /** * The feature id for the '<em><b>Name</b></em>' attribute. <!-- @@ -1164,7 +1193,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getCustomization() * @generated */ - int CUSTOMIZATION = 20; + int CUSTOMIZATION = 21; /** * The feature id for the '<em><b>Vsm Element Customizations</b></em>' @@ -1194,7 +1223,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getIVSMElementCustomization() * @generated */ - int IVSM_ELEMENT_CUSTOMIZATION = 21; + int IVSM_ELEMENT_CUSTOMIZATION = 22; /** * The number of structural features of the ' @@ -1216,7 +1245,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getVSMElementCustomization() * @generated */ - int VSM_ELEMENT_CUSTOMIZATION = 22; + int VSM_ELEMENT_CUSTOMIZATION = 23; /** * The feature id for the '<em><b>Predicate Expression</b></em>' attribute. @@ -1256,7 +1285,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getVSMElementCustomizationReuse() * @generated */ - int VSM_ELEMENT_CUSTOMIZATION_REUSE = 23; + int VSM_ELEMENT_CUSTOMIZATION_REUSE = 24; /** * The feature id for the '<em><b>Reuse</b></em>' reference list. <!-- @@ -1296,7 +1325,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getEStructuralFeatureCustomization() * @generated */ - int ESTRUCTURAL_FEATURE_CUSTOMIZATION = 24; + int ESTRUCTURAL_FEATURE_CUSTOMIZATION = 25; /** * The feature id for the '<em><b>Applied On</b></em>' reference list. <!-- @@ -1336,7 +1365,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getEAttributeCustomization() * @generated */ - int EATTRIBUTE_CUSTOMIZATION = 25; + int EATTRIBUTE_CUSTOMIZATION = 26; /** * The feature id for the '<em><b>Applied On</b></em>' reference list. <!-- @@ -1394,7 +1423,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getEReferenceCustomization() * @generated */ - int EREFERENCE_CUSTOMIZATION = 26; + int EREFERENCE_CUSTOMIZATION = 27; /** * The feature id for the '<em><b>Applied On</b></em>' reference list. <!-- @@ -1452,7 +1481,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getSelectionDescription() * @generated */ - int SELECTION_DESCRIPTION = 27; + int SELECTION_DESCRIPTION = 28; /** * The feature id for the '<em><b>Candidates Expression</b></em>' attribute. @@ -1527,7 +1556,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getColorDescription() * @generated */ - int COLOR_DESCRIPTION = 28; + int COLOR_DESCRIPTION = 29; /** * The number of structural features of the '<em>Color Description</em>' @@ -1548,7 +1577,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getFixedColor() * @generated */ - int FIXED_COLOR = 32; + int FIXED_COLOR = 33; /** * The feature id for the '<em><b>Red</b></em>' attribute. <!-- @@ -1596,7 +1625,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getSystemColor() * @generated */ - int SYSTEM_COLOR = 29; + int SYSTEM_COLOR = 30; /** * The feature id for the '<em><b>Red</b></em>' attribute. <!-- @@ -1653,7 +1682,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getInterpolatedColor() * @generated */ - int INTERPOLATED_COLOR = 30; + int INTERPOLATED_COLOR = 31; /** * The feature id for the '<em><b>Name</b></em>' attribute. <!-- @@ -1720,7 +1749,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getColorStep() * @generated */ - int COLOR_STEP = 31; + int COLOR_STEP = 32; /** * The feature id for the '<em><b>Associated Value</b></em>' attribute. <!-- @@ -1759,7 +1788,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getUserFixedColor() * @generated */ - int USER_FIXED_COLOR = 33; + int USER_FIXED_COLOR = 34; /** * The feature id for the '<em><b>Red</b></em>' attribute. <!-- @@ -1816,7 +1845,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getUserColor() * @generated */ - int USER_COLOR = 34; + int USER_COLOR = 35; /** * The feature id for the '<em><b>Name</b></em>' attribute. <!-- @@ -1846,7 +1875,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getEnvironment() * @generated */ - int ENVIRONMENT = 35; + int ENVIRONMENT = 36; /** * The feature id for the '<em><b>System Colors</b></em>' containment @@ -1894,7 +1923,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getSytemColorsPalette() * @generated */ - int SYTEM_COLORS_PALETTE = 36; + int SYTEM_COLORS_PALETTE = 37; /** * The feature id for the '<em><b>Entries</b></em>' containment reference @@ -1924,7 +1953,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getUserColorsPalette() * @generated */ - int USER_COLORS_PALETTE = 37; + int USER_COLORS_PALETTE = 38; /** * The feature id for the '<em><b>Name</b></em>' attribute. <!-- @@ -1963,7 +1992,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getAnnotationEntry() * @generated */ - int ANNOTATION_ENTRY = 38; + int ANNOTATION_ENTRY = 39; /** * The feature id for the '<em><b>Source</b></em>' attribute. <!-- @@ -2002,7 +2031,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getEndUserDocumentedElement() * @generated */ - int END_USER_DOCUMENTED_ELEMENT = 39; + int END_USER_DOCUMENTED_ELEMENT = 40; /** * The feature id for the '<em><b>End User Documentation</b></em>' @@ -2033,7 +2062,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getComputedColor() * @generated */ - int COMPUTED_COLOR = 41; + int COMPUTED_COLOR = 42; /** * The feature id for the '<em><b>Name</b></em>' attribute. <!-- @@ -2090,7 +2119,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getDAnnotationEntry() * @generated */ - int DANNOTATION_ENTRY = 42; + int DANNOTATION_ENTRY = 43; /** * The feature id for the '<em><b>Source</b></em>' attribute. <!-- @@ -2128,7 +2157,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getPosition() * @generated */ - int POSITION = 43; + int POSITION = 44; /** * The meta object id for the ' @@ -2140,7 +2169,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getSystemColors() * @generated */ - int SYSTEM_COLORS = 44; + int SYSTEM_COLORS = 45; /** * The meta object id for the '<em>Type Name</em>' data type. <!-- @@ -2150,7 +2179,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getTypeName() * @generated */ - int TYPE_NAME = 45; + int TYPE_NAME = 46; /** * The meta object id for the '<em>Interpreted Expression</em>' data type. @@ -2160,7 +2189,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getInterpretedExpression() * @generated */ - int INTERPRETED_EXPRESSION = 46; + int INTERPRETED_EXPRESSION = 47; /** * The meta object id for the '<em>Feature Name</em>' data type. <!-- @@ -2170,7 +2199,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getFeatureName() * @generated */ - int FEATURE_NAME = 47; + int FEATURE_NAME = 48; /** * The meta object id for the '<em>Image Path</em>' data type. <!-- @@ -2180,7 +2209,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getImagePath() * @generated */ - int IMAGE_PATH = 48; + int IMAGE_PATH = 49; /** * The meta object id for the '<em>URI</em>' data type. <!-- begin-user-doc @@ -2190,7 +2219,7 @@ public interface DescriptionPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getURI() * @generated */ - int URI = 49; + int URI = 50; /** * Returns the meta object for class ' @@ -2270,6 +2299,30 @@ public interface DescriptionPackage extends EPackage { EAttribute getGroup_Version(); /** + * Returns the meta object for the containment reference list ' + * {@link org.eclipse.sirius.viewpoint.description.Group#getExtensions + * <em>Extensions</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return the meta object for the containment reference list ' + * <em>Extensions</em>'. + * @see org.eclipse.sirius.viewpoint.description.Group#getExtensions() + * @see #getGroup() + * @generated + */ + EReference getGroup_Extensions(); + + /** + * Returns the meta object for class ' + * {@link org.eclipse.sirius.viewpoint.description.Extension + * <em>Extension</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return the meta object for class '<em>Extension</em>'. + * @see org.eclipse.sirius.viewpoint.description.Extension + * @generated + */ + EClass getExtension(); + + /** * Returns the meta object for class ' * {@link org.eclipse.sirius.viewpoint.description.Component * <em>Component</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -3995,6 +4048,27 @@ public interface DescriptionPackage extends EPackage { EAttribute GROUP__VERSION = DescriptionPackage.eINSTANCE.getGroup_Version(); /** + * The meta object literal for the '<em><b>Extensions</b></em>' + * containment reference list feature. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @generated + */ + EReference GROUP__EXTENSIONS = DescriptionPackage.eINSTANCE.getGroup_Extensions(); + + /** + * The meta object literal for the ' + * {@link org.eclipse.sirius.viewpoint.description.Extension + * <em>Extension</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc + * --> + * + * @see org.eclipse.sirius.viewpoint.description.Extension + * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getExtension() + * @generated + */ + EClass EXTENSION = DescriptionPackage.eINSTANCE.getExtension(); + + /** * The meta object literal for the ' * {@link org.eclipse.sirius.viewpoint.description.Component * <em>Component</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/Extension.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/Extension.java new file mode 100644 index 0000000000..46a06d6a8c --- /dev/null +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/Extension.java @@ -0,0 +1,26 @@ +/** + * Copyright (c) 2007, 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.viewpoint.description; + +import org.eclipse.emf.ecore.EObject; + +/** + * <!-- begin-user-doc --> A representation of the model object ' + * <em><b>Extension</b></em>'. <!-- end-user-doc --> + * + * + * @see org.eclipse.sirius.viewpoint.description.DescriptionPackage#getExtension() + * @model interface="true" abstract="true" + * @generated + */ +public interface Extension extends EObject { +} // Extension diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/Group.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/Group.java index ad5f9603b5..7a3296a19f 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/Group.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/Group.java @@ -32,6 +32,8 @@ import org.eclipse.emf.common.util.EList; * <em>User Colors Palettes</em>}</li> * <li>{@link org.eclipse.sirius.viewpoint.description.Group#getVersion <em> * Version</em>}</li> + * <li>{@link org.eclipse.sirius.viewpoint.description.Group#getExtensions <em> + * Extensions</em>}</li> * </ul> * </p> * @@ -169,4 +171,23 @@ public interface Group extends DModelElement, DocumentedElement { */ void setVersion(String value); + /** + * Returns the value of the '<em><b>Extensions</b></em>' containment + * reference list. The list contents are of type + * {@link org.eclipse.sirius.viewpoint.description.Extension}. <!-- + * begin-user-doc --> + * <p> + * If the meaning of the '<em>Extensions</em>' containment reference list + * isn't clear, there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @return the value of the '<em>Extensions</em>' containment reference + * list. + * @see org.eclipse.sirius.viewpoint.description.DescriptionPackage#getGroup_Extensions() + * @model containment="true" resolveProxies="true" + * @generated + */ + EList<Extension> getExtensions(); + } // Group diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java index 13f4d7ac6f..6bff2c08fc 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java @@ -42,6 +42,7 @@ import org.eclipse.sirius.viewpoint.description.EReferenceCustomization; import org.eclipse.sirius.viewpoint.description.EStructuralFeatureCustomization; import org.eclipse.sirius.viewpoint.description.EndUserDocumentedElement; import org.eclipse.sirius.viewpoint.description.Environment; +import org.eclipse.sirius.viewpoint.description.Extension; import org.eclipse.sirius.viewpoint.description.FeatureExtensionDescription; import org.eclipse.sirius.viewpoint.description.FixedColor; import org.eclipse.sirius.viewpoint.description.Group; @@ -97,6 +98,13 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP * * @generated */ + private EClass extensionEClass = null; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ private EClass componentEClass = null; /** @@ -592,6 +600,26 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP * @generated */ @Override + public EReference getGroup_Extensions() { + return (EReference) groupEClass.getEStructuralFeatures().get(5); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public EClass getExtension() { + return extensionEClass; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override public EClass getComponent() { return componentEClass; } @@ -1953,6 +1981,9 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP createEReference(groupEClass, DescriptionPackage.GROUP__SYSTEM_COLORS_PALETTE); createEReference(groupEClass, DescriptionPackage.GROUP__USER_COLORS_PALETTES); createEAttribute(groupEClass, DescriptionPackage.GROUP__VERSION); + createEReference(groupEClass, DescriptionPackage.GROUP__EXTENSIONS); + + extensionEClass = createEClass(DescriptionPackage.EXTENSION); componentEClass = createEClass(DescriptionPackage.COMPONENT); @@ -2229,6 +2260,13 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP getGroup_Version(), theEcorePackage.getEString(), "version", null, 0, 1, Group.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ + initEReference( + getGroup_Extensions(), + this.getExtension(), + null, + "extensions", null, 0, -1, Group.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ + + initEClass(extensionEClass, Extension.class, "Extension", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEClass(componentEClass, Component.class, "Component", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/GroupImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/GroupImpl.java index d592b6f0bc..835e1b1270 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/GroupImpl.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/GroupImpl.java @@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.sirius.viewpoint.description.DescriptionPackage; import org.eclipse.sirius.viewpoint.description.DocumentedElement; +import org.eclipse.sirius.viewpoint.description.Extension; import org.eclipse.sirius.viewpoint.description.Group; import org.eclipse.sirius.viewpoint.description.SytemColorsPalette; import org.eclipse.sirius.viewpoint.description.UserColorsPalette; @@ -51,6 +52,9 @@ import org.eclipse.sirius.viewpoint.description.Viewpoint; * <li> * {@link org.eclipse.sirius.viewpoint.description.impl.GroupImpl#getVersion * <em>Version</em>}</li> + * <li> + * {@link org.eclipse.sirius.viewpoint.description.impl.GroupImpl#getExtensions + * <em>Extensions</em>}</li> * </ul> * </p> * @@ -153,6 +157,16 @@ public class GroupImpl extends DModelElementImpl implements Group { protected String version = GroupImpl.VERSION_EDEFAULT; /** + * The cached value of the '{@link #getExtensions() <em>Extensions</em>}' + * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see #getExtensions() + * @generated + * @ordered + */ + protected EList<Extension> extensions; + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -317,12 +331,27 @@ public class GroupImpl extends DModelElementImpl implements Group { * @generated */ @Override + public EList<Extension> getExtensions() { + if (extensions == null) { + extensions = new EObjectContainmentEList.Resolving<Extension>(Extension.class, this, DescriptionPackage.GROUP__EXTENSIONS); + } + return extensions; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { case DescriptionPackage.GROUP__OWNED_VIEWPOINTS: return ((InternalEList<?>) getOwnedViewpoints()).basicRemove(otherEnd, msgs); case DescriptionPackage.GROUP__USER_COLORS_PALETTES: return ((InternalEList<?>) getUserColorsPalettes()).basicRemove(otherEnd, msgs); + case DescriptionPackage.GROUP__EXTENSIONS: + return ((InternalEList<?>) getExtensions()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -350,6 +379,8 @@ public class GroupImpl extends DModelElementImpl implements Group { return getUserColorsPalettes(); case DescriptionPackage.GROUP__VERSION: return getVersion(); + case DescriptionPackage.GROUP__EXTENSIONS: + return getExtensions(); } return super.eGet(featureID, resolve, coreType); } @@ -383,6 +414,10 @@ public class GroupImpl extends DModelElementImpl implements Group { case DescriptionPackage.GROUP__VERSION: setVersion((String) newValue); return; + case DescriptionPackage.GROUP__EXTENSIONS: + getExtensions().clear(); + getExtensions().addAll((Collection<? extends Extension>) newValue); + return; } super.eSet(featureID, newValue); } @@ -413,6 +448,9 @@ public class GroupImpl extends DModelElementImpl implements Group { case DescriptionPackage.GROUP__VERSION: setVersion(GroupImpl.VERSION_EDEFAULT); return; + case DescriptionPackage.GROUP__EXTENSIONS: + getExtensions().clear(); + return; } super.eUnset(featureID); } @@ -437,6 +475,8 @@ public class GroupImpl extends DModelElementImpl implements Group { return userColorsPalettes != null && !userColorsPalettes.isEmpty(); case DescriptionPackage.GROUP__VERSION: return GroupImpl.VERSION_EDEFAULT == null ? version != null : !GroupImpl.VERSION_EDEFAULT.equals(version); + case DescriptionPackage.GROUP__EXTENSIONS: + return extensions != null && !extensions.isEmpty(); } return super.eIsSet(featureID); } diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/PaneBasedSelectionWizardDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/PaneBasedSelectionWizardDescriptionImpl.java index 0d015bb103..9655db39b4 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/PaneBasedSelectionWizardDescriptionImpl.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/PaneBasedSelectionWizardDescriptionImpl.java @@ -210,7 +210,7 @@ public class PaneBasedSelectionWizardDescriptionImpl extends AbstractToolDescrip * The default value of the '{@link #getChoiceOfValuesMessage() * <em>Choice Of Values Message</em>}' attribute. <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getChoiceOfValuesMessage() * @not-generated * @ordered @@ -318,7 +318,7 @@ public class PaneBasedSelectionWizardDescriptionImpl extends AbstractToolDescrip * The default value of the '{@link #getSelectedValuesMessage() * <em>Selected Values Message</em>}' attribute. <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getSelectedValuesMessage() * @not-generated * @ordered @@ -468,8 +468,8 @@ public class PaneBasedSelectionWizardDescriptionImpl extends AbstractToolDescrip containerView = (ContainerViewVariable) eResolveProxy(oldContainerView); if (containerView != oldContainerView) { InternalEObject newContainerView = (InternalEObject) containerView; - NotificationChain msgs = oldContainerView.eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - ToolPackage.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__CONTAINER_VIEW, null, - null); + NotificationChain msgs = oldContainerView + .eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - ToolPackage.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__CONTAINER_VIEW, null, null); if (newContainerView.eInternalContainer() == null) { msgs = newContainerView.eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - ToolPackage.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__CONTAINER_VIEW, null, msgs); } @@ -627,8 +627,8 @@ public class PaneBasedSelectionWizardDescriptionImpl extends AbstractToolDescrip initialOperation = (InitialOperation) eResolveProxy(oldInitialOperation); if (initialOperation != oldInitialOperation) { InternalEObject newInitialOperation = (InternalEObject) initialOperation; - NotificationChain msgs = oldInitialOperation.eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - ToolPackage.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__INITIAL_OPERATION, null, - null); + NotificationChain msgs = oldInitialOperation.eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - ToolPackage.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__INITIAL_OPERATION, + null, null); if (newInitialOperation.eInternalContainer() == null) { msgs = newInitialOperation.eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - ToolPackage.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__INITIAL_OPERATION, null, msgs); } @@ -1172,8 +1172,8 @@ public class PaneBasedSelectionWizardDescriptionImpl extends AbstractToolDescrip case ToolPackage.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__WINDOW_TITLE: return PaneBasedSelectionWizardDescriptionImpl.WINDOW_TITLE_EDEFAULT == null ? windowTitle != null : !PaneBasedSelectionWizardDescriptionImpl.WINDOW_TITLE_EDEFAULT.equals(windowTitle); case ToolPackage.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__WINDOW_IMAGE_PATH: - return PaneBasedSelectionWizardDescriptionImpl.WINDOW_IMAGE_PATH_EDEFAULT == null ? windowImagePath != null - : !PaneBasedSelectionWizardDescriptionImpl.WINDOW_IMAGE_PATH_EDEFAULT.equals(windowImagePath); + return PaneBasedSelectionWizardDescriptionImpl.WINDOW_IMAGE_PATH_EDEFAULT == null ? windowImagePath != null : !PaneBasedSelectionWizardDescriptionImpl.WINDOW_IMAGE_PATH_EDEFAULT + .equals(windowImagePath); case ToolPackage.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__MESSAGE: return PaneBasedSelectionWizardDescriptionImpl.MESSAGE_EDEFAULT == null ? message != null : !PaneBasedSelectionWizardDescriptionImpl.MESSAGE_EDEFAULT.equals(message); case ToolPackage.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__CHOICE_OF_VALUES_MESSAGE: @@ -1185,11 +1185,11 @@ public class PaneBasedSelectionWizardDescriptionImpl extends AbstractToolDescrip case ToolPackage.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__TREE: return tree != PaneBasedSelectionWizardDescriptionImpl.TREE_EDEFAULT; case ToolPackage.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__ROOT_EXPRESSION: - return PaneBasedSelectionWizardDescriptionImpl.ROOT_EXPRESSION_EDEFAULT == null ? rootExpression != null - : !PaneBasedSelectionWizardDescriptionImpl.ROOT_EXPRESSION_EDEFAULT.equals(rootExpression); + return PaneBasedSelectionWizardDescriptionImpl.ROOT_EXPRESSION_EDEFAULT == null ? rootExpression != null : !PaneBasedSelectionWizardDescriptionImpl.ROOT_EXPRESSION_EDEFAULT + .equals(rootExpression); case ToolPackage.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__CHILDREN_EXPRESSION: - return PaneBasedSelectionWizardDescriptionImpl.CHILDREN_EXPRESSION_EDEFAULT == null ? childrenExpression != null - : !PaneBasedSelectionWizardDescriptionImpl.CHILDREN_EXPRESSION_EDEFAULT.equals(childrenExpression); + return PaneBasedSelectionWizardDescriptionImpl.CHILDREN_EXPRESSION_EDEFAULT == null ? childrenExpression != null : !PaneBasedSelectionWizardDescriptionImpl.CHILDREN_EXPRESSION_EDEFAULT + .equals(childrenExpression); case ToolPackage.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__SELECTED_VALUES_MESSAGE: return PaneBasedSelectionWizardDescriptionImpl.SELECTED_VALUES_MESSAGE_EDEFAULT == null ? selectedValuesMessage != null : !PaneBasedSelectionWizardDescriptionImpl.SELECTED_VALUES_MESSAGE_EDEFAULT.equals(selectedValuesMessage); diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SelectionWizardDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SelectionWizardDescriptionImpl.java index af25ecd106..cf0ca8031c 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SelectionWizardDescriptionImpl.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SelectionWizardDescriptionImpl.java @@ -268,7 +268,7 @@ public class SelectionWizardDescriptionImpl extends AbstractToolDescriptionImpl /** * The default value of the '{@link #getWindowTitle() <em>Window Title</em>} * ' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getWindowTitle() * @not-generated * @ordered @@ -1039,8 +1039,8 @@ public class SelectionWizardDescriptionImpl extends AbstractToolDescriptionImpl public boolean eIsSet(int featureID) { switch (featureID) { case ToolPackage.SELECTION_WIZARD_DESCRIPTION__CANDIDATES_EXPRESSION: - return SelectionWizardDescriptionImpl.CANDIDATES_EXPRESSION_EDEFAULT == null ? candidatesExpression != null - : !SelectionWizardDescriptionImpl.CANDIDATES_EXPRESSION_EDEFAULT.equals(candidatesExpression); + return SelectionWizardDescriptionImpl.CANDIDATES_EXPRESSION_EDEFAULT == null ? candidatesExpression != null : !SelectionWizardDescriptionImpl.CANDIDATES_EXPRESSION_EDEFAULT + .equals(candidatesExpression); case ToolPackage.SELECTION_WIZARD_DESCRIPTION__MULTIPLE: return multiple != SelectionWizardDescriptionImpl.MULTIPLE_EDEFAULT; case ToolPackage.SELECTION_WIZARD_DESCRIPTION__TREE: @@ -1048,8 +1048,8 @@ public class SelectionWizardDescriptionImpl extends AbstractToolDescriptionImpl case ToolPackage.SELECTION_WIZARD_DESCRIPTION__ROOT_EXPRESSION: return SelectionWizardDescriptionImpl.ROOT_EXPRESSION_EDEFAULT == null ? rootExpression != null : !SelectionWizardDescriptionImpl.ROOT_EXPRESSION_EDEFAULT.equals(rootExpression); case ToolPackage.SELECTION_WIZARD_DESCRIPTION__CHILDREN_EXPRESSION: - return SelectionWizardDescriptionImpl.CHILDREN_EXPRESSION_EDEFAULT == null ? childrenExpression != null - : !SelectionWizardDescriptionImpl.CHILDREN_EXPRESSION_EDEFAULT.equals(childrenExpression); + return SelectionWizardDescriptionImpl.CHILDREN_EXPRESSION_EDEFAULT == null ? childrenExpression != null : !SelectionWizardDescriptionImpl.CHILDREN_EXPRESSION_EDEFAULT + .equals(childrenExpression); case ToolPackage.SELECTION_WIZARD_DESCRIPTION__MESSAGE: return SelectionWizardDescriptionImpl.MESSAGE_EDEFAULT == null ? message != null : !SelectionWizardDescriptionImpl.MESSAGE_EDEFAULT.equals(message); case ToolPackage.SELECTION_WIZARD_DESCRIPTION__ELEMENT: diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionAdapterFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionAdapterFactory.java index 39db7b404a..6cab7381e1 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionAdapterFactory.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionAdapterFactory.java @@ -35,6 +35,7 @@ import org.eclipse.sirius.viewpoint.description.EReferenceCustomization; import org.eclipse.sirius.viewpoint.description.EStructuralFeatureCustomization; import org.eclipse.sirius.viewpoint.description.EndUserDocumentedElement; import org.eclipse.sirius.viewpoint.description.Environment; +import org.eclipse.sirius.viewpoint.description.Extension; import org.eclipse.sirius.viewpoint.description.FeatureExtensionDescription; import org.eclipse.sirius.viewpoint.description.FixedColor; import org.eclipse.sirius.viewpoint.description.Group; @@ -121,6 +122,11 @@ public class DescriptionAdapterFactory extends AdapterFactoryImpl { } @Override + public Adapter caseExtension(Extension object) { + return createExtensionAdapter(); + } + + @Override public Adapter caseComponent(Component object) { return createComponentAdapter(); } @@ -367,6 +373,22 @@ public class DescriptionAdapterFactory extends AdapterFactoryImpl { /** * Creates a new adapter for an object of class ' + * {@link org.eclipse.sirius.viewpoint.description.Extension + * <em>Extension</em>}'. <!-- begin-user-doc --> This default implementation + * returns null so that we can easily ignore cases; it's useful to ignore a + * case when inheritance will catch all the cases anyway. <!-- end-user-doc + * --> + * + * @return the new adapter. + * @see org.eclipse.sirius.viewpoint.description.Extension + * @generated + */ + public Adapter createExtensionAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class ' * {@link org.eclipse.sirius.viewpoint.description.Component * <em>Component</em>}'. <!-- begin-user-doc --> This default implementation * returns null so that we can easily ignore cases; it's useful to ignore a diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionSwitch.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionSwitch.java index 9224ba68ed..4761cd5429 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionSwitch.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionSwitch.java @@ -35,6 +35,7 @@ import org.eclipse.sirius.viewpoint.description.EReferenceCustomization; import org.eclipse.sirius.viewpoint.description.EStructuralFeatureCustomization; import org.eclipse.sirius.viewpoint.description.EndUserDocumentedElement; import org.eclipse.sirius.viewpoint.description.Environment; +import org.eclipse.sirius.viewpoint.description.Extension; import org.eclipse.sirius.viewpoint.description.FeatureExtensionDescription; import org.eclipse.sirius.viewpoint.description.FixedColor; import org.eclipse.sirius.viewpoint.description.Group; @@ -147,6 +148,14 @@ public class DescriptionSwitch<T> { } return result; } + case DescriptionPackage.EXTENSION: { + Extension extension = (Extension) theEObject; + T result = caseExtension(extension); + if (result == null) { + result = defaultCase(theEObject); + } + return result; + } case DescriptionPackage.COMPONENT: { Component component = (Component) theEObject; T result = caseComponent(component); @@ -588,6 +597,23 @@ public class DescriptionSwitch<T> { /** * Returns the result of interpreting the object as an instance of ' + * <em>Extension</em>'. <!-- begin-user-doc --> This implementation returns + * null; returning a non-null result will terminate the switch. <!-- + * end-user-doc --> + * + * @param object + * the target of the switch. + * @return the result of interpreting the object as an instance of ' + * <em>Extension</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseExtension(Extension object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of ' * <em>Component</em>'. <!-- begin-user-doc --> This implementation returns * null; returning a non-null result will terminate the switch. <!-- * end-user-doc --> diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationRuleImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationRuleImpl.java index 65648fca22..45473b96dd 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationRuleImpl.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationRuleImpl.java @@ -77,7 +77,7 @@ public abstract class ValidationRuleImpl extends IdentifiedElementImpl implement /** * The default value of the '{@link #getMessage() <em>Message</em>}' * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getMessage() * @not-generated * @ordered |