diff options
39 files changed, 436 insertions, 98 deletions
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IInformationFlow.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IInformationFlow.gif Binary files differnew file mode 100755 index 00000000000..a03a30edab8 --- /dev/null +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IInformationFlow.gif diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IObjectLink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IObjectLink.gif Binary files differnew file mode 100755 index 00000000000..cfb2d6e244d --- /dev/null +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IObjectLink.gif diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IInformationFlow.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IInformationFlow.gif Binary files differnew file mode 100755 index 00000000000..cd264439191 --- /dev/null +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IInformationFlow.gif diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IObjectLink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IObjectLink.gif Binary files differnew file mode 100755 index 00000000000..5ea562b4e54 --- /dev/null +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IObjectLink.gif diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IInformationFlow.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IInformationFlow.gif Binary files differnew file mode 100755 index 00000000000..83c60f902ae --- /dev/null +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IInformationFlow.gif diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IObjectLink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IObjectLink.gif Binary files differnew file mode 100755 index 00000000000..c0de2c7a46c --- /dev/null +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IObjectLink.gif diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IInformationFlow.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IInformationFlow.gif Binary files differnew file mode 100755 index 00000000000..3cfac31dcd1 --- /dev/null +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IInformationFlow.gif diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IObjectLink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IObjectLink.gif Binary files differnew file mode 100755 index 00000000000..179a7e8acb6 --- /dev/null +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IObjectLink.gif diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IInformationFlow.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IInformationFlow.gif Binary files differnew file mode 100755 index 00000000000..3cfac31dcd1 --- /dev/null +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IInformationFlow.gif diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IObjectLink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IObjectLink.gif Binary files differnew file mode 100755 index 00000000000..179a7e8acb6 --- /dev/null +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IObjectLink.gif diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IInformationFlow.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IInformationFlow.gif Binary files differnew file mode 100755 index 00000000000..49d51602e94 --- /dev/null +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IInformationFlow.gif diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IObjectLink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IObjectLink.gif Binary files differnew file mode 100755 index 00000000000..be01e398e7d --- /dev/null +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IObjectLink.gif diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IInformationFlow.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IInformationFlow.gif Binary files differnew file mode 100755 index 00000000000..f6ec10ae1ca --- /dev/null +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IInformationFlow.gif diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IObjectLink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IObjectLink.gif Binary files differnew file mode 100755 index 00000000000..5aacb3fcbfe --- /dev/null +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IObjectLink.gif diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IInformationFlow.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IInformationFlow.gif Binary files differnew file mode 100755 index 00000000000..ecde3358fa7 --- /dev/null +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IInformationFlow.gif diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IObjectLink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IObjectLink.gif Binary files differnew file mode 100755 index 00000000000..05fd372965d --- /dev/null +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IObjectLink.gif diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IAssociationClassItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IAssociationClassItemProvider.java index 8089ca7d676..149e04a2284 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IAssociationClassItemProvider.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IAssociationClassItemProvider.java @@ -135,7 +135,8 @@ public class IAssociationClassItemProvider extends IClassItemProvider { childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_Operations() || childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_PrimitiveOperations() || childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_Dependencies() || - childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_HyperLinks(); + childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_HyperLinks() || + childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_ObjectLinks(); if (qualify) { return getString diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IClassItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IClassItemProvider.java index cfaeaf67ddc..ead28a7e8f8 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IClassItemProvider.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IClassItemProvider.java @@ -1182,6 +1182,11 @@ public class IClassItemProvider extends IClassifierItemProvider { newChildDescriptors.add (createChildParameter (UMLRhapsodyPackage.eINSTANCE.getIClass_Inheritances(), + UMLRhapsodyFactory.eINSTANCE.createIInformationFlow())); + + newChildDescriptors.add + (createChildParameter + (UMLRhapsodyPackage.eINSTANCE.getIClass_Inheritances(), UMLRhapsodyFactory.eINSTANCE.createIRelation())); newChildDescriptors.add @@ -1272,6 +1277,11 @@ public class IClassItemProvider extends IClassifierItemProvider { newChildDescriptors.add (createChildParameter (UMLRhapsodyPackage.eINSTANCE.getIClass_Inheritances(), + UMLRhapsodyFactory.eINSTANCE.createIObjectLink())); + + newChildDescriptors.add + (createChildParameter + (UMLRhapsodyPackage.eINSTANCE.getIClass_Inheritances(), UMLRhapsodyFactory.eINSTANCE.createIObjectModelDiagram())); newChildDescriptors.add @@ -2223,7 +2233,8 @@ public class IClassItemProvider extends IClassifierItemProvider { childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_Operations() || childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_PrimitiveOperations() || childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_Dependencies() || - childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_HyperLinks(); + childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_HyperLinks() || + childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_ObjectLinks(); if (qualify) { return getString diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IDiagramItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IDiagramItemProvider.java index 80990069c0e..07bf8711a60 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IDiagramItemProvider.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IDiagramItemProvider.java @@ -718,6 +718,11 @@ public class IDiagramItemProvider extends IUnitItemProvider { newChildDescriptors.add (createChildParameter (UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes(), + UMLRhapsodyFactory.eINSTANCE.createIInformationFlow())); + + newChildDescriptors.add + (createChildParameter + (UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes(), UMLRhapsodyFactory.eINSTANCE.createIRelation())); newChildDescriptors.add @@ -808,6 +813,11 @@ public class IDiagramItemProvider extends IUnitItemProvider { newChildDescriptors.add (createChildParameter (UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes(), + UMLRhapsodyFactory.eINSTANCE.createIObjectLink())); + + newChildDescriptors.add + (createChildParameter + (UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes(), UMLRhapsodyFactory.eINSTANCE.createIObjectModelDiagram())); newChildDescriptors.add diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IFileItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IFileItemProvider.java index a7b8ed6d5c8..0252fe43243 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IFileItemProvider.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IFileItemProvider.java @@ -615,6 +615,11 @@ public class IFileItemProvider extends IUnitItemProvider { newChildDescriptors.add (createChildParameter (UMLRhapsodyPackage.eINSTANCE.getIFile_Fragments(), + UMLRhapsodyFactory.eINSTANCE.createIInformationFlow())); + + newChildDescriptors.add + (createChildParameter + (UMLRhapsodyPackage.eINSTANCE.getIFile_Fragments(), UMLRhapsodyFactory.eINSTANCE.createIRelation())); newChildDescriptors.add @@ -705,6 +710,11 @@ public class IFileItemProvider extends IUnitItemProvider { newChildDescriptors.add (createChildParameter (UMLRhapsodyPackage.eINSTANCE.getIFile_Fragments(), + UMLRhapsodyFactory.eINSTANCE.createIObjectLink())); + + newChildDescriptors.add + (createChildParameter + (UMLRhapsodyPackage.eINSTANCE.getIFile_Fragments(), UMLRhapsodyFactory.eINSTANCE.createIObjectModelDiagram())); newChildDescriptors.add diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInformationFlowItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInformationFlowItemProvider.java index 7ebb2154ed1..2789d65943b 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInformationFlowItemProvider.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInformationFlowItemProvider.java @@ -58,6 +58,7 @@ public class IInformationFlowItemProvider extends DeclarativesTypeItemProvider { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); + addDisplayNamePropertyDescriptor(object); addIdPropertyDescriptor(object); addMyStatePropertyDescriptor(object); addNamePropertyDescriptor(object); @@ -75,6 +76,28 @@ public class IInformationFlowItemProvider extends DeclarativesTypeItemProvider { } /** + * This adds a property descriptor for the Display Name feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addDisplayNamePropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_IModelElement_displayName_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_IModelElement_displayName_feature", "_UI_IModelElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + UMLRhapsodyPackage.eINSTANCE.getIModelElement_DisplayName(), + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); + } + + /** * This adds a property descriptor for the Id feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -412,6 +435,7 @@ public class IInformationFlowItemProvider extends DeclarativesTypeItemProvider { updateChildren(notification); switch (notification.getFeatureID(IInformationFlow.class)) { + case UMLRhapsodyPackage.IINFORMATION_FLOW__DISPLAY_NAME: case UMLRhapsodyPackage.IINFORMATION_FLOW__ID: case UMLRhapsodyPackage.IINFORMATION_FLOW__MY_STATE: case UMLRhapsodyPackage.IINFORMATION_FLOW__NAME: diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IObjectLinkItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IObjectLinkItemProvider.java index 3011efb1fd8..4f2e79412bf 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IObjectLinkItemProvider.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IObjectLinkItemProvider.java @@ -62,6 +62,7 @@ public class IObjectLinkItemProvider extends ObjectLinksTypeItemProvider { addIdPropertyDescriptor(object); addMyStatePropertyDescriptor(object); addNamePropertyDescriptor(object); + addDisplayNamePropertyDescriptor(object); addToLinkPropertyDescriptor(object); addFromLinkPropertyDescriptor(object); addEnd1MultiplicityPropertyDescriptor(object); @@ -165,6 +166,28 @@ public class IObjectLinkItemProvider extends ObjectLinksTypeItemProvider { } /** + * This adds a property descriptor for the Display Name feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addDisplayNamePropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_IModelElement_displayName_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_IModelElement_displayName_feature", "_UI_IModelElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + UMLRhapsodyPackage.eINSTANCE.getIModelElement_DisplayName(), + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); + } + + /** * This adds a property descriptor for the To Link feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -459,6 +482,7 @@ public class IObjectLinkItemProvider extends ObjectLinksTypeItemProvider { case UMLRhapsodyPackage.IOBJECT_LINK__ID: case UMLRhapsodyPackage.IOBJECT_LINK__MY_STATE: case UMLRhapsodyPackage.IOBJECT_LINK__NAME: + case UMLRhapsodyPackage.IOBJECT_LINK__DISPLAY_NAME: case UMLRhapsodyPackage.IOBJECT_LINK__END1_MULTIPLICITY: case UMLRhapsodyPackage.IOBJECT_LINK__END2_MULTIPLICITY: case UMLRhapsodyPackage.IOBJECT_LINK__REQUIREMEN_TRACABILITY_HANDLE: diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IPartItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IPartItemProvider.java index ae38f5a6823..8fee347a62d 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IPartItemProvider.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IPartItemProvider.java @@ -275,41 +275,41 @@ public class IPartItemProvider extends AssociationsTypeItemProvider { } /** - * This adds a property descriptor for the Other Class feature. + * This adds a property descriptor for the Display Name feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void addOtherClassPropertyDescriptor(Object object) { + protected void addDisplayNamePropertyDescriptor(Object object) { itemPropertyDescriptors.add (createItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_IPart_otherClass_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IPart_otherClass_feature", "_UI_IPart_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - UMLRhapsodyPackage.eINSTANCE.getIPart_OtherClass(), + getString("_UI_IModelElement_displayName_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_IModelElement_displayName_feature", "_UI_IModelElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + UMLRhapsodyPackage.eINSTANCE.getIModelElement_DisplayName(), true, false, - true, - null, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** - * This adds a property descriptor for the Inverse feature. + * This adds a property descriptor for the Other Class feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void addInversePropertyDescriptor(Object object) { + protected void addOtherClassPropertyDescriptor(Object object) { itemPropertyDescriptors.add (createItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_IPart_inverse_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IPart_inverse_feature", "_UI_IPart_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - UMLRhapsodyPackage.eINSTANCE.getIPart_Inverse(), + getString("_UI_IPart_otherClass_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_IPart_otherClass_feature", "_UI_IPart_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + UMLRhapsodyPackage.eINSTANCE.getIPart_OtherClass(), true, false, true, @@ -319,23 +319,23 @@ public class IPartItemProvider extends AssociationsTypeItemProvider { } /** - * This adds a property descriptor for the Display Name feature. + * This adds a property descriptor for the Inverse feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void addDisplayNamePropertyDescriptor(Object object) { + protected void addInversePropertyDescriptor(Object object) { itemPropertyDescriptors.add (createItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_IModelElement_displayName_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IModelElement_displayName_feature", "_UI_IModelElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - UMLRhapsodyPackage.eINSTANCE.getIModelElement_DisplayName(), + getString("_UI_IPart_inverse_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_IPart_inverse_feature", "_UI_IPart_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + UMLRhapsodyPackage.eINSTANCE.getIPart_Inverse(), true, false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + true, + null, null, null)); } diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IProjectItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IProjectItemProvider.java index 067cc87806e..eb566e5f859 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IProjectItemProvider.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IProjectItemProvider.java @@ -596,6 +596,11 @@ public class IProjectItemProvider extends IPackageItemProvider { newChildDescriptors.add (createChildParameter (UMLRhapsodyPackage.eINSTANCE.getIProject_Diagrams(), + UMLRhapsodyFactory.eINSTANCE.createIInformationFlow())); + + newChildDescriptors.add + (createChildParameter + (UMLRhapsodyPackage.eINSTANCE.getIProject_Diagrams(), UMLRhapsodyFactory.eINSTANCE.createIRelation())); newChildDescriptors.add @@ -686,6 +691,11 @@ public class IProjectItemProvider extends IPackageItemProvider { newChildDescriptors.add (createChildParameter (UMLRhapsodyPackage.eINSTANCE.getIProject_Diagrams(), + UMLRhapsodyFactory.eINSTANCE.createIObjectLink())); + + newChildDescriptors.add + (createChildParameter + (UMLRhapsodyPackage.eINSTANCE.getIProject_Diagrams(), UMLRhapsodyFactory.eINSTANCE.createIObjectModelDiagram())); newChildDescriptors.add @@ -1086,6 +1096,11 @@ public class IProjectItemProvider extends IPackageItemProvider { newChildDescriptors.add (createChildParameter (UMLRhapsodyPackage.eINSTANCE.getIProject_Components(), + UMLRhapsodyFactory.eINSTANCE.createIInformationFlow())); + + newChildDescriptors.add + (createChildParameter + (UMLRhapsodyPackage.eINSTANCE.getIProject_Components(), UMLRhapsodyFactory.eINSTANCE.createIRelation())); newChildDescriptors.add @@ -1176,6 +1191,11 @@ public class IProjectItemProvider extends IPackageItemProvider { newChildDescriptors.add (createChildParameter (UMLRhapsodyPackage.eINSTANCE.getIProject_Components(), + UMLRhapsodyFactory.eINSTANCE.createIObjectLink())); + + newChildDescriptors.add + (createChildParameter + (UMLRhapsodyPackage.eINSTANCE.getIProject_Components(), UMLRhapsodyFactory.eINSTANCE.createIObjectModelDiagram())); newChildDescriptors.add diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStateChartItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStateChartItemProvider.java index dc61f42b922..18776c0795a 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStateChartItemProvider.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStateChartItemProvider.java @@ -423,6 +423,7 @@ public class IStateChartItemProvider extends IClassItemProvider { childFeature == UMLRhapsodyPackage.eINSTANCE.getIStateChart_States() || childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_Dependencies() || childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_HyperLinks() || + childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_ObjectLinks() || childFeature == UMLRhapsodyPackage.eINSTANCE.getNestedStateChartType_Transitions(); if (qualify) { diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStateItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStateItemProvider.java index 0226ac23ab2..537884c6f76 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStateItemProvider.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStateItemProvider.java @@ -585,6 +585,11 @@ public class IStateItemProvider extends IStateVertexItemProvider { newChildDescriptors.add (createChildParameter (UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction(), + UMLRhapsodyFactory.eINSTANCE.createIInformationFlow())); + + newChildDescriptors.add + (createChildParameter + (UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction(), UMLRhapsodyFactory.eINSTANCE.createIRelation())); newChildDescriptors.add @@ -675,6 +680,11 @@ public class IStateItemProvider extends IStateVertexItemProvider { newChildDescriptors.add (createChildParameter (UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction(), + UMLRhapsodyFactory.eINSTANCE.createIObjectLink())); + + newChildDescriptors.add + (createChildParameter + (UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction(), UMLRhapsodyFactory.eINSTANCE.createIObjectModelDiagram())); newChildDescriptors.add diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ISubsystemItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ISubsystemItemProvider.java index 7f8c6f6fefd..48f502af86e 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ISubsystemItemProvider.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ISubsystemItemProvider.java @@ -1898,6 +1898,11 @@ public class ISubsystemItemProvider extends OwnerHandleTypeItemProvider { newChildDescriptors.add (createChildParameter (UMLRhapsodyPackage.eINSTANCE.getISubsystem_TableLayouts(), + UMLRhapsodyFactory.eINSTANCE.createIInformationFlow())); + + newChildDescriptors.add + (createChildParameter + (UMLRhapsodyPackage.eINSTANCE.getISubsystem_TableLayouts(), UMLRhapsodyFactory.eINSTANCE.createIRelation())); newChildDescriptors.add @@ -1988,6 +1993,11 @@ public class ISubsystemItemProvider extends OwnerHandleTypeItemProvider { newChildDescriptors.add (createChildParameter (UMLRhapsodyPackage.eINSTANCE.getISubsystem_TableLayouts(), + UMLRhapsodyFactory.eINSTANCE.createIObjectLink())); + + newChildDescriptors.add + (createChildParameter + (UMLRhapsodyPackage.eINSTANCE.getISubsystem_TableLayouts(), UMLRhapsodyFactory.eINSTANCE.createIObjectModelDiagram())); newChildDescriptors.add diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITagItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITagItemProvider.java index d5f4bfbfbe6..750867604dd 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITagItemProvider.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITagItemProvider.java @@ -632,6 +632,11 @@ public class ITagItemProvider extends IVariableItemProvider { newChildDescriptors.add (createChildParameter (UMLRhapsodyPackage.eINSTANCE.getITag_ValueSpecifications(), + UMLRhapsodyFactory.eINSTANCE.createIInformationFlow())); + + newChildDescriptors.add + (createChildParameter + (UMLRhapsodyPackage.eINSTANCE.getITag_ValueSpecifications(), UMLRhapsodyFactory.eINSTANCE.createIRelation())); newChildDescriptors.add @@ -722,6 +727,11 @@ public class ITagItemProvider extends IVariableItemProvider { newChildDescriptors.add (createChildParameter (UMLRhapsodyPackage.eINSTANCE.getITag_ValueSpecifications(), + UMLRhapsodyFactory.eINSTANCE.createIObjectLink())); + + newChildDescriptors.add + (createChildParameter + (UMLRhapsodyPackage.eINSTANCE.getITag_ValueSpecifications(), UMLRhapsodyFactory.eINSTANCE.createIObjectModelDiagram())); newChildDescriptors.add diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/model/Rhapsody.ecore b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/model/Rhapsody.ecore index f3e97a4602e..3d8bbebb258 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/model/Rhapsody.ecore +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/model/Rhapsody.ecore @@ -1183,6 +1183,9 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="IAssociationClass" eSuperTypes="#//IClass"/> <eClassifiers xsi:type="ecore:EClass" name="IAssociationEnd" eSuperTypes="#//AssociationsType #//M_subjectType #//M_hTargetType #//InverseType #//M_pModelObjectType #//ToLinkType"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="This object must not inherit from IModelElement.
In Rhapsody, this object doesn't have displayName field!"/> + </eAnnotations> <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="myState" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> @@ -1839,7 +1842,7 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="umlDependencyID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="IHyperLink" eSuperTypes="#//IDependency"/> - <eClassifiers xsi:type="ecore:EClass" name="IInformationFlow" eSuperTypes="#//DeclarativesType #//DependsOnType"> + <eClassifiers xsi:type="ecore:EClass" name="IInformationFlow" eSuperTypes="#//DeclarativesType #//DependsOnType #//IModelElement"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="myState" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> @@ -2110,7 +2113,7 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="count" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="INode" eSuperTypes="#//IClassifier"/> - <eClassifiers xsi:type="ecore:EClass" name="IObjectLink" eSuperTypes="#//ObjectLinksType #//ValueType #//M_pModelObjectType #//DependsOnType"> + <eClassifiers xsi:type="ecore:EClass" name="IObjectLink" eSuperTypes="#//ObjectLinksType #//ValueType #//M_pModelObjectType #//DependsOnType #//IModelElement"> <eStructuralFeatures xsi:type="ecore:EReference" name="Stereotypes" eType="#//IUnit"/> <eStructuralFeatures xsi:type="ecore:EReference" name="Tags" eType="#//ITag" containment="true"/> <eStructuralFeatures xsi:type="ecore:EReference" name="toLink" eType="#//ToLinkType"/> diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IAssociationEnd.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IAssociationEnd.java index 247d6fdd06d..d33609bcd57 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IAssociationEnd.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IAssociationEnd.java @@ -19,6 +19,11 @@ import org.eclipse.emf.common.util.EList; * A representation of the model object '<em><b>IAssociation End</b></em>'. * <!-- end-user-doc --> * + * <!-- begin-model-doc --> + * This object must not inherit from IModelElement. + * In Rhapsody, this object doesn't have displayName field! + * <!-- end-model-doc --> + * * <p> * The following features are supported: * </p> diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IInformationFlow.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IInformationFlow.java index e3de1539306..d762f1e1a64 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IInformationFlow.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IInformationFlow.java @@ -48,7 +48,7 @@ import org.eclipse.emf.common.util.EList; * @model * @generated */ -public interface IInformationFlow extends DeclarativesType, DependsOnType { +public interface IInformationFlow extends DeclarativesType, DependsOnType, IModelElement { /** * Returns the value of the '<em><b>Id</b></em>' attribute. * <!-- begin-user-doc --> diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IObjectLink.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IObjectLink.java index 62f818ea1dd..c82913c7ee6 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IObjectLink.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IObjectLink.java @@ -43,7 +43,7 @@ import org.eclipse.emf.common.util.EList; * @model * @generated */ -public interface IObjectLink extends ObjectLinksType, ValueType, M_pModelObjectType, DependsOnType { +public interface IObjectLink extends ObjectLinksType, ValueType, M_pModelObjectType, DependsOnType, IModelElement { /** * Returns the value of the '<em><b>Stereotypes</b></em>' reference. * <!-- begin-user-doc --> diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/UMLRhapsodyPackage.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/UMLRhapsodyPackage.java index 429d055aab8..11f1fbbc95e 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/UMLRhapsodyPackage.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/UMLRhapsodyPackage.java @@ -20288,13 +20288,22 @@ public interface UMLRhapsodyPackage extends EPackage { int IINFORMATION_FLOW = 133; /** + * The feature id for the '<em><b>Display Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int IINFORMATION_FLOW__DISPLAY_NAME = DECLARATIVES_TYPE_FEATURE_COUNT + 0; + + /** * The feature id for the '<em><b>Id</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int IINFORMATION_FLOW__ID = DECLARATIVES_TYPE_FEATURE_COUNT + 0; + int IINFORMATION_FLOW__ID = DECLARATIVES_TYPE_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>My State</b></em>' attribute. @@ -20303,7 +20312,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IINFORMATION_FLOW__MY_STATE = DECLARATIVES_TYPE_FEATURE_COUNT + 1; + int IINFORMATION_FLOW__MY_STATE = DECLARATIVES_TYPE_FEATURE_COUNT + 2; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -20312,7 +20321,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IINFORMATION_FLOW__NAME = DECLARATIVES_TYPE_FEATURE_COUNT + 2; + int IINFORMATION_FLOW__NAME = DECLARATIVES_TYPE_FEATURE_COUNT + 3; /** * The feature id for the '<em><b>Conveyed</b></em>' reference list. @@ -20321,7 +20330,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IINFORMATION_FLOW__CONVEYED = DECLARATIVES_TYPE_FEATURE_COUNT + 3; + int IINFORMATION_FLOW__CONVEYED = DECLARATIVES_TYPE_FEATURE_COUNT + 4; /** * The feature id for the '<em><b>End1 </b></em>' reference. @@ -20330,7 +20339,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IINFORMATION_FLOW__END1_ = DECLARATIVES_TYPE_FEATURE_COUNT + 4; + int IINFORMATION_FLOW__END1_ = DECLARATIVES_TYPE_FEATURE_COUNT + 5; /** * The feature id for the '<em><b>End2 </b></em>' reference. @@ -20339,7 +20348,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IINFORMATION_FLOW__END2_ = DECLARATIVES_TYPE_FEATURE_COUNT + 5; + int IINFORMATION_FLOW__END2_ = DECLARATIVES_TYPE_FEATURE_COUNT + 6; /** * The feature id for the '<em><b>Direction </b></em>' attribute. @@ -20348,7 +20357,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IINFORMATION_FLOW__DIRECTION_ = DECLARATIVES_TYPE_FEATURE_COUNT + 6; + int IINFORMATION_FLOW__DIRECTION_ = DECLARATIVES_TYPE_FEATURE_COUNT + 7; /** * The feature id for the '<em><b>Modified Time Weak</b></em>' attribute list. @@ -20357,7 +20366,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IINFORMATION_FLOW__MODIFIED_TIME_WEAK = DECLARATIVES_TYPE_FEATURE_COUNT + 7; + int IINFORMATION_FLOW__MODIFIED_TIME_WEAK = DECLARATIVES_TYPE_FEATURE_COUNT + 8; /** * The feature id for the '<em><b>Description</b></em>' containment reference. @@ -20366,7 +20375,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IINFORMATION_FLOW__DESCRIPTION = DECLARATIVES_TYPE_FEATURE_COUNT + 8; + int IINFORMATION_FLOW__DESCRIPTION = DECLARATIVES_TYPE_FEATURE_COUNT + 9; /** * The feature id for the '<em><b>End1 Object Port </b></em>' reference. @@ -20375,7 +20384,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IINFORMATION_FLOW__END1_OBJECT_PORT_ = DECLARATIVES_TYPE_FEATURE_COUNT + 9; + int IINFORMATION_FLOW__END1_OBJECT_PORT_ = DECLARATIVES_TYPE_FEATURE_COUNT + 10; /** * The feature id for the '<em><b>End2 Object Port </b></em>' reference. @@ -20384,7 +20393,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IINFORMATION_FLOW__END2_OBJECT_PORT_ = DECLARATIVES_TYPE_FEATURE_COUNT + 10; + int IINFORMATION_FLOW__END2_OBJECT_PORT_ = DECLARATIVES_TYPE_FEATURE_COUNT + 11; /** * The feature id for the '<em><b>Requiremen Tracability Handle</b></em>' attribute. @@ -20393,7 +20402,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IINFORMATION_FLOW__REQUIREMEN_TRACABILITY_HANDLE = DECLARATIVES_TYPE_FEATURE_COUNT + 11; + int IINFORMATION_FLOW__REQUIREMEN_TRACABILITY_HANDLE = DECLARATIVES_TYPE_FEATURE_COUNT + 12; /** * The feature id for the '<em><b>Hyper Links</b></em>' containment reference. @@ -20402,7 +20411,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IINFORMATION_FLOW__HYPER_LINKS = DECLARATIVES_TYPE_FEATURE_COUNT + 12; + int IINFORMATION_FLOW__HYPER_LINKS = DECLARATIVES_TYPE_FEATURE_COUNT + 13; /** * The feature id for the '<em><b>Dependencies</b></em>' containment reference. @@ -20411,7 +20420,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IINFORMATION_FLOW__DEPENDENCIES = DECLARATIVES_TYPE_FEATURE_COUNT + 13; + int IINFORMATION_FLOW__DEPENDENCIES = DECLARATIVES_TYPE_FEATURE_COUNT + 14; /** * The feature id for the '<em><b>Annotations</b></em>' containment reference. @@ -20420,7 +20429,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IINFORMATION_FLOW__ANNOTATIONS = DECLARATIVES_TYPE_FEATURE_COUNT + 14; + int IINFORMATION_FLOW__ANNOTATIONS = DECLARATIVES_TYPE_FEATURE_COUNT + 15; /** * The feature id for the '<em><b>Object Creation</b></em>' attribute. @@ -20429,7 +20438,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IINFORMATION_FLOW__OBJECT_CREATION = DECLARATIVES_TYPE_FEATURE_COUNT + 15; + int IINFORMATION_FLOW__OBJECT_CREATION = DECLARATIVES_TYPE_FEATURE_COUNT + 16; /** * The feature id for the '<em><b>Uml Dependency ID</b></em>' attribute. @@ -20438,7 +20447,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IINFORMATION_FLOW__UML_DEPENDENCY_ID = DECLARATIVES_TYPE_FEATURE_COUNT + 16; + int IINFORMATION_FLOW__UML_DEPENDENCY_ID = DECLARATIVES_TYPE_FEATURE_COUNT + 17; /** * The feature id for the '<em><b>Stereotypes</b></em>' reference. @@ -20447,7 +20456,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IINFORMATION_FLOW__STEREOTYPES = DECLARATIVES_TYPE_FEATURE_COUNT + 17; + int IINFORMATION_FLOW__STEREOTYPES = DECLARATIVES_TYPE_FEATURE_COUNT + 18; /** * The feature id for the '<em><b>Tags</b></em>' containment reference list. @@ -20456,7 +20465,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IINFORMATION_FLOW__TAGS = DECLARATIVES_TYPE_FEATURE_COUNT + 18; + int IINFORMATION_FLOW__TAGS = DECLARATIVES_TYPE_FEATURE_COUNT + 19; /** * The number of structural features of the '<em>IInformation Flow</em>' class. @@ -20465,7 +20474,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IINFORMATION_FLOW_FEATURE_COUNT = DECLARATIVES_TYPE_FEATURE_COUNT + 19; + int IINFORMATION_FLOW_FEATURE_COUNT = DECLARATIVES_TYPE_FEATURE_COUNT + 20; /** * The number of operations of the '<em>IInformation Flow</em>' class. @@ -23136,13 +23145,22 @@ public interface UMLRhapsodyPackage extends EPackage { int IOBJECT_LINK__NAME = OBJECT_LINKS_TYPE_FEATURE_COUNT + 3; /** + * The feature id for the '<em><b>Display Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int IOBJECT_LINK__DISPLAY_NAME = OBJECT_LINKS_TYPE_FEATURE_COUNT + 4; + + /** * The feature id for the '<em><b>Stereotypes</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int IOBJECT_LINK__STEREOTYPES = OBJECT_LINKS_TYPE_FEATURE_COUNT + 4; + int IOBJECT_LINK__STEREOTYPES = OBJECT_LINKS_TYPE_FEATURE_COUNT + 5; /** * The feature id for the '<em><b>Tags</b></em>' containment reference. @@ -23151,7 +23169,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IOBJECT_LINK__TAGS = OBJECT_LINKS_TYPE_FEATURE_COUNT + 5; + int IOBJECT_LINK__TAGS = OBJECT_LINKS_TYPE_FEATURE_COUNT + 6; /** * The feature id for the '<em><b>To Link</b></em>' reference. @@ -23160,7 +23178,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IOBJECT_LINK__TO_LINK = OBJECT_LINKS_TYPE_FEATURE_COUNT + 6; + int IOBJECT_LINK__TO_LINK = OBJECT_LINKS_TYPE_FEATURE_COUNT + 7; /** * The feature id for the '<em><b>From Link</b></em>' reference. @@ -23169,7 +23187,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IOBJECT_LINK__FROM_LINK = OBJECT_LINKS_TYPE_FEATURE_COUNT + 7; + int IOBJECT_LINK__FROM_LINK = OBJECT_LINKS_TYPE_FEATURE_COUNT + 8; /** * The feature id for the '<em><b>Instantiates</b></em>' containment reference. @@ -23178,7 +23196,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IOBJECT_LINK__INSTANTIATES = OBJECT_LINKS_TYPE_FEATURE_COUNT + 8; + int IOBJECT_LINK__INSTANTIATES = OBJECT_LINKS_TYPE_FEATURE_COUNT + 9; /** * The feature id for the '<em><b>End1 Multiplicity</b></em>' attribute. @@ -23187,7 +23205,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IOBJECT_LINK__END1_MULTIPLICITY = OBJECT_LINKS_TYPE_FEATURE_COUNT + 9; + int IOBJECT_LINK__END1_MULTIPLICITY = OBJECT_LINKS_TYPE_FEATURE_COUNT + 10; /** * The feature id for the '<em><b>End2 Multiplicity</b></em>' attribute. @@ -23196,7 +23214,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IOBJECT_LINK__END2_MULTIPLICITY = OBJECT_LINKS_TYPE_FEATURE_COUNT + 10; + int IOBJECT_LINK__END2_MULTIPLICITY = OBJECT_LINKS_TYPE_FEATURE_COUNT + 11; /** * The feature id for the '<em><b>To Port</b></em>' reference. @@ -23205,7 +23223,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IOBJECT_LINK__TO_PORT = OBJECT_LINKS_TYPE_FEATURE_COUNT + 11; + int IOBJECT_LINK__TO_PORT = OBJECT_LINKS_TYPE_FEATURE_COUNT + 12; /** * The feature id for the '<em><b>From Port</b></em>' reference. @@ -23214,7 +23232,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IOBJECT_LINK__FROM_PORT = OBJECT_LINKS_TYPE_FEATURE_COUNT + 12; + int IOBJECT_LINK__FROM_PORT = OBJECT_LINKS_TYPE_FEATURE_COUNT + 13; /** * The feature id for the '<em><b>Description</b></em>' containment reference. @@ -23223,7 +23241,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IOBJECT_LINK__DESCRIPTION = OBJECT_LINKS_TYPE_FEATURE_COUNT + 13; + int IOBJECT_LINK__DESCRIPTION = OBJECT_LINKS_TYPE_FEATURE_COUNT + 14; /** * The feature id for the '<em><b>Requiremen Tracability Handle</b></em>' attribute. @@ -23232,7 +23250,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IOBJECT_LINK__REQUIREMEN_TRACABILITY_HANDLE = OBJECT_LINKS_TYPE_FEATURE_COUNT + 14; + int IOBJECT_LINK__REQUIREMEN_TRACABILITY_HANDLE = OBJECT_LINKS_TYPE_FEATURE_COUNT + 15; /** * The feature id for the '<em><b>Code Update CG Time</b></em>' attribute list. @@ -23241,7 +23259,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IOBJECT_LINK__CODE_UPDATE_CG_TIME = OBJECT_LINKS_TYPE_FEATURE_COUNT + 15; + int IOBJECT_LINK__CODE_UPDATE_CG_TIME = OBJECT_LINKS_TYPE_FEATURE_COUNT + 16; /** * The feature id for the '<em><b>Object Creation</b></em>' attribute. @@ -23250,7 +23268,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IOBJECT_LINK__OBJECT_CREATION = OBJECT_LINKS_TYPE_FEATURE_COUNT + 16; + int IOBJECT_LINK__OBJECT_CREATION = OBJECT_LINKS_TYPE_FEATURE_COUNT + 17; /** * The feature id for the '<em><b>Uml Dependency ID</b></em>' attribute. @@ -23259,7 +23277,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IOBJECT_LINK__UML_DEPENDENCY_ID = OBJECT_LINKS_TYPE_FEATURE_COUNT + 17; + int IOBJECT_LINK__UML_DEPENDENCY_ID = OBJECT_LINKS_TYPE_FEATURE_COUNT + 18; /** * The number of structural features of the '<em>IObject Link</em>' class. @@ -23268,7 +23286,7 @@ public interface UMLRhapsodyPackage extends EPackage { * @generated * @ordered */ - int IOBJECT_LINK_FEATURE_COUNT = OBJECT_LINKS_TYPE_FEATURE_COUNT + 18; + int IOBJECT_LINK_FEATURE_COUNT = OBJECT_LINKS_TYPE_FEATURE_COUNT + 19; /** * The number of operations of the '<em>IObject Link</em>' class. diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IInformationFlowImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IInformationFlowImpl.java index 7299a2cfac5..dd21e332a1a 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IInformationFlowImpl.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IInformationFlowImpl.java @@ -30,6 +30,8 @@ import org.eclipse.emf.ecore.util.EObjectResolvingEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ConveyedType; +import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.DependsOnType; +import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ElementsType; import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.End1_Type; import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.End2_Type; import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDependency; @@ -37,6 +39,7 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDescription; import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IInformationFlow; import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IInstance; import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMHyperLink; +import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IModelElement; import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IRequirement; import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITag; import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IUnit; @@ -50,6 +53,7 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPacka * The following features are implemented: * </p> * <ul> + * <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IInformationFlowImpl#getDisplayName <em>Display Name</em>}</li> * <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IInformationFlowImpl#getId <em>Id</em>}</li> * <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IInformationFlowImpl#getMyState <em>My State</em>}</li> * <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IInformationFlowImpl#getName <em>Name</em>}</li> @@ -75,6 +79,26 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPacka */ public class IInformationFlowImpl extends DeclarativesTypeImpl implements IInformationFlow { /** + * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getDisplayName() + * @generated + * @ordered + */ + protected static final String DISPLAY_NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getDisplayName() + * @generated + * @ordered + */ + protected String displayName = DISPLAY_NAME_EDEFAULT; + + /** * The default value of the '{@link #getId() <em>Id</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -358,6 +382,27 @@ public class IInformationFlowImpl extends DeclarativesTypeImpl implements IInfor * <!-- end-user-doc --> * @generated */ + public String getDisplayName() { + return displayName; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setDisplayName(String newDisplayName) { + String oldDisplayName = displayName; + displayName = newDisplayName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, UMLRhapsodyPackage.IINFORMATION_FLOW__DISPLAY_NAME, oldDisplayName, displayName)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public String getId() { return id; } @@ -1020,6 +1065,8 @@ public class IInformationFlowImpl extends DeclarativesTypeImpl implements IInfor @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { + case UMLRhapsodyPackage.IINFORMATION_FLOW__DISPLAY_NAME: + return getDisplayName(); case UMLRhapsodyPackage.IINFORMATION_FLOW__ID: return getId(); case UMLRhapsodyPackage.IINFORMATION_FLOW__MY_STATE: @@ -1080,6 +1127,9 @@ public class IInformationFlowImpl extends DeclarativesTypeImpl implements IInfor @Override public void eSet(int featureID, Object newValue) { switch (featureID) { + case UMLRhapsodyPackage.IINFORMATION_FLOW__DISPLAY_NAME: + setDisplayName((String)newValue); + return; case UMLRhapsodyPackage.IINFORMATION_FLOW__ID: setId((String)newValue); return; @@ -1152,6 +1202,9 @@ public class IInformationFlowImpl extends DeclarativesTypeImpl implements IInfor @Override public void eUnset(int featureID) { switch (featureID) { + case UMLRhapsodyPackage.IINFORMATION_FLOW__DISPLAY_NAME: + setDisplayName(DISPLAY_NAME_EDEFAULT); + return; case UMLRhapsodyPackage.IINFORMATION_FLOW__ID: setId(ID_EDEFAULT); return; @@ -1221,6 +1274,8 @@ public class IInformationFlowImpl extends DeclarativesTypeImpl implements IInfor @Override public boolean eIsSet(int featureID) { switch (featureID) { + case UMLRhapsodyPackage.IINFORMATION_FLOW__DISPLAY_NAME: + return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName); case UMLRhapsodyPackage.IINFORMATION_FLOW__ID: return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id); case UMLRhapsodyPackage.IINFORMATION_FLOW__MY_STATE: @@ -1269,11 +1324,65 @@ public class IInformationFlowImpl extends DeclarativesTypeImpl implements IInfor * @generated */ @Override + public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) { + if (baseClass == ElementsType.class) { + switch (derivedFeatureID) { + default: return -1; + } + } + if (baseClass == DependsOnType.class) { + switch (derivedFeatureID) { + default: return -1; + } + } + if (baseClass == IModelElement.class) { + switch (derivedFeatureID) { + case UMLRhapsodyPackage.IINFORMATION_FLOW__DISPLAY_NAME: return UMLRhapsodyPackage.IMODEL_ELEMENT__DISPLAY_NAME; + default: return -1; + } + } + return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) { + if (baseClass == ElementsType.class) { + switch (baseFeatureID) { + default: return -1; + } + } + if (baseClass == DependsOnType.class) { + switch (baseFeatureID) { + default: return -1; + } + } + if (baseClass == IModelElement.class) { + switch (baseFeatureID) { + case UMLRhapsodyPackage.IMODEL_ELEMENT__DISPLAY_NAME: return UMLRhapsodyPackage.IINFORMATION_FLOW__DISPLAY_NAME; + default: return -1; + } + } + return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override public String toString() { if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (id: "); //$NON-NLS-1$ + result.append(" (displayName: "); //$NON-NLS-1$ + result.append(displayName); + result.append(", id: "); //$NON-NLS-1$ result.append(id); result.append(", myState: "); //$NON-NLS-1$ result.append(myState); diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IObjectLinkImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IObjectLinkImpl.java index 6852fa217d2..b662924b254 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IObjectLinkImpl.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IObjectLinkImpl.java @@ -31,6 +31,7 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ElementsType; import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.FromLinkType; import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDescription; import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMetaLinkHandle; +import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IModelElement; import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IObjectLink; import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IRelation; import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITag; @@ -52,6 +53,7 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ValueType; * <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IObjectLinkImpl#getId <em>Id</em>}</li> * <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IObjectLinkImpl#getMyState <em>My State</em>}</li> * <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IObjectLinkImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IObjectLinkImpl#getDisplayName <em>Display Name</em>}</li> * <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IObjectLinkImpl#getStereotypes <em>Stereotypes</em>}</li> * <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IObjectLinkImpl#getTags <em>Tags</em>}</li> * <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IObjectLinkImpl#getToLink <em>To Link</em>}</li> @@ -142,6 +144,26 @@ public class IObjectLinkImpl extends ObjectLinksTypeImpl implements IObjectLink protected String name = NAME_EDEFAULT; /** + * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getDisplayName() + * @generated + * @ordered + */ + protected static final String DISPLAY_NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getDisplayName() + * @generated + * @ordered + */ + protected String displayName = DISPLAY_NAME_EDEFAULT; + + /** * The cached value of the '{@link #getStereotypes() <em>Stereotypes</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -430,6 +452,27 @@ public class IObjectLinkImpl extends ObjectLinksTypeImpl implements IObjectLink * <!-- end-user-doc --> * @generated */ + public String getDisplayName() { + return displayName; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setDisplayName(String newDisplayName) { + String oldDisplayName = displayName; + displayName = newDisplayName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, UMLRhapsodyPackage.IOBJECT_LINK__DISPLAY_NAME, oldDisplayName, displayName)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public IUnit getStereotypes() { if (stereotypes != null && stereotypes.eIsProxy()) { InternalEObject oldStereotypes = (InternalEObject)stereotypes; @@ -964,6 +1007,8 @@ public class IObjectLinkImpl extends ObjectLinksTypeImpl implements IObjectLink return getMyState(); case UMLRhapsodyPackage.IOBJECT_LINK__NAME: return getName(); + case UMLRhapsodyPackage.IOBJECT_LINK__DISPLAY_NAME: + return getDisplayName(); case UMLRhapsodyPackage.IOBJECT_LINK__STEREOTYPES: if (resolve) return getStereotypes(); return basicGetStereotypes(); @@ -1026,6 +1071,9 @@ public class IObjectLinkImpl extends ObjectLinksTypeImpl implements IObjectLink case UMLRhapsodyPackage.IOBJECT_LINK__NAME: setName((String)newValue); return; + case UMLRhapsodyPackage.IOBJECT_LINK__DISPLAY_NAME: + setDisplayName((String)newValue); + return; case UMLRhapsodyPackage.IOBJECT_LINK__STEREOTYPES: setStereotypes((IUnit)newValue); return; @@ -1093,6 +1141,9 @@ public class IObjectLinkImpl extends ObjectLinksTypeImpl implements IObjectLink case UMLRhapsodyPackage.IOBJECT_LINK__NAME: setName(NAME_EDEFAULT); return; + case UMLRhapsodyPackage.IOBJECT_LINK__DISPLAY_NAME: + setDisplayName(DISPLAY_NAME_EDEFAULT); + return; case UMLRhapsodyPackage.IOBJECT_LINK__STEREOTYPES: setStereotypes((IUnit)null); return; @@ -1155,6 +1206,8 @@ public class IObjectLinkImpl extends ObjectLinksTypeImpl implements IObjectLink return MY_STATE_EDEFAULT == null ? myState != null : !MY_STATE_EDEFAULT.equals(myState); case UMLRhapsodyPackage.IOBJECT_LINK__NAME: return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case UMLRhapsodyPackage.IOBJECT_LINK__DISPLAY_NAME: + return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName); case UMLRhapsodyPackage.IOBJECT_LINK__STEREOTYPES: return stereotypes != null; case UMLRhapsodyPackage.IOBJECT_LINK__TAGS: @@ -1218,6 +1271,12 @@ public class IObjectLinkImpl extends ObjectLinksTypeImpl implements IObjectLink default: return -1; } } + if (baseClass == IModelElement.class) { + switch (derivedFeatureID) { + case UMLRhapsodyPackage.IOBJECT_LINK__DISPLAY_NAME: return UMLRhapsodyPackage.IMODEL_ELEMENT__DISPLAY_NAME; + default: return -1; + } + } return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); } @@ -1252,6 +1311,12 @@ public class IObjectLinkImpl extends ObjectLinksTypeImpl implements IObjectLink default: return -1; } } + if (baseClass == IModelElement.class) { + switch (baseFeatureID) { + case UMLRhapsodyPackage.IMODEL_ELEMENT__DISPLAY_NAME: return UMLRhapsodyPackage.IOBJECT_LINK__DISPLAY_NAME; + default: return -1; + } + } return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); } @@ -1273,6 +1338,8 @@ public class IObjectLinkImpl extends ObjectLinksTypeImpl implements IObjectLink result.append(myState); result.append(", name: "); //$NON-NLS-1$ result.append(name); + result.append(", displayName: "); //$NON-NLS-1$ + result.append(displayName); result.append(", end1Multiplicity: "); //$NON-NLS-1$ result.append(end1Multiplicity); result.append(", end2Multiplicity: "); //$NON-NLS-1$ diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IPartImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IPartImpl.java index 15a168c7fdb..3ac7fe662e8 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IPartImpl.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IPartImpl.java @@ -812,6 +812,27 @@ public class IPartImpl extends AssociationsTypeImpl implements IPart { * <!-- end-user-doc --> * @generated */ + public String getDisplayName() { + return displayName; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setDisplayName(String newDisplayName) { + String oldDisplayName = displayName; + displayName = newDisplayName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, UMLRhapsodyPackage.IPART__DISPLAY_NAME, oldDisplayName, displayName)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public IUnit getStereotypes() { if (stereotypes != null && stereotypes.eIsProxy()) { InternalEObject oldStereotypes = (InternalEObject)stereotypes; @@ -1070,27 +1091,6 @@ public class IPartImpl extends AssociationsTypeImpl implements IPart { * <!-- end-user-doc --> * @generated */ - public String getDisplayName() { - return displayName; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setDisplayName(String newDisplayName) { - String oldDisplayName = displayName; - displayName = newDisplayName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, UMLRhapsodyPackage.IPART__DISPLAY_NAME, oldDisplayName, displayName)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ public EList<String> getCodeUpdateCGTime() { if (codeUpdateCGTime == null) { codeUpdateCGTime = new EDataTypeEList<String>(String.class, this, UMLRhapsodyPackage.IPART__CODE_UPDATE_CG_TIME); diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/rhapsodymetamodel.ecore b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/rhapsodymetamodel.ecore index 8b50349ff25..a476577ac9f 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/rhapsodymetamodel.ecore +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/rhapsodymetamodel.ecore @@ -1839,7 +1839,7 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="umlDependencyID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="IHyperLink" eSuperTypes="#//IDependency"/> - <eClassifiers xsi:type="ecore:EClass" name="IInformationFlow" eSuperTypes="#//DeclarativesType #//DependsOnType"> + <eClassifiers xsi:type="ecore:EClass" name="IInformationFlow" eSuperTypes="#//DeclarativesType #//DependsOnType #//IModelElement"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="myState" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> @@ -2103,7 +2103,7 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="count" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="INode" eSuperTypes="#//IClassifier"/> - <eClassifiers xsi:type="ecore:EClass" name="IObjectLink" eSuperTypes="#//ObjectLinksType #//ValueType #//M_pModelObjectType #//DependsOnType"> + <eClassifiers xsi:type="ecore:EClass" name="IObjectLink" eSuperTypes="#//ObjectLinksType #//ValueType #//M_pModelObjectType #//DependsOnType #//IModelElement"> <eStructuralFeatures xsi:type="ecore:EReference" name="Stereotypes" eType="#//IUnit"/> <eStructuralFeatures xsi:type="ecore:EReference" name="Tags" eType="#//ITag" containment="true"/> <eStructuralFeatures xsi:type="ecore:EReference" name="toLink" eType="#//ToLinkType"/> diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/util/UMLRhapsodySwitch.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/util/UMLRhapsodySwitch.java index f9a225389f9..b0cee127a48 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/util/UMLRhapsodySwitch.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/util/UMLRhapsodySwitch.java @@ -1204,6 +1204,7 @@ public class UMLRhapsodySwitch<T> extends Switch<T> { T result = caseIInformationFlow(iInformationFlow); if (result == null) result = caseDeclarativesType(iInformationFlow); if (result == null) result = caseDependsOnType(iInformationFlow); + if (result == null) result = caseIModelElement(iInformationFlow); if (result == null) result = caseElementsType(iInformationFlow); if (result == null) result = defaultCase(theEObject); return result; @@ -1441,6 +1442,7 @@ public class UMLRhapsodySwitch<T> extends Switch<T> { if (result == null) result = caseValueType(iObjectLink); if (result == null) result = caseM_pModelObjectType(iObjectLink); if (result == null) result = caseDependsOnType(iObjectLink); + if (result == null) result = caseIModelElement(iObjectLink); if (result == null) result = caseElementsType(iObjectLink); if (result == null) result = defaultCase(theEObject); return result; diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/transform/SemanticInternationalization.qvto b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/transform/SemanticInternationalization.qvto index ee55b9bccb6..7ac809b3f11 100755 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/transform/SemanticInternationalization.qvto +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/transform/SemanticInternationalization.qvto @@ -141,21 +141,23 @@ helper NamedElement::getRhaposdyLabel():String{ rpyElement:=self.invresolveoneIn(IType::iTypeFromRhapsodyPredefinedTypesWithUMLPrimitivesTypes)->selectByKind(IModelElement)->any(true); }; - + //IAssociationEnd doesn't have the feature displayName //mapping umlrhapsody::IAssociationEnd::toAssociationswithoutProp(): uml::Association - if(rpyElement=null){ - rpyElement:=self.invresolveoneIn(IAssociationEnd::toAssociationswithoutProp)->selectByKind(IModelElement)->any(true); - }; +// if(rpyElement=null){ +// rpyElement:=self.invresolveoneIn(IAssociationEnd::toAssociationswithoutProp)->selectByKind(IModelElement)->any(true); +// }; + //IAssociationEnd doesn't have the feature displayName //mapping umlrhapsody::IAssociationEnd::toAssociationswithProp(): uml::Association { - if(rpyElement=null){ - rpyElement:=self.invresolveoneIn(IAssociationEnd::toAssociationswithProp)->selectByKind(IModelElement)->any(true); - }; - +// if(rpyElement=null){ +// rpyElement:=self.invresolveoneIn(IAssociationEnd::toAssociationswithProp)->selectByKind(IModelElement)->any(true); +// }; + + //IAssociationEnd doesn't have the feature displayName //mapping umlrhapsody::IAssociationEnd::toOwnedAssociationEnd(): uml::Property{ - if(rpyElement=null){ - rpyElement:=self.invresolveoneIn(IAssociationEnd::toOwnedAssociationEnd)->selectByKind(IModelElement)->any(true); - }; +// if(rpyElement=null){ +// rpyElement:=self.invresolveoneIn(IAssociationEnd::toOwnedAssociationEnd)->selectByKind(IModelElement)->any(true); +// }; //mapping umlrhapsody::IType::toUMLDatatype() : uml::DataType when {self.isUMLDataType()}{ //already managed by IType::iTypeToUMLElement @@ -319,10 +321,11 @@ helper NamedElement::getRhaposdyLabel():String{ rpyElement:=self.invresolveoneIn(IInterfaceItemTrigger::toTrigger)->selectByKind(IModelElement)->any(true); }; + //IAssociationEnd doesn't have the feature displayName //mapping umlrhapsody::IAssociationEnd::toAssociationsEnd(): uml::Property when{self.oclIsTypeOf(IAssociationEnd)}{ - if(rpyElement=null){ - rpyElement:=self.invresolveoneIn(IAssociationEnd::toAssociationsEnd)->selectByKind(IModelElement)->any(true); - }; +// if(rpyElement=null){ +// rpyElement:=self.invresolveoneIn(IAssociationEnd::toAssociationsEnd)->selectByKind(IModelElement)->any(true); +// }; //mapping umlrhapsody::IClass::fromClasse2Associations(): uml::Association if(rpyElement=null){ |
