diff options
| author | Laurent Fasani | 2015-06-08 16:43:42 +0000 |
|---|---|---|
| committer | Laurent Fasani | 2015-08-04 12:55:20 +0000 |
| commit | a0f13eb71060917cf8d340b793212ab1245ce461 (patch) | |
| tree | 140f27665d622a08ecd39a6cb6eb13ec15813d70 | |
| parent | 54c7d6e16d78cc43ce7fa368bc49ffd8dd87930d (diff) | |
| download | org.eclipse.sirius-a0f13eb71060917cf8d340b793212ab1245ce461.tar.gz org.eclipse.sirius-a0f13eb71060917cf8d340b793212ab1245ce461.tar.xz org.eclipse.sirius-a0f13eb71060917cf8d340b793212ab1245ce461.zip | |
[464269] Change VSM and representation meta-models
Add elementsToSelect and inverseSelectionOrder features to
AbstractToolDescription
Add UIState abstraction which is used to store transient UI information
on DRepresentation.
Add uiState attribute to DRepresentation
Note that the tests testVariablesInInterpretedExpressionEAnnotation,
testInterpretedExpressionTargetOnGroup and
testInterpretedExpressionTargetOnTree fail and will be fixed in next
commit.
Bug: 464269
Change-Id: I7ac83b4061e04838d3aa43e4550fa4d45e3792d2
Signed-off-by: Laurent Fasani <laurent.fasani@obeo.fr>
51 files changed, 3709 insertions, 687 deletions
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/MessageCreationToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/MessageCreationToolItemProvider.java index 9d9ae8cf96..a0c66f51b3 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/MessageCreationToolItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/MessageCreationToolItemProvider.java @@ -61,6 +61,8 @@ public class MessageCreationToolItemProvider extends SequenceDiagramToolDescript addLabelPropertyDescriptor(object); addPreconditionPropertyDescriptor(object); addForceRefreshPropertyDescriptor(object); + addElementsToSelectPropertyDescriptor(object); + addInverseSelectionOrderPropertyDescriptor(object); addEdgeMappingsPropertyDescriptor(object); addIconPathPropertyDescriptor(object); addExtraSourceMappingsPropertyDescriptor(object); @@ -133,6 +135,32 @@ public class MessageCreationToolItemProvider extends SequenceDiagramToolDescript } /** + * This adds a property descriptor for the Elements To Select feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected void addElementsToSelectPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_AbstractToolDescription_elementsToSelect_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_AbstractToolDescription_elementsToSelect_feature", "_UI_AbstractToolDescription_type"), + ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + } + + /** + * This adds a property descriptor for the Inverse Selection Order feature. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected void addInverseSelectionOrderPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_AbstractToolDescription_inverseSelectionOrder_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_AbstractToolDescription_inverseSelectionOrder_feature", "_UI_AbstractToolDescription_type"), + ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); + } + + /** * This adds a property descriptor for the Edge Mappings feature. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -279,6 +307,8 @@ public class MessageCreationToolItemProvider extends SequenceDiagramToolDescript case org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage.MESSAGE_CREATION_TOOL__LABEL: case org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage.MESSAGE_CREATION_TOOL__PRECONDITION: case org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage.MESSAGE_CREATION_TOOL__FORCE_REFRESH: + case org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage.MESSAGE_CREATION_TOOL__ELEMENTS_TO_SELECT: + case org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage.MESSAGE_CREATION_TOOL__INVERSE_SELECTION_ORDER: case org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage.MESSAGE_CREATION_TOOL__ICON_PATH: case org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage.MESSAGE_CREATION_TOOL__CONNECTION_START_PRECONDITION: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/SequencePackage.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/SequencePackage.java index e2c04e4858..0d8c0311a6 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/SequencePackage.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/SequencePackage.java @@ -126,6 +126,15 @@ public interface SequencePackage extends EPackage { int SEQUENCE_DDIAGRAM__OWNED_ANNOTATION_ENTRIES = DiagramPackage.DSEMANTIC_DIAGRAM__OWNED_ANNOTATION_ENTRIES; /** + * The feature id for the '<em><b>Ui State</b></em>' containment reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int SEQUENCE_DDIAGRAM__UI_STATE = DiagramPackage.DSEMANTIC_DIAGRAM__UI_STATE; + + /** * The feature id for the '<em><b>Owned Diagram Elements</b></em>' * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc --> * diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/ToolPackage.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/ToolPackage.java index 61ba75b83c..c95db1cdef 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/ToolPackage.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/ToolPackage.java @@ -219,6 +219,24 @@ public interface ToolPackage extends EPackage { int INSTANCE_ROLE_CREATION_TOOL__FILTERS = org.eclipse.sirius.diagram.description.tool.ToolPackage.NODE_CREATION_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int INSTANCE_ROLE_CREATION_TOOL__ELEMENTS_TO_SELECT = org.eclipse.sirius.diagram.description.tool.ToolPackage.NODE_CREATION_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int INSTANCE_ROLE_CREATION_TOOL__INVERSE_SELECTION_ORDER = org.eclipse.sirius.diagram.description.tool.ToolPackage.NODE_CREATION_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Node Mappings</b></em>' reference list. * <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -358,6 +376,24 @@ public interface ToolPackage extends EPackage { int LIFELINE_CREATION_TOOL__FILTERS = org.eclipse.sirius.diagram.description.tool.ToolPackage.CONTAINER_CREATION_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int LIFELINE_CREATION_TOOL__ELEMENTS_TO_SELECT = org.eclipse.sirius.diagram.description.tool.ToolPackage.CONTAINER_CREATION_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int LIFELINE_CREATION_TOOL__INVERSE_SELECTION_ORDER = org.eclipse.sirius.diagram.description.tool.ToolPackage.CONTAINER_CREATION_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Container Mappings</b></em>' reference * list. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -487,13 +523,31 @@ public interface ToolPackage extends EPackage { int MESSAGE_CREATION_TOOL__FILTERS = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 5; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int MESSAGE_CREATION_TOOL__ELEMENTS_TO_SELECT = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 6; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int MESSAGE_CREATION_TOOL__INVERSE_SELECTION_ORDER = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 7; + + /** * The feature id for the '<em><b>Edge Mappings</b></em>' reference list. * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int MESSAGE_CREATION_TOOL__EDGE_MAPPINGS = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 6; + int MESSAGE_CREATION_TOOL__EDGE_MAPPINGS = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 8; /** * The feature id for the '<em><b>Source Variable</b></em>' containment @@ -502,7 +556,7 @@ public interface ToolPackage extends EPackage { * @generated * @ordered */ - int MESSAGE_CREATION_TOOL__SOURCE_VARIABLE = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 7; + int MESSAGE_CREATION_TOOL__SOURCE_VARIABLE = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 9; /** * The feature id for the '<em><b>Target Variable</b></em>' containment @@ -511,7 +565,7 @@ public interface ToolPackage extends EPackage { * @generated * @ordered */ - int MESSAGE_CREATION_TOOL__TARGET_VARIABLE = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 8; + int MESSAGE_CREATION_TOOL__TARGET_VARIABLE = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 10; /** * The feature id for the '<em><b>Source View Variable</b></em>' containment @@ -520,7 +574,7 @@ public interface ToolPackage extends EPackage { * @generated * @ordered */ - int MESSAGE_CREATION_TOOL__SOURCE_VIEW_VARIABLE = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 9; + int MESSAGE_CREATION_TOOL__SOURCE_VIEW_VARIABLE = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 11; /** * The feature id for the '<em><b>Target View Variable</b></em>' containment @@ -529,7 +583,7 @@ public interface ToolPackage extends EPackage { * @generated * @ordered */ - int MESSAGE_CREATION_TOOL__TARGET_VIEW_VARIABLE = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 10; + int MESSAGE_CREATION_TOOL__TARGET_VIEW_VARIABLE = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 12; /** * The feature id for the '<em><b>Initial Operation</b></em>' containment @@ -538,7 +592,7 @@ public interface ToolPackage extends EPackage { * @generated * @ordered */ - int MESSAGE_CREATION_TOOL__INITIAL_OPERATION = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 11; + int MESSAGE_CREATION_TOOL__INITIAL_OPERATION = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 13; /** * The feature id for the '<em><b>Icon Path</b></em>' attribute. <!-- @@ -547,7 +601,7 @@ public interface ToolPackage extends EPackage { * @generated * @ordered */ - int MESSAGE_CREATION_TOOL__ICON_PATH = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 12; + int MESSAGE_CREATION_TOOL__ICON_PATH = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 14; /** * The feature id for the '<em><b>Extra Source Mappings</b></em>' reference @@ -556,7 +610,7 @@ public interface ToolPackage extends EPackage { * @generated * @ordered */ - int MESSAGE_CREATION_TOOL__EXTRA_SOURCE_MAPPINGS = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 13; + int MESSAGE_CREATION_TOOL__EXTRA_SOURCE_MAPPINGS = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 15; /** * The feature id for the '<em><b>Extra Target Mappings</b></em>' reference @@ -565,7 +619,7 @@ public interface ToolPackage extends EPackage { * @generated * @ordered */ - int MESSAGE_CREATION_TOOL__EXTRA_TARGET_MAPPINGS = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 14; + int MESSAGE_CREATION_TOOL__EXTRA_TARGET_MAPPINGS = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 16; /** * The feature id for the '<em><b>Connection Start Precondition</b></em>' @@ -574,7 +628,7 @@ public interface ToolPackage extends EPackage { * @generated * @ordered */ - int MESSAGE_CREATION_TOOL__CONNECTION_START_PRECONDITION = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 15; + int MESSAGE_CREATION_TOOL__CONNECTION_START_PRECONDITION = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 17; /** * The feature id for the '<em><b>Starting End Predecessor</b></em>' @@ -583,7 +637,7 @@ public interface ToolPackage extends EPackage { * @generated * @ordered */ - int MESSAGE_CREATION_TOOL__STARTING_END_PREDECESSOR = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 16; + int MESSAGE_CREATION_TOOL__STARTING_END_PREDECESSOR = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 18; /** * The feature id for the '<em><b>Finishing End Predecessor</b></em>' @@ -592,7 +646,7 @@ public interface ToolPackage extends EPackage { * @generated * @ordered */ - int MESSAGE_CREATION_TOOL__FINISHING_END_PREDECESSOR = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 17; + int MESSAGE_CREATION_TOOL__FINISHING_END_PREDECESSOR = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 19; /** * The number of structural features of the '<em>Message Creation Tool</em>' @@ -601,7 +655,7 @@ public interface ToolPackage extends EPackage { * @generated * @ordered */ - int MESSAGE_CREATION_TOOL_FEATURE_COUNT = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 18; + int MESSAGE_CREATION_TOOL_FEATURE_COUNT = ToolPackage.SEQUENCE_DIAGRAM_TOOL_DESCRIPTION_FEATURE_COUNT + 20; /** * The meta object id for the ' @@ -670,6 +724,24 @@ public interface ToolPackage extends EPackage { int EXECUTION_CREATION_TOOL__FILTERS = org.eclipse.sirius.diagram.description.tool.ToolPackage.NODE_CREATION_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int EXECUTION_CREATION_TOOL__ELEMENTS_TO_SELECT = org.eclipse.sirius.diagram.description.tool.ToolPackage.NODE_CREATION_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int EXECUTION_CREATION_TOOL__INVERSE_SELECTION_ORDER = org.eclipse.sirius.diagram.description.tool.ToolPackage.NODE_CREATION_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Node Mappings</b></em>' reference list. * <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -818,6 +890,24 @@ public interface ToolPackage extends EPackage { int STATE_CREATION_TOOL__FILTERS = org.eclipse.sirius.diagram.description.tool.ToolPackage.NODE_CREATION_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int STATE_CREATION_TOOL__ELEMENTS_TO_SELECT = org.eclipse.sirius.diagram.description.tool.ToolPackage.NODE_CREATION_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int STATE_CREATION_TOOL__INVERSE_SELECTION_ORDER = org.eclipse.sirius.diagram.description.tool.ToolPackage.NODE_CREATION_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Node Mappings</b></em>' reference list. * <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -977,6 +1067,24 @@ public interface ToolPackage extends EPackage { int INTERACTION_USE_CREATION_TOOL__FILTERS = org.eclipse.sirius.diagram.description.tool.ToolPackage.CONTAINER_CREATION_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int INTERACTION_USE_CREATION_TOOL__ELEMENTS_TO_SELECT = org.eclipse.sirius.diagram.description.tool.ToolPackage.CONTAINER_CREATION_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int INTERACTION_USE_CREATION_TOOL__INVERSE_SELECTION_ORDER = org.eclipse.sirius.diagram.description.tool.ToolPackage.CONTAINER_CREATION_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Container Mappings</b></em>' reference * list. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -1134,6 +1242,24 @@ public interface ToolPackage extends EPackage { int COMBINED_FRAGMENT_CREATION_TOOL__FILTERS = org.eclipse.sirius.diagram.description.tool.ToolPackage.CONTAINER_CREATION_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int COMBINED_FRAGMENT_CREATION_TOOL__ELEMENTS_TO_SELECT = org.eclipse.sirius.diagram.description.tool.ToolPackage.CONTAINER_CREATION_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int COMBINED_FRAGMENT_CREATION_TOOL__INVERSE_SELECTION_ORDER = org.eclipse.sirius.diagram.description.tool.ToolPackage.CONTAINER_CREATION_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Container Mappings</b></em>' reference * list. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -1291,6 +1417,24 @@ public interface ToolPackage extends EPackage { int OPERAND_CREATION_TOOL__FILTERS = org.eclipse.sirius.diagram.description.tool.ToolPackage.CONTAINER_CREATION_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int OPERAND_CREATION_TOOL__ELEMENTS_TO_SELECT = org.eclipse.sirius.diagram.description.tool.ToolPackage.CONTAINER_CREATION_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int OPERAND_CREATION_TOOL__INVERSE_SELECTION_ORDER = org.eclipse.sirius.diagram.description.tool.ToolPackage.CONTAINER_CREATION_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Container Mappings</b></em>' reference * list. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -1438,6 +1582,24 @@ public interface ToolPackage extends EPackage { int OBSERVATION_POINT_CREATION_TOOL__FILTERS = org.eclipse.sirius.diagram.description.tool.ToolPackage.NODE_CREATION_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int OBSERVATION_POINT_CREATION_TOOL__ELEMENTS_TO_SELECT = org.eclipse.sirius.diagram.description.tool.ToolPackage.NODE_CREATION_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int OBSERVATION_POINT_CREATION_TOOL__INVERSE_SELECTION_ORDER = org.eclipse.sirius.diagram.description.tool.ToolPackage.NODE_CREATION_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Node Mappings</b></em>' reference list. * <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -1574,6 +1736,24 @@ public interface ToolPackage extends EPackage { int REORDER_TOOL__FILTERS = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int REORDER_TOOL__ELEMENTS_TO_SELECT = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int REORDER_TOOL__INVERSE_SELECTION_ORDER = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Mappings</b></em>' reference list. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -1703,6 +1883,24 @@ public interface ToolPackage extends EPackage { int INSTANCE_ROLE_REORDER_TOOL__FILTERS = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int INSTANCE_ROLE_REORDER_TOOL__ELEMENTS_TO_SELECT = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int INSTANCE_ROLE_REORDER_TOOL__INVERSE_SELECTION_ORDER = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Mappings</b></em>' reference list. <!-- * begin-user-doc --> <!-- end-user-doc --> * diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/MessageCreationToolImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/MessageCreationToolImpl.java index 38ba2859a4..32b52d42f6 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/MessageCreationToolImpl.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/MessageCreationToolImpl.java @@ -68,6 +68,12 @@ import org.eclipse.sirius.viewpoint.description.tool.ToolFilterDescription; * {@link org.eclipse.sirius.diagram.sequence.description.tool.impl.MessageCreationToolImpl#getFilters * <em>Filters</em>}</li> * <li> + * {@link org.eclipse.sirius.diagram.sequence.description.tool.impl.MessageCreationToolImpl#getElementsToSelect + * <em>Elements To Select</em>}</li> + * <li> + * {@link org.eclipse.sirius.diagram.sequence.description.tool.impl.MessageCreationToolImpl#isInverseSelectionOrder + * <em>Inverse Selection Order</em>}</li> + * <li> * {@link org.eclipse.sirius.diagram.sequence.description.tool.impl.MessageCreationToolImpl#getEdgeMappings * <em>Edge Mappings</em>}</li> * <li> @@ -224,6 +230,50 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl protected EList<ToolFilterDescription> filters; /** + * The default value of the '{@link #getElementsToSelect() + * <em>Elements To Select</em>}' attribute. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #getElementsToSelect() + * @generated + * @ordered + */ + protected static final String ELEMENTS_TO_SELECT_EDEFAULT = ""; + + /** + * The cached value of the '{@link #getElementsToSelect() + * <em>Elements To Select</em>}' attribute. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #getElementsToSelect() + * @generated + * @ordered + */ + protected String elementsToSelect = MessageCreationToolImpl.ELEMENTS_TO_SELECT_EDEFAULT; + + /** + * The default value of the '{@link #isInverseSelectionOrder() + * <em>Inverse Selection Order</em>}' attribute. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #isInverseSelectionOrder() + * @generated + * @ordered + */ + protected static final boolean INVERSE_SELECTION_ORDER_EDEFAULT = false; + + /** + * The cached value of the '{@link #isInverseSelectionOrder() + * <em>Inverse Selection Order</em>}' attribute. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #isInverseSelectionOrder() + * @generated + * @ordered + */ + protected boolean inverseSelectionOrder = MessageCreationToolImpl.INVERSE_SELECTION_ORDER_EDEFAULT; + + /** * The cached value of the '{@link #getEdgeMappings() * <em>Edge Mappings</em>}' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> @@ -533,6 +583,54 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl * @generated */ @Override + public String getElementsToSelect() { + return elementsToSelect; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void setElementsToSelect(String newElementsToSelect) { + String oldElementsToSelect = elementsToSelect; + elementsToSelect = newElementsToSelect; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, ToolPackage.MESSAGE_CREATION_TOOL__ELEMENTS_TO_SELECT, oldElementsToSelect, elementsToSelect)); + } + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public boolean isInverseSelectionOrder() { + return inverseSelectionOrder; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void setInverseSelectionOrder(boolean newInverseSelectionOrder) { + boolean oldInverseSelectionOrder = inverseSelectionOrder; + inverseSelectionOrder = newInverseSelectionOrder; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, ToolPackage.MESSAGE_CREATION_TOOL__INVERSE_SELECTION_ORDER, oldInverseSelectionOrder, inverseSelectionOrder)); + } + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override public EList<EdgeMapping> getEdgeMappings() { if (edgeMappings == null) { edgeMappings = new EObjectResolvingEList<EdgeMapping>(EdgeMapping.class, this, ToolPackage.MESSAGE_CREATION_TOOL__EDGE_MAPPINGS); @@ -1181,6 +1279,10 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl return isForceRefresh(); case ToolPackage.MESSAGE_CREATION_TOOL__FILTERS: return getFilters(); + case ToolPackage.MESSAGE_CREATION_TOOL__ELEMENTS_TO_SELECT: + return getElementsToSelect(); + case ToolPackage.MESSAGE_CREATION_TOOL__INVERSE_SELECTION_ORDER: + return isInverseSelectionOrder(); case ToolPackage.MESSAGE_CREATION_TOOL__EDGE_MAPPINGS: return getEdgeMappings(); case ToolPackage.MESSAGE_CREATION_TOOL__SOURCE_VARIABLE: @@ -1252,6 +1354,12 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl getFilters().clear(); getFilters().addAll((Collection<? extends ToolFilterDescription>) newValue); return; + case ToolPackage.MESSAGE_CREATION_TOOL__ELEMENTS_TO_SELECT: + setElementsToSelect((String) newValue); + return; + case ToolPackage.MESSAGE_CREATION_TOOL__INVERSE_SELECTION_ORDER: + setInverseSelectionOrder((Boolean) newValue); + return; case ToolPackage.MESSAGE_CREATION_TOOL__EDGE_MAPPINGS: getEdgeMappings().clear(); getEdgeMappings().addAll((Collection<? extends EdgeMapping>) newValue); @@ -1321,6 +1429,12 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl case ToolPackage.MESSAGE_CREATION_TOOL__FILTERS: getFilters().clear(); return; + case ToolPackage.MESSAGE_CREATION_TOOL__ELEMENTS_TO_SELECT: + setElementsToSelect(MessageCreationToolImpl.ELEMENTS_TO_SELECT_EDEFAULT); + return; + case ToolPackage.MESSAGE_CREATION_TOOL__INVERSE_SELECTION_ORDER: + setInverseSelectionOrder(MessageCreationToolImpl.INVERSE_SELECTION_ORDER_EDEFAULT); + return; case ToolPackage.MESSAGE_CREATION_TOOL__EDGE_MAPPINGS: getEdgeMappings().clear(); return; @@ -1381,6 +1495,10 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl return forceRefresh != MessageCreationToolImpl.FORCE_REFRESH_EDEFAULT; case ToolPackage.MESSAGE_CREATION_TOOL__FILTERS: return filters != null && !filters.isEmpty(); + case ToolPackage.MESSAGE_CREATION_TOOL__ELEMENTS_TO_SELECT: + return MessageCreationToolImpl.ELEMENTS_TO_SELECT_EDEFAULT == null ? elementsToSelect != null : !MessageCreationToolImpl.ELEMENTS_TO_SELECT_EDEFAULT.equals(elementsToSelect); + case ToolPackage.MESSAGE_CREATION_TOOL__INVERSE_SELECTION_ORDER: + return inverseSelectionOrder != MessageCreationToolImpl.INVERSE_SELECTION_ORDER_EDEFAULT; case ToolPackage.MESSAGE_CREATION_TOOL__EDGE_MAPPINGS: return edgeMappings != null && !edgeMappings.isEmpty(); case ToolPackage.MESSAGE_CREATION_TOOL__SOURCE_VARIABLE: @@ -1449,6 +1567,10 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl return org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FORCE_REFRESH; case ToolPackage.MESSAGE_CREATION_TOOL__FILTERS: return org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS; + case ToolPackage.MESSAGE_CREATION_TOOL__ELEMENTS_TO_SELECT: + return org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + case ToolPackage.MESSAGE_CREATION_TOOL__INVERSE_SELECTION_ORDER: + return org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; default: return -1; } @@ -1537,6 +1659,10 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl return ToolPackage.MESSAGE_CREATION_TOOL__FORCE_REFRESH; case org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS: return ToolPackage.MESSAGE_CREATION_TOOL__FILTERS; + case org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT: + return ToolPackage.MESSAGE_CREATION_TOOL__ELEMENTS_TO_SELECT; + case org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER: + return ToolPackage.MESSAGE_CREATION_TOOL__INVERSE_SELECTION_ORDER; default: return -1; } @@ -1608,6 +1734,10 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl result.append(precondition); result.append(", forceRefresh: "); result.append(forceRefresh); + result.append(", elementsToSelect: "); + result.append(elementsToSelect); + result.append(", inverseSelectionOrder: "); + result.append(inverseSelectionOrder); result.append(", iconPath: "); result.append(iconPath); result.append(", connectionStartPrecondition: "); diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DiagramPackage.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DiagramPackage.java index f4dcfc3061..2efff151b6 100644 --- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DiagramPackage.java +++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DiagramPackage.java @@ -129,6 +129,15 @@ public interface DiagramPackage extends EPackage { int DDIAGRAM__OWNED_ANNOTATION_ENTRIES = ViewpointPackage.DREPRESENTATION__OWNED_ANNOTATION_ENTRIES; /** + * The feature id for the '<em><b>Ui State</b></em>' containment reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DDIAGRAM__UI_STATE = ViewpointPackage.DREPRESENTATION__UI_STATE; + + /** * The feature id for the '<em><b>Owned Diagram Elements</b></em>' * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -366,6 +375,15 @@ public interface DiagramPackage extends EPackage { int DSEMANTIC_DIAGRAM__OWNED_ANNOTATION_ENTRIES = DiagramPackage.DDIAGRAM__OWNED_ANNOTATION_ENTRIES; /** + * The feature id for the '<em><b>Ui State</b></em>' containment reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DSEMANTIC_DIAGRAM__UI_STATE = DiagramPackage.DDIAGRAM__UI_STATE; + + /** * The feature id for the '<em><b>Owned Diagram Elements</b></em>' * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc --> * diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/ToolPackage.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/ToolPackage.java index 5b2dfab6d9..1528543e0d 100644 --- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/ToolPackage.java +++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/ToolPackage.java @@ -326,6 +326,24 @@ public interface ToolPackage extends EPackage { int NODE_CREATION_DESCRIPTION__FILTERS = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int NODE_CREATION_DESCRIPTION__ELEMENTS_TO_SELECT = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int NODE_CREATION_DESCRIPTION__INVERSE_SELECTION_ORDER = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Node Mappings</b></em>' reference list. * <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -456,6 +474,24 @@ public interface ToolPackage extends EPackage { int EDGE_CREATION_DESCRIPTION__FILTERS = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int EDGE_CREATION_DESCRIPTION__ELEMENTS_TO_SELECT = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int EDGE_CREATION_DESCRIPTION__INVERSE_SELECTION_ORDER = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Edge Mappings</b></em>' reference list. * <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -622,6 +658,24 @@ public interface ToolPackage extends EPackage { int CONTAINER_CREATION_DESCRIPTION__FILTERS = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CONTAINER_CREATION_DESCRIPTION__ELEMENTS_TO_SELECT = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CONTAINER_CREATION_DESCRIPTION__INVERSE_SELECTION_ORDER = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Container Mappings</b></em>' reference * list. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -752,6 +806,24 @@ public interface ToolPackage extends EPackage { int DELETE_ELEMENT_DESCRIPTION__FILTERS = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DELETE_ELEMENT_DESCRIPTION__ELEMENTS_TO_SELECT = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DELETE_ELEMENT_DESCRIPTION__INVERSE_SELECTION_ORDER = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Element</b></em>' containment reference. * <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -873,6 +945,24 @@ public interface ToolPackage extends EPackage { int DOUBLE_CLICK_DESCRIPTION__FILTERS = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DOUBLE_CLICK_DESCRIPTION__ELEMENTS_TO_SELECT = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DOUBLE_CLICK_DESCRIPTION__INVERSE_SELECTION_ORDER = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Mappings</b></em>' reference list. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -1063,6 +1153,24 @@ public interface ToolPackage extends EPackage { int RECONNECT_EDGE_DESCRIPTION__FILTERS = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int RECONNECT_EDGE_DESCRIPTION__ELEMENTS_TO_SELECT = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int RECONNECT_EDGE_DESCRIPTION__INVERSE_SELECTION_ORDER = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Reconnection Kind</b></em>' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -1211,6 +1319,24 @@ public interface ToolPackage extends EPackage { int REQUEST_DESCRIPTION__FILTERS = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int REQUEST_DESCRIPTION__ELEMENTS_TO_SELECT = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int REQUEST_DESCRIPTION__INVERSE_SELECTION_ORDER = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Type</b></em>' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -1295,6 +1421,24 @@ public interface ToolPackage extends EPackage { int DIRECT_EDIT_LABEL__FILTERS = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DIRECT_EDIT_LABEL__ELEMENTS_TO_SELECT = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DIRECT_EDIT_LABEL__INVERSE_SELECTION_ORDER = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Mask</b></em>' containment reference. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -1397,6 +1541,24 @@ public interface ToolPackage extends EPackage { int BEHAVIOR_TOOL__FILTERS = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int BEHAVIOR_TOOL__ELEMENTS_TO_SELECT = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int BEHAVIOR_TOOL__INVERSE_SELECTION_ORDER = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Domain Class</b></em>' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -1909,6 +2071,24 @@ public interface ToolPackage extends EPackage { int DIAGRAM_CREATION_DESCRIPTION__FILTERS = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.REPRESENTATION_CREATION_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DIAGRAM_CREATION_DESCRIPTION__ELEMENTS_TO_SELECT = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.REPRESENTATION_CREATION_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DIAGRAM_CREATION_DESCRIPTION__INVERSE_SELECTION_ORDER = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.REPRESENTATION_CREATION_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Title Expression</b></em>' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -2048,6 +2228,24 @@ public interface ToolPackage extends EPackage { int DIAGRAM_NAVIGATION_DESCRIPTION__FILTERS = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.REPRESENTATION_NAVIGATION_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DIAGRAM_NAVIGATION_DESCRIPTION__ELEMENTS_TO_SELECT = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.REPRESENTATION_NAVIGATION_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DIAGRAM_NAVIGATION_DESCRIPTION__INVERSE_SELECTION_ORDER = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.REPRESENTATION_NAVIGATION_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Browse Expression</b></em>' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -2187,6 +2385,24 @@ public interface ToolPackage extends EPackage { int CONTAINER_DROP_DESCRIPTION__FILTERS = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CONTAINER_DROP_DESCRIPTION__ELEMENTS_TO_SELECT = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CONTAINER_DROP_DESCRIPTION__INVERSE_SELECTION_ORDER = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Mappings</b></em>' reference list. <!-- * begin-user-doc --> <!-- end-user-doc --> * diff --git a/plugins/org.eclipse.sirius.editor.diagram/help/contexts.xml b/plugins/org.eclipse.sirius.editor.diagram/help/contexts.xml index 1333e75e85..3ead0bedb0 100644 --- a/plugins/org.eclipse.sirius.editor.diagram/help/contexts.xml +++ b/plugins/org.eclipse.sirius.editor.diagram/help/contexts.xml @@ -208,7 +208,7 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + <!-- Start of user code NodeStyle description --> @@ -223,9 +223,9 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + - strokeSizeComputationExpression: an integer. - + <!-- Start of user code Dot description --> @@ -252,7 +252,7 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + <!-- Start of user code ContainerStyle description --> @@ -266,7 +266,7 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + <!-- Start of user code FlatContainerStyle description --> @@ -280,7 +280,7 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + <!-- Start of user code ShapeContainerStyle description --> @@ -295,7 +295,7 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + <!-- Start of user code Square description --> @@ -310,7 +310,7 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + <!-- Start of user code Ellipse description --> @@ -325,7 +325,7 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + <!-- Start of user code Lozenge description --> @@ -340,7 +340,7 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + <!-- Start of user code BundledImage description --> @@ -355,7 +355,7 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + <!-- Start of user code WorkspaceImage description --> @@ -369,7 +369,7 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + <!-- Start of user code CustomStyle description --> @@ -408,7 +408,7 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + <!-- Start of user code GaugeCompositeStyle description --> @@ -422,7 +422,7 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + <!-- Start of user code BorderedStyle description --> @@ -436,7 +436,7 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + <!-- Start of user code Note description --> @@ -548,59 +548,26 @@ </description> </context> - <context id="DiagramElementMapping2ModelElement"> - <description> - - - - <!-- Start of user code DiagramElementMapping2ModelElement description --> - - <!-- End of user code DiagramElementMapping2ModelElement description --> - - </description> - </context> - <context id="ModelElement2ViewVariable"> - <description> - - - - <!-- Start of user code ModelElement2ViewVariable description --> - - <!-- End of user code ModelElement2ViewVariable description --> - - </description> - </context> - <context id="ViewVariable2ContainerVariable"> + <context id="DragAndDropTarget"> <description> - + A DragAndDropTarget is an element that can managed drop requests. + - <!-- Start of user code ViewVariable2ContainerVariable description --> + <!-- Start of user code DragAndDropTarget description --> - <!-- End of user code ViewVariable2ContainerVariable description --> + <!-- End of user code DragAndDropTarget description --> </description> </context> - <context id="ContainerVariable2StyleDescription"> + <context id="HideLabelCapabilityStyle"> <description> - <!-- Start of user code ContainerVariable2StyleDescription description --> - - <!-- End of user code ContainerVariable2StyleDescription description --> - - </description> - </context> - <context id="DragAndDropTarget"> - <description> - A DragAndDropTarget is an element that can managed drop requests. - - - - <!-- Start of user code DragAndDropTarget description --> + <!-- Start of user code HideLabelCapabilityStyle description --> - <!-- End of user code DragAndDropTarget description --> + <!-- End of user code HideLabelCapabilityStyle description --> </description> </context> @@ -610,13 +577,13 @@ Interpreted expressions, requested return type and available variables: - titleExpression: a string. - + - preconditionExpression: a boolean. - + - rootExpression: an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. - + <!-- Start of user code DiagramDescription description --> @@ -630,13 +597,13 @@ Interpreted expressions, requested return type and available variables: - titleExpression: a string. - + - preconditionExpression: a boolean. - + - rootExpression: an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. - + <!-- Start of user code DiagramImportDescription description --> @@ -670,18 +637,18 @@ . source: (edge only) the semantic element of sourceView. . targetView: (edge only) the target view of the current potential edge. . target: (edge only) the semantic element of targetView. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . containerView: the parent view of potential candidates. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - semanticElements: a Collection<EObject> or an EObject. . diagram: the current DSemanticDiagram. . view: the current view created from the current mapping. . viewpoint: (deprecated) the current DSemanticDiagram. - + <!-- Start of user code DiagramElementMapping description --> @@ -704,18 +671,18 @@ . source: (edge only) the semantic element of sourceView. . targetView: (edge only) the target view of the current potential edge. . target: (edge only) the semantic element of targetView. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . containerView: the parent view of potential candidates. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - semanticElements: a Collection<EObject> or an EObject. . diagram: the current DSemanticDiagram. . view: the current view created from the current mapping. . viewpoint: (deprecated) the current DSemanticDiagram. - + <!-- Start of user code AbstractNodeMapping description --> @@ -738,18 +705,18 @@ . source: (edge only) the semantic element of sourceView. . targetView: (edge only) the target view of the current potential edge. . target: (edge only) the semantic element of targetView. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . containerView: the parent view of potential candidates. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - semanticElements: a Collection<EObject> or an EObject. . diagram: the current DSemanticDiagram. . view: the current view created from the current mapping. . viewpoint: (deprecated) the current DSemanticDiagram. - + <!-- Start of user code NodeMapping description --> @@ -772,18 +739,18 @@ . source: (edge only) the semantic element of sourceView. . targetView: (edge only) the target view of the current potential edge. . target: (edge only) the semantic element of targetView. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . containerView: the parent view of potential candidates. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - semanticElements: a Collection<EObject> or an EObject. . diagram: the current DSemanticDiagram. . view: the current view created from the current mapping. . viewpoint: (deprecated) the current DSemanticDiagram. - + <!-- Start of user code ContainerMapping description --> @@ -806,18 +773,18 @@ . source: (edge only) the semantic element of sourceView. . targetView: (edge only) the target view of the current potential edge. . target: (edge only) the semantic element of targetView. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . containerView: the parent view of potential candidates. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - semanticElements: a Collection<EObject> or an EObject. . diagram: the current DSemanticDiagram. . view: the current view created from the current mapping. . viewpoint: (deprecated) the current DSemanticDiagram. - + <!-- Start of user code NodeMappingImport description --> @@ -840,18 +807,18 @@ . source: (edge only) the semantic element of sourceView. . targetView: (edge only) the target view of the current potential edge. . target: (edge only) the semantic element of targetView. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . containerView: the parent view of potential candidates. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - semanticElements: a Collection<EObject> or an EObject. . diagram: the current DSemanticDiagram. . view: the current view created from the current mapping. . viewpoint: (deprecated) the current DSemanticDiagram. - + <!-- Start of user code ContainerMappingImport description --> @@ -874,40 +841,40 @@ . source: (edge only) the semantic element of sourceView. . targetView: (edge only) the target view of the current potential edge. . target: (edge only) the semantic element of targetView. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . containerView: the parent view of potential candidates. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - semanticElements: a Collection<EObject> or an EObject. . diagram: the current DSemanticDiagram. . view: the current view created from the current mapping. . viewpoint: (deprecated) the current DSemanticDiagram. - + - targetFinderExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - sourceFinderExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - targetExpression: an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - pathExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . element: the semantic element of the current edge. . source: the semantic target of the current source node. . target: the semantic element of the current target node. - + <!-- Start of user code EdgeMapping description --> @@ -945,7 +912,7 @@ - predicateExpression: a boolean. . view: the current view. . container: the semantic container. - + <!-- Start of user code ConditionalNodeStyleDescription description --> @@ -961,7 +928,7 @@ - predicateExpression: a boolean. . view: the current view. . container: the semantic container. - + <!-- Start of user code ConditionalEdgeStyleDescription description --> @@ -977,7 +944,7 @@ - predicateExpression: a boolean. . view: the current view. . container: the semantic container. - + <!-- Start of user code ConditionalContainerStyleDescription description --> @@ -1003,7 +970,7 @@ Interpreted expressions, requested return type and available variables: - childrenExpression: a Collection<EObject> or an EObject. - + <!-- Start of user code OrderedTreeLayout description --> @@ -1033,7 +1000,7 @@ . container: the semantic element of the container view. . viewpoint: (deprecated) the current diagram. . diagram: the current diagram. - + <!-- Start of user code MappingBasedDecoration description --> @@ -1064,17 +1031,6 @@ </description> </context> - <context id="HideLabelCapabilityStyle"> - <description> - - - - <!-- Start of user code HideLabelCapabilityStyle description --> - - <!-- End of user code HideLabelCapabilityStyle description --> - - </description> - </context> <context id="DragAndDropTargetDescription"> <description> A DragAndDropTargetDescription is a Description or Mapping that can have many DropTools @@ -1092,7 +1048,7 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + <!-- Start of user code BorderedStyleDescription description --> @@ -1107,16 +1063,16 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + - labelExpression: a string. . diagram: the current DSemanticDiagram. . view: the current view for which the label is calculated. - + - tooltipExpression: a string. . view: the current view. - + - sizeComputationExpression: an integer. - + <!-- Start of user code NodeStyleDescription description --> @@ -1130,16 +1086,16 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + - labelExpression: a string. . diagram: the current DSemanticDiagram. . view: the current view for which the label is calculated. - + - tooltipExpression: a string. . view: the current view. - + - sizeComputationExpression: an integer. - + <!-- Start of user code CustomStyleDescription description --> @@ -1154,16 +1110,16 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + - labelExpression: a string. . diagram: the current DSemanticDiagram. . view: the current view for which the label is calculated. - + - tooltipExpression: a string. . view: the current view. - + - sizeComputationExpression: an integer. - + <!-- Start of user code SquareDescription description --> @@ -1178,20 +1134,20 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + - labelExpression: a string. . diagram: the current DSemanticDiagram. . view: the current view for which the label is calculated. - + - tooltipExpression: a string. . view: the current view. - + - sizeComputationExpression: an integer. - + - widthComputationExpression: an integer. - + - heightComputationExpression: an integer. - + <!-- Start of user code LozengeNodeDescription description --> @@ -1206,20 +1162,20 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + - labelExpression: a string. . diagram: the current DSemanticDiagram. . view: the current view for which the label is calculated. - + - tooltipExpression: a string. . view: the current view. - + - sizeComputationExpression: an integer. - + - horizontalDiameterComputationExpression: an integer. - + - verticalDiameterComputationExpression: an integer. - + <!-- Start of user code EllipseNodeDescription description --> @@ -1234,16 +1190,16 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + - labelExpression: a string. . diagram: the current DSemanticDiagram. . view: the current view for which the label is calculated. - + - tooltipExpression: a string. . view: the current view. - + - sizeComputationExpression: an integer. - + <!-- Start of user code BundledImageDescription description --> @@ -1257,16 +1213,16 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + - labelExpression: a string. . diagram: the current DSemanticDiagram. . view: the current view for which the label is calculated. - + - tooltipExpression: a string. . view: the current view. - + - sizeComputationExpression: an integer. - + <!-- Start of user code NoteDescription description --> @@ -1281,18 +1237,18 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + - labelExpression: a string. . diagram: the current DSemanticDiagram. . view: the current view for which the label is calculated. - + - tooltipExpression: a string. . view: the current view. - + - sizeComputationExpression: an integer. - + - strokeSizeComputationExpression: an integer. - + <!-- Start of user code DotDescription description --> @@ -1307,16 +1263,16 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + - labelExpression: a string. . diagram: the current DSemanticDiagram. . view: the current view for which the label is calculated. - + - tooltipExpression: a string. . view: the current view. - + - sizeComputationExpression: an integer. - + <!-- Start of user code GaugeCompositeStyleDescription description --> @@ -1331,11 +1287,11 @@ Interpreted expressions, requested return type and available variables: - minValueExpression: an integer. - + - maxValueExpression: an integer. - + - valueExpression: an integer. - + <!-- Start of user code GaugeSectionDescription description --> @@ -1349,9 +1305,9 @@ Interpreted expressions, requested return type and available variables: - widthComputationExpression: an integer. - + - heightComputationExpression: an integer. - + <!-- Start of user code SizeComputationContainerStyleDescription description --> @@ -1377,14 +1333,14 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + - labelExpression: a string. . diagram: the current DSemanticDiagram. . view: the current view for which the label is calculated. - + - tooltipExpression: a string. . view: the current view. - + <!-- Start of user code ContainerStyleDescription description --> @@ -1398,18 +1354,18 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + - labelExpression: a string. . diagram: the current DSemanticDiagram. . view: the current view for which the label is calculated. - + - tooltipExpression: a string. . view: the current view. - + - widthComputationExpression: an integer. - + - heightComputationExpression: an integer. - + <!-- Start of user code FlatContainerStyleDescription description --> @@ -1423,18 +1379,18 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + - labelExpression: a string. . diagram: the current DSemanticDiagram. . view: the current view for which the label is calculated. - + - tooltipExpression: a string. . view: the current view. - + - widthComputationExpression: an integer. - + - heightComputationExpression: an integer. - + <!-- Start of user code ShapeContainerStyleDescription description --> @@ -1449,16 +1405,16 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + - labelExpression: a string. . diagram: the current DSemanticDiagram. . view: the current view for which the label is calculated. - + - tooltipExpression: a string. . view: the current view. - + - sizeComputationExpression: an integer. - + <!-- Start of user code WorkspaceImageDescription description --> @@ -1477,7 +1433,7 @@ . view: the current edge view for which the size is calculated. . sourceView: the source view of the current edge. . targetView: the target view of the current edge. - + <!-- Start of user code EdgeStyleDescription description --> @@ -1494,7 +1450,7 @@ - labelExpression: a string. . diagram: the current DSemanticDiagram. . view: the current view for which the label is calculated. - + <!-- Start of user code BeginLabelStyleDescription description --> @@ -1511,7 +1467,7 @@ - labelExpression: a string. . diagram: the current DSemanticDiagram. . view: the current view for which the label is calculated. - + <!-- Start of user code CenterLabelStyleDescription description --> @@ -1528,7 +1484,7 @@ - labelExpression: a string. . diagram: the current DSemanticDiagram. . view: the current view for which the label is calculated. - + <!-- Start of user code EndLabelStyleDescription description --> @@ -1546,7 +1502,7 @@ . view: the current edge view for which the size is calculated. . sourceView: the source view of the current edge. . targetView: the target view of the current edge. - + <!-- Start of user code BracketEdgeStyleDescription description --> @@ -1607,7 +1563,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - container: The variable container that represents the semantic element of the clicked view. @@ -1626,13 +1584,15 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + - connectionStartPrecondition: a boolean. . container: the semantic element of diagram. . preSourceView: (edge only) the source view of the current potential edge. . preSource: (edge only) the semantic element of $preSourceView. . diagram: the diagram of the current potential edge - + List of the available variables for tool operations: - source: The semantic element of the source view. @@ -1653,7 +1613,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - container: The semantic element of the cicked view. @@ -1672,7 +1634,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - element: The semantic element of the ViewPointElement to delete. @@ -1692,7 +1656,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - element: The semantic element of the ViewPointElement to delete. @@ -1720,7 +1686,7 @@ Interpreted expressions, requested return type and available variables: - value: a Collection<EObject> or an EObject. - + <!-- Start of user code DeleteHookParameter description --> @@ -1736,7 +1702,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - source: The semantic element of the source view of the reconnection operation. @@ -1758,7 +1726,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + <!-- Start of user code RequestDescription description --> @@ -1774,11 +1744,13 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + - inputLabelExpression: a string. . diagram: the current DSemanticDiagram. . view: the current view for which the label is calculated. - + <!-- Start of user code DirectEditLabel description --> @@ -1794,7 +1766,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + <!-- Start of user code BehaviorTool description --> @@ -1875,7 +1849,7 @@ Interpreted expressions, requested return type and available variables: - containerViewExpression: a view (DNode, DEdge, DDiagram -> any DSemanticDecorator). - + <!-- Start of user code CreateView description --> @@ -1889,11 +1863,11 @@ Interpreted expressions, requested return type and available variables: - containerViewExpression: a view (DNode, DEdge, DDiagram -> any DSemanticDecorator). - + - sourceExpression: an EObject. - + - targetExpression: an EObject. - + <!-- Start of user code CreateEdgeView description --> @@ -1920,11 +1894,13 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + - titleExpression: a string. - + - browseExpression: an EObject. - + List of the available variables for tool operations: - containerView: The variable containerView that represents the clickedView (instance of ViewPoint or ViewPointElement). @@ -1942,12 +1918,14 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + - browseExpression: an EObject. - + - navigationNameExpression: a string. . name: name of the targeted Representation. - + List of the available variables for tool operations: - containerView: The variable containerView that represents the clickedView (instance of ViewPoint or ViewPointElement). @@ -1967,7 +1945,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - oldSemanticElement: The semantic element of the old container view. @@ -2011,9 +1991,9 @@ Interpreted expressions, requested return type and available variables: - semanticConditionExpression: a boolean. - + - viewConditionExpression: a boolean. - + <!-- Start of user code MappingFilter description --> @@ -2040,7 +2020,7 @@ Interpreted expressions, requested return type and available variables: - semanticConditionExpression: a boolean. - + <!-- Start of user code VariableFilter description --> @@ -2057,17 +2037,17 @@ . diagram: the current DDiagram. . containerView: the view of the container. . container: the semantic element of the container. - + - rootExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . containerView: the view of the container. . container: the semantic element of the container. - + - childrenExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . containerView: the view of the container. . container: the semantic element of the container. - + <!-- Start of user code FilterVariable description --> diff --git a/plugins/org.eclipse.sirius.editor.sequence/help/contexts.xml b/plugins/org.eclipse.sirius.editor.sequence/help/contexts.xml index 7b5bda4418..dae63051d5 100644 --- a/plugins/org.eclipse.sirius.editor.sequence/help/contexts.xml +++ b/plugins/org.eclipse.sirius.editor.sequence/help/contexts.xml @@ -16,18 +16,18 @@ Interpreted expressions, requested return type and available variables: - titleExpression: a string. - + - preconditionExpression: a boolean. - + - rootExpression: an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. - + - endsOrdering: a Collection<EObject> or an EObject. . eventEnds: a List<EObject> containing the semantic event ends. - + - instanceRolesOrdering: a Collection<EObject> or an EObject. - + <!-- Start of user code SequenceDiagramDescription description --> @@ -41,7 +41,7 @@ Interpreted expressions, requested return type and available variables: - preconditionExpression: a boolean. - . containerView: the view that sould contain the potential views of the checked elements. + . containerView: the view that should contain the potential views of the checked elements. . container: the semantic element of containerView. . viewpoint: (deprecated) the current DSemanticDiagram. . diagram: the current DSemanticDiagram. @@ -49,18 +49,18 @@ . source: (edge only) the semantic element of sourceView. . targetView: (edge only) the target view of the current potential edge. . target: (edge only) the semantic element of targetView. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . containerView: the parent view of potential candidates. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - semanticElements: a Collection<EObject> or an EObject. . diagram: the current DSemanticDiagram. . view: the current view created from the current mapping. . viewpoint: (deprecated) the current DSemanticDiagram. - + <!-- Start of user code InstanceRoleMapping description --> @@ -85,9 +85,9 @@ Interpreted expressions, requested return type and available variables: - startingEndFinderExpression: an EObject. - + - finishingEndFinderExpression: an EObject. - + <!-- Start of user code DelimitedEventMapping description --> @@ -105,7 +105,7 @@ Interpreted expressions, requested return type and available variables: - preconditionExpression: a boolean. - . containerView: the view that sould contain the potential views of the checked elements. + . containerView: the view that should contain the potential views of the checked elements. . container: the semantic element of containerView. . viewpoint: (deprecated) the current DSemanticDiagram. . diagram: the current DSemanticDiagram. @@ -113,22 +113,22 @@ . source: (edge only) the semantic element of sourceView. . targetView: (edge only) the target view of the current potential edge. . target: (edge only) the semantic element of targetView. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . containerView: the parent view of potential candidates. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - semanticElements: a Collection<EObject> or an EObject. . diagram: the current DSemanticDiagram. . view: the current view created from the current mapping. . viewpoint: (deprecated) the current DSemanticDiagram. - + - startingEndFinderExpression: an EObject. - + - finishingEndFinderExpression: an EObject. - + <!-- Start of user code ExecutionMapping description --> @@ -142,7 +142,7 @@ Interpreted expressions, requested return type and available variables: - preconditionExpression: a boolean. - . containerView: the view that sould contain the potential views of the checked elements. + . containerView: the view that should contain the potential views of the checked elements. . container: the semantic element of containerView. . viewpoint: (deprecated) the current DSemanticDiagram. . diagram: the current DSemanticDiagram. @@ -150,22 +150,22 @@ . source: (edge only) the semantic element of sourceView. . targetView: (edge only) the target view of the current potential edge. . target: (edge only) the semantic element of targetView. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . containerView: the parent view of potential candidates. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - semanticElements: a Collection<EObject> or an EObject. . diagram: the current DSemanticDiagram. . view: the current view created from the current mapping. . viewpoint: (deprecated) the current DSemanticDiagram. - + - startingEndFinderExpression: an EObject. - + - finishingEndFinderExpression: an EObject. - + <!-- Start of user code StateMapping description --> @@ -181,7 +181,7 @@ Interpreted expressions, requested return type and available variables: - preconditionExpression: a boolean. - . containerView: the view that sould contain the potential views of the checked elements. + . containerView: the view that should contain the potential views of the checked elements. . container: the semantic element of containerView. . viewpoint: (deprecated) the current DSemanticDiagram. . diagram: the current DSemanticDiagram. @@ -189,18 +189,18 @@ . source: (edge only) the semantic element of sourceView. . targetView: (edge only) the target view of the current potential edge. . target: (edge only) the semantic element of targetView. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . containerView: the parent view of potential candidates. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - semanticElements: a Collection<EObject> or an EObject. . diagram: the current DSemanticDiagram. . view: the current view created from the current mapping. . viewpoint: (deprecated) the current DSemanticDiagram. - + <!-- Start of user code EndOfLifeMapping description --> @@ -214,7 +214,7 @@ Interpreted expressions, requested return type and available variables: - preconditionExpression: a boolean. - . containerView: the view that sould contain the potential views of the checked elements. + . containerView: the view that should contain the potential views of the checked elements. . container: the semantic element of containerView. . viewpoint: (deprecated) the current DSemanticDiagram. . diagram: the current DSemanticDiagram. @@ -222,44 +222,44 @@ . source: (edge only) the semantic element of sourceView. . targetView: (edge only) the target view of the current potential edge. . target: (edge only) the semantic element of targetView. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . containerView: the parent view of potential candidates. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - semanticElements: a Collection<EObject> or an EObject. . diagram: the current DSemanticDiagram. . view: the current view created from the current mapping. . viewpoint: (deprecated) the current DSemanticDiagram. - + - targetFinderExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - sourceFinderExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - targetExpression: an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - pathExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . element: the semantic element of the current edge. . source: the semantic target of the current source node. . target: the semantic element of the current target node. - + - sendingEndFinderExpression: an EObject. - + - receivingEndFinderExpression: an EObject. - + <!-- Start of user code MessageMapping description --> @@ -273,7 +273,7 @@ Interpreted expressions, requested return type and available variables: - preconditionExpression: a boolean. - . containerView: the view that sould contain the potential views of the checked elements. + . containerView: the view that should contain the potential views of the checked elements. . container: the semantic element of containerView. . viewpoint: (deprecated) the current DSemanticDiagram. . diagram: the current DSemanticDiagram. @@ -281,44 +281,44 @@ . source: (edge only) the semantic element of sourceView. . targetView: (edge only) the target view of the current potential edge. . target: (edge only) the semantic element of targetView. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . containerView: the parent view of potential candidates. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - semanticElements: a Collection<EObject> or an EObject. . diagram: the current DSemanticDiagram. . view: the current view created from the current mapping. . viewpoint: (deprecated) the current DSemanticDiagram. - + - targetFinderExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - sourceFinderExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - targetExpression: an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - pathExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . element: the semantic element of the current edge. . source: the semantic target of the current source node. . target: the semantic element of the current target node. - + - sendingEndFinderExpression: an EObject. - + - receivingEndFinderExpression: an EObject. - + <!-- Start of user code BasicMessageMapping description --> @@ -332,7 +332,7 @@ Interpreted expressions, requested return type and available variables: - preconditionExpression: a boolean. - . containerView: the view that sould contain the potential views of the checked elements. + . containerView: the view that should contain the potential views of the checked elements. . container: the semantic element of containerView. . viewpoint: (deprecated) the current DSemanticDiagram. . diagram: the current DSemanticDiagram. @@ -340,46 +340,46 @@ . source: (edge only) the semantic element of sourceView. . targetView: (edge only) the target view of the current potential edge. . target: (edge only) the semantic element of targetView. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . containerView: the parent view of potential candidates. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - semanticElements: a Collection<EObject> or an EObject. . diagram: the current DSemanticDiagram. . view: the current view created from the current mapping. . viewpoint: (deprecated) the current DSemanticDiagram. - + - targetFinderExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - sourceFinderExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - targetExpression: an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - pathExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . element: the semantic element of the current edge. . source: the semantic target of the current source node. . target: the semantic element of the current target node. - + - sendingEndFinderExpression: an EObject. - + - receivingEndFinderExpression: an EObject. - + - invocationMessageFinderExpression: an EObject. - + <!-- Start of user code ReturnMessageMapping description --> @@ -393,7 +393,7 @@ Interpreted expressions, requested return type and available variables: - preconditionExpression: a boolean. - . containerView: the view that sould contain the potential views of the checked elements. + . containerView: the view that should contain the potential views of the checked elements. . container: the semantic element of containerView. . viewpoint: (deprecated) the current DSemanticDiagram. . diagram: the current DSemanticDiagram. @@ -401,44 +401,44 @@ . source: (edge only) the semantic element of sourceView. . targetView: (edge only) the target view of the current potential edge. . target: (edge only) the semantic element of targetView. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . containerView: the parent view of potential candidates. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - semanticElements: a Collection<EObject> or an EObject. . diagram: the current DSemanticDiagram. . view: the current view created from the current mapping. . viewpoint: (deprecated) the current DSemanticDiagram. - + - targetFinderExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - sourceFinderExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - targetExpression: an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - pathExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . element: the semantic element of the current edge. . source: the semantic target of the current source node. . target: the semantic element of the current target node. - + - sendingEndFinderExpression: an EObject. - + - receivingEndFinderExpression: an EObject. - + <!-- Start of user code CreationMessageMapping description --> @@ -452,7 +452,7 @@ Interpreted expressions, requested return type and available variables: - preconditionExpression: a boolean. - . containerView: the view that sould contain the potential views of the checked elements. + . containerView: the view that should contain the potential views of the checked elements. . container: the semantic element of containerView. . viewpoint: (deprecated) the current DSemanticDiagram. . diagram: the current DSemanticDiagram. @@ -460,44 +460,44 @@ . source: (edge only) the semantic element of sourceView. . targetView: (edge only) the target view of the current potential edge. . target: (edge only) the semantic element of targetView. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . containerView: the parent view of potential candidates. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - semanticElements: a Collection<EObject> or an EObject. . diagram: the current DSemanticDiagram. . view: the current view created from the current mapping. . viewpoint: (deprecated) the current DSemanticDiagram. - + - targetFinderExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - sourceFinderExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - targetExpression: an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - pathExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . element: the semantic element of the current edge. . source: the semantic target of the current source node. . target: the semantic element of the current target node. - + - sendingEndFinderExpression: an EObject. - + - receivingEndFinderExpression: an EObject. - + <!-- Start of user code DestructionMessageMapping description --> @@ -533,7 +533,7 @@ Interpreted expressions, requested return type and available variables: - preconditionExpression: a boolean. - . containerView: the view that sould contain the potential views of the checked elements. + . containerView: the view that should contain the potential views of the checked elements. . container: the semantic element of containerView. . viewpoint: (deprecated) the current DSemanticDiagram. . diagram: the current DSemanticDiagram. @@ -541,26 +541,26 @@ . source: (edge only) the semantic element of sourceView. . targetView: (edge only) the target view of the current potential edge. . target: (edge only) the semantic element of targetView. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . containerView: the parent view of potential candidates. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - semanticElements: a Collection<EObject> or an EObject. . diagram: the current DSemanticDiagram. . view: the current view created from the current mapping. . viewpoint: (deprecated) the current DSemanticDiagram. - + - startingEndFinderExpression: an EObject. - + - finishingEndFinderExpression: an EObject. - + - coveredLifelinesExpression: the list of semantic EObjects representing the lifelines which are semantically covered by the frame. - + - centerLabelExpression: the text to show in the center of the IU - + <!-- Start of user code FrameMapping description --> @@ -574,7 +574,7 @@ Interpreted expressions, requested return type and available variables: - preconditionExpression: a boolean. - . containerView: the view that sould contain the potential views of the checked elements. + . containerView: the view that should contain the potential views of the checked elements. . container: the semantic element of containerView. . viewpoint: (deprecated) the current DSemanticDiagram. . diagram: the current DSemanticDiagram. @@ -582,26 +582,26 @@ . source: (edge only) the semantic element of sourceView. . targetView: (edge only) the target view of the current potential edge. . target: (edge only) the semantic element of targetView. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . containerView: the parent view of potential candidates. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - semanticElements: a Collection<EObject> or an EObject. . diagram: the current DSemanticDiagram. . view: the current view created from the current mapping. . viewpoint: (deprecated) the current DSemanticDiagram. - + - startingEndFinderExpression: an EObject. - + - finishingEndFinderExpression: an EObject. - + - coveredLifelinesExpression: the list of semantic EObjects representing the lifelines which are semantically covered by the frame. - + - centerLabelExpression: the text to show in the center of the IU - + <!-- Start of user code InteractionUseMapping description --> @@ -615,7 +615,7 @@ Interpreted expressions, requested return type and available variables: - preconditionExpression: a boolean. - . containerView: the view that sould contain the potential views of the checked elements. + . containerView: the view that should contain the potential views of the checked elements. . container: the semantic element of containerView. . viewpoint: (deprecated) the current DSemanticDiagram. . diagram: the current DSemanticDiagram. @@ -623,26 +623,26 @@ . source: (edge only) the semantic element of sourceView. . targetView: (edge only) the target view of the current potential edge. . target: (edge only) the semantic element of targetView. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . containerView: the parent view of potential candidates. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - semanticElements: a Collection<EObject> or an EObject. . diagram: the current DSemanticDiagram. . view: the current view created from the current mapping. . viewpoint: (deprecated) the current DSemanticDiagram. - + - startingEndFinderExpression: an EObject. - + - finishingEndFinderExpression: an EObject. - + - coveredLifelinesExpression: the list of semantic EObjects representing the lifelines which are semantically covered by the frame. - + - centerLabelExpression: the text to show in the center of the IU - + <!-- Start of user code CombinedFragmentMapping description --> @@ -656,7 +656,7 @@ Interpreted expressions, requested return type and available variables: - preconditionExpression: a boolean. - . containerView: the view that sould contain the potential views of the checked elements. + . containerView: the view that should contain the potential views of the checked elements. . container: the semantic element of containerView. . viewpoint: (deprecated) the current DSemanticDiagram. . diagram: the current DSemanticDiagram. @@ -664,22 +664,22 @@ . source: (edge only) the semantic element of sourceView. . targetView: (edge only) the target view of the current potential edge. . target: (edge only) the semantic element of targetView. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . containerView: the parent view of potential candidates. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - semanticElements: a Collection<EObject> or an EObject. . diagram: the current DSemanticDiagram. . view: the current view created from the current mapping. . viewpoint: (deprecated) the current DSemanticDiagram. - + - startingEndFinderExpression: an EObject. - + - finishingEndFinderExpression: an EObject. - + <!-- Start of user code OperandMapping description --> @@ -693,7 +693,7 @@ Interpreted expressions, requested return type and available variables: - preconditionExpression: a boolean. - . containerView: the view that sould contain the potential views of the checked elements. + . containerView: the view that should contain the potential views of the checked elements. . container: the semantic element of containerView. . viewpoint: (deprecated) the current DSemanticDiagram. . diagram: the current DSemanticDiagram. @@ -701,18 +701,18 @@ . source: (edge only) the semantic element of sourceView. . targetView: (edge only) the target view of the current potential edge. . target: (edge only) the semantic element of targetView. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . containerView: the parent view of potential candidates. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - semanticElements: a Collection<EObject> or an EObject. . diagram: the current DSemanticDiagram. . view: the current view created from the current mapping. . viewpoint: (deprecated) the current DSemanticDiagram. - + <!-- Start of user code ObservationPointMapping description --> @@ -760,7 +760,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - predecessor: @@ -779,7 +781,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - container: The semantic element of the cicked view. @@ -797,13 +801,15 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + - connectionStartPrecondition: a boolean. . container: the semantic element of diagram. . preSourceView: (edge only) the source view of the current potential edge. . preSource: (edge only) the semantic element of $preSourceView. . diagram: the diagram of the current potential edge - + List of the available variables for tool operations: - source: The semantic element of the source view. @@ -825,7 +831,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - container: The variable container that represents the semantic element of the clicked view. @@ -845,7 +853,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - container: The variable container that represents the semantic element of the clicked view. @@ -865,7 +875,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - container: The semantic element of the cicked view. @@ -886,7 +898,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - container: The semantic element of the cicked view. @@ -907,7 +921,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - container: The semantic element of the cicked view. @@ -927,7 +943,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - container: The variable container that represents the semantic element of the clicked view. @@ -947,7 +965,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - startingEndPredecessorBefore: @@ -967,7 +987,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - predecessorBefore: @@ -1054,7 +1076,7 @@ . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + <!-- Start of user code TAbstractMapping description --> @@ -1069,7 +1091,7 @@ Interpreted expressions, requested return type and available variables: - endsOrdering: a Collection<EObject> or an EObject. . eventEnds: a List<EObject> containing the semantic event ends. - + <!-- Start of user code TSequenceDiagram description --> @@ -1098,13 +1120,13 @@ . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - eolVisibleExpression: a boolean. . containerView: the view that sould contain the potential views of the checked elements. . container: the semantic element of $containerView. . viewpoint: (deprecated) the current DSemanticDiagram. . diagram: the current DSemanticDiagram. - + <!-- Start of user code TLifelineMapping description --> @@ -1118,7 +1140,7 @@ Interpreted expressions, requested return type and available variables: - lifelineWidthComputationExpression: an integer. - + <!-- Start of user code TLifelineStyle description --> @@ -1134,7 +1156,7 @@ - predicateExpression: a boolean. . view: the current view. . container: the semantic container. - + <!-- Start of user code TConditionalLifelineStyle description --> @@ -1152,11 +1174,11 @@ . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - startingEndFinderExpression: an EObject. - + - finishingEndFinderExpression: an EObject. - + <!-- Start of user code TExecutionMapping description --> @@ -1170,7 +1192,7 @@ Interpreted expressions, requested return type and available variables: - borderSizeComputationExpression: an integer. - + <!-- Start of user code TExecutionStyle description --> @@ -1186,7 +1208,7 @@ - predicateExpression: a boolean. . view: the current view. . container: the semantic container. - + <!-- Start of user code TConditionalExecutionStyle description --> @@ -1204,11 +1226,11 @@ . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - sendingEndFinderExpression: an EObject. - + - receivingEndFinderExpression: an EObject. - + <!-- Start of user code TMessageMapping description --> @@ -1224,7 +1246,7 @@ - labelExpression: a string. . diagram: the current DSemanticDiagram. . view: the current view for which the label is calculated. - + <!-- Start of user code TMessageStyle description --> @@ -1240,7 +1262,7 @@ - predicateExpression: a boolean. . view: the current view. . container: the semantic container. - + <!-- Start of user code TConditionalMessageStyle description --> @@ -1258,21 +1280,21 @@ . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - sendingEndFinderExpression: an EObject. - + - receivingEndFinderExpression: an EObject. - + - sourceFinderExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - targetFinderExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + <!-- Start of user code TBasicMessageMapping description --> @@ -1290,21 +1312,21 @@ . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - sendingEndFinderExpression: an EObject. - + - receivingEndFinderExpression: an EObject. - + - sourceFinderExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - targetFinderExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + <!-- Start of user code TSourceTargetMessageMapping description --> @@ -1322,13 +1344,13 @@ . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - sendingEndFinderExpression: an EObject. - + - receivingEndFinderExpression: an EObject. - + - invocationMessageFinderExpression: an EObject. - + <!-- Start of user code TReturnMessageMapping description --> @@ -1346,21 +1368,21 @@ . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - sendingEndFinderExpression: an EObject. - + - receivingEndFinderExpression: an EObject. - + - sourceFinderExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - targetFinderExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + <!-- Start of user code TCreationMessageMapping description --> @@ -1378,21 +1400,21 @@ . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - sendingEndFinderExpression: an EObject. - + - receivingEndFinderExpression: an EObject. - + - sourceFinderExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + - targetFinderExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . viewpoint: (deprecated) the current DDiagram. . viewPoint: (deprecated) the current DDiagram. - + <!-- Start of user code TDestructionMessageMapping description --> diff --git a/plugins/org.eclipse.sirius.editor.table/help/contexts.xml b/plugins/org.eclipse.sirius.editor.table/help/contexts.xml index c4e493b747..5fe8d01451 100644 --- a/plugins/org.eclipse.sirius.editor.table/help/contexts.xml +++ b/plugins/org.eclipse.sirius.editor.table/help/contexts.xml @@ -11,17 +11,6 @@ </description> </context> - <context id="DTableElementUpdater"> - <description> - - - - <!-- Start of user code DTableElementUpdater description --> - - <!-- End of user code DTableElementUpdater description --> - - </description> - </context> <context id="DTableElement"> <description> @@ -137,9 +126,9 @@ Interpreted expressions, requested return type and available variables: - titleExpression: a string. - + - preconditionExpression: boolean - + <!-- Start of user code TableDescription description --> @@ -153,9 +142,9 @@ Interpreted expressions, requested return type and available variables: - titleExpression: a string. - + - preconditionExpression: boolean - + <!-- Start of user code EditionTableDescription description --> @@ -169,9 +158,9 @@ Interpreted expressions, requested return type and available variables: - titleExpression: a string. - + - preconditionExpression: boolean - + <!-- Start of user code CrossTableDescription description --> @@ -188,7 +177,7 @@ . view: current DTableElement (DCell, DColumn, DLine, ...). . containerView: container of the current DTableElement (variable is available if container is not null). . container: semantic target of containerView (if it is a DSemanticDecorator). - + <!-- Start of user code TableMapping description --> @@ -205,16 +194,16 @@ . view: current DTableElement (DCell, DColumn, DLine, ...). . containerView: container of the current DTableElement (variable is available if container is not null). . container: semantic target of containerView (if it is a DSemanticDecorator). - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . viewpoint: (deprecated) current DTable. . table: current DTable. . root: semantic target of $table. . containerView: current LineContainer (DLine or DTable). . container: semantic target of $containerView (if it is a DSemanticDecorator). - + - headerLabelExpression: a string. - + <!-- Start of user code LineMapping description --> @@ -231,9 +220,9 @@ . view: current DTableElement (DCell, DColumn, DLine, ...). . containerView: container of the current DTableElement (variable is available if container is not null). . container: semantic target of containerView (if it is a DSemanticDecorator). - + - headerLabelExpression: a string. - + <!-- Start of user code ColumnMapping description --> @@ -250,15 +239,15 @@ . view: current DTableElement (DCell, DColumn, DLine, ...). . containerView: container of the current DTableElement (variable is available if container is not null). . container: semantic target of containerView (if it is a DSemanticDecorator). - + - headerLabelExpression: a string. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. . viewpoint: (deprecated) current DTable. . table: current DTable. . containerView: current DTable. . container: semantic element targeted by the current DTable. - + <!-- Start of user code ElementColumnMapping description --> @@ -275,11 +264,11 @@ . view: current DTableElement (DCell, DColumn, DLine, ...). . containerView: container of the current DTableElement (variable is available if container is not null). . container: semantic target of containerView (if it is a DSemanticDecorator). - + - headerLabelExpression: a string. - + - canEdit: a boolean. - + - labelExpression: a string. . root: semantic target of the current DTable. . line: DLine of the current DCell. @@ -287,11 +276,11 @@ . container: semantic target of $line. . column: DColumn of the current DCell. . columnSemantic: semantic target of $column - + - featureParentExpression: a Collection<EObject> or an EObject. . root: semantic target of the current DTable. . container: semantic target of the current DLine. - + <!-- Start of user code FeatureColumnMapping description --> @@ -305,7 +294,7 @@ Interpreted expressions, requested return type and available variables: - canEdit: a boolean. - + <!-- Start of user code CellUpdater description --> @@ -333,9 +322,9 @@ . view: current DTableElement (DCell, DColumn, DLine, ...). . containerView: container of the current DTableElement (variable is available if container is not null). . container: semantic target of containerView (if it is a DSemanticDecorator). - + - canEdit: a boolean. - + - labelExpression: a string. . root: semantic target of the current DTable. . line: DLine of the current DCell. @@ -343,20 +332,20 @@ . container: semantic target of $line. . column: DColumn of the current DCell. . columnSemantic: semantic target of $column - + - columnFinderExpression: a Collection<EObject> or an EObject. - + - lineFinderExpression: a Collection<EObject> or an EObject. - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. - + - preconditionExpression: a boolean. . line: the source view of the current potential line. . lineSemantic: the semantic element of $line. . column: the source view of the current potential column. . columnSemantic: the semantic element of $column. . table: the current DTable. - + <!-- Start of user code IntersectionMapping description --> @@ -393,7 +382,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - variables: @@ -410,7 +401,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + <!-- Start of user code CreateColumnTool description --> @@ -425,7 +418,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + <!-- Start of user code CreateCrossColumnTool description --> @@ -440,7 +435,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + <!-- Start of user code CreateLineTool description --> @@ -455,7 +452,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - variables: @@ -472,7 +471,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - variables: @@ -489,7 +490,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + <!-- Start of user code DeleteColumnTool description --> @@ -504,7 +507,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + <!-- Start of user code DeleteLineTool description --> @@ -540,7 +545,7 @@ Interpreted expressions, requested return type and available variables: - predicateExpression: a boolean. - + <!-- Start of user code ForegroundConditionalStyle description --> @@ -554,7 +559,7 @@ Interpreted expressions, requested return type and available variables: - predicateExpression: a boolean. - + <!-- Start of user code BackgroundConditionalStyle description --> @@ -580,11 +585,13 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + - titleExpression: a string. - + - browseExpression: an EObject. - + List of the available variables for tool operations: - containerView: The variable containerView that represents the clickedView (instance of ViewPoint or ViewPointElement). @@ -602,12 +609,14 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + - browseExpression: an EObject. - + - navigationNameExpression: a string. . name: name of the targeted Representation. - + List of the available variables for tool operations: - containerView: The variable containerView that represents the clickedView (instance of ViewPoint or ViewPointElement). diff --git a/plugins/org.eclipse.sirius.editor.table/src-gen/org/eclipse/sirius/table/editor/properties/sections/description/foregroundstyledescription/ForegroundStyleDescriptionLabelFormatPropertySection.java b/plugins/org.eclipse.sirius.editor.table/src-gen/org/eclipse/sirius/table/editor/properties/sections/description/foregroundstyledescription/ForegroundStyleDescriptionLabelFormatPropertySection.java index c5fff0ac23..52984a5282 100644 --- a/plugins/org.eclipse.sirius.editor.table/src-gen/org/eclipse/sirius/table/editor/properties/sections/description/foregroundstyledescription/ForegroundStyleDescriptionLabelFormatPropertySection.java +++ b/plugins/org.eclipse.sirius.editor.table/src-gen/org/eclipse/sirius/table/editor/properties/sections/description/foregroundstyledescription/ForegroundStyleDescriptionLabelFormatPropertySection.java @@ -9,33 +9,30 @@ *******************************************************************************/ package org.eclipse.sirius.table.editor.properties.sections.description.foregroundstyledescription; -// Start of user code imports - +import java.util.Iterator; import java.util.List; import org.eclipse.emf.ecore.EAttribute; -import org.eclipse.sirius.editor.properties.sections.common.AbstractComboPropertySection; +import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection; import org.eclipse.sirius.table.metamodel.table.description.DescriptionPackage; import org.eclipse.sirius.viewpoint.FontFormat; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; -// End of user code imports - /** * A section for the labelFormat property of a ForegroundStyleDescription * object. */ -public class ForegroundStyleDescriptionLabelFormatPropertySection extends AbstractComboPropertySection { +public class ForegroundStyleDescriptionLabelFormatPropertySection extends AbstractEditorDialogPropertySection { /** - * @see org.eclipse.sirius.table.editor.properties.sections.AbstractComboPropertySection#getDefaultLabelText() + * @see org.eclipse.sirius.table.editor.properties.sections.AbstractEditorDialogPropertySection#getDefaultLabelText() */ protected String getDefaultLabelText() { return "LabelFormat"; //$NON-NLS-1$ } /** - * @see org.eclipse.sirius.table.editor.properties.sections.AbstractComboPropertySection#getLabelText() + * @see org.eclipse.sirius.table.editor.properties.sections.AbstractEditorDialogPropertySection#getLabelText() */ protected String getLabelText() { String labelText; @@ -47,28 +44,39 @@ public class ForegroundStyleDescriptionLabelFormatPropertySection extends Abstra } /** - * @see org.eclipse.sirius.table.editor.properties.sections.AbstractComboPropertySection#getFeature() + * @see org.eclipse.sirius.table.editor.properties.sections.AbstractEditorDialogPropertySection#getFeature() */ protected EAttribute getFeature() { return DescriptionPackage.eINSTANCE.getForegroundStyleDescription_LabelFormat(); } /** - * @see org.eclipse.sirius.table.editor.properties.sections.AbstractComboPropertySection#getFeatureValue(int) + * @see org.eclipse.sirius.table.editor.properties.sections.AbstractEditorDialogPropertySection#getFeatureAsText() */ - protected Object getFeatureValue(int index) { - return getChoiceOfValues().get(index); + protected String getFeatureAsText() { + String string = new String(); + + if (eObject.eGet(getFeature()) != null) { + List<?> values = (List<?>) eObject.eGet(getFeature()); + for (Iterator<?> iterator = values.iterator(); iterator.hasNext();) { + string += getAdapterFactoryLabelProvider().getText(iterator.next()); + if (iterator.hasNext()) + string += ", "; + } + } + + return string; } /** - * @see org.eclipse.sirius.table.editor.properties.sections.AbstractComboPropertySection#isEqual(int) + * @see org.eclipse.sirius.table.editor.properties.sections.AbstractEditorDialogPropertySection#isEqual(List) */ - protected boolean isEqual(int index) { - return getChoiceOfValues().get(index).equals(eObject.eGet(getFeature())); + protected boolean isEqual(List<?> newList) { + return newList.equals(eObject.eGet(getFeature())); } /** - * @see org.eclipse.sirius.table.editor.properties.sections.AbstractComboPropertySection#getEnumerationFeatureValues() + * @see org.eclipse.sirius.table.editor.properties.sections.AbstractEditorDialogPropertySection#getEnumerationFeatureValues() */ protected List<?> getChoiceOfValues() { return FontFormat.VALUES; @@ -79,6 +87,5 @@ public class ForegroundStyleDescriptionLabelFormatPropertySection extends Abstra */ public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) { super.createControls(parent, tabbedPropertySheetPage); - } } diff --git a/plugins/org.eclipse.sirius.editor.tree/help/contexts.xml b/plugins/org.eclipse.sirius.editor.tree/help/contexts.xml index 496078fabd..79aa9b5161 100644 --- a/plugins/org.eclipse.sirius.editor.tree/help/contexts.xml +++ b/plugins/org.eclipse.sirius.editor.tree/help/contexts.xml @@ -11,17 +11,6 @@ </description> </context> - <context id="DTreeElementUpdater"> - <description> - - - - <!-- Start of user code DTreeElementUpdater description --> - - <!-- End of user code DTreeElementUpdater description --> - - </description> - </context> <context id="DTreeElement"> <description> @@ -82,9 +71,9 @@ Interpreted expressions, requested return type and available variables: - titleExpression: a string. - + - preconditionExpression: boolean - + <!-- Start of user code TreeDescription description --> @@ -101,17 +90,17 @@ . view: current DTreeElement. . containerView: container of the current DTreeElement (variable is available if container is not null). . container: semantic target of $containerView (if it is a DSemanticDecorator). - + - preconditionExpression: a Collection<EObject> or an EObject. - . view: current DTreeElement. + . tree: current DTree. . containerView: container of the current DTreeElement (variable is available if container is not null). . container: semantic target of $containerView (if it is a DSemanticDecorator). - + - semanticCandidatesExpression: a Collection<EObject> or an EObject. - . view: current DTreeElement. + . tree: current DTree. . containerView: container of the current DTreeElement (variable is available if container is not null). . container: semantic target of $containerView (if it is a DSemanticDecorator). - + <!-- Start of user code TreeItemMapping description --> @@ -127,7 +116,7 @@ - labelExpression: a string. . diagram: the current DSemanticDiagram. . view: the current view for which the label is calculated. - + <!-- Start of user code TreeItemStyleDescription description --> @@ -143,7 +132,7 @@ - predicateExpression: a boolean. . view: the current view. . container: the semantic container. - + <!-- Start of user code ConditionalTreeItemStyleDescription description --> @@ -158,7 +147,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - variables: @@ -176,7 +167,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - oldContainer: @@ -198,7 +191,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - oldContainer: @@ -219,7 +214,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - variables: @@ -236,7 +233,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - element: @@ -255,7 +254,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - variables: @@ -272,11 +273,13 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + - titleExpression: a string. - + - browseExpression: an EObject. - + List of the available variables for tool operations: - containerView: The variable containerView that represents the clickedView (instance of ViewPoint or ViewPointElement). @@ -294,12 +297,14 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + - browseExpression: an EObject. - + - navigationNameExpression: a string. . name: name of the targeted Representation. - + List of the available variables for tool operations: - containerView: The variable containerView that represents the clickedView (instance of ViewPoint or ViewPointElement). @@ -320,7 +325,7 @@ . view: current DTreeElement. . containerView: container of the current DTreeElement (variable is available if container is not null). . container: semantic target of $containerView (if it is a DSemanticDecorator). - + <!-- Start of user code TreeMapping description --> @@ -390,7 +395,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + <!-- Start of user code TreePopupMenu description --> diff --git a/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF index 763501d7d9..3ac637a131 100644 --- a/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF @@ -68,6 +68,7 @@ Export-Package: org.eclipse.sirius.editor.assist.content;version="2.0.4", org.eclipse.sirius.editor.properties.filters.style.labelborderstyledescription;version="2.0.4", org.eclipse.sirius.editor.properties.filters.style.labelstyledescription;version="2.0.4", org.eclipse.sirius.editor.properties.filters.style.tooltipstyledescription;version="2.0.4", + org.eclipse.sirius.editor.properties.filters.tool.abstracttool;version="3.1.0", org.eclipse.sirius.editor.properties.filters.tool.abstracttooldescription;version="2.0.4", org.eclipse.sirius.editor.properties.filters.tool.abstractvariable;version="2.0.4", org.eclipse.sirius.editor.properties.filters.tool.acceleovariable;version="2.0.4", @@ -184,22 +185,22 @@ Export-Package: org.eclipse.sirius.editor.assist.content;version="2.0.4", org.eclipse.sirius.editor.tools.api.editor;version="2.0.4", org.eclipse.sirius.editor.tools.api.menu;version="2.1.0", org.eclipse.sirius.editor.tools.api.perspectives;version="2.0.4", - org.eclipse.sirius.editor.tools.internal.actions;x-internal:=true;version="2.0.4", - org.eclipse.sirius.editor.tools.internal.assist;x-internal:=true;version="2.0.4", - org.eclipse.sirius.editor.tools.internal.color;x-internal:=true;version="2.0.4", - org.eclipse.sirius.editor.tools.internal.commands;x-internal:=true;version="3.0.0", - org.eclipse.sirius.editor.tools.internal.editor;x-internal:=true;version="2.0.4", - org.eclipse.sirius.editor.tools.internal.marker;x-internal:=true;version="2.0.4", - org.eclipse.sirius.editor.tools.internal.menu;x-internal:=true;version="2.1.0", - org.eclipse.sirius.editor.tools.internal.menu.child;x-internal:=true;version="2.1.0", - org.eclipse.sirius.editor.tools.internal.menu.refactoring;x-internal:=true;version="2.1.0", - org.eclipse.sirius.editor.tools.internal.menu.refactoring.border;x-internal:=true;version="2.0.4", - org.eclipse.sirius.editor.tools.internal.outline;x-internal:=true;version="3.0.0", - org.eclipse.sirius.editor.tools.internal.perspectives;x-internal:=true;version="2.0.4", - org.eclipse.sirius.editor.tools.internal.presentation;x-internal:=true;version="2.1.0", - org.eclipse.sirius.editor.tools.internal.property.filter;x-internal:=true;version="2.0.4", - org.eclipse.sirius.editor.tools.internal.property.section;x-internal:=true;version="2.0.4", - org.eclipse.sirius.editor.tools.internal.wizards;x-internal:=true;version="2.0.4", + org.eclipse.sirius.editor.tools.internal.actions;version="2.0.4";x-internal:=true, + org.eclipse.sirius.editor.tools.internal.assist;version="2.0.4";x-internal:=true, + org.eclipse.sirius.editor.tools.internal.color;version="2.0.4";x-internal:=true, + org.eclipse.sirius.editor.tools.internal.commands;version="3.0.0";x-internal:=true, + org.eclipse.sirius.editor.tools.internal.editor;version="2.0.4";x-internal:=true, + org.eclipse.sirius.editor.tools.internal.marker;version="2.0.4";x-internal:=true, + org.eclipse.sirius.editor.tools.internal.menu;version="2.1.0";x-internal:=true, + org.eclipse.sirius.editor.tools.internal.menu.child;version="2.1.0";x-internal:=true, + org.eclipse.sirius.editor.tools.internal.menu.refactoring;version="2.1.0";x-internal:=true, + org.eclipse.sirius.editor.tools.internal.menu.refactoring.border;version="2.0.4";x-internal:=true, + org.eclipse.sirius.editor.tools.internal.outline;version="3.0.0";x-internal:=true, + org.eclipse.sirius.editor.tools.internal.perspectives;version="2.0.4";x-internal:=true, + org.eclipse.sirius.editor.tools.internal.presentation;version="2.1.0";x-internal:=true, + org.eclipse.sirius.editor.tools.internal.property.filter;version="2.0.4";x-internal:=true, + org.eclipse.sirius.editor.tools.internal.property.section;version="2.0.4";x-internal:=true, + org.eclipse.sirius.editor.tools.internal.wizards;version="2.0.4";x-internal:=true, org.eclipse.sirius.editor.utils;version="2.1.0", org.eclipse.sirius.editor.wizards;version="2.0.4" Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.sirius.editor/help/contexts.xml b/plugins/org.eclipse.sirius.editor/help/contexts.xml index 086b141a8e..ac9624f02c 100644 --- a/plugins/org.eclipse.sirius.editor/help/contexts.xml +++ b/plugins/org.eclipse.sirius.editor/help/contexts.xml @@ -22,30 +22,6 @@ </description> </context> - <context id="DValidable"> - <description> - Represents an element that can be validated. - - - - <!-- Start of user code DValidable description --> - - <!-- End of user code DValidable description --> - - </description> - </context> - <context id="DNavigable"> - <description> - Represents an element that can be navigate. The user can see the details in another editor. - - - - <!-- Start of user code DNavigable description --> - - <!-- End of user code DNavigable description --> - - </description> - </context> <context id="DStylizable"> <description> An element that has a style. @@ -70,18 +46,6 @@ </description> </context> - <context id="DLabelled"> - <description> - An element that has a label. - - - - <!-- Start of user code DLabelled description --> - - <!-- End of user code DLabelled description --> - - </description> - </context> <context id="DMappingBased"> <description> An element that has a mapping. @@ -94,18 +58,6 @@ </description> </context> - <context id="DContainer"> - <description> - An element that contains others diagram elements. - - - - <!-- Start of user code DContainer description --> - - <!-- End of user code DContainer description --> - - </description> - </context> <context id="DRepresentationContainer"> <description> @@ -188,30 +140,6 @@ </description> </context> - <context id="DNavigationLink"> - <description> - A link for a navigable. - - - - <!-- Start of user code DNavigationLink description --> - - <!-- End of user code DNavigationLink description --> - - </description> - </context> - <context id="DSourceFileLink"> - <description> - A link that references a Source File. - - - - <!-- Start of user code DSourceFileLink description --> - - <!-- End of user code DSourceFileLink description --> - - </description> - </context> <context id="DAnalysisCustomData"> <description> @@ -247,17 +175,6 @@ </description> </context> - <context id="RGBValues"> - <description> - - - - <!-- Start of user code RGBValues description --> - - <!-- End of user code RGBValues description --> - - </description> - </context> <context id="DAnalysisSessionEObject"> <description> @@ -369,6 +286,18 @@ </description> </context> + <context id="UIState"> + <description> + This abstraction is used to store transient UI informations. + + + + <!-- Start of user code UIState description --> + + <!-- End of user code UIState description --> + + </description> + </context> <context id="Group"> <description> @@ -419,7 +348,7 @@ Interpreted expressions, requested return type and available variables: - titleExpression: a string. - + <!-- Start of user code RepresentationDescription description --> @@ -444,7 +373,7 @@ Interpreted expressions, requested return type and available variables: - titleExpression: a string. - + <!-- Start of user code RepresentationImportDescription description --> @@ -550,7 +479,7 @@ - predicateExpression: a boolean. . view: the current view. . container: the semantic container. - + <!-- Start of user code ConditionalStyleDescription description --> @@ -591,7 +520,7 @@ . container: the semantic element of the container view. . viewpoint: (deprecated) the current diagram. . diagram: the current diagram. - + <!-- Start of user code DecorationDescription description --> @@ -610,7 +539,7 @@ . container: the semantic element of the container view. . viewpoint: (deprecated) the current diagram. . diagram: the current diagram. - + <!-- Start of user code SemanticBasedDecoration description --> @@ -648,7 +577,7 @@ - predicateExpression: a boolean result. True to enable the customization, false to disabled it. True by default. . view: the current view. . container: the semantic container. - + <!-- Start of user code VSMElementCustomization description --> @@ -686,7 +615,7 @@ - value: A java Object to affect as new value of a EAttribute, for example a java primitive. . view: the current view. . container: the semantic container. - + <!-- Start of user code EAttributeCustomization description --> @@ -714,17 +643,17 @@ . diagram: the current DDiagram. . containerView: the view of the container. . container: the semantic element of the container. - + - rootExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . containerView: the view of the container. . container: the semantic element of the container. - + - childrenExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . containerView: the view of the container. . container: the semantic element of the container. - + <!-- Start of user code SelectionDescription description --> @@ -768,11 +697,11 @@ Interpreted expressions, requested return type and available variables: - colorValueComputationExpression: an integer. - + - minValueComputationExpression: an integer. - + - maxValueComputationExpression: an integer. - + <!-- Start of user code InterpolatedColor description --> @@ -787,7 +716,7 @@ Interpreted expressions, requested return type and available variables: - associatedValue: an integer. - + <!-- Start of user code ColorStep description --> @@ -903,11 +832,11 @@ Interpreted expressions, requested return type and available variables: - red: an integer. - + - green: an integer. - + - blue: an integer. - + <!-- Start of user code ComputedColor description --> @@ -946,7 +875,7 @@ - labelExpression: a string. . diagram: the current DSemanticDiagram. . view: the current view for which the label is calculated. - + <!-- Start of user code BasicLabelStyleDescription description --> @@ -963,7 +892,7 @@ - labelExpression: a string. . diagram: the current DSemanticDiagram. . view: the current view for which the label is calculated. - + <!-- Start of user code LabelStyleDescription description --> @@ -974,7 +903,7 @@ </context> <context id="LabelBorderStyles"> <description> - A group of LabelBorderStyleDescription to store in Environment.odesign + A group of LabelBorderStyleDescription to store in Environment.odesign. @@ -1002,7 +931,7 @@ Interpreted expressions, requested return type and available variables: - tooltipExpression: a string. . view: the current view. - + <!-- Start of user code TooltipStyleDescription description --> @@ -1029,7 +958,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + <!-- Start of user code AbstractToolDescription description --> @@ -1045,7 +976,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + <!-- Start of user code MappingBasedToolDescription description --> @@ -1060,7 +993,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - element: The variable container that represents the semantic element of the clicked view. @@ -1079,7 +1014,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - newSemanticContainer: The semantic element of the new container view. @@ -1099,22 +1036,24 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + - candidatesExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . containerView: the view of the container. . container: the semantic element of the container. - + - rootExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . containerView: the view of the container. . container: the semantic element of the container. - + - childrenExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . containerView: the view of the container. . container: the semantic element of the container. - + List of the available variables for tool operations: - element: @@ -1133,27 +1072,29 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + - candidatesExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . containerView: the selected view. . container: the semantic element of containerView. - + - rootExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . containerView: the selected view. . container: the semantic element of containerView. - + - childrenExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . containerView: the selected view. . container: the semantic element of containerView. - + - preSelectedCandidatesExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . containerView: the selected view. . container: the semantic element of containerView. - + List of the available variables for tool operations: - element: @@ -1172,11 +1113,13 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + - titleExpression: a string. - + - browseExpression: an EObject. - + List of the available variables for tool operations: - containerView: The variable containerView that represents the clickedView (instance of ViewPoint or ViewPointElement). @@ -1194,12 +1137,14 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + - browseExpression: an EObject. - + - navigationNameExpression: a string. . name: name of the targeted Representation. - + List of the available variables for tool operations: - containerView: The variable containerView that represents the clickedView (instance of ViewPoint or ViewPointElement). @@ -1229,7 +1174,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + <!-- Start of user code MenuItemDescription description --> @@ -1255,7 +1202,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + List of the available variables for tool operations: - view: @@ -1272,7 +1221,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + <!-- Start of user code ExternalJavaAction description --> @@ -1288,7 +1239,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + <!-- Start of user code ExternalJavaActionCall description --> @@ -1303,7 +1256,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. . container: the container. - + + - elementsToSelect: a Collection<EObject> + <!-- Start of user code PopupMenu description --> @@ -1339,7 +1294,7 @@ Interpreted expressions, requested return type and available variables: - computationExpression: a Collection<Object> or an Object. - + <!-- Start of user code AcceleoVariable description --> @@ -1466,17 +1421,17 @@ . diagram: the current DDiagram. . containerView: the view of the container. . container: the semantic element of the container. - + - rootExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . containerView: the view of the container. . container: the semantic element of the container. - + - childrenExpression: a Collection<EObject> or an EObject. . diagram: the current DDiagram. . containerView: the view of the container. . container: the semantic element of the container. - + <!-- Start of user code SelectModelElementVariable description --> @@ -1580,7 +1535,7 @@ Interpreted expressions, requested return type and available variables: - browseExpression: an EObject. - + <!-- Start of user code ChangeContext description --> @@ -1595,7 +1550,7 @@ Interpreted expressions, requested return type and available variables: - valueExpression: any type supported by the feature. - + <!-- Start of user code SetValue description --> @@ -1620,7 +1575,7 @@ Interpreted expressions, requested return type and available variables: - elementExpression: a Collection<EObject> or an EObject. - + <!-- Start of user code Unset description --> @@ -1635,7 +1590,7 @@ Interpreted expressions, requested return type and available variables: - newContainerExpression: an EObject. - + <!-- Start of user code MoveElement description --> @@ -1662,7 +1617,7 @@ Interpreted expressions, requested return type and available variables: - expression: a Collection<EObject> or an EObject. - + <!-- Start of user code For description --> @@ -1677,7 +1632,7 @@ Interpreted expressions, requested return type and available variables: - conditionExpression: a boolean. - + <!-- Start of user code If description --> @@ -1714,7 +1669,7 @@ Interpreted expressions, requested return type and available variables: - value: any type supported by the corresponding java parameter. - + <!-- Start of user code ExternalJavaActionParameter description --> @@ -1729,9 +1684,9 @@ Interpreted expressions, requested return type and available variables: - precondition: a boolean. - + - elementsToListen: a collection. - + <!-- Start of user code ToolFilterDescription description --> @@ -1757,7 +1712,7 @@ Interpreted expressions, requested return type and available variables: - conditionExpression: a boolean. - + <!-- Start of user code Case description --> @@ -1818,8 +1773,8 @@ A validation rule. Interpreted expressions, requested return type and available variables: - - message: a boolean. - + - message: a string. + <!-- Start of user code ValidationRule description --> @@ -1833,8 +1788,8 @@ A validation rule that is applied on a semantic element. Interpreted expressions, requested return type and available variables: - - message: a boolean. - + - message: a string. + <!-- Start of user code SemanticValidationRule description --> @@ -1848,8 +1803,8 @@ A validation rule that is applied on a view element. Interpreted expressions, requested return type and available variables: - - message: a boolean. - + - message: a string. + <!-- Start of user code ViewValidationRule description --> @@ -1864,7 +1819,7 @@ Interpreted expressions, requested return type and available variables: - auditExpression: a boolean. - + <!-- Start of user code RuleAudit description --> diff --git a/plugins/org.eclipse.sirius.editor/plugin.xml b/plugins/org.eclipse.sirius.editor/plugin.xml index 545d18429a..e9f26ba75c 100644 --- a/plugins/org.eclipse.sirius.editor/plugin.xml +++ b/plugins/org.eclipse.sirius.editor/plugin.xml @@ -531,6 +531,22 @@ <input type="org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription"/> </propertySection> <propertySection + class="org.eclipse.sirius.editor.properties.sections.tool.abstracttooldescription.AbstractToolDescriptionElementsToSelectPropertySection" + filter="org.eclipse.sirius.editor.properties.filters.tool.abstracttool.AbstractToolDescriptionElementsToSelectFilterSpec" + id="tool.section.abstractToolDescription.ElementsToSelect" + afterSection="tool.section.abstractToolDescription.ForceRefresh" + tab="viewpoint.tab.general"> + <input type="org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription"/> + </propertySection> + <propertySection + class="org.eclipse.sirius.editor.properties.sections.tool.abstracttooldescription.AbstractToolDescriptionInverseSelectionOrderPropertySection" + filter="org.eclipse.sirius.editor.properties.filters.tool.abstracttool.AbstractToolDescriptionInverseSelectionOrderFilterSpec" + id="tool.section.abstractToolDescription.InverseSelectionOrder " + afterSection="tool.section.abstractToolDescription.ElementsToSelect" + tab="viewpoint.tab.general"> + <input type="org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription"/> + </propertySection> + <propertySection class="org.eclipse.sirius.editor.properties.sections.style.tooltipstyledescription.TooltipStyleDescriptionTooltipExpressionPropertySection" filter="org.eclipse.sirius.editor.properties.filters.style.tooltipstyledescription.TooltipStyleDescriptionTooltipExpressionFilter" id="style.section.tooltipStyleDescription.TooltipExpression" diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/abstracttooldescription/AbstractToolDescriptionElementsToSelectFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/abstracttooldescription/AbstractToolDescriptionElementsToSelectFilter.java new file mode 100644 index 0000000000..e0bababe96 --- /dev/null +++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/abstracttooldescription/AbstractToolDescriptionElementsToSelectFilter.java @@ -0,0 +1,43 @@ +/******************************************************************************* + * 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.editor.properties.filters.tool.abstracttooldescription; + +// Start of user code specific imports + +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter; +import org.eclipse.sirius.viewpoint.description.tool.ToolPackage; + +// End of user code specific imports + +/** + * A filter for the elementsToSelect property section. + */ +public class AbstractToolDescriptionElementsToSelectFilter extends ViewpointPropertyFilter { + + /** + * {@inheritDoc} + */ + protected EStructuralFeature getFeature() { + return ToolPackage.eINSTANCE.getAbstractToolDescription_ElementsToSelect(); + } + + /** + * {@inheritDoc} + */ + protected boolean isRightInputType(Object arg0) { + return arg0 instanceof org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription; + } + + // Start of user code user methods + + // End of user code user methods + +} diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/abstracttooldescription/AbstractToolDescriptionInverseSelectionOrderFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/abstracttooldescription/AbstractToolDescriptionInverseSelectionOrderFilter.java new file mode 100644 index 0000000000..d56fd57c75 --- /dev/null +++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/abstracttooldescription/AbstractToolDescriptionInverseSelectionOrderFilter.java @@ -0,0 +1,43 @@ +/******************************************************************************* + * 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.editor.properties.filters.tool.abstracttooldescription; + +// Start of user code specific imports + +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter; +import org.eclipse.sirius.viewpoint.description.tool.ToolPackage; + +// End of user code specific imports + +/** + * A filter for the inverseSelectionOrder property section. + */ +public class AbstractToolDescriptionInverseSelectionOrderFilter extends ViewpointPropertyFilter { + + /** + * {@inheritDoc} + */ + protected EStructuralFeature getFeature() { + return ToolPackage.eINSTANCE.getAbstractToolDescription_InverseSelectionOrder(); + } + + /** + * {@inheritDoc} + */ + protected boolean isRightInputType(Object arg0) { + return arg0 instanceof org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription; + } + + // Start of user code user methods + + // End of user code user methods + +} diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/style/basiclabelstyledescription/BasicLabelStyleDescriptionLabelFormatPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/style/basiclabelstyledescription/BasicLabelStyleDescriptionLabelFormatPropertySection.java index 5fc5e69ab6..04934e5d7e 100644 --- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/style/basiclabelstyledescription/BasicLabelStyleDescriptionLabelFormatPropertySection.java +++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/style/basiclabelstyledescription/BasicLabelStyleDescriptionLabelFormatPropertySection.java @@ -9,33 +9,30 @@ *******************************************************************************/ package org.eclipse.sirius.editor.properties.sections.style.basiclabelstyledescription; -// Start of user code imports - +import java.util.Iterator; import java.util.List; import org.eclipse.emf.ecore.EAttribute; -import org.eclipse.sirius.editor.properties.sections.common.AbstractComboPropertySection; +import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection; import org.eclipse.sirius.viewpoint.FontFormat; import org.eclipse.sirius.viewpoint.description.style.StylePackage; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; -// End of user code imports - /** * A section for the labelFormat property of a BasicLabelStyleDescription * object. */ -public class BasicLabelStyleDescriptionLabelFormatPropertySection extends AbstractComboPropertySection { +public class BasicLabelStyleDescriptionLabelFormatPropertySection extends AbstractEditorDialogPropertySection { /** - * @see org.eclipse.sirius.editor.properties.sections.AbstractComboPropertySection#getDefaultLabelText() + * @see org.eclipse.sirius.editor.properties.sections.AbstractEditorDialogPropertySection#getDefaultLabelText() */ protected String getDefaultLabelText() { return "LabelFormat"; //$NON-NLS-1$ } /** - * @see org.eclipse.sirius.editor.properties.sections.AbstractComboPropertySection#getLabelText() + * @see org.eclipse.sirius.editor.properties.sections.AbstractEditorDialogPropertySection#getLabelText() */ protected String getLabelText() { String labelText; @@ -47,28 +44,39 @@ public class BasicLabelStyleDescriptionLabelFormatPropertySection extends Abstra } /** - * @see org.eclipse.sirius.editor.properties.sections.AbstractComboPropertySection#getFeature() + * @see org.eclipse.sirius.editor.properties.sections.AbstractEditorDialogPropertySection#getFeature() */ protected EAttribute getFeature() { return StylePackage.eINSTANCE.getBasicLabelStyleDescription_LabelFormat(); } /** - * @see org.eclipse.sirius.editor.properties.sections.AbstractComboPropertySection#getFeatureValue(int) + * @see org.eclipse.sirius.editor.properties.sections.AbstractEditorDialogPropertySection#getFeatureAsText() */ - protected Object getFeatureValue(int index) { - return getChoiceOfValues().get(index); + protected String getFeatureAsText() { + String string = new String(); + + if (eObject.eGet(getFeature()) != null) { + List<?> values = (List<?>) eObject.eGet(getFeature()); + for (Iterator<?> iterator = values.iterator(); iterator.hasNext();) { + string += getAdapterFactoryLabelProvider().getText(iterator.next()); + if (iterator.hasNext()) + string += ", "; + } + } + + return string; } /** - * @see org.eclipse.sirius.editor.properties.sections.AbstractComboPropertySection#isEqual(int) + * @see org.eclipse.sirius.editor.properties.sections.AbstractEditorDialogPropertySection#isEqual(List) */ - protected boolean isEqual(int index) { - return getChoiceOfValues().get(index).equals(eObject.eGet(getFeature())); + protected boolean isEqual(List<?> newList) { + return newList.equals(eObject.eGet(getFeature())); } /** - * @see org.eclipse.sirius.editor.properties.sections.AbstractComboPropertySection#getEnumerationFeatureValues() + * @see org.eclipse.sirius.editor.properties.sections.AbstractEditorDialogPropertySection#getEnumerationFeatureValues() */ protected List<?> getChoiceOfValues() { return FontFormat.VALUES; @@ -79,6 +87,5 @@ public class BasicLabelStyleDescriptionLabelFormatPropertySection extends Abstra */ public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) { super.createControls(parent, tabbedPropertySheetPage); - } } diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/abstracttooldescription/AbstractToolDescriptionElementsToSelectPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/abstracttooldescription/AbstractToolDescriptionElementsToSelectPropertySection.java new file mode 100644 index 0000000000..49243a49a7 --- /dev/null +++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/abstracttooldescription/AbstractToolDescriptionElementsToSelectPropertySection.java @@ -0,0 +1,144 @@ +/******************************************************************************* + * 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.editor.properties.sections.tool.abstracttooldescription; + +// Start of user code imports + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.sirius.editor.editorPlugin.SiriusEditor; +import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection; +import org.eclipse.sirius.editor.tools.api.assist.TypeContentProposalProvider; +import org.eclipse.sirius.editor.tools.internal.presentation.TextWithContentProposalDialog; +import org.eclipse.sirius.ui.tools.api.assist.ContentProposalClient; +import org.eclipse.sirius.viewpoint.description.tool.ToolPackage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.CLabel; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; + +// End of user code imports + +/** + * A section for the elementsToSelect property of a AbstractToolDescription + * object. + */ +public class AbstractToolDescriptionElementsToSelectPropertySection extends AbstractTextWithButtonPropertySection implements ContentProposalClient { + + /** Help control of the section. */ + protected CLabel help; + + /** + * @see org.eclipse.ui.views.properties.tabbed.view.ITabbedPropertySection#refresh() + */ + public void refresh() { + super.refresh(); + + final String tooltip = getToolTipText(); + if (tooltip != null && help != null) { + help.setToolTipText(getToolTipText()); + } + } + + /** + * @see org.eclipse.sirius.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText() + */ + protected String getDefaultLabelText() { + return "ElementsToSelect"; //$NON-NLS-1$ + } + + /** + * @see org.eclipse.sirius.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText() + */ + protected String getLabelText() { + String labelText; + labelText = super.getLabelText() + ":"; //$NON-NLS-1$ + // Start of user code get label text + + // End of user code get label text + return labelText; + } + + /** + * @see org.eclipse.sirius.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature() + */ + public EAttribute getFeature() { + return ToolPackage.eINSTANCE.getAbstractToolDescription_ElementsToSelect(); + } + + /** + * @see org.eclipse.sirius.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String) + */ + protected Object getFeatureValue(String newText) { + return newText; + } + + /** + * @see org.eclipse.sirius.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String) + */ + protected boolean isEqual(String newText) { + return getFeatureAsText().equals(newText); + } + + /** + * {@inheritDoc} + */ + public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) { + super.createControls(parent, tabbedPropertySheetPage); + /* + * We set the color as it's a InterpretedExpression + */ + text.setBackground(SiriusEditor.getColorRegistry().get("yellow")); + + text.setToolTipText(getToolTipText()); + + help = getWidgetFactory().createCLabel(composite, ""); + FormData data = new FormData(); + data.top = new FormAttachment(text, 0, SWT.TOP); + data.left = new FormAttachment(nameLabel); + help.setLayoutData(data); + help.setImage(getHelpIcon()); + help.setToolTipText(getToolTipText()); + + TypeContentProposalProvider.bindPluginsCompletionProcessors(this, text); + + // Start of user code create controls + + // End of user code create controls + + } + + @Override + protected SelectionListener createButtonListener() { + return new SelectionAdapter() { + public void widgetSelected(SelectionEvent e) { + TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), AbstractToolDescriptionElementsToSelectPropertySection.this, text.getText()); + dialog.open(); + text.setText(dialog.getResult()); + handleTextModified(); + } + }; + } + + /** + * {@inheritDoc} + */ + protected String getPropertyDescription() { + return "An expression used to define the selected elements after the tool execution."; + } + + // Start of user code user operations + + // End of user code user operations +} diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/abstracttooldescription/AbstractToolDescriptionInverseSelectionOrderPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/abstracttooldescription/AbstractToolDescriptionInverseSelectionOrderPropertySection.java new file mode 100644 index 0000000000..fd65289d24 --- /dev/null +++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/abstracttooldescription/AbstractToolDescriptionInverseSelectionOrderPropertySection.java @@ -0,0 +1,114 @@ +/******************************************************************************* + * 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.editor.properties.sections.tool.abstracttooldescription; + +// Start of user code imports + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.sirius.editor.properties.sections.common.AbstractCheckBoxPropertySection; +import org.eclipse.sirius.viewpoint.description.tool.ToolPackage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.CLabel; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; + +// End of user code imports + +/** + * A section for the inverseSelectionOrder property of a AbstractToolDescription + * object. + */ +public class AbstractToolDescriptionInverseSelectionOrderPropertySection extends AbstractCheckBoxPropertySection { + /** + * @see org.eclipse.sirius.editor.properties.sections.AbstractCheckBoxPropertySection#getDefaultLabelText() + */ + protected String getDefaultLabelText() { + return "InverseSelectionOrder"; //$NON-NLS-1$ + } + + /** + * @see org.eclipse.sirius.editor.properties.sections.AbstractCheckBoxPropertySection#getLabelText() + */ + protected String getLabelText() { + String labelText; + labelText = super.getLabelText() + ":"; //$NON-NLS-1$ + // Start of user code get label text + + // End of user code get label text + return labelText; + } + + /** + * @see org.eclipse.sirius.editor.properties.sections.AbstractCheckBoxPropertySection#getFeature() + */ + protected EAttribute getFeature() { + return ToolPackage.eINSTANCE.getAbstractToolDescription_InverseSelectionOrder(); + } + + /** + * @see org.eclipse.sirius.editor.properties.sections.AbstractCheckBoxPropertySection#getFeatureAsInteger() + */ + protected String getDefaultFeatureAsText() { + String value = new String(); + if (eObject.eGet(getFeature()) != null) + value = toBoolean(eObject.eGet(getFeature()).toString()).toString(); + return value; + } + + /** + * @see org.eclipse.sirius.editor.properties.sections.AbstractCheckBoxPropertySection#getFeatureValue(int) + */ + protected Object getFeatureValue(String newText) { + return toBoolean(newText); + } + + /** + * @see org.eclipse.sirius.editor.properties.sections.AbstractCheckBoxPropertySection#isEqual(int) + */ + protected boolean isEqual(String newText) { + boolean equal = true; + if (toBoolean(newText) != null) + equal = getFeatureAsText().equals(toBoolean(newText).toString()); + else + refresh(); + return equal; + } + + /** + * Converts the given text to the boolean it represents if applicable. + * + * @return The boolean the given text represents if applicable, + * <code>null</code> otherwise. + */ + private Boolean toBoolean(String text) { + Boolean booleanValue = null; + if (text.toLowerCase().matches("true|false")) + booleanValue = Boolean.parseBoolean(text); + return booleanValue; + } + + /** + * {@inheritDoc} + */ + public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) { + super.createControls(parent, tabbedPropertySheetPage); + checkbox.setToolTipText("By default the elements to select are listed in the creation order. If true, the order is inverted."); + + CLabel help = getWidgetFactory().createCLabel(composite, ""); + FormData data = new FormData(); + data.top = new FormAttachment(checkbox, 0, SWT.TOP); + data.left = new FormAttachment(nameLabel); + help.setLayoutData(data); + help.setImage(getHelpIcon()); + help.setToolTipText("By default the elements to select are listed in the creation order. If true, the order is inverted."); + } +} diff --git a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/properties/filters/tool/abstracttool/AbstractToolDescriptionElementsToSelectFilterSpec.java b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/properties/filters/tool/abstracttool/AbstractToolDescriptionElementsToSelectFilterSpec.java new file mode 100644 index 0000000000..258170cbfa --- /dev/null +++ b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/properties/filters/tool/abstracttool/AbstractToolDescriptionElementsToSelectFilterSpec.java @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (c) 2015 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.editor.properties.filters.tool.abstracttool; + +import org.eclipse.sirius.editor.properties.filters.tool.abstracttooldescription.AbstractToolDescriptionElementsToSelectFilter; +import org.eclipse.sirius.viewpoint.description.tool.PopupMenu; + +/** + * A filter for the elementsToSelect property section. + * + * @author <a href="mailto:laurent.fasani@obeo.fr">Laurent Fasani</a> + */ +public class AbstractToolDescriptionElementsToSelectFilterSpec extends AbstractToolDescriptionElementsToSelectFilter { + + @Override + protected boolean isRightInputType(Object arg0) { + return arg0 instanceof org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription && !(arg0 instanceof PopupMenu); + } +} diff --git a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/properties/filters/tool/abstracttool/AbstractToolDescriptionInverseSelectionOrderFilterSpec.java b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/properties/filters/tool/abstracttool/AbstractToolDescriptionInverseSelectionOrderFilterSpec.java new file mode 100644 index 0000000000..c667e76f71 --- /dev/null +++ b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/properties/filters/tool/abstracttool/AbstractToolDescriptionInverseSelectionOrderFilterSpec.java @@ -0,0 +1,25 @@ +/******************************************************************************* + * Copyright (c) 2015 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.editor.properties.filters.tool.abstracttool; + +import org.eclipse.sirius.editor.properties.filters.tool.abstracttooldescription.AbstractToolDescriptionInverseSelectionOrderFilter; +import org.eclipse.sirius.viewpoint.description.tool.PopupMenu; + +/** + * A filter for the inverseSelectionOrder property section. + * + * @author <a href="mailto:laurent.fasani@obeo.fr">Laurent Fasani</a> + */ +public class AbstractToolDescriptionInverseSelectionOrderFilterSpec extends AbstractToolDescriptionInverseSelectionOrderFilter { + @Override + protected boolean isRightInputType(Object arg0) { + return arg0 instanceof org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription && !(arg0 instanceof PopupMenu); + } +} diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateCellToolItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateCellToolItemProvider.java index 00a8452df5..7b2df4b1c4 100644 --- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateCellToolItemProvider.java +++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateCellToolItemProvider.java @@ -61,6 +61,8 @@ public class CreateCellToolItemProvider extends TableToolItemProvider { addLabelPropertyDescriptor(object); addPreconditionPropertyDescriptor(object); addForceRefreshPropertyDescriptor(object); + addElementsToSelectPropertyDescriptor(object); + addInverseSelectionOrderPropertyDescriptor(object); } return itemPropertyDescriptors; } @@ -128,6 +130,32 @@ public class CreateCellToolItemProvider extends TableToolItemProvider { } /** + * This adds a property descriptor for the Elements To Select feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected void addElementsToSelectPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_AbstractToolDescription_elementsToSelect_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_AbstractToolDescription_elementsToSelect_feature", "_UI_AbstractToolDescription_type"), + ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + } + + /** + * This adds a property descriptor for the Inverse Selection Order feature. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected void addInverseSelectionOrderPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_AbstractToolDescription_inverseSelectionOrder_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_AbstractToolDescription_inverseSelectionOrder_feature", "_UI_AbstractToolDescription_type"), + ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); + } + + /** * This specifies how to implement {@link #getChildren} and is used to * deduce an appropriate feature for an * {@link org.eclipse.emf.edit.command.AddCommand}, @@ -202,6 +230,8 @@ public class CreateCellToolItemProvider extends TableToolItemProvider { case org.eclipse.sirius.table.metamodel.table.description.DescriptionPackage.CREATE_CELL_TOOL__LABEL: case org.eclipse.sirius.table.metamodel.table.description.DescriptionPackage.CREATE_CELL_TOOL__PRECONDITION: case org.eclipse.sirius.table.metamodel.table.description.DescriptionPackage.CREATE_CELL_TOOL__FORCE_REFRESH: + case org.eclipse.sirius.table.metamodel.table.description.DescriptionPackage.CREATE_CELL_TOOL__ELEMENTS_TO_SELECT: + case org.eclipse.sirius.table.metamodel.table.description.DescriptionPackage.CREATE_CELL_TOOL__INVERSE_SELECTION_ORDER: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; case org.eclipse.sirius.table.metamodel.table.description.DescriptionPackage.CREATE_CELL_TOOL__FILTERS: diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/TablePackage.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/TablePackage.java index c001517df2..0714e4f03e 100644 --- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/TablePackage.java +++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/TablePackage.java @@ -127,6 +127,15 @@ public interface TablePackage extends EPackage { int DTABLE__OWNED_ANNOTATION_ENTRIES = ViewpointPackage.DREPRESENTATION__OWNED_ANNOTATION_ENTRIES; /** + * The feature id for the '<em><b>Ui State</b></em>' containment reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DTABLE__UI_STATE = ViewpointPackage.DREPRESENTATION__UI_STATE; + + /** * The feature id for the '<em><b>Target</b></em>' reference. <!-- * begin-user-doc --> <!-- end-user-doc --> * diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/DescriptionPackage.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/DescriptionPackage.java index fd82f9938a..acb87af2af 100644 --- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/DescriptionPackage.java +++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/DescriptionPackage.java @@ -1960,6 +1960,24 @@ public interface DescriptionPackage extends EPackage { int CREATE_TOOL__FILTERS = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CREATE_TOOL__ELEMENTS_TO_SELECT = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CREATE_TOOL__INVERSE_SELECTION_ORDER = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Variables</b></em>' containment reference * list. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -2053,6 +2071,24 @@ public interface DescriptionPackage extends EPackage { int CREATE_COLUMN_TOOL__FILTERS = DescriptionPackage.CREATE_TOOL__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CREATE_COLUMN_TOOL__ELEMENTS_TO_SELECT = DescriptionPackage.CREATE_TOOL__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CREATE_COLUMN_TOOL__INVERSE_SELECTION_ORDER = DescriptionPackage.CREATE_TOOL__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Variables</b></em>' containment reference * list. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -2155,6 +2191,24 @@ public interface DescriptionPackage extends EPackage { int CREATE_CROSS_COLUMN_TOOL__FILTERS = DescriptionPackage.CREATE_TOOL__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CREATE_CROSS_COLUMN_TOOL__ELEMENTS_TO_SELECT = DescriptionPackage.CREATE_TOOL__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CREATE_CROSS_COLUMN_TOOL__INVERSE_SELECTION_ORDER = DescriptionPackage.CREATE_TOOL__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Variables</b></em>' containment reference * list. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -2258,6 +2312,24 @@ public interface DescriptionPackage extends EPackage { int CREATE_LINE_TOOL__FILTERS = DescriptionPackage.CREATE_TOOL__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CREATE_LINE_TOOL__ELEMENTS_TO_SELECT = DescriptionPackage.CREATE_TOOL__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CREATE_LINE_TOOL__INVERSE_SELECTION_ORDER = DescriptionPackage.CREATE_TOOL__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Variables</b></em>' containment reference * list. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -2378,13 +2450,31 @@ public interface DescriptionPackage extends EPackage { int CREATE_CELL_TOOL__FILTERS = DescriptionPackage.TABLE_TOOL_FEATURE_COUNT + 5; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CREATE_CELL_TOOL__ELEMENTS_TO_SELECT = DescriptionPackage.TABLE_TOOL_FEATURE_COUNT + 6; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CREATE_CELL_TOOL__INVERSE_SELECTION_ORDER = DescriptionPackage.TABLE_TOOL_FEATURE_COUNT + 7; + + /** * The feature id for the '<em><b>Mask</b></em>' containment reference. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int CREATE_CELL_TOOL__MASK = DescriptionPackage.TABLE_TOOL_FEATURE_COUNT + 6; + int CREATE_CELL_TOOL__MASK = DescriptionPackage.TABLE_TOOL_FEATURE_COUNT + 8; /** * The feature id for the '<em><b>Mapping</b></em>' container reference. @@ -2393,7 +2483,7 @@ public interface DescriptionPackage extends EPackage { * @generated * @ordered */ - int CREATE_CELL_TOOL__MAPPING = DescriptionPackage.TABLE_TOOL_FEATURE_COUNT + 7; + int CREATE_CELL_TOOL__MAPPING = DescriptionPackage.TABLE_TOOL_FEATURE_COUNT + 9; /** * The number of structural features of the '<em>Create Cell Tool</em>' @@ -2402,7 +2492,7 @@ public interface DescriptionPackage extends EPackage { * @generated * @ordered */ - int CREATE_CELL_TOOL_FEATURE_COUNT = DescriptionPackage.TABLE_TOOL_FEATURE_COUNT + 8; + int CREATE_CELL_TOOL_FEATURE_COUNT = DescriptionPackage.TABLE_TOOL_FEATURE_COUNT + 10; /** * The meta object id for the ' @@ -2471,6 +2561,24 @@ public interface DescriptionPackage extends EPackage { int DELETE_TOOL__FILTERS = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DELETE_TOOL__ELEMENTS_TO_SELECT = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DELETE_TOOL__INVERSE_SELECTION_ORDER = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Variables</b></em>' containment reference * list. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -2564,6 +2672,24 @@ public interface DescriptionPackage extends EPackage { int DELETE_COLUMN_TOOL__FILTERS = DescriptionPackage.DELETE_TOOL__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DELETE_COLUMN_TOOL__ELEMENTS_TO_SELECT = DescriptionPackage.DELETE_TOOL__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DELETE_COLUMN_TOOL__INVERSE_SELECTION_ORDER = DescriptionPackage.DELETE_TOOL__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Variables</b></em>' containment reference * list. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -2666,6 +2792,24 @@ public interface DescriptionPackage extends EPackage { int DELETE_LINE_TOOL__FILTERS = DescriptionPackage.DELETE_TOOL__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DELETE_LINE_TOOL__ELEMENTS_TO_SELECT = DescriptionPackage.DELETE_TOOL__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DELETE_LINE_TOOL__INVERSE_SELECTION_ORDER = DescriptionPackage.DELETE_TOOL__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Variables</b></em>' containment reference * list. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -2976,6 +3120,24 @@ public interface DescriptionPackage extends EPackage { int TABLE_CREATION_DESCRIPTION__FILTERS = ToolPackage.REPRESENTATION_CREATION_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TABLE_CREATION_DESCRIPTION__ELEMENTS_TO_SELECT = ToolPackage.REPRESENTATION_CREATION_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TABLE_CREATION_DESCRIPTION__INVERSE_SELECTION_ORDER = ToolPackage.REPRESENTATION_CREATION_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Title Expression</b></em>' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -3115,6 +3277,24 @@ public interface DescriptionPackage extends EPackage { int TABLE_NAVIGATION_DESCRIPTION__FILTERS = ToolPackage.REPRESENTATION_NAVIGATION_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TABLE_NAVIGATION_DESCRIPTION__ELEMENTS_TO_SELECT = ToolPackage.REPRESENTATION_NAVIGATION_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TABLE_NAVIGATION_DESCRIPTION__INVERSE_SELECTION_ORDER = ToolPackage.REPRESENTATION_NAVIGATION_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Browse Expression</b></em>' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> * diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/CreateCellToolImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/CreateCellToolImpl.java index a620f4de6f..cea4a8e4a6 100644 --- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/CreateCellToolImpl.java +++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/CreateCellToolImpl.java @@ -57,6 +57,12 @@ import org.eclipse.sirius.viewpoint.description.tool.ToolPackage; * {@link org.eclipse.sirius.table.metamodel.table.description.impl.CreateCellToolImpl#getFilters * <em>Filters</em>}</li> * <li> + * {@link org.eclipse.sirius.table.metamodel.table.description.impl.CreateCellToolImpl#getElementsToSelect + * <em>Elements To Select</em>}</li> + * <li> + * {@link org.eclipse.sirius.table.metamodel.table.description.impl.CreateCellToolImpl#isInverseSelectionOrder + * <em>Inverse Selection Order</em>}</li> + * <li> * {@link org.eclipse.sirius.table.metamodel.table.description.impl.CreateCellToolImpl#getMask * <em>Mask</em>}</li> * <li> @@ -183,6 +189,50 @@ public class CreateCellToolImpl extends TableToolImpl implements CreateCellTool protected EList<ToolFilterDescription> filters; /** + * The default value of the '{@link #getElementsToSelect() + * <em>Elements To Select</em>}' attribute. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #getElementsToSelect() + * @generated + * @ordered + */ + protected static final String ELEMENTS_TO_SELECT_EDEFAULT = ""; + + /** + * The cached value of the '{@link #getElementsToSelect() + * <em>Elements To Select</em>}' attribute. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #getElementsToSelect() + * @generated + * @ordered + */ + protected String elementsToSelect = CreateCellToolImpl.ELEMENTS_TO_SELECT_EDEFAULT; + + /** + * The default value of the '{@link #isInverseSelectionOrder() + * <em>Inverse Selection Order</em>}' attribute. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #isInverseSelectionOrder() + * @generated + * @ordered + */ + protected static final boolean INVERSE_SELECTION_ORDER_EDEFAULT = false; + + /** + * The cached value of the '{@link #isInverseSelectionOrder() + * <em>Inverse Selection Order</em>}' attribute. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #isInverseSelectionOrder() + * @generated + * @ordered + */ + protected boolean inverseSelectionOrder = CreateCellToolImpl.INVERSE_SELECTION_ORDER_EDEFAULT; + + /** * The cached value of the '{@link #getMask() <em>Mask</em>}' containment * reference. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -350,6 +400,54 @@ public class CreateCellToolImpl extends TableToolImpl implements CreateCellTool * @generated */ @Override + public String getElementsToSelect() { + return elementsToSelect; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void setElementsToSelect(String newElementsToSelect) { + String oldElementsToSelect = elementsToSelect; + elementsToSelect = newElementsToSelect; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, DescriptionPackage.CREATE_CELL_TOOL__ELEMENTS_TO_SELECT, oldElementsToSelect, elementsToSelect)); + } + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public boolean isInverseSelectionOrder() { + return inverseSelectionOrder; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void setInverseSelectionOrder(boolean newInverseSelectionOrder) { + boolean oldInverseSelectionOrder = inverseSelectionOrder; + inverseSelectionOrder = newInverseSelectionOrder; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, DescriptionPackage.CREATE_CELL_TOOL__INVERSE_SELECTION_ORDER, oldInverseSelectionOrder, inverseSelectionOrder)); + } + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override public EditMaskVariables getMask() { return mask; } @@ -516,6 +614,10 @@ public class CreateCellToolImpl extends TableToolImpl implements CreateCellTool return isForceRefresh(); case DescriptionPackage.CREATE_CELL_TOOL__FILTERS: return getFilters(); + case DescriptionPackage.CREATE_CELL_TOOL__ELEMENTS_TO_SELECT: + return getElementsToSelect(); + case DescriptionPackage.CREATE_CELL_TOOL__INVERSE_SELECTION_ORDER: + return isInverseSelectionOrder(); case DescriptionPackage.CREATE_CELL_TOOL__MASK: return getMask(); case DescriptionPackage.CREATE_CELL_TOOL__MAPPING: @@ -552,6 +654,12 @@ public class CreateCellToolImpl extends TableToolImpl implements CreateCellTool getFilters().clear(); getFilters().addAll((Collection<? extends ToolFilterDescription>) newValue); return; + case DescriptionPackage.CREATE_CELL_TOOL__ELEMENTS_TO_SELECT: + setElementsToSelect((String) newValue); + return; + case DescriptionPackage.CREATE_CELL_TOOL__INVERSE_SELECTION_ORDER: + setInverseSelectionOrder((Boolean) newValue); + return; case DescriptionPackage.CREATE_CELL_TOOL__MASK: setMask((EditMaskVariables) newValue); return; @@ -588,6 +696,12 @@ public class CreateCellToolImpl extends TableToolImpl implements CreateCellTool case DescriptionPackage.CREATE_CELL_TOOL__FILTERS: getFilters().clear(); return; + case DescriptionPackage.CREATE_CELL_TOOL__ELEMENTS_TO_SELECT: + setElementsToSelect(CreateCellToolImpl.ELEMENTS_TO_SELECT_EDEFAULT); + return; + case DescriptionPackage.CREATE_CELL_TOOL__INVERSE_SELECTION_ORDER: + setInverseSelectionOrder(CreateCellToolImpl.INVERSE_SELECTION_ORDER_EDEFAULT); + return; case DescriptionPackage.CREATE_CELL_TOOL__MASK: setMask((EditMaskVariables) null); return; @@ -618,6 +732,10 @@ public class CreateCellToolImpl extends TableToolImpl implements CreateCellTool return forceRefresh != CreateCellToolImpl.FORCE_REFRESH_EDEFAULT; case DescriptionPackage.CREATE_CELL_TOOL__FILTERS: return filters != null && !filters.isEmpty(); + case DescriptionPackage.CREATE_CELL_TOOL__ELEMENTS_TO_SELECT: + return CreateCellToolImpl.ELEMENTS_TO_SELECT_EDEFAULT == null ? elementsToSelect != null : !CreateCellToolImpl.ELEMENTS_TO_SELECT_EDEFAULT.equals(elementsToSelect); + case DescriptionPackage.CREATE_CELL_TOOL__INVERSE_SELECTION_ORDER: + return inverseSelectionOrder != CreateCellToolImpl.INVERSE_SELECTION_ORDER_EDEFAULT; case DescriptionPackage.CREATE_CELL_TOOL__MASK: return mask != null; case DescriptionPackage.CREATE_CELL_TOOL__MAPPING: @@ -665,6 +783,10 @@ public class CreateCellToolImpl extends TableToolImpl implements CreateCellTool return ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FORCE_REFRESH; case DescriptionPackage.CREATE_CELL_TOOL__FILTERS: return ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS; + case DescriptionPackage.CREATE_CELL_TOOL__ELEMENTS_TO_SELECT: + return ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + case DescriptionPackage.CREATE_CELL_TOOL__INVERSE_SELECTION_ORDER: + return ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; default: return -1; } @@ -711,6 +833,10 @@ public class CreateCellToolImpl extends TableToolImpl implements CreateCellTool return DescriptionPackage.CREATE_CELL_TOOL__FORCE_REFRESH; case ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS: return DescriptionPackage.CREATE_CELL_TOOL__FILTERS; + case ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT: + return DescriptionPackage.CREATE_CELL_TOOL__ELEMENTS_TO_SELECT; + case ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER: + return DescriptionPackage.CREATE_CELL_TOOL__INVERSE_SELECTION_ORDER; default: return -1; } @@ -740,6 +866,10 @@ public class CreateCellToolImpl extends TableToolImpl implements CreateCellTool result.append(precondition); result.append(", forceRefresh: "); result.append(forceRefresh); + result.append(", elementsToSelect: "); + result.append(elementsToSelect); + result.append(", inverseSelectionOrder: "); + result.append(inverseSelectionOrder); result.append(')'); return result.toString(); } diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DescriptionPackageImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DescriptionPackageImpl.java index 32e3669834..8f4a90f3e2 100644 --- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DescriptionPackageImpl.java +++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DescriptionPackageImpl.java @@ -264,7 +264,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP * method {@link #init init()}, which also performs initialization of the * package, or returns the registered package, if one already exists. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see org.eclipse.emf.ecore.EPackage.Registry * @see org.eclipse.sirius.table.metamodel.table.description.DescriptionPackage#eNS_URI * @see #init() @@ -290,7 +290,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP * when that field is accessed. Clients should not invoke it directly. * Instead, they should simply access that field to obtain the package. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #eNS_URI * @see #createPackageContents() * @see #initializePackageContents() @@ -1567,7 +1567,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP * Complete the initialization of the package and its meta-model. This * method is guarded to have no affect on any invocation but its first. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ public void initializePackageContents() { diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/TablePackageImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/TablePackageImpl.java index 66f4997af5..35a1464b6d 100644 --- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/TablePackageImpl.java +++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/TablePackageImpl.java @@ -128,7 +128,7 @@ public class TablePackageImpl extends EPackageImpl implements TablePackage { * method {@link #init init()}, which also performs initialization of the * package, or returns the registered package, if one already exists. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see org.eclipse.emf.ecore.EPackage.Registry * @see org.eclipse.sirius.table.metamodel.table.TablePackage#eNS_URI * @see #init() @@ -154,7 +154,7 @@ public class TablePackageImpl extends EPackageImpl implements TablePackage { * that field is accessed. Clients should not invoke it directly. Instead, * they should simply access that field to obtain the package. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #eNS_URI * @see #createPackageContents() * @see #initializePackageContents() @@ -765,7 +765,7 @@ public class TablePackageImpl extends EPackageImpl implements TablePackage { * Complete the initialization of the package and its meta-model. This * method is guarded to have no affect on any invocation but its first. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ public void initializePackageContents() { diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/TreePackage.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/TreePackage.java index 7ba54debe7..9ef93aac94 100644 --- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/TreePackage.java +++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/TreePackage.java @@ -139,6 +139,15 @@ public interface TreePackage extends EPackage { int DTREE__OWNED_ANNOTATION_ENTRIES = ViewpointPackage.DREPRESENTATION__OWNED_ANNOTATION_ENTRIES; /** + * The feature id for the '<em><b>Ui State</b></em>' containment reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DTREE__UI_STATE = ViewpointPackage.DREPRESENTATION__UI_STATE; + + /** * The feature id for the '<em><b>Target</b></em>' reference. <!-- * begin-user-doc --> <!-- end-user-doc --> * diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/DescriptionPackage.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/DescriptionPackage.java index 267e5dcd88..d80e552e2a 100644 --- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/DescriptionPackage.java +++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/DescriptionPackage.java @@ -689,6 +689,24 @@ public interface DescriptionPackage extends EPackage { int TREE_ITEM_TOOL__FILTERS = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TREE_ITEM_TOOL__ELEMENTS_TO_SELECT = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TREE_ITEM_TOOL__INVERSE_SELECTION_ORDER = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>First Model Operation</b></em>' * containment reference. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -782,6 +800,24 @@ public interface DescriptionPackage extends EPackage { int TREE_ITEM_DRAG_TOOL__FILTERS = ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TREE_ITEM_DRAG_TOOL__ELEMENTS_TO_SELECT = ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TREE_ITEM_DRAG_TOOL__INVERSE_SELECTION_ORDER = ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>First Model Operation</b></em>' * containment reference. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -938,6 +974,24 @@ public interface DescriptionPackage extends EPackage { int TREE_ITEM_CONTAINER_DROP_TOOL__FILTERS = ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TREE_ITEM_CONTAINER_DROP_TOOL__ELEMENTS_TO_SELECT = ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TREE_ITEM_CONTAINER_DROP_TOOL__INVERSE_SELECTION_ORDER = ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>First Model Operation</b></em>' * containment reference. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -1086,6 +1140,24 @@ public interface DescriptionPackage extends EPackage { int TREE_ITEM_CREATION_TOOL__FILTERS = DescriptionPackage.TREE_ITEM_TOOL__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TREE_ITEM_CREATION_TOOL__ELEMENTS_TO_SELECT = DescriptionPackage.TREE_ITEM_TOOL__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TREE_ITEM_CREATION_TOOL__INVERSE_SELECTION_ORDER = DescriptionPackage.TREE_ITEM_TOOL__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>First Model Operation</b></em>' * containment reference. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -1189,6 +1261,24 @@ public interface DescriptionPackage extends EPackage { int TREE_ITEM_EDITION_TOOL__FILTERS = DescriptionPackage.TREE_ITEM_TOOL__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TREE_ITEM_EDITION_TOOL__ELEMENTS_TO_SELECT = DescriptionPackage.TREE_ITEM_TOOL__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TREE_ITEM_EDITION_TOOL__INVERSE_SELECTION_ORDER = DescriptionPackage.TREE_ITEM_TOOL__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>First Model Operation</b></em>' * containment reference. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -1318,6 +1408,24 @@ public interface DescriptionPackage extends EPackage { int TREE_ITEM_DELETION_TOOL__FILTERS = DescriptionPackage.TREE_ITEM_TOOL__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TREE_ITEM_DELETION_TOOL__ELEMENTS_TO_SELECT = DescriptionPackage.TREE_ITEM_TOOL__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TREE_ITEM_DELETION_TOOL__INVERSE_SELECTION_ORDER = DescriptionPackage.TREE_ITEM_TOOL__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>First Model Operation</b></em>' * containment reference. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -1421,6 +1529,24 @@ public interface DescriptionPackage extends EPackage { int TREE_CREATION_DESCRIPTION__FILTERS = ToolPackage.REPRESENTATION_CREATION_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TREE_CREATION_DESCRIPTION__ELEMENTS_TO_SELECT = ToolPackage.REPRESENTATION_CREATION_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TREE_CREATION_DESCRIPTION__INVERSE_SELECTION_ORDER = ToolPackage.REPRESENTATION_CREATION_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Title Expression</b></em>' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -1560,6 +1686,24 @@ public interface DescriptionPackage extends EPackage { int TREE_NAVIGATION_DESCRIPTION__FILTERS = ToolPackage.REPRESENTATION_NAVIGATION_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TREE_NAVIGATION_DESCRIPTION__ELEMENTS_TO_SELECT = ToolPackage.REPRESENTATION_NAVIGATION_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TREE_NAVIGATION_DESCRIPTION__INVERSE_SELECTION_ORDER = ToolPackage.REPRESENTATION_NAVIGATION_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Browse Expression</b></em>' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -1905,6 +2049,24 @@ public interface DescriptionPackage extends EPackage { int TREE_POPUP_MENU__FILTERS = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TREE_POPUP_MENU__ELEMENTS_TO_SELECT = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TREE_POPUP_MENU__INVERSE_SELECTION_ORDER = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Menu Item Descriptions</b></em>' * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc --> * diff --git a/plugins/org.eclipse.sirius.ui/plugin.properties b/plugins/org.eclipse.sirius.ui/plugin.properties index d255edfb6c..b1566233bd 100644 --- a/plugins/org.eclipse.sirius.ui/plugin.properties +++ b/plugins/org.eclipse.sirius.ui/plugin.properties @@ -1034,3 +1034,11 @@ _UI_Viewpoint_customizes_feature = Customizes _UI_EStructuralFeatureCustomization_applyOnAll_feature = Apply On All _UI_EStructuralFeatureCustomization_applyOnAll_description = If true, this customization will be applied on all style description. _UI_DAnalysis_semanticResources_feature = Semantic Resources +_UI_UIState_type = UI State +_UI_DRepresentation_uiState_feature = Ui State +_UI_UIState_inverseSelectionOrder_feature = Inverse Selection Order +_UI_UIState_elementsToSelect_feature = Elements To Select +_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. diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/AbstractToolDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/AbstractToolDescriptionItemProvider.java index 67b5510b9b..a8ce6d9856 100644 --- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/AbstractToolDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/AbstractToolDescriptionItemProvider.java @@ -62,6 +62,8 @@ public class AbstractToolDescriptionItemProvider extends DocumentedElementItemPr addLabelPropertyDescriptor(object); addPreconditionPropertyDescriptor(object); addForceRefreshPropertyDescriptor(object); + addElementsToSelectPropertyDescriptor(object); + addInverseSelectionOrderPropertyDescriptor(object); } return itemPropertyDescriptors; } @@ -117,6 +119,30 @@ public class AbstractToolDescriptionItemProvider extends DocumentedElementItemPr } /** + * This adds a property descriptor for the Elements To Select feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected void addElementsToSelectPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_AbstractToolDescription_elementsToSelect_feature"), getString("_UI_AbstractToolDescription_elementsToSelect_description"), + ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + } + + /** + * This adds a property descriptor for the Inverse Selection Order feature. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected void addInverseSelectionOrderPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_AbstractToolDescription_inverseSelectionOrder_feature"), getString("_UI_AbstractToolDescription_inverseSelectionOrder_description"), + ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); + } + + /** * This specifies how to implement {@link #getChildren} and is used to * deduce an appropriate feature for an * {@link org.eclipse.emf.edit.command.AddCommand}, @@ -178,6 +204,8 @@ public class AbstractToolDescriptionItemProvider extends DocumentedElementItemPr case ToolPackage.ABSTRACT_TOOL_DESCRIPTION__LABEL: case ToolPackage.ABSTRACT_TOOL_DESCRIPTION__PRECONDITION: case ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FORCE_REFRESH: + case ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT: + case ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; case ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS: diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationItemProvider.java index 8ce793208b..02d2481a2d 100644 --- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationItemProvider.java +++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationItemProvider.java @@ -23,6 +23,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.sirius.viewpoint.DRepresentation; +import org.eclipse.sirius.viewpoint.ViewpointFactory; import org.eclipse.sirius.viewpoint.ViewpointPackage; import org.eclipse.sirius.viewpoint.description.DescriptionFactory; import org.eclipse.sirius.viewpoint.description.DescriptionPackage; @@ -118,6 +119,7 @@ public class DRepresentationItemProvider extends DocumentedElementItemProvider { super.getChildrenFeatures(object); childrenFeatures.add(DescriptionPackage.Literals.DMODEL_ELEMENT__EANNOTATIONS); childrenFeatures.add(ViewpointPackage.Literals.DREPRESENTATION__OWNED_ANNOTATION_ENTRIES); + childrenFeatures.add(ViewpointPackage.Literals.DREPRESENTATION__UI_STATE); } return childrenFeatures; } @@ -166,6 +168,7 @@ public class DRepresentationItemProvider extends DocumentedElementItemProvider { return; case ViewpointPackage.DREPRESENTATION__EANNOTATIONS: case ViewpointPackage.DREPRESENTATION__OWNED_ANNOTATION_ENTRIES: + case ViewpointPackage.DREPRESENTATION__UI_STATE: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); return; } @@ -186,6 +189,8 @@ public class DRepresentationItemProvider extends DocumentedElementItemProvider { newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.DMODEL_ELEMENT__EANNOTATIONS, DescriptionFactory.eINSTANCE.createDAnnotation())); newChildDescriptors.add(createChildParameter(ViewpointPackage.Literals.DREPRESENTATION__OWNED_ANNOTATION_ENTRIES, DescriptionFactory.eINSTANCE.createAnnotationEntry())); + + newChildDescriptors.add(createChildParameter(ViewpointPackage.Literals.DREPRESENTATION__UI_STATE, ViewpointFactory.eINSTANCE.createUIState())); } /** diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/UIStateItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/UIStateItemProvider.java new file mode 100644 index 0000000000..3b146a5cf3 --- /dev/null +++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/UIStateItemProvider.java @@ -0,0 +1,147 @@ +/** + * Copyright (c) 2015 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.provider; + +import java.util.Collection; +import java.util.List; + +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.util.ResourceLocator; +import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; +import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ItemProviderAdapter; +import org.eclipse.emf.edit.provider.ViewerNotification; +import org.eclipse.sirius.viewpoint.UIState; +import org.eclipse.sirius.viewpoint.ViewpointPackage; + +/** + * This is the item provider adapter for a + * {@link org.eclipse.sirius.viewpoint.UIState} object. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ +public class UIStateItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { + /** + * This constructs an instance from a factory and a notifier. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public UIStateItemProvider(AdapterFactory adapterFactory) { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); + + addInverseSelectionOrderPropertyDescriptor(object); + addElementsToSelectPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * This adds a property descriptor for the Inverse Selection Order feature. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected void addInverseSelectionOrderPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_UIState_inverseSelectionOrder_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UIState_inverseSelectionOrder_feature", "_UI_UIState_type"), + ViewpointPackage.Literals.UI_STATE__INVERSE_SELECTION_ORDER, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); + } + + /** + * This adds a property descriptor for the Elements To Select feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected void addElementsToSelectPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_UIState_elementsToSelect_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UIState_elementsToSelect_feature", "_UI_UIState_type"), + ViewpointPackage.Literals.UI_STATE__ELEMENTS_TO_SELECT, true, false, true, null, null, null)); + } + + /** + * This returns the label text for the adapted class. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public String getText(Object object) { + UIState uiState = (UIState) object; + return getString("_UI_UIState_type") + " " + uiState.isInverseSelectionOrder(); + } + + /** + * This handles model notifications by calling {@link #updateChildren} to + * update any cached children and by creating a viewer notification, which + * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @generated + */ + @Override + public void notifyChanged(Notification notification) { + updateChildren(notification); + + switch (notification.getFeatureID(UIState.class)) { + case ViewpointPackage.UI_STATE__INVERSE_SELECTION_ORDER: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + } + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s + * describing the children that can be created under this object. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + + /** + * Return the resource locator for this item provider's resources. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public ResourceLocator getResourceLocator() { + return SiriusEditPlugin.INSTANCE; + } + +} diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/ViewpointItemProviderAdapterFactory.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/ViewpointItemProviderAdapterFactory.java index c8dedb673c..b9708db0c2 100644 --- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/ViewpointItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/ViewpointItemProviderAdapterFactory.java @@ -454,6 +454,31 @@ public class ViewpointItemProviderAdapterFactory extends ViewpointAdapterFactory } /** + * This keeps track of the one adapter used for all + * {@link org.eclipse.sirius.viewpoint.UIState} instances. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected UIStateItemProvider uiStateItemProvider; + + /** + * This creates an adapter for a + * {@link org.eclipse.sirius.viewpoint.UIState}. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public Adapter createUIStateAdapter() { + if (uiStateItemProvider == null) { + uiStateItemProvider = new UIStateItemProvider(this); + } + + return uiStateItemProvider; + } + + /** * This returns the root adapter factory that contains this factory. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -602,6 +627,9 @@ public class ViewpointItemProviderAdapterFactory extends ViewpointAdapterFactory if (basicLabelStyleItemProvider != null) { basicLabelStyleItemProvider.dispose(); } + if (uiStateItemProvider != null) { + uiStateItemProvider.dispose(); + } } } diff --git a/plugins/org.eclipse.sirius/model/viewpoint.ecore b/plugins/org.eclipse.sirius/model/viewpoint.ecore index c854367d79..e270a926c7 100644 --- a/plugins/org.eclipse.sirius/model/viewpoint.ecore +++ b/plugins/org.eclipse.sirius/model/viewpoint.ecore @@ -96,6 +96,8 @@ </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="ownedAnnotationEntries" upperBound="-1" eType="#//description/AnnotationEntry" containment="true"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="uiState" eType="#//UIState" + transient="true" containment="true" resolveProxies="false"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="DRepresentationElement" abstract="true" eSuperTypes="#//DMappingBased #//DStylizable #//DRefreshable #//DSemanticDecorator"> @@ -260,6 +262,17 @@ eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/> </eClassifiers> <eClassifiers xsi:type="ecore:EDataType" name="ResourceDescriptor" instanceClassName="org.eclipse.sirius.business.api.resource.ResourceDescriptor"/> + <eClassifiers xsi:type="ecore:EClass" name="UIState"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="This abstraction is used to store transient UI informations."/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="inverseSelectionOrder" + eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean" + transient="true" defaultValueLiteral="false"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="elementsToSelect" upperBound="-1" + eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject" + transient="true" unsettable="true" resolveProxies="false"/> + </eClassifiers> <eSubpackages name="description" nsURI="http://www.eclipse.org/sirius/description/1.1.0" nsPrefix="description"> <eClassifiers xsi:type="ecore:EClass" name="Group" eSuperTypes="#//description/DModelElement #//description/DocumentedElement"> @@ -963,6 +976,25 @@ </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="filters" upperBound="-1" eType="#//description/tool/ToolFilterDescription" containment="true"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementsToSelect" eType="#//description/InterpretedExpression" + defaultValueLiteral=""> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="An expression used to define the selected elements after the tool execution."/> + </eAnnotations> + <eAnnotations source="http://www.eclipse.org/sirius/interpreted/expression/returnType"> + <details key="returnType" value="a Collection<EObject>"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="inverseSelectionOrder" + eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean" + defaultValueLiteral="false"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="By default the elements to select are listed in the creation order. If true, the order is inverted."/> + </eAnnotations> + <eAnnotations source="http://www.eclipse.org/sirius/interpreted/expression/returnType"> + <details key="returnType" value="a boolean."/> + </eAnnotations> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="MappingBasedToolDescription" abstract="true" eSuperTypes="#//description/tool/AbstractToolDescription"> diff --git a/plugins/org.eclipse.sirius/model/viewpoint.genmodel b/plugins/org.eclipse.sirius/model/viewpoint.genmodel index 0c8b6d5d09..08c4474ca7 100644 --- a/plugins/org.eclipse.sirius/model/viewpoint.genmodel +++ b/plugins/org.eclipse.sirius/model/viewpoint.genmodel @@ -62,6 +62,7 @@ <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference viewpoint.ecore#//DRepresentation/representationElements"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute viewpoint.ecore#//DRepresentation/name"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference viewpoint.ecore#//DRepresentation/ownedAnnotationEntries"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference viewpoint.ecore#//DRepresentation/uiState"/> </genClasses> <genClasses image="false" ecoreClass="viewpoint.ecore#//DRepresentationElement"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute viewpoint.ecore#//DRepresentationElement/name"/> @@ -120,6 +121,10 @@ <genClasses image="false" ecoreClass="viewpoint.ecore#//Customizable"> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EAttribute viewpoint.ecore#//Customizable/customFeatures"/> </genClasses> + <genClasses image="false" ecoreClass="viewpoint.ecore#//UIState"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute viewpoint.ecore#//UIState/inverseSelectionOrder"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference viewpoint.ecore#//UIState/elementsToSelect"/> + </genClasses> <nestedGenPackages prefix="Description" basePackage="org.eclipse.sirius.viewpoint" resource="XMI" disposableProviderFactory="true" extensibleProviderFactory="true" ecorePackage="viewpoint.ecore#//description"> @@ -431,6 +436,10 @@ <genFeatures createChild="false" propertyCategory="General" ecoreFeature="ecore:EAttribute viewpoint.ecore#//description/tool/AbstractToolDescription/forceRefresh"/> <genFeatures property="None" children="true" createChild="true" propertyCategory="" propertyDescription="" ecoreFeature="ecore:EReference viewpoint.ecore#//description/tool/AbstractToolDescription/filters"/> + <genFeatures createChild="false" propertyDescription="An expression used to define the selected elements after the tool execution." + ecoreFeature="ecore:EAttribute viewpoint.ecore#//description/tool/AbstractToolDescription/elementsToSelect"/> + <genFeatures createChild="false" propertyDescription="By default the elements to select are listed in the creation order. If true, the order is inverted." + ecoreFeature="ecore:EAttribute viewpoint.ecore#//description/tool/AbstractToolDescription/inverseSelectionOrder"/> </genClasses> <genClasses image="false" ecoreClass="viewpoint.ecore#//description/tool/MappingBasedToolDescription"/> <genClasses ecoreClass="viewpoint.ecore#//description/tool/ToolDescription"> diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DRepresentation.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DRepresentation.java index 574b77df18..2fa819bb2c 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DRepresentation.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DRepresentation.java @@ -34,6 +34,8 @@ import org.eclipse.sirius.viewpoint.description.DocumentedElement; * <li> * {@link org.eclipse.sirius.viewpoint.DRepresentation#getOwnedAnnotationEntries * <em>Owned Annotation Entries</em>}</li> + * <li>{@link org.eclipse.sirius.viewpoint.DRepresentation#getUiState <em>Ui + * State</em>}</li> * </ul> * </p> * @@ -119,4 +121,35 @@ public interface DRepresentation extends DocumentedElement, DRefreshable, DModel */ EList<AnnotationEntry> getOwnedAnnotationEntries(); + /** + * Returns the value of the '<em><b>Ui State</b></em>' containment + * reference. <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Ui State</em>' containment reference isn't + * clear, there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @return the value of the '<em>Ui State</em>' containment reference. + * @see #setUiState(UIState) + * @see org.eclipse.sirius.viewpoint.ViewpointPackage#getDRepresentation_UiState() + * @model containment="true" transient="true" + * @generated + */ + UIState getUiState(); + + /** + * Sets the value of the ' + * {@link org.eclipse.sirius.viewpoint.DRepresentation#getUiState + * <em>Ui State</em>}' containment reference. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @param value + * the new value of the '<em>Ui State</em>' containment + * reference. + * @see #getUiState() + * @generated + */ + void setUiState(UIState value); + } // DRepresentation diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/UIState.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/UIState.java new file mode 100644 index 0000000000..6854a7de24 --- /dev/null +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/UIState.java @@ -0,0 +1,116 @@ +/** + * Copyright (c) 2015 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; + +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EObject; + +/** + * <!-- begin-user-doc --> A representation of the model object ' + * <em><b>UI State</b></em>'. <!-- end-user-doc --> + * + * <!-- begin-model-doc --> This abstraction is used to store transient UI + * informations. <!-- end-model-doc --> + * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.sirius.viewpoint.UIState#isInverseSelectionOrder <em> + * Inverse Selection Order</em>}</li> + * <li>{@link org.eclipse.sirius.viewpoint.UIState#getElementsToSelect <em> + * Elements To Select</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.sirius.viewpoint.ViewpointPackage#getUIState() + * @model + * @generated + */ +public interface UIState extends EObject { + /** + * Returns the value of the '<em><b>Inverse Selection Order</b></em>' + * attribute. The default value is <code>"false"</code>. <!-- begin-user-doc + * --> + * <p> + * If the meaning of the '<em>Inverse Selection Order</em>' attribute isn't + * clear, there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @return the value of the '<em>Inverse Selection Order</em>' attribute. + * @see #setInverseSelectionOrder(boolean) + * @see org.eclipse.sirius.viewpoint.ViewpointPackage#getUIState_InverseSelectionOrder() + * @model default="false" transient="true" + * @generated + */ + boolean isInverseSelectionOrder(); + + /** + * Sets the value of the ' + * {@link org.eclipse.sirius.viewpoint.UIState#isInverseSelectionOrder + * <em>Inverse Selection Order</em>}' attribute. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @param value + * the new value of the '<em>Inverse Selection Order</em>' + * attribute. + * @see #isInverseSelectionOrder() + * @generated + */ + void setInverseSelectionOrder(boolean value); + + /** + * Returns the value of the '<em><b>Elements To Select</b></em>' reference + * list. The list contents are of type {@link org.eclipse.emf.ecore.EObject} + * . <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Elements To Select</em>' reference list isn't + * clear, there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @return the value of the '<em>Elements To Select</em>' reference list. + * @see #isSetElementsToSelect() + * @see #unsetElementsToSelect() + * @see org.eclipse.sirius.viewpoint.ViewpointPackage#getUIState_ElementsToSelect() + * @model resolveProxies="false" unsettable="true" transient="true" + * @generated + */ + EList<EObject> getElementsToSelect(); + + /** + * Unsets the value of the ' + * {@link org.eclipse.sirius.viewpoint.UIState#getElementsToSelect + * <em>Elements To Select</em>}' reference list. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #isSetElementsToSelect() + * @see #getElementsToSelect() + * @generated + */ + void unsetElementsToSelect(); + + /** + * Returns whether the value of the ' + * {@link org.eclipse.sirius.viewpoint.UIState#getElementsToSelect + * <em>Elements To Select</em>}' reference list is set. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @return whether the value of the '<em>Elements To Select</em>' reference + * list is set. + * @see #unsetElementsToSelect() + * @see #getElementsToSelect() + * @generated + */ + boolean isSetElementsToSelect(); + +} // UIState diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointFactory.java index 8e4dc81698..134c53559b 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointFactory.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointFactory.java @@ -165,6 +165,15 @@ public interface ViewpointFactory extends EFactory { BasicLabelStyle createBasicLabelStyle(); /** + * Returns a new object of class '<em>UI State</em>'. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @return a new object of class '<em>UI State</em>'. + * @generated + */ + UIState createUIState(); + + /** * Returns the package supported by this factory. <!-- begin-user-doc --> * <!-- end-user-doc --> * diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointPackage.java index 8e56262c98..ca3982b6f2 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointPackage.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointPackage.java @@ -450,13 +450,22 @@ public interface ViewpointPackage extends EPackage { int DREPRESENTATION__OWNED_ANNOTATION_ENTRIES = DescriptionPackage.DOCUMENTED_ELEMENT_FEATURE_COUNT + 4; /** + * The feature id for the '<em><b>Ui State</b></em>' containment reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DREPRESENTATION__UI_STATE = DescriptionPackage.DOCUMENTED_ELEMENT_FEATURE_COUNT + 5; + + /** * The number of structural features of the '<em>DRepresentation</em>' * class. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int DREPRESENTATION_FEATURE_COUNT = DescriptionPackage.DOCUMENTED_ELEMENT_FEATURE_COUNT + 5; + int DREPRESENTATION_FEATURE_COUNT = DescriptionPackage.DOCUMENTED_ELEMENT_FEATURE_COUNT + 6; /** * The meta object id for the ' @@ -843,7 +852,7 @@ public interface ViewpointPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getRGBValues() * @generated */ - int RGB_VALUES = 28; + int RGB_VALUES = 29; /** * The meta object id for the '<em>Resource Descriptor</em>' data type. <!-- @@ -853,7 +862,7 @@ public interface ViewpointPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getResourceDescriptor() * @generated */ - int RESOURCE_DESCRIPTOR = 29; + int RESOURCE_DESCRIPTOR = 30; /** * The meta object id for the ' @@ -1220,6 +1229,44 @@ public interface ViewpointPackage extends EPackage { /** * The meta object id for the ' + * {@link org.eclipse.sirius.viewpoint.impl.UIStateImpl <em>UI State</em>}' + * class. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see org.eclipse.sirius.viewpoint.impl.UIStateImpl + * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getUIState() + * @generated + */ + int UI_STATE = 25; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int UI_STATE__INVERSE_SELECTION_ORDER = 0; + + /** + * The feature id for the '<em><b>Elements To Select</b></em>' reference + * list. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int UI_STATE__ELEMENTS_TO_SELECT = 1; + + /** + * The number of structural features of the '<em>UI State</em>' class. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int UI_STATE_FEATURE_COUNT = 2; + + /** + * The meta object id for the ' * {@link org.eclipse.sirius.viewpoint.FontFormat <em>Font Format</em>}' * enum. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -1227,7 +1274,7 @@ public interface ViewpointPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getFontFormat() * @generated */ - int FONT_FORMAT = 25; + int FONT_FORMAT = 26; /** * The meta object id for the ' @@ -1239,7 +1286,7 @@ public interface ViewpointPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getLabelAlignment() * @generated */ - int LABEL_ALIGNMENT = 26; + int LABEL_ALIGNMENT = 27; /** * The meta object id for the ' @@ -1250,7 +1297,7 @@ public interface ViewpointPackage extends EPackage { * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getSyncStatus() * @generated */ - int SYNC_STATUS = 27; + int SYNC_STATUS = 28; /** * Returns the meta object for class ' @@ -1538,6 +1585,19 @@ public interface ViewpointPackage extends EPackage { EReference getDRepresentation_OwnedAnnotationEntries(); /** + * Returns the meta object for the containment reference ' + * {@link org.eclipse.sirius.viewpoint.DRepresentation#getUiState + * <em>Ui State</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return the meta object for the containment reference '<em>Ui State</em> + * '. + * @see org.eclipse.sirius.viewpoint.DRepresentation#getUiState() + * @see #getDRepresentation() + * @generated + */ + EReference getDRepresentation_UiState(); + + /** * Returns the meta object for class ' * {@link org.eclipse.sirius.viewpoint.DRepresentationElement * <em>DRepresentation Element</em>}'. <!-- begin-user-doc --> <!-- @@ -2096,6 +2156,45 @@ public interface ViewpointPackage extends EPackage { EAttribute getCustomizable_CustomFeatures(); /** + * Returns the meta object for class ' + * {@link org.eclipse.sirius.viewpoint.UIState <em>UI State</em>}'. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @return the meta object for class '<em>UI State</em>'. + * @see org.eclipse.sirius.viewpoint.UIState + * @generated + */ + EClass getUIState(); + + /** + * Returns the meta object for the attribute ' + * {@link org.eclipse.sirius.viewpoint.UIState#isInverseSelectionOrder + * <em>Inverse Selection Order</em>}'. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @return the meta object for the attribute ' + * <em>Inverse Selection Order</em>'. + * @see org.eclipse.sirius.viewpoint.UIState#isInverseSelectionOrder() + * @see #getUIState() + * @generated + */ + EAttribute getUIState_InverseSelectionOrder(); + + /** + * Returns the meta object for the reference list ' + * {@link org.eclipse.sirius.viewpoint.UIState#getElementsToSelect + * <em>Elements To Select</em>}'. <!-- begin-user-doc --> <!-- end-user-doc + * --> + * + * @return the meta object for the reference list ' + * <em>Elements To Select</em>'. + * @see org.eclipse.sirius.viewpoint.UIState#getElementsToSelect() + * @see #getUIState() + * @generated + */ + EReference getUIState_ElementsToSelect(); + + /** * Returns the meta object for enum ' * {@link org.eclipse.sirius.viewpoint.FontFormat <em>Font Format</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> @@ -2373,6 +2472,15 @@ public interface ViewpointPackage extends EPackage { EReference DREPRESENTATION__OWNED_ANNOTATION_ENTRIES = ViewpointPackage.eINSTANCE.getDRepresentation_OwnedAnnotationEntries(); /** + * The meta object literal for the '<em><b>Ui State</b></em>' + * containment reference feature. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @generated + */ + EReference DREPRESENTATION__UI_STATE = ViewpointPackage.eINSTANCE.getDRepresentation_UiState(); + + /** * The meta object literal for the ' * {@link org.eclipse.sirius.viewpoint.impl.DRepresentationElementImpl * <em>DRepresentation Element</em>}' class. <!-- begin-user-doc --> @@ -2815,6 +2923,35 @@ public interface ViewpointPackage extends EPackage { /** * The meta object literal for the ' + * {@link org.eclipse.sirius.viewpoint.impl.UIStateImpl + * <em>UI State</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc + * --> + * + * @see org.eclipse.sirius.viewpoint.impl.UIStateImpl + * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getUIState() + * @generated + */ + EClass UI_STATE = ViewpointPackage.eINSTANCE.getUIState(); + + /** + * The meta object literal for the ' + * <em><b>Inverse Selection Order</b></em>' attribute feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + EAttribute UI_STATE__INVERSE_SELECTION_ORDER = ViewpointPackage.eINSTANCE.getUIState_InverseSelectionOrder(); + + /** + * The meta object literal for the '<em><b>Elements To Select</b></em>' + * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + EReference UI_STATE__ELEMENTS_TO_SELECT = ViewpointPackage.eINSTANCE.getUIState_ElementsToSelect(); + + /** + * The meta object literal for the ' * {@link org.eclipse.sirius.viewpoint.FontFormat <em>Font Format</em>}' * enum. <!-- begin-user-doc --> <!-- end-user-doc --> * 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 e315e5806b..526905af22 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 @@ -2175,7 +2175,7 @@ public interface DescriptionPackage extends EPackage { /** * The meta object id for the '<em>Image Path</em>' data type. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see java.lang.String * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getImagePath() * @generated @@ -5251,7 +5251,7 @@ public interface DescriptionPackage extends EPackage { /** * The meta object literal for the '<em>Image Path</em>' data type. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see java.lang.String * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getImagePath() * @generated diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/AbstractToolDescription.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/AbstractToolDescription.java index b28f8b7813..3f09f1dacf 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/AbstractToolDescription.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/AbstractToolDescription.java @@ -31,6 +31,12 @@ import org.eclipse.emf.common.util.EList; * <li> * {@link org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription#getFilters * <em>Filters</em>}</li> + * <li> + * {@link org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription#getElementsToSelect + * <em>Elements To Select</em>}</li> + * <li> + * {@link org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription#isInverseSelectionOrder + * <em>Inverse Selection Order</em>}</li> * </ul> * </p> * @@ -119,4 +125,73 @@ public interface AbstractToolDescription extends ToolEntry { */ EList<ToolFilterDescription> getFilters(); + /** + * Returns the value of the '<em><b>Elements To Select</b></em>' attribute. + * The default value is <code>""</code>. <!-- begin-user-doc --> <!-- + * end-user-doc --> <!-- begin-model-doc --> The precondition of the tool. + * <!-- end-model-doc --> + * + * @return the value of the '<em>Elements To Select</em>' attribute. + * @see #setElementsToSelect(String) + * @see org.eclipse.sirius.viewpoint.description.tool.ToolPackage#getAbstractToolDescription_ElementsToSelect() + * @model default="" dataType= + * "org.eclipse.sirius.viewpoint.description.InterpretedExpression" + * annotation + * ="http://www.eclipse.org/emf/2002/GenModel contentassist=''" + * annotation= + * "http://www.eclipse.org/sirius/interpreted/expression/returnType returnType='a boolean.'" + * annotation= + * "http://www.eclipse.org/sirius/interpreted/expression/variables container='ecore.EObject | the container.'" + * @generated + */ + String getElementsToSelect(); + + /** + * Sets the value of the ' + * {@link org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription#getElementsToSelect + * <em>Elements To Select</em>}' attribute. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @param value + * the new value of the '<em>Elements To Select</em>' attribute. + * @see #getElementsToSelect() + * @generated + */ + void setElementsToSelect(String value); + + /** + * Returns the value of the '<em><b>Inverse Selection Order</b></em>' + * attribute. The default value is <code>"false"</code>. <!-- begin-user-doc + * --> + * <p> + * If the meaning of the '<em>Inverse Selection Order</em>' attribute isn't + * clear, there really should be more of a description here... + * </p> + * <!-- end-user-doc --> <!-- begin-model-doc --> By default the elements to + * select are listed in the creation order. If true, the order is inverted. + * <!-- end-model-doc --> + * + * @return the value of the '<em>Inverse Selection Order</em>' attribute. + * @see #setInverseSelectionOrder(boolean) + * @see org.eclipse.sirius.viewpoint.description.tool.ToolPackage#getAbstractToolDescription_InverseSelectionOrder() + * @model default="false" annotation= + * "http://www.eclipse.org/sirius/interpreted/expression/returnType returnType='a boolean.'" + * @generated + */ + boolean isInverseSelectionOrder(); + + /** + * Sets the value of the ' + * {@link org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription#isInverseSelectionOrder + * <em>Inverse Selection Order</em>}' attribute. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @param value + * the new value of the '<em>Inverse Selection Order</em>' + * attribute. + * @see #isInverseSelectionOrder() + * @generated + */ + void setInverseSelectionOrder(boolean value); + } // AbstractToolDescription diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ToolPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ToolPackage.java index b64d1896b4..c7a6b7dc74 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ToolPackage.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ToolPackage.java @@ -177,6 +177,24 @@ public interface ToolPackage extends EPackage { int ABSTRACT_TOOL_DESCRIPTION__FILTERS = ToolPackage.TOOL_ENTRY_FEATURE_COUNT + 2; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT = ToolPackage.TOOL_ENTRY_FEATURE_COUNT + 3; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER = ToolPackage.TOOL_ENTRY_FEATURE_COUNT + 4; + + /** * The number of structural features of the ' * <em>Abstract Tool Description</em>' class. <!-- begin-user-doc --> <!-- * end-user-doc --> @@ -184,7 +202,7 @@ public interface ToolPackage extends EPackage { * @generated * @ordered */ - int ABSTRACT_TOOL_DESCRIPTION_FEATURE_COUNT = ToolPackage.TOOL_ENTRY_FEATURE_COUNT + 3; + int ABSTRACT_TOOL_DESCRIPTION_FEATURE_COUNT = ToolPackage.TOOL_ENTRY_FEATURE_COUNT + 5; /** * The meta object id for the ' @@ -253,6 +271,24 @@ public interface ToolPackage extends EPackage { int MAPPING_BASED_TOOL_DESCRIPTION__FILTERS = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int MAPPING_BASED_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int MAPPING_BASED_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The number of structural features of the ' * <em>Mapping Based Tool Description</em>' class. <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -329,6 +365,24 @@ public interface ToolPackage extends EPackage { int TOOL_DESCRIPTION__FILTERS = ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TOOL_DESCRIPTION__ELEMENTS_TO_SELECT = ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER = ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Icon Path</b></em>' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -440,6 +494,24 @@ public interface ToolPackage extends EPackage { int PASTE_DESCRIPTION__FILTERS = ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int PASTE_DESCRIPTION__ELEMENTS_TO_SELECT = ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int PASTE_DESCRIPTION__INVERSE_SELECTION_ORDER = ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Container</b></em>' containment reference. * <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -560,6 +632,24 @@ public interface ToolPackage extends EPackage { int SELECTION_WIZARD_DESCRIPTION__FILTERS = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int SELECTION_WIZARD_DESCRIPTION__ELEMENTS_TO_SELECT = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int SELECTION_WIZARD_DESCRIPTION__INVERSE_SELECTION_ORDER = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Candidates Expression</b></em>' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -753,6 +843,24 @@ public interface ToolPackage extends EPackage { int PANE_BASED_SELECTION_WIZARD_DESCRIPTION__FILTERS = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int PANE_BASED_SELECTION_WIZARD_DESCRIPTION__ELEMENTS_TO_SELECT = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int PANE_BASED_SELECTION_WIZARD_DESCRIPTION__INVERSE_SELECTION_ORDER = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Element</b></em>' containment reference. * <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -965,6 +1073,24 @@ public interface ToolPackage extends EPackage { int REPRESENTATION_CREATION_DESCRIPTION__FILTERS = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int REPRESENTATION_CREATION_DESCRIPTION__ELEMENTS_TO_SELECT = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int REPRESENTATION_CREATION_DESCRIPTION__INVERSE_SELECTION_ORDER = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Title Expression</b></em>' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -1095,6 +1221,24 @@ public interface ToolPackage extends EPackage { int REPRESENTATION_NAVIGATION_DESCRIPTION__FILTERS = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int REPRESENTATION_NAVIGATION_DESCRIPTION__ELEMENTS_TO_SELECT = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int REPRESENTATION_NAVIGATION_DESCRIPTION__INVERSE_SELECTION_ORDER = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Browse Expression</b></em>' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -1246,6 +1390,24 @@ public interface ToolPackage extends EPackage { int MENU_ITEM_DESCRIPTION__FILTERS = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int MENU_ITEM_DESCRIPTION__ELEMENTS_TO_SELECT = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int MENU_ITEM_DESCRIPTION__INVERSE_SELECTION_ORDER = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Icon</b></em>' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -1361,6 +1523,24 @@ public interface ToolPackage extends EPackage { int OPERATION_ACTION__FILTERS = ToolPackage.MENU_ITEM_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int OPERATION_ACTION__ELEMENTS_TO_SELECT = ToolPackage.MENU_ITEM_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int OPERATION_ACTION__INVERSE_SELECTION_ORDER = ToolPackage.MENU_ITEM_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Icon</b></em>' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -1463,6 +1643,24 @@ public interface ToolPackage extends EPackage { int EXTERNAL_JAVA_ACTION__FILTERS = ToolPackage.MENU_ITEM_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int EXTERNAL_JAVA_ACTION__ELEMENTS_TO_SELECT = ToolPackage.MENU_ITEM_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int EXTERNAL_JAVA_ACTION__INVERSE_SELECTION_ORDER = ToolPackage.MENU_ITEM_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Icon</b></em>' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -1574,6 +1772,24 @@ public interface ToolPackage extends EPackage { int EXTERNAL_JAVA_ACTION_CALL__FILTERS = ToolPackage.MENU_ITEM_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int EXTERNAL_JAVA_ACTION_CALL__ELEMENTS_TO_SELECT = ToolPackage.MENU_ITEM_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int EXTERNAL_JAVA_ACTION_CALL__INVERSE_SELECTION_ORDER = ToolPackage.MENU_ITEM_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Icon</b></em>' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -1677,6 +1893,24 @@ public interface ToolPackage extends EPackage { int POPUP_MENU__FILTERS = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS; /** + * The feature id for the '<em><b>Elements To Select</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int POPUP_MENU__ELEMENTS_TO_SELECT = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT; + + /** + * The feature id for the '<em><b>Inverse Selection Order</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int POPUP_MENU__INVERSE_SELECTION_ORDER = ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER; + + /** * The feature id for the '<em><b>Menu Item Description</b></em>' * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -3266,6 +3500,33 @@ public interface ToolPackage extends EPackage { EReference getAbstractToolDescription_Filters(); /** + * Returns the meta object for the attribute ' + * {@link org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription#getElementsToSelect + * <em>Elements To Select</em>}'. <!-- begin-user-doc --> <!-- end-user-doc + * --> + * + * @return the meta object for the attribute '<em>Elements To Select</em>'. + * @see org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription#getElementsToSelect() + * @see #getAbstractToolDescription() + * @generated + */ + EAttribute getAbstractToolDescription_ElementsToSelect(); + + /** + * Returns the meta object for the attribute ' + * {@link org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription#isInverseSelectionOrder + * <em>Inverse Selection Order</em>}'. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @return the meta object for the attribute ' + * <em>Inverse Selection Order</em>'. + * @see org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription#isInverseSelectionOrder() + * @see #getAbstractToolDescription() + * @generated + */ + EAttribute getAbstractToolDescription_InverseSelectionOrder(); + + /** * Returns the meta object for class ' * {@link org.eclipse.sirius.viewpoint.description.tool.MappingBasedToolDescription * <em>Mapping Based Tool Description</em>}'. <!-- begin-user-doc --> <!-- @@ -5099,6 +5360,23 @@ public interface ToolPackage extends EPackage { EReference ABSTRACT_TOOL_DESCRIPTION__FILTERS = ToolPackage.eINSTANCE.getAbstractToolDescription_Filters(); /** + * The meta object literal for the '<em><b>Elements To Select</b></em>' + * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + EAttribute ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT = ToolPackage.eINSTANCE.getAbstractToolDescription_ElementsToSelect(); + + /** + * The meta object literal for the ' + * <em><b>Inverse Selection Order</b></em>' attribute feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + EAttribute ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER = ToolPackage.eINSTANCE.getAbstractToolDescription_InverseSelectionOrder(); + + /** * The meta object literal for the ' * {@link org.eclipse.sirius.viewpoint.description.tool.impl.MappingBasedToolDescriptionImpl * <em>Mapping Based Tool Description</em>}' class. <!-- begin-user-doc diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/AbstractToolDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/AbstractToolDescriptionImpl.java index 4a74218861..ad11dbaa13 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/AbstractToolDescriptionImpl.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/AbstractToolDescriptionImpl.java @@ -49,6 +49,12 @@ import org.eclipse.sirius.viewpoint.description.tool.ToolPackage; * <li> * {@link org.eclipse.sirius.viewpoint.description.tool.impl.AbstractToolDescriptionImpl#getFilters * <em>Filters</em>}</li> + * <li> + * {@link org.eclipse.sirius.viewpoint.description.tool.impl.AbstractToolDescriptionImpl#getElementsToSelect + * <em>Elements To Select</em>}</li> + * <li> + * {@link org.eclipse.sirius.viewpoint.description.tool.impl.AbstractToolDescriptionImpl#isInverseSelectionOrder + * <em>Inverse Selection Order</em>}</li> * </ul> * </p> * @@ -148,6 +154,50 @@ public abstract class AbstractToolDescriptionImpl extends DocumentedElementImpl protected EList<ToolFilterDescription> filters; /** + * The default value of the '{@link #getElementsToSelect() + * <em>Elements To Select</em>}' attribute. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #getElementsToSelect() + * @generated + * @ordered + */ + protected static final String ELEMENTS_TO_SELECT_EDEFAULT = ""; + + /** + * The cached value of the '{@link #getElementsToSelect() + * <em>Elements To Select</em>}' attribute. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #getElementsToSelect() + * @generated + * @ordered + */ + protected String elementsToSelect = AbstractToolDescriptionImpl.ELEMENTS_TO_SELECT_EDEFAULT; + + /** + * The default value of the '{@link #isInverseSelectionOrder() + * <em>Inverse Selection Order</em>}' attribute. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #isInverseSelectionOrder() + * @generated + * @ordered + */ + protected static final boolean INVERSE_SELECTION_ORDER_EDEFAULT = false; + + /** + * The cached value of the '{@link #isInverseSelectionOrder() + * <em>Inverse Selection Order</em>}' attribute. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #isInverseSelectionOrder() + * @generated + * @ordered + */ + protected boolean inverseSelectionOrder = AbstractToolDescriptionImpl.INVERSE_SELECTION_ORDER_EDEFAULT; + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -281,6 +331,54 @@ public abstract class AbstractToolDescriptionImpl extends DocumentedElementImpl * @generated */ @Override + public String getElementsToSelect() { + return elementsToSelect; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void setElementsToSelect(String newElementsToSelect) { + String oldElementsToSelect = elementsToSelect; + elementsToSelect = newElementsToSelect; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT, oldElementsToSelect, elementsToSelect)); + } + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public boolean isInverseSelectionOrder() { + return inverseSelectionOrder; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void setInverseSelectionOrder(boolean newInverseSelectionOrder) { + boolean oldInverseSelectionOrder = inverseSelectionOrder; + inverseSelectionOrder = newInverseSelectionOrder; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER, oldInverseSelectionOrder, inverseSelectionOrder)); + } + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { case ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS: @@ -307,6 +405,10 @@ public abstract class AbstractToolDescriptionImpl extends DocumentedElementImpl return isForceRefresh(); case ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS: return getFilters(); + case ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT: + return getElementsToSelect(); + case ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER: + return isInverseSelectionOrder(); } return super.eGet(featureID, resolve, coreType); } @@ -336,6 +438,12 @@ public abstract class AbstractToolDescriptionImpl extends DocumentedElementImpl getFilters().clear(); getFilters().addAll((Collection<? extends ToolFilterDescription>) newValue); return; + case ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT: + setElementsToSelect((String) newValue); + return; + case ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER: + setInverseSelectionOrder((Boolean) newValue); + return; } super.eSet(featureID, newValue); } @@ -363,6 +471,12 @@ public abstract class AbstractToolDescriptionImpl extends DocumentedElementImpl case ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS: getFilters().clear(); return; + case ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT: + setElementsToSelect(AbstractToolDescriptionImpl.ELEMENTS_TO_SELECT_EDEFAULT); + return; + case ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER: + setInverseSelectionOrder(AbstractToolDescriptionImpl.INVERSE_SELECTION_ORDER_EDEFAULT); + return; } super.eUnset(featureID); } @@ -385,6 +499,10 @@ public abstract class AbstractToolDescriptionImpl extends DocumentedElementImpl return forceRefresh != AbstractToolDescriptionImpl.FORCE_REFRESH_EDEFAULT; case ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS: return filters != null && !filters.isEmpty(); + case ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT: + return AbstractToolDescriptionImpl.ELEMENTS_TO_SELECT_EDEFAULT == null ? elementsToSelect != null : !AbstractToolDescriptionImpl.ELEMENTS_TO_SELECT_EDEFAULT.equals(elementsToSelect); + case ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER: + return inverseSelectionOrder != AbstractToolDescriptionImpl.INVERSE_SELECTION_ORDER_EDEFAULT; } return super.eIsSet(featureID); } @@ -449,6 +567,10 @@ public abstract class AbstractToolDescriptionImpl extends DocumentedElementImpl result.append(precondition); result.append(", forceRefresh: "); result.append(forceRefresh); + result.append(", elementsToSelect: "); + result.append(elementsToSelect); + result.append(", inverseSelectionOrder: "); + result.append(inverseSelectionOrder); result.append(')'); return result.toString(); } diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolPackageImpl.java index 24f539343d..eaee03aa48 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolPackageImpl.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolPackageImpl.java @@ -633,6 +633,26 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage { * @generated */ @Override + public EAttribute getAbstractToolDescription_ElementsToSelect() { + return (EAttribute) abstractToolDescriptionEClass.getEStructuralFeatures().get(3); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public EAttribute getAbstractToolDescription_InverseSelectionOrder() { + return (EAttribute) abstractToolDescriptionEClass.getEStructuralFeatures().get(4); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override public EClass getMappingBasedToolDescription() { return mappingBasedToolDescriptionEClass; } @@ -2074,6 +2094,8 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage { createEAttribute(abstractToolDescriptionEClass, ToolPackage.ABSTRACT_TOOL_DESCRIPTION__PRECONDITION); createEAttribute(abstractToolDescriptionEClass, ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FORCE_REFRESH); createEReference(abstractToolDescriptionEClass, ToolPackage.ABSTRACT_TOOL_DESCRIPTION__FILTERS); + createEAttribute(abstractToolDescriptionEClass, ToolPackage.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT); + createEAttribute(abstractToolDescriptionEClass, ToolPackage.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER); mappingBasedToolDescriptionEClass = createEClass(ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION); @@ -2376,6 +2398,12 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage { initEReference(getAbstractToolDescription_Filters(), this.getToolFilterDescription(), null, "filters", null, 0, -1, AbstractToolDescription.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); + initEAttribute(getAbstractToolDescription_ElementsToSelect(), theDescriptionPackage.getInterpretedExpression(), "elementsToSelect", "", 0, 1, AbstractToolDescription.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); + initEAttribute(getAbstractToolDescription_InverseSelectionOrder(), theEcorePackage.getEBoolean(), "inverseSelectionOrder", "false", 0, 1, AbstractToolDescription.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); initEClass(mappingBasedToolDescriptionEClass, MappingBasedToolDescription.class, "MappingBasedToolDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); @@ -2757,6 +2785,8 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage { protected void createReturnTypeAnnotations() { String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType"; addAnnotation(getAbstractToolDescription_Precondition(), source, new String[] { "returnType", "a boolean." }); + addAnnotation(getAbstractToolDescription_ElementsToSelect(), source, new String[] { "returnType", "a Collection<EObject>" }); + addAnnotation(getAbstractToolDescription_InverseSelectionOrder(), source, new String[] { "returnType", "a boolean." }); addAnnotation(getPaneBasedSelectionWizardDescription_CandidatesExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." }); addAnnotation(getPaneBasedSelectionWizardDescription_RootExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." }); addAnnotation(getPaneBasedSelectionWizardDescription_ChildrenExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." }); diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationImpl.java index d1385f5de7..2b93965cfe 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationImpl.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationImpl.java @@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.sirius.viewpoint.DRefreshable; import org.eclipse.sirius.viewpoint.DRepresentation; import org.eclipse.sirius.viewpoint.DRepresentationElement; +import org.eclipse.sirius.viewpoint.UIState; import org.eclipse.sirius.viewpoint.ViewpointPackage; import org.eclipse.sirius.viewpoint.description.AnnotationEntry; import org.eclipse.sirius.viewpoint.description.DAnnotation; @@ -51,6 +52,8 @@ import org.eclipse.sirius.viewpoint.description.impl.DocumentedElementImpl; * <li> * {@link org.eclipse.sirius.viewpoint.impl.DRepresentationImpl#getOwnedAnnotationEntries * <em>Owned Annotation Entries</em>}</li> + * <li>{@link org.eclipse.sirius.viewpoint.impl.DRepresentationImpl#getUiState + * <em>Ui State</em>}</li> * </ul> * </p> * @@ -100,6 +103,16 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen protected EList<AnnotationEntry> ownedAnnotationEntries; /** + * The cached value of the '{@link #getUiState() <em>Ui State</em>}' + * containment reference. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see #getUiState() + * @generated + * @ordered + */ + protected UIState uiState; + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -210,6 +223,59 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen * @generated */ @Override + public UIState getUiState() { + return uiState; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public NotificationChain basicSetUiState(UIState newUiState, NotificationChain msgs) { + UIState oldUiState = uiState; + uiState = newUiState; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ViewpointPackage.DREPRESENTATION__UI_STATE, oldUiState, newUiState); + if (msgs == null) { + msgs = notification; + } else { + msgs.add(notification); + } + } + return msgs; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void setUiState(UIState newUiState) { + if (newUiState != uiState) { + NotificationChain msgs = null; + if (uiState != null) { + msgs = ((InternalEObject) uiState).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - ViewpointPackage.DREPRESENTATION__UI_STATE, null, msgs); + } + if (newUiState != null) { + msgs = ((InternalEObject) newUiState).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - ViewpointPackage.DREPRESENTATION__UI_STATE, null, msgs); + } + msgs = basicSetUiState(newUiState, msgs); + if (msgs != null) { + msgs.dispatch(); + } + } else if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, ViewpointPackage.DREPRESENTATION__UI_STATE, newUiState, newUiState)); + } + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override public DAnnotation getDAnnotation(String source) { // TODO: implement this method // Ensure that you remove @generated or mark it @generated NOT @@ -240,6 +306,8 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen return ((InternalEList<?>) getEAnnotations()).basicRemove(otherEnd, msgs); case ViewpointPackage.DREPRESENTATION__OWNED_ANNOTATION_ENTRIES: return ((InternalEList<?>) getOwnedAnnotationEntries()).basicRemove(otherEnd, msgs); + case ViewpointPackage.DREPRESENTATION__UI_STATE: + return basicSetUiState(null, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -262,6 +330,8 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen return getName(); case ViewpointPackage.DREPRESENTATION__OWNED_ANNOTATION_ENTRIES: return getOwnedAnnotationEntries(); + case ViewpointPackage.DREPRESENTATION__UI_STATE: + return getUiState(); } return super.eGet(featureID, resolve, coreType); } @@ -286,6 +356,9 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen getOwnedAnnotationEntries().clear(); getOwnedAnnotationEntries().addAll((Collection<? extends AnnotationEntry>) newValue); return; + case ViewpointPackage.DREPRESENTATION__UI_STATE: + setUiState((UIState) newValue); + return; } super.eSet(featureID, newValue); } @@ -307,6 +380,9 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen case ViewpointPackage.DREPRESENTATION__OWNED_ANNOTATION_ENTRIES: getOwnedAnnotationEntries().clear(); return; + case ViewpointPackage.DREPRESENTATION__UI_STATE: + setUiState((UIState) null); + return; } super.eUnset(featureID); } @@ -329,6 +405,8 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen return DRepresentationImpl.NAME_EDEFAULT == null ? name != null : !DRepresentationImpl.NAME_EDEFAULT.equals(name); case ViewpointPackage.DREPRESENTATION__OWNED_ANNOTATION_ENTRIES: return ownedAnnotationEntries != null && !ownedAnnotationEntries.isEmpty(); + case ViewpointPackage.DREPRESENTATION__UI_STATE: + return uiState != null; } return super.eIsSet(featureID); } diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/UIStateImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/UIStateImpl.java new file mode 100644 index 0000000000..5090b0a14b --- /dev/null +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/UIStateImpl.java @@ -0,0 +1,243 @@ +/** + * Copyright (c) 2015 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.impl; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; +import org.eclipse.emf.ecore.util.EObjectEList; +import org.eclipse.emf.ecore.util.InternalEList; +import org.eclipse.sirius.viewpoint.UIState; +import org.eclipse.sirius.viewpoint.ViewpointPackage; + +/** + * <!-- begin-user-doc --> An implementation of the model object ' + * <em><b>UI State</b></em>'. <!-- end-user-doc --> + * <p> + * The following features are implemented: + * <ul> + * <li> + * {@link org.eclipse.sirius.viewpoint.impl.UIStateImpl#isInverseSelectionOrder + * <em>Inverse Selection Order</em>}</li> + * <li>{@link org.eclipse.sirius.viewpoint.impl.UIStateImpl#getElementsToSelect + * <em>Elements To Select</em>}</li> + * </ul> + * </p> + * + * @generated + */ +public class UIStateImpl extends MinimalEObjectImpl.Container implements UIState { + /** + * The default value of the '{@link #isInverseSelectionOrder() + * <em>Inverse Selection Order</em>}' attribute. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #isInverseSelectionOrder() + * @generated + * @ordered + */ + protected static final boolean INVERSE_SELECTION_ORDER_EDEFAULT = false; + + /** + * The cached value of the '{@link #isInverseSelectionOrder() + * <em>Inverse Selection Order</em>}' attribute. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #isInverseSelectionOrder() + * @generated + * @ordered + */ + protected boolean inverseSelectionOrder = UIStateImpl.INVERSE_SELECTION_ORDER_EDEFAULT; + + /** + * The cached value of the '{@link #getElementsToSelect() + * <em>Elements To Select</em>}' reference list. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #getElementsToSelect() + * @generated + * @ordered + */ + protected EList<EObject> elementsToSelect; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected UIStateImpl() { + super(); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return ViewpointPackage.Literals.UI_STATE; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public boolean isInverseSelectionOrder() { + return inverseSelectionOrder; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void setInverseSelectionOrder(boolean newInverseSelectionOrder) { + boolean oldInverseSelectionOrder = inverseSelectionOrder; + inverseSelectionOrder = newInverseSelectionOrder; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, ViewpointPackage.UI_STATE__INVERSE_SELECTION_ORDER, oldInverseSelectionOrder, inverseSelectionOrder)); + } + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public EList<EObject> getElementsToSelect() { + if (elementsToSelect == null) { + elementsToSelect = new EObjectEList.Unsettable<EObject>(EObject.class, this, ViewpointPackage.UI_STATE__ELEMENTS_TO_SELECT); + } + return elementsToSelect; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void unsetElementsToSelect() { + if (elementsToSelect != null) { + ((InternalEList.Unsettable<?>) elementsToSelect).unset(); + } + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public boolean isSetElementsToSelect() { + return elementsToSelect != null && ((InternalEList.Unsettable<?>) elementsToSelect).isSet(); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case ViewpointPackage.UI_STATE__INVERSE_SELECTION_ORDER: + return isInverseSelectionOrder(); + case ViewpointPackage.UI_STATE__ELEMENTS_TO_SELECT: + return getElementsToSelect(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case ViewpointPackage.UI_STATE__INVERSE_SELECTION_ORDER: + setInverseSelectionOrder((Boolean) newValue); + return; + case ViewpointPackage.UI_STATE__ELEMENTS_TO_SELECT: + getElementsToSelect().clear(); + getElementsToSelect().addAll((Collection<? extends EObject>) newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case ViewpointPackage.UI_STATE__INVERSE_SELECTION_ORDER: + setInverseSelectionOrder(UIStateImpl.INVERSE_SELECTION_ORDER_EDEFAULT); + return; + case ViewpointPackage.UI_STATE__ELEMENTS_TO_SELECT: + unsetElementsToSelect(); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case ViewpointPackage.UI_STATE__INVERSE_SELECTION_ORDER: + return inverseSelectionOrder != UIStateImpl.INVERSE_SELECTION_ORDER_EDEFAULT; + case ViewpointPackage.UI_STATE__ELEMENTS_TO_SELECT: + return isSetElementsToSelect(); + } + return super.eIsSet(featureID); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) { + return super.toString(); + } + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (inverseSelectionOrder: "); + result.append(inverseSelectionOrder); + result.append(')'); + return result.toString(); + } + +} // UIStateImpl diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointFactoryImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointFactoryImpl.java index 9f735e3fa0..1bb1100c8c 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointFactoryImpl.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointFactoryImpl.java @@ -41,6 +41,7 @@ import org.eclipse.sirius.viewpoint.MetaModelExtension; import org.eclipse.sirius.viewpoint.RGBValues; import org.eclipse.sirius.viewpoint.SessionManagerEObject; import org.eclipse.sirius.viewpoint.SyncStatus; +import org.eclipse.sirius.viewpoint.UIState; import org.eclipse.sirius.viewpoint.ViewpointFactory; import org.eclipse.sirius.viewpoint.ViewpointPackage; @@ -119,6 +120,8 @@ public class ViewpointFactoryImpl extends EFactoryImpl implements ViewpointFacto return createDModel(); case ViewpointPackage.BASIC_LABEL_STYLE: return createBasicLabelStyle(); + case ViewpointPackage.UI_STATE: + return createUIState(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } @@ -340,6 +343,17 @@ public class ViewpointFactoryImpl extends EFactoryImpl implements ViewpointFacto * * @generated */ + @Override + public UIState createUIState() { + UIStateImpl uiState = new UIStateImpl(); + return uiState; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ public FontFormat createFontFormatFromString(EDataType eDataType, String initialValue) { FontFormat result = FontFormat.get(initialValue); if (result == null) { diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointPackageImpl.java index 22ae0d0804..6bd19fa31c 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointPackageImpl.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointPackageImpl.java @@ -49,6 +49,7 @@ import org.eclipse.sirius.viewpoint.RGBValues; import org.eclipse.sirius.viewpoint.SessionManagerEObject; import org.eclipse.sirius.viewpoint.Style; import org.eclipse.sirius.viewpoint.SyncStatus; +import org.eclipse.sirius.viewpoint.UIState; import org.eclipse.sirius.viewpoint.ViewpointFactory; import org.eclipse.sirius.viewpoint.ViewpointPackage; import org.eclipse.sirius.viewpoint.description.DescriptionPackage; @@ -250,6 +251,13 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka * * @generated */ + private EClass uiStateEClass = null; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ private EEnum fontFormatEEnum = null; /** @@ -289,7 +297,7 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka * method {@link #init init()}, which also performs initialization of the * package, or returns the registered package, if one already exists. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see org.eclipse.emf.ecore.EPackage.Registry * @see org.eclipse.sirius.viewpoint.ViewpointPackage#eNS_URI * @see #init() @@ -315,7 +323,7 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka * that field is accessed. Clients should not invoke it directly. Instead, * they should simply access that field to obtain the package. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #eNS_URI * @see #createPackageContents() * @see #initializePackageContents() @@ -607,6 +615,16 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka * @generated */ @Override + public EReference getDRepresentation_UiState() { + return (EReference) dRepresentationEClass.getEStructuralFeatures().get(4); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override public EClass getDRepresentationElement() { return dRepresentationElementEClass; } @@ -1047,6 +1065,36 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka * @generated */ @Override + public EClass getUIState() { + return uiStateEClass; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public EAttribute getUIState_InverseSelectionOrder() { + return (EAttribute) uiStateEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public EReference getUIState_ElementsToSelect() { + return (EReference) uiStateEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override public EEnum getFontFormat() { return fontFormatEEnum; } @@ -1152,6 +1200,7 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka createEReference(dRepresentationEClass, ViewpointPackage.DREPRESENTATION__REPRESENTATION_ELEMENTS); createEAttribute(dRepresentationEClass, ViewpointPackage.DREPRESENTATION__NAME); createEReference(dRepresentationEClass, ViewpointPackage.DREPRESENTATION__OWNED_ANNOTATION_ENTRIES); + createEReference(dRepresentationEClass, ViewpointPackage.DREPRESENTATION__UI_STATE); dRepresentationElementEClass = createEClass(ViewpointPackage.DREPRESENTATION_ELEMENT); createEAttribute(dRepresentationElementEClass, ViewpointPackage.DREPRESENTATION_ELEMENT__NAME); @@ -1214,6 +1263,10 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka customizableEClass = createEClass(ViewpointPackage.CUSTOMIZABLE); createEAttribute(customizableEClass, ViewpointPackage.CUSTOMIZABLE__CUSTOM_FEATURES); + uiStateEClass = createEClass(ViewpointPackage.UI_STATE); + createEAttribute(uiStateEClass, ViewpointPackage.UI_STATE__INVERSE_SELECTION_ORDER); + createEReference(uiStateEClass, ViewpointPackage.UI_STATE__ELEMENTS_TO_SELECT); + // Create enums fontFormatEEnum = createEEnum(ViewpointPackage.FONT_FORMAT); labelAlignmentEEnum = createEEnum(ViewpointPackage.LABEL_ALIGNMENT); @@ -1235,7 +1288,7 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka * Complete the initialization of the package and its meta-model. This * method is guarded to have no affect on any invocation but its first. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ public void initializePackageContents() { @@ -1345,6 +1398,9 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka initEReference(getDRepresentation_OwnedAnnotationEntries(), theDescriptionPackage.getAnnotationEntry(), null, "ownedAnnotationEntries", null, 0, -1, DRepresentation.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); + initEReference(getDRepresentation_UiState(), this.getUIState(), null, "uiState", null, 0, 1, DRepresentation.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); initEClass(dRepresentationElementEClass, DRepresentationElement.class, "DRepresentationElement", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); initEAttribute(getDRepresentationElement_Name(), theEcorePackage.getEString(), "name", "", 0, 1, DRepresentationElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, @@ -1447,6 +1503,13 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka initEAttribute(getCustomizable_CustomFeatures(), theEcorePackage.getEString(), "customFeatures", null, 0, -1, Customizable.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); + initEClass(uiStateEClass, UIState.class, "UIState", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getUIState_InverseSelectionOrder(), theEcorePackage.getEBoolean(), "inverseSelectionOrder", "false", 0, 1, UIState.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); + initEReference(getUIState_ElementsToSelect(), theEcorePackage.getEObject(), null, "elementsToSelect", null, 0, -1, UIState.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); + // Initialize enums and add enum literals initEEnum(fontFormatEEnum, FontFormat.class, "FontFormat"); addEEnumLiteral(fontFormatEEnum, FontFormat.ITALIC_LITERAL); diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointAdapterFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointAdapterFactory.java index 92a28952c7..126086d6d9 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointAdapterFactory.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointAdapterFactory.java @@ -40,6 +40,7 @@ import org.eclipse.sirius.viewpoint.LabelStyle; import org.eclipse.sirius.viewpoint.MetaModelExtension; import org.eclipse.sirius.viewpoint.SessionManagerEObject; import org.eclipse.sirius.viewpoint.Style; +import org.eclipse.sirius.viewpoint.UIState; import org.eclipse.sirius.viewpoint.ViewpointPackage; import org.eclipse.sirius.viewpoint.description.DModelElement; import org.eclipse.sirius.viewpoint.description.DocumentedElement; @@ -225,6 +226,11 @@ public class ViewpointAdapterFactory extends AdapterFactoryImpl { } @Override + public Adapter caseUIState(UIState object) { + return createUIStateAdapter(); + } + + @Override public Adapter caseDocumentedElement(DocumentedElement object) { return createDocumentedElementAdapter(); } @@ -643,6 +649,21 @@ public class ViewpointAdapterFactory extends AdapterFactoryImpl { /** * Creates a new adapter for an object of class ' + * {@link org.eclipse.sirius.viewpoint.UIState <em>UI State</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.UIState + * @generated + */ + public Adapter createUIStateAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class ' * {@link org.eclipse.sirius.viewpoint.description.DocumentedElement * <em>Documented Element</em>}'. <!-- begin-user-doc --> This default * implementation returns null so that we can easily ignore cases; it's diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointSwitch.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointSwitch.java index ca51d97a45..96004c4f5d 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointSwitch.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointSwitch.java @@ -40,6 +40,7 @@ import org.eclipse.sirius.viewpoint.LabelStyle; import org.eclipse.sirius.viewpoint.MetaModelExtension; import org.eclipse.sirius.viewpoint.SessionManagerEObject; import org.eclipse.sirius.viewpoint.Style; +import org.eclipse.sirius.viewpoint.UIState; import org.eclipse.sirius.viewpoint.ViewpointPackage; import org.eclipse.sirius.viewpoint.description.DModelElement; import org.eclipse.sirius.viewpoint.description.DocumentedElement; @@ -386,6 +387,14 @@ public class ViewpointSwitch<T> { } return result; } + case ViewpointPackage.UI_STATE: { + UIState uiState = (UIState) theEObject; + T result = caseUIState(uiState); + if (result == null) { + result = defaultCase(theEObject); + } + return result; + } default: return defaultCase(theEObject); } @@ -818,6 +827,23 @@ public class ViewpointSwitch<T> { /** * Returns the result of interpreting the object as an instance of ' + * <em>UI State</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>UI State</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseUIState(UIState object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of ' * <em>Documented Element</em>'. <!-- begin-user-doc --> This implementation * returns null; returning a non-null result will terminate the switch. <!-- * end-user-doc --> |